Theme My Login - Version 5.0.1

Version Description

Only display function override notices on TML settings page
Typecast arrays as arrays (Fixes invalid datatype notices)
Add plugin domain to all gettext calls

Release Info

Developer	jfarthing84
Plugin	Theme My Login
Version	5.0.1
Comparing to
See all releases

Code changes from version 5.0 to 5.0.1

Files changed (27) hide show

admin/includes/admin.php +7 -1
admin/includes/module.php +6 -6
admin/options-basic.php +1 -1
admin/options-modules.php +1 -1
admin/options.php +2 -2
includes/functions.php +1 -1
includes/hook-functions.php +2 -2
includes/login-actions.php +1 -1
includes/login-functions.php +23 -23
includes/pluggable-functions.php +9 -9
includes/template-functions.php +22 -22
language/theme-my-login.pot +857 -0
modules/custom-passwords/custom-passwords.php +2 -2
modules/custom-passwords/{functions.php → includes/functions.php} +7 -7
modules/custom-passwords/{hook-functions.php → includes/hook-functions.php} +3 -3
modules/custom-redirection/{admin.php → admin/admin.php} +2 -2
modules/custom-redirection/custom-redirection.php +2 -2
modules/custom-redirection/{hook-functions.php → includes/hook-functions.php} +0 -0
modules/custom-user-links/admin/admin.php +1 -1
modules/custom-user-links/custom-user-links.php +2 -2
modules/themed-profiles/includes/template-functions.php +20 -20
modules/themed-profiles/themed-profiles.php +1 -1
modules/user-moderation/admin/admin.php +1 -1
modules/user-moderation/includes/functions.php +6 -6
modules/user-moderation/user-moderation.php +1 -1
readme.txt +6 -1
theme-my-login.php +1 -6

admin/includes/admin.php CHANGED Viewed

	@@ -33,6 +33,12 @@ function wdbj_tml_load_settings_page() {
33
34	do_action('tml_settings_page');
35






36	// Enqueue neccessary scripts and styles
37	wp_enqueue_script('theme-my-login-admin', plugins_url('/theme-my-login/admin/js/theme-my-login-admin.js'));
38	wp_enqueue_script('jquery-ui-tabs');
	@@ -94,7 +100,7 @@ function wdbj_tml_module_error_notice() {
94	// Display them
95	echo '<div class="error">';
96	foreach ( $theme_my_login->options['module_errors'] as $module => $error ) {
97	- echo "<p><strong>ERROR: The module \"$module\" could not be activated ($error)~~.</~~strong></p>";
98	}
99	echo '</div>';
100	// Unset the error array


33
34	do_action('tml_settings_page');
35
36	+ // Display warning notices for function overrides
37	+ if ( function_exists('wp_new_user_notification') )
38	+ add_action('admin_notices', 'wdbj_tml_new_user_notification_override_notice');
39	+ if ( function_exists('wp_password_change_notification') )
40	+ add_action('admin_notices', 'wdbj_tml_password_change_notification_override_notice');
41	+
42	// Enqueue neccessary scripts and styles
43	wp_enqueue_script('theme-my-login-admin', plugins_url('/theme-my-login/admin/js/theme-my-login-admin.js'));
44	wp_enqueue_script('jquery-ui-tabs');

100	// Display them
101	echo '<div class="error">';
102	foreach ( $theme_my_login->options['module_errors'] as $module => $error ) {
103	+ echo '<p><strong>' . sprintf(__('ERROR: The module "$module" could not be activated (%s).', 'theme-my-login'), $error) . '</strong></p>';
104	}
105	echo '</div>';
106	// Unset the error array

admin/includes/module.php CHANGED Viewed

	@@ -6,7 +6,7 @@ function wdbj_tml_activate_module($module) {
6	if ( is_wp_error($valid) )
7	return $valid;
8
9	- $current = wdbj_tml_get_option('active_modules');
10	if ( ! wdbj_tml_is_module_active($module) ) {
11	//ob_start();
12	@include (TML_MODULE_DIR . '/' . $module);
	@@ -25,7 +25,7 @@ function wdbj_tml_activate_module($module) {
25	}
26
27	function wdbj_tml_deactivate_modules($modules, $silent= false) {
28	- $current = wdbj_tml_get_option('active_modules');
29
30	if ( ! is_array($modules) )
31	$modules = array($modules);
	@@ -65,20 +65,20 @@ function wdbj_tml_activate_modules($modules) {
65	}
66
67	if ( !empty($errors) )
68	- return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
69
70	return true;
71	}
72
73	function wdbj_tml_validate_module($module) {
74	if ( validate_file($module) )
75	- return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
76	if ( ! file_exists(TML_MODULE_DIR . '/' . $module) )
77	- return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
78
79	$installed_modules = get_plugins('/theme-my-login/modules');
80	if ( ! isset($installed_modules[$module]) )
81	- return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
82	return 0;
83	}
84


6	if ( is_wp_error($valid) )
7	return $valid;
8
9	+ $current = (array) wdbj_tml_get_option('active_modules');
10	if ( ! wdbj_tml_is_module_active($module) ) {
11	//ob_start();
12	@include (TML_MODULE_DIR . '/' . $module);

25	}
26
27	function wdbj_tml_deactivate_modules($modules, $silent= false) {
28	+ $current = (array) wdbj_tml_get_option('active_modules');
29
30	if ( ! is_array($modules) )
31	$modules = array($modules);

65	}
66
67	if ( !empty($errors) )
68	+ return new WP_Error('plugins_invalid', __('One of the plugins is invalid.', 'theme-my-login'), $errors);
69
70	return true;
71	}
72
73	function wdbj_tml_validate_module($module) {
74	if ( validate_file($module) )
75	+ return new WP_Error('plugin_invalid', __('Invalid plugin path.', 'theme-my-login'));
76	if ( ! file_exists(TML_MODULE_DIR . '/' . $module) )
77	+ return new WP_Error('plugin_not_found', __('Plugin file does not exist.', 'theme-my-login'));
78
79	$installed_modules = get_plugins('/theme-my-login/modules');
80	if ( ! isset($installed_modules[$module]) )
81	+ return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.', 'theme-my-login'));
82	return 0;
83	}
84

admin/options-basic.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	<th scope="row"><label for="theme_my_login_page_id"><?php _e('Page ID', 'theme-my-login'); ?></label></th>
4	<td>
5	<input name="theme_my_login[page_id]" type="text" id="theme_my_login_page_id" value="<?php echo (int) $theme_my_login->options['page_id']; ?>" class="small-text" />
6	- <p class="description"><?php _e('This should be the ID of the WordPress page that includes the [theme-my-login] shortcode. By default, this page is titled "Login".'); ?></p>
7	</td>
8	</tr>
9	<tr valign="top">


3	<th scope="row"><label for="theme_my_login_page_id"><?php _e('Page ID', 'theme-my-login'); ?></label></th>
4	<td>
5	<input name="theme_my_login[page_id]" type="text" id="theme_my_login_page_id" value="<?php echo (int) $theme_my_login->options['page_id']; ?>" class="small-text" />
6	+ <p class="description"><?php _e('This should be the ID of the WordPress page that includes the [theme-my-login] shortcode. By default, this page is titled "Login".', 'theme-my-login'); ?></p>
7	</td>
8	</tr>
9	<tr valign="top">

admin/options-modules.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	<td>
5	<input type="hidden" name="tml_editing_modules" value="1" />
6	<?php $modules = get_plugins('/theme-my-login/modules'); if ( !empty($modules) ) : foreach ( $modules as $module_file => $module_data ) : ?>
7	- <input name="theme_my_login[modules][]" type="checkbox" id="theme_my_login_modules_<?php echo $module_file; ?>" value="<?php echo $module_file; ?>"<?php checked(1, in_array($module_file, $theme_my_login->options['active_modules'])); ?> />
8	<label for="theme_my_login_modules_<?php echo $module_file; ?>"><?php printf(__('Enable %s', 'theme-my-login'), $module_data['Name']); ?></label><br />
9	<?php if ( $module_data['Description'] ) echo '<p class="description">' . $module_data['Description'] . '</p>'; ?>
10	<?php endforeach; else : _e('No modules found.', 'theme-my-login'); endif; ?>


4	<td>
5	<input type="hidden" name="tml_editing_modules" value="1" />
6	<?php $modules = get_plugins('/theme-my-login/modules'); if ( !empty($modules) ) : foreach ( $modules as $module_file => $module_data ) : ?>
7	+ <input name="theme_my_login[modules][]" type="checkbox" id="theme_my_login_modules_<?php echo $module_file; ?>" value="<?php echo $module_file; ?>"<?php checked(1, in_array($module_file, (array) $theme_my_login->options['active_modules'])); ?> />
8	<label for="theme_my_login_modules_<?php echo $module_file; ?>"><?php printf(__('Enable %s', 'theme-my-login'), $module_data['Name']); ?></label><br />
9	<?php if ( $module_data['Description'] ) echo '<p class="description">' . $module_data['Description'] . '</p>'; ?>
10	<?php endforeach; else : _e('No modules found.', 'theme-my-login'); endif; ?>

admin/options.php CHANGED Viewed

	@@ -23,7 +23,7 @@ do_action('tml_admin_menu');
23	<?php settings_fields('theme_my_login'); ?>
24
25	<div style="display:none;">
26	- <p><input type="submit" name="submit" value="<?php esc_attr_e('Save Changes') ?>" /></p>
27	</div>
28
29	<div id="tml-container">
	@@ -81,7 +81,7 @@ do_action('tml_admin_menu');
81
82	</div>
83
84	- <p><input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" /></p>
85	</form>
86
87	</div>


23	<?php settings_fields('theme_my_login'); ?>
24
25	<div style="display:none;">
26	+ <p><input type="submit" name="submit" value="<?php esc_attr_e('Save Changes', 'theme-my-login') ?>" /></p>
27	</div>
28
29	<div id="tml-container">

81
82	</div>
83
84	+ <p><input type="submit" name="submit" class="button-primary" value="<?php esc_attr_e('Save Changes', 'theme-my-login') ?>" /></p>
85	</form>
86
87	</div>

includes/functions.php CHANGED Viewed

	@@ -77,7 +77,7 @@ function wdbj_tml_get_css($file = 'theme-my-login.css') {
77
78	function wdbj_tml_is_module_active($module) {
79	$modules = apply_filters('tml_active_modules', wdbj_tml_get_option('active_modules'));
80	- return in_array($module, $modules);
81	}
82
83	function wdbj_tml_load_active_modules() {


77
78	function wdbj_tml_is_module_active($module) {
79	$modules = apply_filters('tml_active_modules', wdbj_tml_get_option('active_modules'));
80	+ return in_array($module, (array) $modules);
81	}
82
83	function wdbj_tml_load_active_modules() {

includes/hook-functions.php CHANGED Viewed

	@@ -61,9 +61,9 @@ function wdbj_tml_get_pages($pages, $attributes) {
61	foreach ( $pages as $page ) {
62	if ( $page->ID == $tml_page ) {
63	if ( is_user_logged_in() )
64	- $page->post_title = __('Log ~~out~~');
65	else
66	- $page->post_title = __('Log In');
67	}
68	}
69	}


61	foreach ( $pages as $page ) {
62	if ( $page->ID == $tml_page ) {
63	if ( is_user_logged_in() )
64	+ $page->post_title = __('Log Out', 'theme-my-login');
65	else
66	+ $page->post_title = __('Log In', 'theme-my-login');
67	}
68	}
69	}

includes/login-actions.php CHANGED Viewed

	@@ -45,7 +45,7 @@ switch ( $action ) {
45	}
46
47	if ( isset($_REQUEST['error']) && 'invalidkey' == $_REQUEST['error'] )
48	- wdbj_tml_set_error('invalidkey', __('Sorry, that key does not appear to be valid.'));
49	break;
50	case 'resetpass' :
51	case 'rp' :


45	}
46
47	if ( isset($_REQUEST['error']) && 'invalidkey' == $_REQUEST['error'] )
48	+ wdbj_tml_set_error('invalidkey', __('Sorry, that key does not appear to be valid.', 'theme-my-login'));
49	break;
50	case 'resetpass' :
51	case 'rp' :

includes/login-functions.php CHANGED Viewed

	@@ -13,12 +13,12 @@ function retrieve_password() {
13	$errors = new WP_Error();
14
15	if ( empty( $_POST['user_login'] ) && empty( $_POST['user_email'] ) )
16	- $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
17
18	if ( strpos($_POST['user_login'], '@') ) {
19	$user_data = get_user_by_email(trim($_POST['user_login']));
20	if ( empty($user_data) )
21	- $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
22	} else {
23	$login = trim($_POST['user_login']);
24	$user_data = get_userdatabylogin($login);
	@@ -30,7 +30,7 @@ function retrieve_password() {
30	return $errors;
31
32	if ( !$user_data ) {
33	- $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
34	return $errors;
35	}
36
	@@ -44,7 +44,7 @@ function retrieve_password() {
44	$allow = apply_filters('allow_password_reset', true, $user_data->ID);
45
46	if ( ! $allow )
47	- return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
48	else if ( is_wp_error($allow) )
49	return $allow;
50
	@@ -56,23 +56,23 @@ function retrieve_password() {
56	// Now insert the new md5 key into the db
57	$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
58	}
59	- $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
60	$message .= get_option('siteurl') . "\r\n\r\n";
61	- $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
62	- $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
63	$message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
64
65	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
66	// we want to reverse this for the plain text arena of emails.
67	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
68
69	- $title = sprintf(__('[%s] Password Reset'), $blogname);
70
71	$title = apply_filters('retrieve_password_title', $title, $user_data->ID);
72	$message = apply_filters('retrieve_password_message', $message, $key, $user_data->ID);
73
74	if ( $message && !wp_mail($user_email, $title, $message) )
75	- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
76
77	return true;
78	}
	@@ -91,14 +91,14 @@ function reset_password($key, $login) {
91	$key = preg_replace('/[^a-z0-9]/i', '', $key);
92
93	if ( empty( $key ) \|\| !is_string( $key ) )
94	- return new WP_Error('invalid_key', __('Invalid key'));
95
96	if ( empty($login) \|\| !is_string($login) )
97	- return new WP_Error('invalid_key', __('Invalid key'));
98
99	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
100	if ( empty( $user ) )
101	- return new WP_Error('invalid_key', __('Invalid key'));
102
103	// Generate something random for a password...
104	$new_pass = wp_generate_password();
	@@ -107,21 +107,21 @@ function reset_password($key, $login) {
107
108	wp_set_password($new_pass, $user->ID);
109	update_usermeta($user->ID, 'default_password_nag', true); //Set up the Password change nag.
110	- $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
111	- $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
112	$message .= site_url('wp-login.php', 'login') . "\r\n";
113
114	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
115	// we want to reverse this for the plain text arena of emails.
116	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
117
118	- $title = sprintf(__('[%s] Your new password'), $blogname);
119
120	$title = apply_filters('password_reset_title', $title, $user->ID);
121	$message = apply_filters('password_reset_message', $message, $new_pass, $user->ID);
122
123	if ( $message && !wp_mail($user->user_email, $title, $message) )
124	- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
125
126	wp_password_change_notification($user);
127
	@@ -143,21 +143,21 @@ function register_new_user($user_login, $user_email) {
143
144	// Check the username
145	if ( $user_login == '' )
146	- $errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.'));
147	elseif ( !validate_username( $user_login ) ) {
148	- $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid. Please enter a valid username.'));
149	$user_login = '';
150	} elseif ( username_exists( $user_login ) )
151	- $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.'));
152
153	// Check the e-mail address
154	if ($user_email == '') {
155	- $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.'));
156	} elseif ( !is_email( $user_email ) ) {
157	- $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn’t correct.'));
158	$user_email = '';
159	} elseif ( email_exists( $user_email ) )
160	- $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
161
162	do_action('register_post', $user_login, $user_email, $errors);
163
	@@ -173,7 +173,7 @@ function register_new_user($user_login, $user_email) {
173
174	$user_id = wp_create_user( $user_login, $user_pass, $user_email );
175	if ( !$user_id ) {
176	- $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
177	return $errors;
178	}
179


13	$errors = new WP_Error();
14
15	if ( empty( $_POST['user_login'] ) && empty( $_POST['user_email'] ) )
16	+ $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'theme-my-login'));
17
18	if ( strpos($_POST['user_login'], '@') ) {
19	$user_data = get_user_by_email(trim($_POST['user_login']));
20	if ( empty($user_data) )
21	+ $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'theme-my-login'));
22	} else {
23	$login = trim($_POST['user_login']);
24	$user_data = get_userdatabylogin($login);

30	return $errors;
31
32	if ( !$user_data ) {
33	+ $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'theme-my-login'));
34	return $errors;
35	}
36

44	$allow = apply_filters('allow_password_reset', true, $user_data->ID);
45
46	if ( ! $allow )
47	+ return new WP_Error('no_password_reset', __('Password reset is not allowed for this user', 'theme-my-login'));
48	else if ( is_wp_error($allow) )
49	return $allow;
50

56	// Now insert the new md5 key into the db
57	$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
58	}
59	+ $message = __('Someone has asked to reset the password for the following site and username.', 'theme-my-login') . "\r\n\r\n";
60	$message .= get_option('siteurl') . "\r\n\r\n";
61	+ $message .= sprintf(__('Username: %s', 'theme-my-login'), $user_login) . "\r\n\r\n";
62	+ $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.', 'theme-my-login') . "\r\n\r\n";
63	$message .= site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n";
64
65	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
66	// we want to reverse this for the plain text arena of emails.
67	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
68
69	+ $title = sprintf(__('[%s] Password Reset', 'theme-my-login'), $blogname);
70
71	$title = apply_filters('retrieve_password_title', $title, $user_data->ID);
72	$message = apply_filters('retrieve_password_message', $message, $key, $user_data->ID);
73
74	if ( $message && !wp_mail($user_email, $title, $message) )
75	+ die('<p>' . __('The e-mail could not be sent.', 'theme-my-login') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...', 'theme-my-login') . '</p>');
76
77	return true;
78	}

91	$key = preg_replace('/[^a-z0-9]/i', '', $key);
92
93	if ( empty( $key ) \|\| !is_string( $key ) )
94	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
95
96	if ( empty($login) \|\| !is_string($login) )
97	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
98
99	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
100	if ( empty( $user ) )
101	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
102
103	// Generate something random for a password...
104	$new_pass = wp_generate_password();

107
108	wp_set_password($new_pass, $user->ID);
109	update_usermeta($user->ID, 'default_password_nag', true); //Set up the Password change nag.
110	+ $message = sprintf(__('Username: %s', 'theme-my-login'), $user->user_login) . "\r\n";
111	+ $message .= sprintf(__('Password: %s', 'theme-my-login'), $new_pass) . "\r\n";
112	$message .= site_url('wp-login.php', 'login') . "\r\n";
113
114	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
115	// we want to reverse this for the plain text arena of emails.
116	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
117
118	+ $title = sprintf(__('[%s] Your new password', 'theme-my-login'), $blogname);
119
120	$title = apply_filters('password_reset_title', $title, $user->ID);
121	$message = apply_filters('password_reset_message', $message, $new_pass, $user->ID);
122
123	if ( $message && !wp_mail($user->user_email, $title, $message) )
124	+ die('<p>' . __('The e-mail could not be sent.', 'theme-my-login') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...', 'theme-my-login') . '</p>');
125
126	wp_password_change_notification($user);
127

143
144	// Check the username
145	if ( $user_login == '' )
146	+ $errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.', 'theme-my-login'));
147	elseif ( !validate_username( $user_login ) ) {
148	+ $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid. Please enter a valid username.', 'theme-my-login'));
149	$user_login = '';
150	} elseif ( username_exists( $user_login ) )
151	+ $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'theme-my-login'));
152
153	// Check the e-mail address
154	if ($user_email == '') {
155	+ $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'theme-my-login'));
156	} elseif ( !is_email( $user_email ) ) {
157	+ $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn’t correct.', 'theme-my-login'));
158	$user_email = '';
159	} elseif ( email_exists( $user_email ) )
160	+ $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'theme-my-login'));
161
162	do_action('register_post', $user_login, $user_email, $errors);
163

173
174	$user_id = wp_create_user( $user_login, $user_pass, $user_email );
175	if ( !$user_id ) {
176	+ $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'theme-my-login'), get_option('admin_email')));
177	return $errors;
178	}
179

includes/pluggable-functions.php CHANGED Viewed

	@@ -14,12 +14,12 @@ function wp_password_change_notification(&$user) {
14	// but check to see if it's the admin whose password we're changing, and skip this
15	if ( $user->user_email != get_option('admin_email') ) {
16	if ( apply_filters('password_change_notification', true) ) {
17	- $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
18	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
19	// we want to reverse this for the plain text arena of emails.
20	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
21
22	- $title = sprintf(__('[%s] Password Lost/Changed'), $blogname);
23
24	$title = apply_filters('password_change_notification_title', $title, $user->ID);
25	$message = apply_filters('password_change_notification_message', $message, $user->ID);
	@@ -52,11 +52,11 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') {
52	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
53
54	if ( apply_filters('new_user_admin_notification', true) ) {
55	- $message = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n";
56	- $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
57	- $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
58
59	- $title = sprintf(__('[%s] New User Registration'), $blogname);
60
61	$title = apply_filters('new_user_admin_notification_title', $title, $user_id);
62	$message = apply_filters('new_user_admin_notification_message', $message, $user_id);
	@@ -68,11 +68,11 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') {
68	return;
69
70	if ( apply_filters('new_user_notification', true) ) {
71	- $message = sprintf(__('Username: %s'), $user_login) . "\r\n";
72	- $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
73	$message .= wp_login_url() . "\r\n";
74
75	- $title = sprintf(__('[%s] Your username and password'), $blogname);
76
77	$title = apply_filters('new_user_notification_title', $title, $user_id);
78	$message = apply_filters('new_user_notification_message', $message, $plaintext_pass, $user_id);


14	// but check to see if it's the admin whose password we're changing, and skip this
15	if ( $user->user_email != get_option('admin_email') ) {
16	if ( apply_filters('password_change_notification', true) ) {
17	+ $message = sprintf(__('Password Lost and Changed for user: %s', 'theme-my-login'), $user->user_login) . "\r\n";
18	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
19	// we want to reverse this for the plain text arena of emails.
20	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
21
22	+ $title = sprintf(__('[%s] Password Lost/Changed', 'theme-my-login'), $blogname);
23
24	$title = apply_filters('password_change_notification_title', $title, $user->ID);
25	$message = apply_filters('password_change_notification_message', $message, $user->ID);

52	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
53
54	if ( apply_filters('new_user_admin_notification', true) ) {
55	+ $message = sprintf(__('New user registration on your blog %s:', 'theme-my-login'), $blogname) . "\r\n\r\n";
56	+ $message .= sprintf(__('Username: %s', 'theme-my-login'), $user_login) . "\r\n\r\n";
57	+ $message .= sprintf(__('E-mail: %s', 'theme-my-login'), $user_email) . "\r\n";
58
59	+ $title = sprintf(__('[%s] New User Registration', 'theme-my-login'), $blogname);
60
61	$title = apply_filters('new_user_admin_notification_title', $title, $user_id);
62	$message = apply_filters('new_user_admin_notification_message', $message, $user_id);

68	return;
69
70	if ( apply_filters('new_user_notification', true) ) {
71	+ $message = sprintf(__('Username: %s', 'theme-my-login'), $user_login) . "\r\n";
72	+ $message .= sprintf(__('Password: %s', 'theme-my-login'), $plaintext_pass) . "\r\n";
73	$message .= wp_login_url() . "\r\n";
74
75	+ $title = sprintf(__('[%s] Your username and password', 'theme-my-login'), $blogname);
76
77	$title = apply_filters('new_user_notification_title', $title, $user_id);
78	$message = apply_filters('new_user_notification_message', $message, $plaintext_pass, $user_id);

includes/template-functions.php CHANGED Viewed

	@@ -20,8 +20,8 @@ function wdbj_tml_display() {
20	echo '<div class="tml-user-avatar">' . get_avatar( $user->ID, $current_instance['gravatar_size'] ) . '</div>' . "\n";
21	echo '<ul class="tml-user-links">' . "\n";
22	$user_links = array(
23	- array('title' => __('Dashboard'), 'url' => admin_url()),
24	- array('title' => __('Profile'), 'url' => admin_url('profile.php'))
25	);
26	$user_links = apply_filters('tml_user_links', $user_links);
27	if ( $user_links ) {
	@@ -29,7 +29,7 @@ function wdbj_tml_display() {
29	echo '<li><a href="' . $link['url'] . '">' . $link['title'] . '</a></li>' . "\n";
30	}
31	}
32	- echo '<li><a href="' . wp_logout_url() . '">' . __('Log out') . '</a></li>' . "\n";
33	echo "</ul>\n</div>\n";
34	} else {
35	if ( has_filter('login_form_' . $action) ) {
	@@ -89,17 +89,17 @@ function wdbj_tml_get_title($action = '') {
89	} else {
90	switch ( $action ) {
91	case 'register':
92	- $title = __('Register');
93	break;
94	case 'lostpassword':
95	case 'retrievepassword':
96	case 'resetpass':
97	case 'rp':
98	- $title = __('Lost Password');
99	break;
100	case 'login':
101	default:
102	- $title = __('Log In');
103	}
104	}
105	return apply_filters('tml_title', $title, $action);
	@@ -181,15 +181,15 @@ function wdbj_tml_get_login_form() {
181	// Some parts of this script use the main login form to display a message
182	if ( $current_instance['is_active'] ) {
183	if ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )
184	- wdbj_tml_set_error('loggedout', __('You are now logged out.'), 'message');
185	elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
186	- wdbj_tml_set_error('registerdisabled', __('User registration is currently not allowed.'));
187	elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
188	- wdbj_tml_set_error('confirm', __('Check your e-mail for the confirmation link.'), 'message');
189	elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
190	- wdbj_tml_set_error('newpass', __('Check your e-mail for your new password.'), 'message');
191	elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
192	- wdbj_tml_set_error('registered', __('Registration complete. Please check your e-mail.'), 'message');
193	}
194
195	wdbj_tml_get_header();
	@@ -204,17 +204,17 @@ function wdbj_tml_get_login_form() {
204	?>
205	<form name="loginform" id="loginform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=login&instance=' . $current_instance['instance_id'])); ?>" method="post">
206	<p>
207	- <label for="log-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username') ?></label>
208	<input type="text" name="log" id="log-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo isset($user_login) ? $user_login : ''; ?>" size="20" />
209	</p>
210	<p>
211	- <label for="pwd-<?php echo $current_instance['instance_id']; ?>"><?php _e('Password') ?></label>
212	<input type="password" name="pwd" id="pwd-<?php echo $current_instance['instance_id']; ?>" class="input" value="" size="20" />
213	</p>
214	<?php do_action('login_form', $current_instance['instance_id']); ?>
215	- <p class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme-<?php echo $current_instance['instance_id']; ?>" value="forever" /> <label for="rememberme-<?php echo $current_instance['instance_id']; ?>"><?php _e('Remember Me'); ?></label></p>
216	<p class="submit">
217	- <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Log In'); ?>" />
218	<input type="hidden" name="redirect_to" value="<?php echo esc_attr(wdbj_tml_get_var('redirect_to')); ?>" />
219	<input type="hidden" name="testcookie" value="1" />
220	</p>
	@@ -234,22 +234,22 @@ function wdbj_tml_get_register_form() {
234	$user_login = isset($_POST['user_login']) ? $_POST['user_login'] : '';
235	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';
236
237	- $message = apply_filters('register_message', __('A password will be e-mailed to you.'));
238
239	wdbj_tml_get_header($message);
240	?>
241	<form name="registerform" id="registerform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=register&instance=' . $current_instance['instance_id'])); ?>" method="post">
242	<p>
243	- <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username') ?></label>
244	<input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" />
245	</p>
246	<p>
247	- <label for="user_email-<?php echo $current_instance['instance_id']; ?>"><?php _e('E-mail') ?></label>
248	<input type="text" name="user_email" id="user_email-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="20" />
249	</p>
250	<?php do_action('register_form', $current_instance['instance_id']); ?>
251	<p class="submit">
252	- <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Register'); ?>" />
253	</p>
254	</form>
255	<?php
	@@ -261,7 +261,7 @@ function wdbj_tml_get_lost_password_form() {
261
262	do_action('lost_password', $current_instance['instance_id']);
263
264	- $message = apply_filters('lostpassword_message', __('Please enter your username or e-mail address. You will receive a new password via e-mail.'));
265
266	wdbj_tml_get_header($message);
267
	@@ -269,12 +269,12 @@ function wdbj_tml_get_lost_password_form() {
269	?>
270	<form name="lostpasswordform" id="lostpasswordform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=lostpassword&instance=' . $current_instance['instance_id'])); ?>" method="post">
271	<p>
272	- <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username or E-mail:') ?></label>
273	<input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape($user_login); ?>" size="20" />
274	</p>
275	<?php do_action('lostpassword_form', $current_instance['instance_id']); ?>
276	<p class="submit">
277	- <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Get New Password'); ?>" />
278	</p>
279	</form>
280	<?php


20	echo '<div class="tml-user-avatar">' . get_avatar( $user->ID, $current_instance['gravatar_size'] ) . '</div>' . "\n";
21	echo '<ul class="tml-user-links">' . "\n";
22	$user_links = array(
23	+ array('title' => __('Dashboard', 'theme-my-login'), 'url' => admin_url()),
24	+ array('title' => __('Profile', 'theme-my-login'), 'url' => admin_url('profile.php'))
25	);
26	$user_links = apply_filters('tml_user_links', $user_links);
27	if ( $user_links ) {

29	echo '<li><a href="' . $link['url'] . '">' . $link['title'] . '</a></li>' . "\n";
30	}
31	}
32	+ echo '<li><a href="' . wp_logout_url() . '">' . __('Log out', 'theme-my-login') . '</a></li>' . "\n";
33	echo "</ul>\n</div>\n";
34	} else {
35	if ( has_filter('login_form_' . $action) ) {

89	} else {
90	switch ( $action ) {
91	case 'register':
92	+ $title = __('Register', 'theme-my-login');
93	break;
94	case 'lostpassword':
95	case 'retrievepassword':
96	case 'resetpass':
97	case 'rp':
98	+ $title = __('Lost Password', 'theme-my-login');
99	break;
100	case 'login':
101	default:
102	+ $title = __('Log In', 'theme-my-login');
103	}
104	}
105	return apply_filters('tml_title', $title, $action);

181	// Some parts of this script use the main login form to display a message
182	if ( $current_instance['is_active'] ) {
183	if ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )
184	+ wdbj_tml_set_error('loggedout', __('You are now logged out.', 'theme-my-login'), 'message');
185	elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
186	+ wdbj_tml_set_error('registerdisabled', __('User registration is currently not allowed.', 'theme-my-login'));
187	elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
188	+ wdbj_tml_set_error('confirm', __('Check your e-mail for the confirmation link.', 'theme-my-login'), 'message');
189	elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
190	+ wdbj_tml_set_error('newpass', __('Check your e-mail for your new password.', 'theme-my-login'), 'message');
191	elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
192	+ wdbj_tml_set_error('registered', __('Registration complete. Please check your e-mail.', 'theme-my-login'), 'message');
193	}
194
195	wdbj_tml_get_header();

204	?>
205	<form name="loginform" id="loginform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=login&instance=' . $current_instance['instance_id'])); ?>" method="post">
206	<p>
207	+ <label for="log-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username', 'theme-my-login') ?></label>
208	<input type="text" name="log" id="log-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo isset($user_login) ? $user_login : ''; ?>" size="20" />
209	</p>
210	<p>
211	+ <label for="pwd-<?php echo $current_instance['instance_id']; ?>"><?php _e('Password', 'theme-my-login') ?></label>
212	<input type="password" name="pwd" id="pwd-<?php echo $current_instance['instance_id']; ?>" class="input" value="" size="20" />
213	</p>
214	<?php do_action('login_form', $current_instance['instance_id']); ?>
215	+ <p class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme-<?php echo $current_instance['instance_id']; ?>" value="forever" /> <label for="rememberme-<?php echo $current_instance['instance_id']; ?>"><?php _e('Remember Me', 'theme-my-login'); ?></label></p>
216	<p class="submit">
217	+ <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Log In', 'theme-my-login'); ?>" />
218	<input type="hidden" name="redirect_to" value="<?php echo esc_attr(wdbj_tml_get_var('redirect_to')); ?>" />
219	<input type="hidden" name="testcookie" value="1" />
220	</p>

234	$user_login = isset($_POST['user_login']) ? $_POST['user_login'] : '';
235	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';
236
237	+ $message = apply_filters('register_message', __('A password will be e-mailed to you.', 'theme-my-login'));
238
239	wdbj_tml_get_header($message);
240	?>
241	<form name="registerform" id="registerform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=register&instance=' . $current_instance['instance_id'])); ?>" method="post">
242	<p>
243	+ <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username', 'theme-my-login') ?></label>
244	<input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_login)); ?>" size="20" />
245	</p>
246	<p>
247	+ <label for="user_email-<?php echo $current_instance['instance_id']; ?>"><?php _e('E-mail', 'theme-my-login') ?></label>
248	<input type="text" name="user_email" id="user_email-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape(stripslashes($user_email)); ?>" size="20" />
249	</p>
250	<?php do_action('register_form', $current_instance['instance_id']); ?>
251	<p class="submit">
252	+ <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Register', 'theme-my-login'); ?>" />
253	</p>
254	</form>
255	<?php

261
262	do_action('lost_password', $current_instance['instance_id']);
263
264	+ $message = apply_filters('lostpassword_message', __('Please enter your username or e-mail address. You will receive a new password via e-mail.', 'theme-my-login'));
265
266	wdbj_tml_get_header($message);
267

269	?>
270	<form name="lostpasswordform" id="lostpasswordform-<?php echo $current_instance['instance_id']; ?>" action="<?php echo esc_url(wdbj_tml_get_current_url('action=lostpassword&instance=' . $current_instance['instance_id'])); ?>" method="post">
271	<p>
272	+ <label for="user_login-<?php echo $current_instance['instance_id']; ?>"><?php _e('Username or E-mail:', 'theme-my-login') ?></label>
273	<input type="text" name="user_login" id="user_login-<?php echo $current_instance['instance_id']; ?>" class="input" value="<?php echo attribute_escape($user_login); ?>" size="20" />
274	</p>
275	<?php do_action('lostpassword_form', $current_instance['instance_id']); ?>
276	<p class="submit">
277	+ <input type="submit" name="wp-submit" id="wp-submit-<?php echo $current_instance['instance_id']; ?>" value="<?php _e('Get New Password', 'theme-my-login'); ?>" />
278	</p>
279	</form>
280	<?php

language/theme-my-login.pot ADDED Viewed

	@@ -0,0 +1,857 @@


1	+ # Translation of the WordPress plugin Theme My Login 5.0 by Jeff Farthing.
2	+ # Copyright (C) 2010 Jeff Farthing
3	+ # This file is distributed under the same license as the Theme My Login package.
4	+ # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5	+ #
6	+ #, fuzzy
7	+ msgid ""
8	+ msgstr ""
9	+ "Project-Id-Version: Theme My Login 5.0\n"
10	+ "Report-Msgid-Bugs-To: http://wordpress.org/tag/theme-my-login\n"
11	+ "POT-Creation-Date: 2010-03-09 18:41+0000\n"
12	+ "PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
13	+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	+ "Language-Team: LANGUAGE <LL@li.org>\n"
15	+ "MIME-Version: 1.0\n"
16	+ "Content-Type: text/plain; charset=utf-8\n"
17	+ "Content-Transfer-Encoding: 8bit\n"
18	+
19	+ #: admin/includes/admin.php:4
20	+ msgid ""
21	+ "<strong>WARNING</strong>: The function <em>wp_new_user_notification</em> has "
22	+ "already been overridden by another plugin. "
23	+ msgstr ""
24	+
25	+ #: admin/includes/admin.php:5 admin/includes/admin.php:11
26	+ msgid "Some features of <em>Theme My Login</em> may not function properly."
27	+ msgstr ""
28	+
29	+ #: admin/includes/admin.php:10
30	+ msgid ""
31	+ "<strong>WARNING</strong>: The function <em>wp_password_change_notification</"
32	+ "em> has already been overridden by another plugin. "
33	+ msgstr ""
34	+
35	+ #. #-#-#-#-# plugin.pot (Theme My Login 5.0) #-#-#-#-#
36	+ #. Plugin Name of a plugin/theme
37	+ #: admin/includes/admin.php:17 includes/widget.php:8
38	+ msgid "Theme My Login"
39	+ msgstr ""
40	+
41	+ #: admin/includes/admin.php:103
42	+ #, php-format
43	+ msgid "ERROR: The module \"$module\" could not be activated (%s)."
44	+ msgstr ""
45	+
46	+ #: admin/includes/module.php:68
47	+ msgid "One of the plugins is invalid."
48	+ msgstr ""
49	+
50	+ #: admin/includes/module.php:75
51	+ msgid "Invalid plugin path."
52	+ msgstr ""
53	+
54	+ #: admin/includes/module.php:77
55	+ msgid "Plugin file does not exist."
56	+ msgstr ""
57	+
58	+ #: admin/includes/module.php:81
59	+ msgid "The plugin does not have a valid header."
60	+ msgstr ""
61	+
62	+ #: admin/options-basic.php:3
63	+ msgid "Page ID"
64	+ msgstr ""
65	+
66	+ #: admin/options-basic.php:6
67	+ msgid ""
68	+ "This should be the ID of the WordPress page that includes the [theme-my-"
69	+ "login] shortcode. By default, this page is titled \"Login\"."
70	+ msgstr ""
71	+
72	+ #: admin/options-basic.php:10
73	+ msgid "Pagelist"
74	+ msgstr ""
75	+
76	+ #: admin/options-basic.php:13
77	+ msgid "Show Page In Pagelist"
78	+ msgstr ""
79	+
80	+ #: admin/options-basic.php:14
81	+ msgid ""
82	+ "Enable this setting to add login/logout links to the pagelist generated by "
83	+ "functions like wp_list_pages() and wp_page_menu()."
84	+ msgstr ""
85	+
86	+ #: admin/options-basic.php:18
87	+ msgid "Links"
88	+ msgstr ""
89	+
90	+ #: admin/options-basic.php:21
91	+ msgid "Rewrite Login Links"
92	+ msgstr ""
93	+
94	+ #: admin/options-basic.php:22
95	+ msgid ""
96	+ "Enable this setting to rewrite links generated by functions like wp_loginout"
97	+ "() and wp_register()."
98	+ msgstr ""
99	+
100	+ #: admin/options-basic.php:26
101	+ msgid "Stylesheet"
102	+ msgstr ""
103	+
104	+ #: admin/options-basic.php:29
105	+ msgid "Enable \"theme-my-login.css\""
106	+ msgstr ""
107	+
108	+ #: admin/options-basic.php:30
109	+ msgid ""
110	+ "In order to keep changes between upgrades, you can store your customized "
111	+ "\"theme-my-login.css\" in your current theme directory."
112	+ msgstr ""
113	+
114	+ #: admin/options-modules.php:3 admin/options.php:6
115	+ msgid "Modules"
116	+ msgstr ""
117	+
118	+ #: admin/options-modules.php:8
119	+ #, php-format
120	+ msgid "Enable %s"
121	+ msgstr ""
122	+
123	+ #: admin/options-modules.php:10
124	+ msgid "No modules found."
125	+ msgstr ""
126	+
127	+ #: admin/options-optimization.php:3 admin/options.php:7
128	+ msgid "Optimization"
129	+ msgstr ""
130	+
131	+ #: admin/options-optimization.php:6
132	+ msgid "Enable Template Tag"
133	+ msgstr ""
134	+
135	+ #: admin/options-optimization.php:7
136	+ msgid ""
137	+ "Enable this setting if you wish to use the theme_my_login() template tag. "
138	+ "Otherwise, leave it disabled for optimization purposes."
139	+ msgstr ""
140	+
141	+ #: admin/options-optimization.php:10
142	+ msgid "Enable Widget"
143	+ msgstr ""
144	+
145	+ #: admin/options-optimization.php:11
146	+ msgid ""
147	+ "Enable this setting if you wish to use the \"Theme My Login\" widget. "
148	+ "Otherwise, leave it disabled for optimization purposes."
149	+ msgstr ""
150	+
151	+ #: admin/options.php:4 modules/custom-email/admin/admin.php:6
152	+ msgid "General"
153	+ msgstr ""
154	+
155	+ #: admin/options.php:5
156	+ msgid "Basic"
157	+ msgstr ""
158	+
159	+ #: admin/options.php:15
160	+ msgid ""
161	+ "If you like this plugin, please help keep it up to date by <a href=\"http://"
162	+ "www.jfarthing.com/donate\">donating through PayPal</a>!"
163	+ msgstr ""
164	+
165	+ #: admin/options.php:20
166	+ msgid "Theme My Login Settings"
167	+ msgstr ""
168	+
169	+ #: admin/options.php:26 admin/options.php:84
170	+ msgid "Save Changes"
171	+ msgstr ""
172	+
173	+ #: includes/hook-functions.php:64
174	+ msgid "Log Out"
175	+ msgstr ""
176	+
177	+ #: includes/hook-functions.php:66 includes/template-functions.php:102
178	+ #: includes/template-functions.php:217
179	+ msgid "Log In"
180	+ msgstr ""
181	+
182	+ #: includes/login-actions.php:48
183	+ msgid "Sorry, that key does not appear to be valid."
184	+ msgstr ""
185	+
186	+ #: includes/login-functions.php:16
187	+ msgid "<strong>ERROR</strong>: Enter a username or e-mail address."
188	+ msgstr ""
189	+
190	+ #: includes/login-functions.php:21
191	+ msgid ""
192	+ "<strong>ERROR</strong>: There is no user registered with that email address."
193	+ msgstr ""
194	+
195	+ #: includes/login-functions.php:33
196	+ msgid "<strong>ERROR</strong>: Invalid username or e-mail."
197	+ msgstr ""
198	+
199	+ #: includes/login-functions.php:47
200	+ msgid "Password reset is not allowed for this user"
201	+ msgstr ""
202	+
203	+ #: includes/login-functions.php:59
204	+ msgid ""
205	+ "Someone has asked to reset the password for the following site and username."
206	+ msgstr ""
207	+
208	+ #: includes/login-functions.php:61 includes/login-functions.php:110
209	+ #: includes/pluggable-functions.php:56 includes/pluggable-functions.php:71
210	+ #: modules/custom-passwords/includes/functions.php:37
211	+ #: modules/user-moderation/includes/functions.php:87
212	+ #: modules/user-moderation/includes/functions.php:150
213	+ #, php-format
214	+ msgid "Username: %s"
215	+ msgstr ""
216	+
217	+ #: includes/login-functions.php:62
218	+ msgid ""
219	+ "To reset your password visit the following address, otherwise just ignore "
220	+ "this email and nothing will happen."
221	+ msgstr ""
222	+
223	+ #: includes/login-functions.php:69
224	+ #, php-format
225	+ msgid "[%s] Password Reset"
226	+ msgstr ""
227	+
228	+ #: includes/login-functions.php:75 includes/login-functions.php:124
229	+ #: modules/custom-passwords/includes/functions.php:51
230	+ #: modules/user-moderation/admin/admin.php:59
231	+ #: modules/user-moderation/includes/functions.php:97
232	+ msgid "The e-mail could not be sent."
233	+ msgstr ""
234	+
235	+ #: includes/login-functions.php:75 includes/login-functions.php:124
236	+ #: modules/custom-passwords/includes/functions.php:51
237	+ #: modules/user-moderation/admin/admin.php:59
238	+ #: modules/user-moderation/includes/functions.php:97
239	+ msgid "Possible reason: your host may have disabled the mail() function..."
240	+ msgstr ""
241	+
242	+ #: includes/login-functions.php:94 includes/login-functions.php:97
243	+ #: includes/login-functions.php:101
244	+ #: modules/custom-passwords/includes/functions.php:9
245	+ #: modules/custom-passwords/includes/functions.php:12
246	+ #: modules/custom-passwords/includes/functions.php:16
247	+ #: modules/user-moderation/includes/functions.php:17
248	+ #: modules/user-moderation/includes/functions.php:20
249	+ #: modules/user-moderation/includes/functions.php:24
250	+ msgid "Invalid key"
251	+ msgstr ""
252	+
253	+ #: includes/login-functions.php:111 includes/pluggable-functions.php:72
254	+ #: modules/custom-passwords/includes/functions.php:38
255	+ #: modules/user-moderation/includes/functions.php:88
256	+ #, php-format
257	+ msgid "Password: %s"
258	+ msgstr ""
259	+
260	+ #: includes/login-functions.php:118
261	+ #: modules/custom-passwords/includes/functions.php:45
262	+ #, php-format
263	+ msgid "[%s] Your new password"
264	+ msgstr ""
265	+
266	+ #: includes/login-functions.php:146
267	+ msgid "<strong>ERROR</strong>: Please enter a username."
268	+ msgstr ""
269	+
270	+ #: includes/login-functions.php:148
271	+ msgid ""
272	+ "<strong>ERROR</strong>: This username is invalid. Please enter a valid "
273	+ "username."
274	+ msgstr ""
275	+
276	+ #: includes/login-functions.php:151
277	+ msgid ""
278	+ "<strong>ERROR</strong>: This username is already registered, please choose "
279	+ "another one."
280	+ msgstr ""
281	+
282	+ #: includes/login-functions.php:155
283	+ msgid "<strong>ERROR</strong>: Please type your e-mail address."
284	+ msgstr ""
285	+
286	+ #: includes/login-functions.php:157
287	+ msgid "<strong>ERROR</strong>: The email address isn’t correct."
288	+ msgstr ""
289	+
290	+ #: includes/login-functions.php:160
291	+ msgid ""
292	+ "<strong>ERROR</strong>: This email is already registered, please choose "
293	+ "another one."
294	+ msgstr ""
295	+
296	+ #: includes/login-functions.php:176
297	+ #, php-format
298	+ msgid ""
299	+ "<strong>ERROR</strong>: Couldn’t register you... please contact the <a "
300	+ "href=\"mailto:%s\">webmaster</a> !"
301	+ msgstr ""
302	+
303	+ #: includes/pluggable-functions.php:17
304	+ #, php-format
305	+ msgid "Password Lost and Changed for user: %s"
306	+ msgstr ""
307	+
308	+ #: includes/pluggable-functions.php:22
309	+ #, php-format
310	+ msgid "[%s] Password Lost/Changed"
311	+ msgstr ""
312	+
313	+ #: includes/pluggable-functions.php:55
314	+ #, php-format
315	+ msgid "New user registration on your blog %s:"
316	+ msgstr ""
317	+
318	+ #: includes/pluggable-functions.php:57
319	+ #: modules/user-moderation/includes/functions.php:151
320	+ #, php-format
321	+ msgid "E-mail: %s"
322	+ msgstr ""
323	+
324	+ #: includes/pluggable-functions.php:59
325	+ #, php-format
326	+ msgid "[%s] New User Registration"
327	+ msgstr ""
328	+
329	+ #: includes/pluggable-functions.php:75
330	+ #, php-format
331	+ msgid "[%s] Your username and password"
332	+ msgstr ""
333	+
334	+ #: includes/template-functions.php:23
335	+ #: modules/custom-user-links/custom-user-links.php:57
336	+ msgid "Dashboard"
337	+ msgstr ""
338	+
339	+ #: includes/template-functions.php:24
340	+ #: modules/custom-user-links/custom-user-links.php:58
341	+ msgid "Profile"
342	+ msgstr ""
343	+
344	+ #: includes/template-functions.php:32
345	+ #: modules/custom-redirection/admin/admin.php:29
346	+ msgid "Log out"
347	+ msgstr ""
348	+
349	+ #: includes/template-functions.php:88
350	+ #, php-format
351	+ msgid "Welcome, %s"
352	+ msgstr ""
353	+
354	+ #: includes/template-functions.php:92 includes/template-functions.php:252
355	+ msgid "Register"
356	+ msgstr ""
357	+
358	+ #: includes/template-functions.php:98
359	+ msgid "Lost Password"
360	+ msgstr ""
361	+
362	+ #: includes/template-functions.php:179
363	+ msgid ""
364	+ "<strong>ERROR</strong>: Cookies are blocked or not supported by your "
365	+ "browser. You must <a href='http://www.google.com/cookies.html'>enable "
366	+ "cookies</a> to use WordPress."
367	+ msgstr ""
368	+
369	+ #: includes/template-functions.php:184
370	+ msgid "You are now logged out."
371	+ msgstr ""
372	+
373	+ #: includes/template-functions.php:186
374	+ msgid "User registration is currently not allowed."
375	+ msgstr ""
376	+
377	+ #: includes/template-functions.php:188
378	+ msgid "Check your e-mail for the confirmation link."
379	+ msgstr ""
380	+
381	+ #: includes/template-functions.php:190
382	+ msgid "Check your e-mail for your new password."
383	+ msgstr ""
384	+
385	+ #: includes/template-functions.php:192
386	+ msgid "Registration complete. Please check your e-mail."
387	+ msgstr ""
388	+
389	+ #: includes/template-functions.php:207 includes/template-functions.php:243
390	+ #: modules/themed-profiles/includes/template-functions.php:33
391	+ msgid "Username"
392	+ msgstr ""
393	+
394	+ #: includes/template-functions.php:211
395	+ msgid "Password"
396	+ msgstr ""
397	+
398	+ #: includes/template-functions.php:215
399	+ msgid "Remember Me"
400	+ msgstr ""
401	+
402	+ #: includes/template-functions.php:237
403	+ msgid "A password will be e-mailed to you."
404	+ msgstr ""
405	+
406	+ #: includes/template-functions.php:247 modules/custom-email/admin/admin.php:5
407	+ #: modules/themed-profiles/includes/template-functions.php:86
408	+ msgid "E-mail"
409	+ msgstr ""
410	+
411	+ #: includes/template-functions.php:264
412	+ msgid ""
413	+ "Please enter your username or e-mail address. You will receive a new "
414	+ "password via e-mail."
415	+ msgstr ""
416	+
417	+ #: includes/template-functions.php:272
418	+ msgid "Username or E-mail:"
419	+ msgstr ""
420	+
421	+ #: includes/template-functions.php:277
422	+ msgid "Get New Password"
423	+ msgstr ""
424	+
425	+ #: includes/widget.php:7
426	+ msgid "A login form for your blog."
427	+ msgstr ""
428	+
429	+ #: includes/widget.php:56
430	+ msgid "Show When Logged In"
431	+ msgstr ""
432	+
433	+ #: includes/widget.php:58
434	+ msgid "Show Title"
435	+ msgstr ""
436	+
437	+ #: includes/widget.php:60
438	+ msgid "Show Login Link"
439	+ msgstr ""
440	+
441	+ #: includes/widget.php:62
442	+ msgid "Show Register Link"
443	+ msgstr ""
444	+
445	+ #: includes/widget.php:64
446	+ msgid "Show Lost Password Link"
447	+ msgstr ""
448	+
449	+ #: includes/widget.php:66
450	+ msgid "Show Gravatar"
451	+ msgstr ""
452	+
453	+ #: includes/widget.php:67
454	+ msgid "Gravatar Size"
455	+ msgstr ""
456	+
457	+ #: includes/widget.php:69
458	+ msgid "Allow Registration"
459	+ msgstr ""
460	+
461	+ #: includes/widget.php:71
462	+ msgid "Allow Password Recovery"
463	+ msgstr ""
464	+
465	+ #: modules/custom-email/admin/admin.php:7
466	+ msgid "New User"
467	+ msgstr ""
468	+
469	+ #: modules/custom-email/admin/admin.php:8
470	+ msgid "Retrieve Password"
471	+ msgstr ""
472	+
473	+ #: modules/custom-email/admin/admin.php:9
474	+ msgid "Reset Password"
475	+ msgstr ""
476	+
477	+ #: modules/custom-email/admin/options-general.php:4
478	+ msgid "From Name"
479	+ msgstr ""
480	+
481	+ #: modules/custom-email/admin/options-general.php:10
482	+ msgid "From E-mail"
483	+ msgstr ""
484	+
485	+ #: modules/custom-email/admin/options-general.php:16
486	+ msgid "E-mail Format"
487	+ msgstr ""
488	+
489	+ #: modules/custom-email/admin/options-new-user.php:4
490	+ #: modules/custom-email/admin/options-reset-pass.php:4
491	+ #: modules/custom-email/admin/options-retrieve-pass.php:4
492	+ #: modules/user-moderation/admin/options-user-activation-email.php:4
493	+ #: modules/user-moderation/admin/options-user-approval-email.php:4
494	+ #: modules/user-moderation/admin/options-user-denial-email.php:4
495	+ msgid "Available Variables"
496	+ msgstr ""
497	+
498	+ #: modules/custom-email/admin/options-new-user.php:5
499	+ #: modules/custom-email/admin/options-reset-pass.php:5
500	+ #: modules/custom-email/admin/options-retrieve-pass.php:5
501	+ #: modules/user-moderation/admin/options-user-activation-email.php:5
502	+ #: modules/user-moderation/admin/options-user-approval-email.php:5
503	+ #: modules/user-moderation/admin/options-user-denial-email.php:5
504	+ msgid "Subject"
505	+ msgstr ""
506	+
507	+ #: modules/custom-email/admin/options-new-user.php:7
508	+ #: modules/custom-email/admin/options-reset-pass.php:7
509	+ #: modules/custom-email/admin/options-retrieve-pass.php:7
510	+ #: modules/user-moderation/admin/options-user-activation-email.php:7
511	+ #: modules/user-moderation/admin/options-user-approval-email.php:7
512	+ #: modules/user-moderation/admin/options-user-denial-email.php:7
513	+ msgid "Message"
514	+ msgstr ""
515	+
516	+ #: modules/custom-email/admin/options-reset-pass.php:10
517	+ msgid "Disable Admin Notification"
518	+ msgstr ""
519	+
520	+ #: modules/custom-passwords/includes/hook-functions.php:5
521	+ msgid "Password:"
522	+ msgstr ""
523	+
524	+ #: modules/custom-passwords/includes/hook-functions.php:7
525	+ #: modules/custom-passwords/includes/hook-functions.php:66
526	+ msgid "Confirm Password:"
527	+ msgstr ""
528	+
529	+ #: modules/custom-passwords/includes/hook-functions.php:14
530	+ msgid "<strong>ERROR</strong>: Please enter a password."
531	+ msgstr ""
532	+
533	+ #: modules/custom-passwords/includes/hook-functions.php:16
534	+ msgid "<strong>ERROR</strong>: Your passwords do not match."
535	+ msgstr ""
536	+
537	+ #: modules/custom-passwords/includes/hook-functions.php:18
538	+ msgid ""
539	+ "<strong>ERROR</strong>: Your password must be at least 6 characters in "
540	+ "length."
541	+ msgstr ""
542	+
543	+ #: modules/custom-passwords/includes/hook-functions.php:54
544	+ msgid "Please enter a new password."
545	+ msgstr ""
546	+
547	+ #: modules/custom-passwords/includes/hook-functions.php:62
548	+ msgid "New Password:"
549	+ msgstr ""
550	+
551	+ #: modules/custom-passwords/includes/hook-functions.php:71
552	+ msgid "Change Password"
553	+ msgstr ""
554	+
555	+ #: modules/custom-passwords/includes/hook-functions.php:102
556	+ msgid ""
557	+ "Please enter your username or e-mail address. You will recieve an e-mail "
558	+ "with a link to reset your password."
559	+ msgstr ""
560	+
561	+ #: modules/custom-passwords/includes/hook-functions.php:108
562	+ msgid "Registration complete. You may now log in."
563	+ msgstr ""
564	+
565	+ #: modules/custom-passwords/includes/hook-functions.php:110
566	+ msgid "Your password has been saved. You may now log in."
567	+ msgstr ""
568	+
569	+ #: modules/custom-redirection/admin/admin.php:6
570	+ msgid "Redirection"
571	+ msgstr ""
572	+
573	+ #: modules/custom-redirection/admin/admin.php:20
574	+ msgid "Log in"
575	+ msgstr ""
576	+
577	+ #: modules/custom-redirection/admin/admin.php:22
578	+ #: modules/custom-redirection/admin/admin.php:31
579	+ msgid "Default"
580	+ msgstr ""
581	+
582	+ #: modules/custom-redirection/admin/admin.php:23
583	+ #: modules/custom-redirection/admin/admin.php:32
584	+ msgid "Referer"
585	+ msgstr ""
586	+
587	+ #: modules/custom-user-links/admin/admin.php:6
588	+ msgid "User Links"
589	+ msgstr ""
590	+
591	+ #: modules/custom-user-links/admin/admin.php:103
592	+ #: modules/custom-user-links/admin/admin.php:119
593	+ #: modules/custom-user-links/admin/admin.php:150
594	+ #: modules/custom-user-links/admin/admin.php:167
595	+ msgid "Title"
596	+ msgstr ""
597	+
598	+ #: modules/custom-user-links/admin/admin.php:104
599	+ #: modules/custom-user-links/admin/admin.php:120
600	+ #: modules/custom-user-links/admin/admin.php:154
601	+ #: modules/custom-user-links/admin/admin.php:168
602	+ msgid "URL"
603	+ msgstr ""
604	+
605	+ #: modules/custom-user-links/admin/admin.php:156
606	+ msgid "Delete"
607	+ msgstr ""
608	+
609	+ #: modules/custom-user-links/admin/admin.php:157
610	+ msgid "Update"
611	+ msgstr ""
612	+
613	+ #: modules/custom-user-links/admin/admin.php:163
614	+ msgid "Add New link:"
615	+ msgstr ""
616	+
617	+ #: modules/custom-user-links/admin/admin.php:179
618	+ msgid "Add link"
619	+ msgstr ""
620	+
621	+ #: modules/themed-profiles/includes/hook-functions.php:22
622	+ msgid "Your Profile"
623	+ msgstr ""
624	+
625	+ #: modules/themed-profiles/includes/template-functions.php:21
626	+ msgid "Personal Options"
627	+ msgstr ""
628	+
629	+ #: modules/themed-profiles/includes/template-functions.php:29
630	+ msgid "Name"
631	+ msgstr ""
632	+
633	+ #: modules/themed-profiles/includes/template-functions.php:34
634	+ msgid "Your username cannot be changed."
635	+ msgstr ""
636	+
637	+ #: modules/themed-profiles/includes/template-functions.php:38
638	+ msgid "First name"
639	+ msgstr ""
640	+
641	+ #: modules/themed-profiles/includes/template-functions.php:43
642	+ msgid "Last name"
643	+ msgstr ""
644	+
645	+ #: modules/themed-profiles/includes/template-functions.php:48
646	+ msgid "Nickname"
647	+ msgstr ""
648	+
649	+ #: modules/themed-profiles/includes/template-functions.php:48
650	+ #: modules/themed-profiles/includes/template-functions.php:86
651	+ msgid "(required)"
652	+ msgstr ""
653	+
654	+ #: modules/themed-profiles/includes/template-functions.php:53
655	+ msgid "Display name publicly as"
656	+ msgstr ""
657	+
658	+ #: modules/themed-profiles/includes/template-functions.php:82
659	+ msgid "Contact Info"
660	+ msgstr ""
661	+
662	+ #: modules/themed-profiles/includes/template-functions.php:91
663	+ msgid "Website"
664	+ msgstr ""
665	+
666	+ #: modules/themed-profiles/includes/template-functions.php:108
667	+ msgid "About Yourself"
668	+ msgstr ""
669	+
670	+ #: modules/themed-profiles/includes/template-functions.php:112
671	+ msgid "Biographical Info"
672	+ msgstr ""
673	+
674	+ #: modules/themed-profiles/includes/template-functions.php:114
675	+ msgid ""
676	+ "Share a little biographical information to fill out your profile. This may "
677	+ "be shown publicly."
678	+ msgstr ""
679	+
680	+ #: modules/themed-profiles/includes/template-functions.php:122
681	+ msgid "New Password"
682	+ msgstr ""
683	+
684	+ #: modules/themed-profiles/includes/template-functions.php:123
685	+ msgid ""
686	+ "If you would like to change the password type a new one. Otherwise leave "
687	+ "this blank."
688	+ msgstr ""
689	+
690	+ #: modules/themed-profiles/includes/template-functions.php:124
691	+ msgid "Type your new password again."
692	+ msgstr ""
693	+
694	+ #: modules/themed-profiles/includes/template-functions.php:125
695	+ msgid "Strength indicator"
696	+ msgstr ""
697	+
698	+ #: modules/themed-profiles/includes/template-functions.php:126
699	+ msgid ""
700	+ "Hint: The password should be at least seven characters long. To make it "
701	+ "stronger, use upper and lower case letters, numbers and symbols like ! \" ? "
702	+ "$ % ^ & )."
703	+ msgstr ""
704	+
705	+ #: modules/themed-profiles/includes/template-functions.php:140
706	+ msgid "Additional Capabilities"
707	+ msgstr ""
708	+
709	+ #: modules/themed-profiles/includes/template-functions.php:160
710	+ msgid "Update Profile"
711	+ msgstr ""
712	+
713	+ #: modules/themed-profiles/themed-profiles.php:45
714	+ msgid "You do not have permission to edit this user."
715	+ msgstr ""
716	+
717	+ #: modules/user-moderation/admin/admin.php:12
718	+ #: modules/user-moderation/admin/admin.php:15
719	+ #: modules/user-moderation/admin/admin.php:21
720	+ msgid "You can’t edit that user."
721	+ msgstr ""
722	+
723	+ #: modules/user-moderation/admin/admin.php:52
724	+ #, php-format
725	+ msgid "You have been denied access to %s"
726	+ msgstr ""
727	+
728	+ #: modules/user-moderation/admin/admin.php:53
729	+ #, php-format
730	+ msgid "[%s] Registration Denied"
731	+ msgstr ""
732	+
733	+ #: modules/user-moderation/admin/admin.php:63
734	+ msgid "Moderation"
735	+ msgstr ""
736	+
737	+ #: modules/user-moderation/admin/admin.php:66
738	+ msgid "User Activation"
739	+ msgstr ""
740	+
741	+ #: modules/user-moderation/admin/admin.php:67
742	+ msgid "User Approval"
743	+ msgstr ""
744	+
745	+ #: modules/user-moderation/admin/admin.php:68
746	+ msgid "User Denial"
747	+ msgstr ""
748	+
749	+ #: modules/user-moderation/admin/admin.php:77
750	+ msgid "User Moderation"
751	+ msgstr ""
752	+
753	+ #: modules/user-moderation/admin/admin.php:80
754	+ msgid "None"
755	+ msgstr ""
756	+
757	+ #: modules/user-moderation/admin/admin.php:83
758	+ msgid "E-mail Confirmation"
759	+ msgstr ""
760	+
761	+ #: modules/user-moderation/admin/admin.php:86
762	+ msgid "Admin Approval"
763	+ msgstr ""
764	+
765	+ #: modules/user-moderation/includes/functions.php:41
766	+ #: modules/user-moderation/includes/functions.php:76
767	+ msgid "Same as when you signed up."
768	+ msgstr ""
769	+
770	+ #: modules/user-moderation/includes/functions.php:86
771	+ #, php-format
772	+ msgid "You have been approved access to %s"
773	+ msgstr ""
774	+
775	+ #: modules/user-moderation/includes/functions.php:91
776	+ #, php-format
777	+ msgid "[%s] Registration Approved"
778	+ msgstr ""
779	+
780	+ #: modules/user-moderation/includes/functions.php:126
781	+ #, php-format
782	+ msgid "[%s] Activate Your Account"
783	+ msgstr ""
784	+
785	+ #: modules/user-moderation/includes/functions.php:127
786	+ #, php-format
787	+ msgid ""
788	+ "Thanks for registering at %s! To complete the activation of your account "
789	+ "please click the following link: "
790	+ msgstr ""
791	+
792	+ #: modules/user-moderation/includes/functions.php:149
793	+ #, php-format
794	+ msgid "New user requires approval on your blog %s:"
795	+ msgstr ""
796	+
797	+ #: modules/user-moderation/includes/functions.php:152
798	+ msgid "To approve or deny this user:"
799	+ msgstr ""
800	+
801	+ #: modules/user-moderation/includes/functions.php:155
802	+ #, php-format
803	+ msgid "[%s] New User Awaiting Approval"
804	+ msgstr ""
805	+
806	+ #: modules/user-moderation/includes/hook-functions.php:30
807	+ msgid "<strong>ERROR</strong>: You have not yet confirmed your e-mail address."
808	+ msgstr ""
809	+
810	+ #: modules/user-moderation/includes/hook-functions.php:32
811	+ msgid "<strong>ERROR</strong>: Your registration has not yet been approved."
812	+ msgstr ""
813	+
814	+ #: modules/user-moderation/user-moderation.php:30
815	+ msgid ""
816	+ "Your registration was successful but you must now confirm your email address "
817	+ "before you can log in. Please check your email and click on the link "
818	+ "provided."
819	+ msgstr ""
820	+
821	+ #: modules/user-moderation/user-moderation.php:32
822	+ msgid ""
823	+ "Your registration was successful but you must now be approved by an "
824	+ "administrator before you can log in. You will be notified by e-mail once "
825	+ "your account has been reviewed."
826	+ msgstr ""
827	+
828	+ #: modules/user-moderation/user-moderation.php:35
829	+ msgid "Your account has been activated. You may now log in."
830	+ msgstr ""
831	+
832	+ #: modules/user-moderation/user-moderation.php:37
833	+ msgid ""
834	+ "Your account has been activated. Please check your e-mail for your password."
835	+ msgstr ""
836	+
837	+ #: modules/user-moderation/user-moderation.php:41
838	+ msgid "<strong>ERROR</strong>: Sorry, that key does not appear to be valid."
839	+ msgstr ""
840	+
841	+ #. Plugin URI of a plugin/theme
842	+ msgid "http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin"
843	+ msgstr ""
844	+
845	+ #. Description of a plugin/theme
846	+ msgid ""
847	+ "Themes the WordPress login, registration and forgot password pages according "
848	+ "to your theme."
849	+ msgstr ""
850	+
851	+ #. Author of a plugin/theme
852	+ msgid "Jeff Farthing"
853	+ msgstr ""
854	+
855	+ #. Author URI of a plugin/theme
856	+ msgid "http://www.jfarthing.com"
857	+ msgstr ""

modules/custom-passwords/custom-passwords.php CHANGED Viewed

	@@ -6,8 +6,8 @@ Description: Enabling this module will initialize and enable custom passwords. T
6
7	add_action('tml_init', 'wdbj_tml_custom_pass_init');
8	function wdbj_tml_custom_pass_init() {
9	- include_once( TML_MODULE_DIR . '/custom-passwords/hook-functions.php' );
10	- require_once( TML_MODULE_DIR . '/custom-passwords/functions.php' );
11	// Password registration
12	add_action('register_form', 'wdbj_tml_custom_pass_form');
13	add_filter('registration_errors', 'wdbj_tml_custom_pass_errors');


6
7	add_action('tml_init', 'wdbj_tml_custom_pass_init');
8	function wdbj_tml_custom_pass_init() {
9	+ include_once( TML_MODULE_DIR . '/custom-passwords/includes/hook-functions.php' );
10	+ require_once( TML_MODULE_DIR . '/custom-passwords/includes/functions.php' );
11	// Password registration
12	add_action('register_form', 'wdbj_tml_custom_pass_form');
13	add_filter('registration_errors', 'wdbj_tml_custom_pass_errors');

modules/custom-passwords/{functions.php → includes/functions.php} RENAMED Viewed

	@@ -6,14 +6,14 @@ function wdbj_tml_custom_pass_validate_reset_key($key, $login) {
6	$key = preg_replace('/[^a-z0-9]/i', '', $key);
7
8	if ( empty( $key ) \|\| !is_string( $key ) )
9	- return new WP_Error('invalid_key', __('Invalid key'));
10
11	if ( empty($login) \|\| !is_string($login) )
12	- return new WP_Error('invalid_key', __('Invalid key'));
13
14	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
15	if ( empty( $user ) )
16	- return new WP_Error('invalid_key', __('Invalid key'));
17
18	return $user;
19	}
	@@ -34,21 +34,21 @@ function wdbj_tml_custom_pass_reset_pass() {
34
35	wp_set_password($new_pass, $user->ID);
36	update_usermeta($user->ID, 'default_password_nag', false);
37	- $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
38	- $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
39	$message .= site_url('wp-login.php', 'login') . "\r\n";
40
41	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
42	// we want to reverse this for the plain text arena of emails.
43	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
44
45	- $title = sprintf(__('[%s] Your new password'), $blogname);
46
47	$title = apply_filters('password_reset_title', $title, $user->ID);
48	$message = apply_filters('password_reset_message', $message, $new_pass, $user->ID);
49
50	if ( $message && !wp_mail($user->user_email, $title, $message) )
51	- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
52
53	wp_password_change_notification($user);
54


6	$key = preg_replace('/[^a-z0-9]/i', '', $key);
7
8	if ( empty( $key ) \|\| !is_string( $key ) )
9	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
10
11	if ( empty($login) \|\| !is_string($login) )
12	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
13
14	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
15	if ( empty( $user ) )
16	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
17
18	return $user;
19	}

34
35	wp_set_password($new_pass, $user->ID);
36	update_usermeta($user->ID, 'default_password_nag', false);
37	+ $message = sprintf(__('Username: %s', 'theme-my-login'), $user->user_login) . "\r\n";
38	+ $message .= sprintf(__('Password: %s', 'theme-my-login'), $new_pass) . "\r\n";
39	$message .= site_url('wp-login.php', 'login') . "\r\n";
40
41	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
42	// we want to reverse this for the plain text arena of emails.
43	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
44
45	+ $title = sprintf(__('[%s] Your new password', 'theme-my-login'), $blogname);
46
47	$title = apply_filters('password_reset_title', $title, $user->ID);
48	$message = apply_filters('password_reset_message', $message, $new_pass, $user->ID);
49
50	if ( $message && !wp_mail($user->user_email, $title, $message) )
51	+ die('<p>' . __('The e-mail could not be sent.', 'theme-my-login') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...', 'theme-my-login') . '</p>');
52
53	wp_password_change_notification($user);
54

modules/custom-passwords/{hook-functions.php → includes/hook-functions.php} RENAMED Viewed

	@@ -11,11 +11,11 @@ function wdbj_tml_custom_pass_form($instance_id) {
11
12	function wdbj_tml_custom_pass_errors($errors = '') {
13	if ( empty($_POST['pass1']) \|\| $_POST['pass1'] == '' \|\| empty($_POST['pass2']) \|\| $_POST['pass2'] == '' ) {
14	- $errors->add('empty_password', __('<strong>ERROR</strong>: Please enter a password.'));
15	} elseif ( $_POST['pass1'] !== $_POST['pass2'] ) {
16	- $errors->add('password_mismatch', __('<strong>ERROR</strong>: Your passwords do not match.'));
17	} elseif ( strlen($_POST['pass1']) < 6 ) {
18	- $errors->add('password_length', __('<strong>ERROR</strong>: Your password must be at least 6 characters in length.'));
19	} else {
20	$_POST['user_pw'] = $_POST['pass1'];
21	}


11
12	function wdbj_tml_custom_pass_errors($errors = '') {
13	if ( empty($_POST['pass1']) \|\| $_POST['pass1'] == '' \|\| empty($_POST['pass2']) \|\| $_POST['pass2'] == '' ) {
14	+ $errors->add('empty_password', __('<strong>ERROR</strong>: Please enter a password.', 'theme-my-login'));
15	} elseif ( $_POST['pass1'] !== $_POST['pass2'] ) {
16	+ $errors->add('password_mismatch', __('<strong>ERROR</strong>: Your passwords do not match.', 'theme-my-login'));
17	} elseif ( strlen($_POST['pass1']) < 6 ) {
18	+ $errors->add('password_length', __('<strong>ERROR</strong>: Your password must be at least 6 characters in length.', 'theme-my-login'));
19	} else {
20	$_POST['user_pw'] = $_POST['pass1'];
21	}

modules/custom-redirection/{admin.php → admin/admin.php} RENAMED Viewed

	@@ -17,7 +17,7 @@ function wdbj_tml_custom_redirect_user_role_admin_page($role) {
17	?>
18	<table class="form-table">
19	<tr valign="top">
20	- <th scope="row"><?php _e('Log in'); ?></th>
21	<td>
22	<input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_default" value="default"<?php checked('default', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
23	<input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer" value="referer"<?php checked('referer', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />
	@@ -26,7 +26,7 @@ function wdbj_tml_custom_redirect_user_role_admin_page($role) {
26	</td>
27	</tr>
28	<tr valign="top">
29	- <th scope="row"><?php _e('Log out'); ?></th>
30	<td>
31	<input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default" value="default"<?php checked('default', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
32	<input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer" value="referer"<?php checked('referer', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />


17	?>
18	<table class="form-table">
19	<tr valign="top">
20	+ <th scope="row"><?php _e('Log in', 'theme-my-login'); ?></th>
21	<td>
22	<input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_default" value="default"<?php checked('default', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
23	<input name="theme_my_login[redirection][<?php echo $role; ?>][login_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer" value="referer"<?php checked('referer', $redirection['login_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_login_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />

26	</td>
27	</tr>
28	<tr valign="top">
29	+ <th scope="row"><?php _e('Log out', 'theme-my-login'); ?></th>
30	<td>
31	<input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default" value="default"<?php checked('default', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_default"><?php _e('Default', 'theme-my-login'); ?></label><br />
32	<input name="theme_my_login[redirection][<?php echo $role; ?>][logout_type]" type="radio" id="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer" value="referer"<?php checked('referer', $redirection['logout_type']); ?> /> <label for="theme_my_login_redirection_<?php echo $role; ?>_logout_type_referer"><?php _e('Referer', 'theme-my-login'); ?></label><br />

modules/custom-redirection/custom-redirection.php CHANGED Viewed

	@@ -6,7 +6,7 @@ Description: Enabling this module will initialize custom redirection. You will t
6
7	add_action('tml_init', 'wdbj_tml_custom_redirect_init');
8	function wdbj_tml_custom_redirect_init() {
9	- include( TML_MODULE_DIR . '/custom-redirection/hook-functions.php' );
10	add_filter('login_redirect', 'wdbj_tml_custom_redirect_login', 10, 3);
11	add_filter('logout_redirect', 'wdbj_tml_custom_redirect_logout', 10, 3);
12	add_action('login_form', 'wdbj_tml_custom_redirect_login_form');
	@@ -14,7 +14,7 @@ function wdbj_tml_custom_redirect_init() {
14
15	add_action('tml_admin_init', 'wdbj_tml_custom_redirect_admin_init');
16	function wdbj_tml_custom_redirect_admin_init() {
17	- require_once (TML_MODULE_DIR . '/custom-redirection/admin.php');
18	add_action('tml_admin_menu', 'wdbj_tml_custom_redirect_admin_menu');
19	}
20


6
7	add_action('tml_init', 'wdbj_tml_custom_redirect_init');
8	function wdbj_tml_custom_redirect_init() {
9	+ include( TML_MODULE_DIR . '/custom-redirection/includes/hook-functions.php' );
10	add_filter('login_redirect', 'wdbj_tml_custom_redirect_login', 10, 3);
11	add_filter('logout_redirect', 'wdbj_tml_custom_redirect_logout', 10, 3);
12	add_action('login_form', 'wdbj_tml_custom_redirect_login_form');

14
15	add_action('tml_admin_init', 'wdbj_tml_custom_redirect_admin_init');
16	function wdbj_tml_custom_redirect_admin_init() {
17	+ require_once (TML_MODULE_DIR . '/custom-redirection/admin/admin.php');
18	add_action('tml_admin_menu', 'wdbj_tml_custom_redirect_admin_menu');
19	}
20

modules/custom-redirection/{hook-functions.php → includes/hook-functions.php} RENAMED Viewed

File without changes

modules/custom-user-links/admin/admin.php CHANGED Viewed

	@@ -160,7 +160,7 @@ function _wdbj_tml_custom_user_links_link_row( $link, $role, &$count ) {
160
161	function wdbj_tml_custom_user_links_link_form($role) {
162	?>
163	- <p><strong><?php _e( 'Add New link:' ) ?></strong></p>
164	<table id="new-<?php echo $role; ?>-link">
165	<thead>
166	<tr>


160
161	function wdbj_tml_custom_user_links_link_form($role) {
162	?>
163	+ <p><strong><?php _e( 'Add New link:' , 'theme-my-login') ?></strong></p>
164	<table id="new-<?php echo $role; ?>-link">
165	<thead>
166	<tr>

modules/custom-user-links/custom-user-links.php CHANGED Viewed

	@@ -54,8 +54,8 @@ function wdbj_tml_custom_user_links_default_settings() {
54	if ( 'pending' == $role )
55	continue;
56	$options[$role] = array(
57	- array('title' => __('Dashboard'), 'url' => admin_url()),
58	- array('title' => __('Profile'), 'url' => admin_url('profile.php'))
59	);
60	}
61	return $options;


54	if ( 'pending' == $role )
55	continue;
56	$options[$role] = array(
57	+ array('title' => __('Dashboard', 'theme-my-login'), 'url' => admin_url()),
58	+ array('title' => __('Profile', 'theme-my-login'), 'url' => admin_url('profile.php'))
59	);
60	}
61	return $options;

modules/themed-profiles/includes/template-functions.php CHANGED Viewed

	@@ -18,7 +18,7 @@ function wdbj_tml_themed_profiles_display() {
18	</p>
19
20	<?php if ( has_filter('personal_options') \|\| has_filter('profile_personal_options') ) : ?>
21	- <h3><?php _e('Personal Options'); ?></h3>
22
23	<table class="form-table">
24	<?php do_action('personal_options', $profileuser); ?>
	@@ -26,31 +26,31 @@ function wdbj_tml_themed_profiles_display() {
26	<?php do_action('profile_personal_options', $profileuser); ?>
27	<?php endif; ?>
28
29	- <h3><?php _e('Name') ?></h3>
30
31	<table class="form-table">
32	<tr>
33	- <th><label for="user_login"><?php _e('Username'); ?></label></th>
34	- <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Your username cannot be changed.'); ?></span></td>
35	</tr>
36
37	<tr>
38	- <th><label for="first_name"><?php _e('First name') ?></label></th>
39	<td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
40	</tr>
41
42	<tr>
43	- <th><label for="last_name"><?php _e('Last name') ?></label></th>
44	<td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
45	</tr>
46
47	<tr>
48	- <th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
49	<td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
50	</tr>
51
52	<tr>
53	- <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
54	<td>
55	<select name="display_name" id="display_name">
56	<?php
	@@ -79,16 +79,16 @@ function wdbj_tml_themed_profiles_display() {
79	</tr>
80	</table>
81
82	- <h3><?php _e('Contact Info') ?></h3>
83
84	<table class="form-table">
85	<tr>
86	- <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
87	<td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /></td>
88	</tr>
89
90	<tr>
91	- <th><label for="url"><?php _e('Website') ?></label></th>
92	<td><input type="text" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
93	</tr>
94
	@@ -105,13 +105,13 @@ function wdbj_tml_themed_profiles_display() {
105	?>
106	</table>
107
108	- <h3><?php _e('About Yourself'); ?></h3>
109
110	<table class="form-table">
111	<tr>
112	- <th><label for="description"><?php _e('Biographical Info'); ?></label></th>
113	<td><textarea name="description" id="description" rows="5" cols="30"><?php echo esc_html($profileuser->description); ?></textarea><br />
114	- <span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span></td>
115	</tr>
116
117	<?php
	@@ -119,11 +119,11 @@ $show_password_fields = apply_filters('show_password_fields', true, $profileuser
119	if ( $show_password_fields ) :
120	?>
121	<tr id="password">
122	- <th><label for="pass1"><?php _e('New Password'); ?></label></th>
123	- <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
124	- <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
125	- <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
126	- <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ & ).'); ?></p>
127	</td>
128	</tr>
129	<?php endif; ?>
	@@ -137,7 +137,7 @@ if ( $show_password_fields ) :
137	<br class="clear" />
138	<table width="99%" style="border: none;" cellspacing="2" cellpadding="3" class="editform">
139	<tr>
140	- <th scope="row"><?php _e('Additional Capabilities') ?></th>
141	<td><?php
142	$output = '';
143	global $wp_roles;


18	</p>
19
20	<?php if ( has_filter('personal_options') \|\| has_filter('profile_personal_options') ) : ?>
21	+ <h3><?php _e('Personal Options', 'theme-my-login'); ?></h3>
22
23	<table class="form-table">
24	<?php do_action('personal_options', $profileuser); ?>

26	<?php do_action('profile_personal_options', $profileuser); ?>
27	<?php endif; ?>
28
29	+ <h3><?php _e('Name', 'theme-my-login') ?></h3>
30
31	<table class="form-table">
32	<tr>
33	+ <th><label for="user_login"><?php _e('Username', 'theme-my-login'); ?></label></th>
34	+ <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Your username cannot be changed.', 'theme-my-login'); ?></span></td>
35	</tr>
36
37	<tr>
38	+ <th><label for="first_name"><?php _e('First name', 'theme-my-login') ?></label></th>
39	<td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
40	</tr>
41
42	<tr>
43	+ <th><label for="last_name"><?php _e('Last name', 'theme-my-login') ?></label></th>
44	<td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
45	</tr>
46
47	<tr>
48	+ <th><label for="nickname"><?php _e('Nickname', 'theme-my-login'); ?> <span class="description"><?php _e('(required)', 'theme-my-login'); ?></span></label></th>
49	<td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
50	</tr>
51
52	<tr>
53	+ <th><label for="display_name"><?php _e('Display name publicly as', 'theme-my-login') ?></label></th>
54	<td>
55	<select name="display_name" id="display_name">
56	<?php

79	</tr>
80	</table>
81
82	+ <h3><?php _e('Contact Info', 'theme-my-login') ?></h3>
83
84	<table class="form-table">
85	<tr>
86	+ <th><label for="email"><?php _e('E-mail', 'theme-my-login'); ?> <span class="description"><?php _e('(required)', 'theme-my-login'); ?></span></label></th>
87	<td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" /></td>
88	</tr>
89
90	<tr>
91	+ <th><label for="url"><?php _e('Website', 'theme-my-login') ?></label></th>
92	<td><input type="text" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
93	</tr>
94

105	?>
106	</table>
107
108	+ <h3><?php _e('About Yourself', 'theme-my-login'); ?></h3>
109
110	<table class="form-table">
111	<tr>
112	+ <th><label for="description"><?php _e('Biographical Info', 'theme-my-login'); ?></label></th>
113	<td><textarea name="description" id="description" rows="5" cols="30"><?php echo esc_html($profileuser->description); ?></textarea><br />
114	+ <span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.', 'theme-my-login'); ?></span></td>
115	</tr>
116
117	<?php

119	if ( $show_password_fields ) :
120	?>
121	<tr id="password">
122	+ <th><label for="pass1"><?php _e('New Password', 'theme-my-login'); ?></label></th>
123	+ <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank.", 'theme-my-login'); ?></span><br />
124	+ <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again.", 'theme-my-login'); ?></span><br />
125	+ <div id="pass-strength-result"><?php _e('Strength indicator', 'theme-my-login'); ?></div>
126	+ <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ & ).', 'theme-my-login'); ?></p>
127	</td>
128	</tr>
129	<?php endif; ?>

137	<br class="clear" />
138	<table width="99%" style="border: none;" cellspacing="2" cellpadding="3" class="editform">
139	<tr>
140	+ <th scope="row"><?php _e('Additional Capabilities', 'theme-my-login') ?></th>
141	<td><?php
142	$output = '';
143	global $wp_roles;

modules/themed-profiles/themed-profiles.php CHANGED Viewed

	@@ -42,7 +42,7 @@ function wdbj_tml_themed_profiles_init() {
42	check_admin_referer('update-user_' . $current_user->ID);
43
44	if ( !current_user_can('edit_user', $current_user->ID) )
45	- wp_die(__('You do not have permission to edit this user.'));
46
47	do_action('personal_options_update', $current_user->ID);
48


42	check_admin_referer('update-user_' . $current_user->ID);
43
44	if ( !current_user_can('edit_user', $current_user->ID) )
45	+ wp_die(__('You do not have permission to edit this user.', 'theme-my-login'));
46
47	do_action('personal_options_update', $current_user->ID);
48

modules/user-moderation/admin/admin.php CHANGED Viewed

	@@ -56,7 +56,7 @@ function wdbj_tml_user_mod_deny_user($user_id) {
56	$message = apply_filters('user_denial_message', $message, $user_id);
57
58	if ( $message && !wp_mail($user->user_email, $title, $message) )
59	- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
60	}
61
62	function wdbj_tml_user_mod_admin_menu() {


56	$message = apply_filters('user_denial_message', $message, $user_id);
57
58	if ( $message && !wp_mail($user->user_email, $title, $message) )
59	+ die('<p>' . __('The e-mail could not be sent.', 'theme-my-login') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...', 'theme-my-login') . '</p>');
60	}
61
62	function wdbj_tml_user_mod_admin_menu() {

modules/user-moderation/includes/functions.php CHANGED Viewed

	@@ -14,14 +14,14 @@ function wdbj_tml_user_mod_activate_new_user($key, $login, $newpass = false) {
14	$key = preg_replace('/[^a-z0-9]/i', '', $key);
15
16	if ( empty($key) \|\| !is_string($key) )
17	- return new WP_Error('invalid_key', __('Invalid key'));
18
19	if ( empty($login) \|\| !is_string($login) )
20	- return new WP_Error('invalid_key', __('Invalid key'));
21
22	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
23	if ( empty( $user ) )
24	- return new WP_Error('invalid_key', __('Invalid key'));
25
26	do_action('user_activation_post', $user->user_login, $user->user_email, $errors);
27
	@@ -84,8 +84,8 @@ function wdbj_tml_user_mod_approve_new_user($id, $newpass = false) {
84	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
85
86	$message = sprintf(__('You have been approved access to %s', 'theme-my-login'), $blogname) . "\r\n\r\n";
87	- $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n";
88	- $message .= sprintf(__('Password: %s'), $user_pass) . "\r\n\r\n";
89	$message .= site_url('wp-login.php', 'login') . "\r\n";
90
91	$title = sprintf(__('[%s] Registration Approved', 'theme-my-login'), $blogname);
	@@ -94,7 +94,7 @@ function wdbj_tml_user_mod_approve_new_user($id, $newpass = false) {
94	$message = apply_filters('user_approval_message', $message, $user_pass, $user->ID);
95
96	if ( $message && !wp_mail($user->user_email, $title, $message) )
97	- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
98
99	return true;
100	}


14	$key = preg_replace('/[^a-z0-9]/i', '', $key);
15
16	if ( empty($key) \|\| !is_string($key) )
17	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
18
19	if ( empty($login) \|\| !is_string($login) )
20	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
21
22	$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login));
23	if ( empty( $user ) )
24	+ return new WP_Error('invalid_key', __('Invalid key', 'theme-my-login'));
25
26	do_action('user_activation_post', $user->user_login, $user->user_email, $errors);
27

84	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
85
86	$message = sprintf(__('You have been approved access to %s', 'theme-my-login'), $blogname) . "\r\n\r\n";
87	+ $message .= sprintf(__('Username: %s', 'theme-my-login'), $user->user_login) . "\r\n";
88	+ $message .= sprintf(__('Password: %s', 'theme-my-login'), $user_pass) . "\r\n\r\n";
89	$message .= site_url('wp-login.php', 'login') . "\r\n";
90
91	$title = sprintf(__('[%s] Registration Approved', 'theme-my-login'), $blogname);

94	$message = apply_filters('user_approval_message', $message, $user_pass, $user->ID);
95
96	if ( $message && !wp_mail($user->user_email, $title, $message) )
97	+ die('<p>' . __('The e-mail could not be sent.', 'theme-my-login') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...', 'theme-my-login') . '</p>');
98
99	return true;
100	}

modules/user-moderation/user-moderation.php CHANGED Viewed

	@@ -38,7 +38,7 @@ function wdbj_tml_user_mod_login_message() {
38	}
39
40	if ( wdbj_tml_get_var('request_instance') == wdbj_tml_get_var('current_instance', 'instance_id') && isset($_GET['activation']) && 'invalidkey' == $_GET['activation'] )
41	- wdbj_tml_set_error('invalid_key', __('<strong>ERROR</strong>: Sorry, that key does not appear to be valid.'));
42	}
43
44	add_action('tml_admin_init', 'wdbj_tml_user_mod_admin_init');


38	}
39
40	if ( wdbj_tml_get_var('request_instance') == wdbj_tml_get_var('current_instance', 'instance_id') && isset($_GET['activation']) && 'invalidkey' == $_GET['activation'] )
41	+ wdbj_tml_set_error('invalid_key', __('<strong>ERROR</strong>: Sorry, that key does not appear to be valid.', 'theme-my-login'));
42	}
43
44	add_action('tml_admin_init', 'wdbj_tml_user_mod_admin_init');

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Donate link: http://www.jfarthing.com/donate
4	Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5	Requires at least: 2.8
6	Tested up to: 3.0-alpha
7	- Stable tag: ~~5.0~~
8
9	Themes the WordPress login pages according to your theme.
10
	@@ -43,6 +43,11 @@ None yet. Please visit http://www.jfarthing.com/forum for any support!
43
44	== Changelog ==
45





46	= 5.0 =
47	* Rewrite code in a modular fashion in order to speed up plugin
48	* Convert custom e-mails, passwords, redirection, user links and user moderation to "modules"


4	Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5	Requires at least: 2.8
6	Tested up to: 3.0-alpha
7	+ Stable tag: trunk
8
9	Themes the WordPress login pages according to your theme.
10

43
44	== Changelog ==
45
46	+ = 5.0.1 =
47	+ * Only display function override notices on TML settings page
48	+ * Typecast arrays as arrays (Fixes invalid datatype notices)
49	+ * Add plugin domain to all gettext calls
50	+
51	= 5.0 =
52	* Rewrite code in a modular fashion in order to speed up plugin
53	* Convert custom e-mails, passwords, redirection, user links and user moderation to "modules"

theme-my-login.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: Theme My Login
4	Plugin URI: http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin
5	Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6	- Version: 5.0
7	Author: Jeff Farthing
8	Author URI: http://www.jfarthing.com
9	Text Domain: theme-my-login
	@@ -45,11 +45,6 @@ if ( is_admin() ) {
45
46	add_action('admin_init', 'wdbj_tml_admin_init');
47	add_action('admin_menu', 'wdbj_tml_admin_menu');
48	-
49	- if ( function_exists('wp_new_user_notification') )
50	- add_action('admin_notices', 'wdbj_tml_new_user_notification_override_notice');
51	- if ( function_exists('wp_password_change_notification') )
52	- add_action('admin_notices', 'wdbj_tml_password_change_notification_override_notice');
53	}
54
55	// Load pluggable functions after modules (in case a module needs to override a function)


3	Plugin Name: Theme My Login
4	Plugin URI: http://www.jfarthing.com/wordpress-plugins/theme-my-login-plugin
5	Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6	+ Version: 5.0.1
7	Author: Jeff Farthing
8	Author URI: http://www.jfarthing.com
9	Text Domain: theme-my-login

45
46	add_action('admin_init', 'wdbj_tml_admin_init');
47	add_action('admin_menu', 'wdbj_tml_admin_menu');





48	}
49
50	// Load pluggable functions after modules (in case a module needs to override a function)