Theme My Login - Version 6.4.5

Version Description

Don't clear username input on login form when autofocusing
Fix custom e-mail disable checkboxes defaulting to being checked
Fix login type functionality
Bring wp-login.php duplicated code up to date
Require WordPress 4.5

Release Info

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

Code changes from version 6.4.4 to 6.4.5

Files changed (9) hide show

admin/class-theme-my-login-admin.php +16 -5
includes/class-theme-my-login.php +38 -30
languages/theme-my-login.pot +183 -215
modules/custom-email/admin/custom-email-admin.php +4 -4
modules/custom-email/custom-email.php +2 -4
readme.txt +10 -3
templates/login-form.php +5 -4
templates/lostpassword-form.php +6 -1
theme-my-login.php +1 -1

admin/class-theme-my-login-admin.php CHANGED Viewed

	@@ -175,14 +175,14 @@ class Theme_My_Login_Admin extends Theme_My_Login_Abstract {
175	<ul>
176
177	<li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_default" value="default"<?php checked( 'default', $this->get_option( 'login_type' ) ); ?> />
178	- <label for="theme_my_login_login_type_default"><?php _e( 'Username ~~only~~', 'theme-my-login' ); ?></label></li>



179
180	<li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_email" value="email"<?php checked( 'email', $this->get_option( 'login_type' ) ); ?> />
181	<label for="theme_my_login_login_type_email"><?php _e( 'E-mail only', 'theme-my-login' ); ?></label></li>
182
183	- <li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_both" value="both"<?php checked( 'both', $this->get_option( 'login_type' ) ); ?> />
184	- <label for="theme_my_login_login_type_both"><?php _e( 'Username or E-mail', 'theme-my-login' ); ?></label></li>
185	-
186	</ul>
187
188	<p class="description"><?php _e( 'Allow users to login using their username and/or e-mail address.', 'theme-my-login' ); ?></p>
	@@ -221,7 +221,7 @@ class Theme_My_Login_Admin extends Theme_My_Login_Abstract {
221	*/
222	public function save_settings( $settings ) {
223	$settings['enable_css'] = ! empty( $settings['enable_css'] );
224	- $settings['login_type'] = in_array( $settings['login_type'], array( 'default', '~~email~~', '~~both~~' ) ) ? $settings['login_type'] : 'default';
225	$settings['active_modules'] = isset( $settings['active_modules'] ) ? (array) $settings['active_modules'] : array();
226
227	// If we have modules to activate
	@@ -327,6 +327,17 @@ class Theme_My_Login_Admin extends Theme_My_Login_Abstract {
327	$this->delete_option( 'email_login' );
328	}
329











330	// Setup default pages
331	foreach ( Theme_My_Login::default_pages() as $action => $title ) {
332	if ( ! $page_id = Theme_My_Login::get_page_id( $action ) ) {


175	<ul>
176
177	<li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_default" value="default"<?php checked( 'default', $this->get_option( 'login_type' ) ); ?> />
178	+ <label for="theme_my_login_login_type_default"><?php _e( 'Username or E-mail', 'theme-my-login' ); ?></label></li>
179	+
180	+ <li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_username" value="username"<?php checked( 'username', $this->get_option( 'login_type' ) ); ?> />
181	+ <label for="theme_my_login_login_type_username"><?php _e( 'Username only', 'theme-my-login' ); ?></label></li>
182
183	<li><input name="theme_my_login[login_type]" type="radio" id="theme_my_login_login_type_email" value="email"<?php checked( 'email', $this->get_option( 'login_type' ) ); ?> />
184	<label for="theme_my_login_login_type_email"><?php _e( 'E-mail only', 'theme-my-login' ); ?></label></li>
185



186	</ul>
187
188	<p class="description"><?php _e( 'Allow users to login using their username and/or e-mail address.', 'theme-my-login' ); ?></p>

221	*/
222	public function save_settings( $settings ) {
223	$settings['enable_css'] = ! empty( $settings['enable_css'] );
224	+ $settings['login_type'] = in_array( $settings['login_type'], array( 'default', 'username', 'email' ) ) ? $settings['login_type'] : 'default';
225	$settings['active_modules'] = isset( $settings['active_modules'] ) ? (array) $settings['active_modules'] : array();
226
227	// If we have modules to activate

327	$this->delete_option( 'email_login' );
328	}
329
330	+ // 6.4.5 upgrade
331	+ if ( version_compare( $version, '6.4.5', '<' ) ) {
332	+ // Convert login type option
333	+ $login_type = $this->get_option( 'login_type' );
334	+ if ( 'both' == $login_type ) {
335	+ $this->set_option( 'login_type', 'default' );
336	+ } elseif ( 'default' == $login_type ) {
337	+ $this->set_option( 'login_type', 'username' );
338	+ }
339	+ }
340	+
341	// Setup default pages
342	foreach ( Theme_My_Login::default_pages() as $action => $title ) {
343	if ( ! $page_id = Theme_My_Login::get_page_id( $action ) ) {

includes/class-theme-my-login.php CHANGED Viewed

	@@ -21,7 +21,7 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
21	* @since 6.3.2
22	* @const string
23	*/
24	- const VERSION = '6.4.4';
25
26	/**
27	* Holds options key
	@@ -143,7 +143,6 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
143	add_action( 'wp_head', array( $this, 'wp_head' ) );
144	add_action( 'wp_footer', array( $this, 'wp_footer' ) );
145	add_action( 'wp_print_footer_scripts', array( $this, 'wp_print_footer_scripts' ) );
146	- add_action( 'wp_authenticate', array( $this, 'wp_authenticate' ) );
147
148	add_filter( 'site_url', array( $this, 'site_url' ), 10, 3 );
149	add_filter( 'logout_url', array( $this, 'logout_url' ), 10, 2 );
	@@ -152,8 +151,15 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
152	add_filter( 'wp_setup_nav_menu_item', array( $this, 'wp_setup_nav_menu_item' ) );
153	add_filter( 'wp_list_pages_excludes', array( $this, 'wp_list_pages_excludes' ) );
154	add_filter( 'page_link', array( $this, 'page_link' ), 10, 2 );

155
156	add_shortcode( 'theme-my-login', array( $this, 'shortcode' ) );






157	}
158
159
	@@ -477,6 +483,9 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
477	$redirect_to = get_dashboard_url( $user->ID );
478	elseif ( ! $user->has_cap( 'edit_posts' ) )
479	$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();



480	}
481	wp_safe_redirect( $redirect_to );
482	exit;
	@@ -601,14 +610,21 @@ setTimeout( function() {
601	try {
602	<?php if ( $user_login ) { ?>
603	d = document.getElementById('user_pass');

604	<?php } else { ?>
605	d = document.getElementById('user_login');
606	- <?php } ?>

607	d.value = '';



608	d.focus();

609	} catch(e){}
610	}, 200 );
611	}

612	wp_attempt_focus();
613	if(typeof wpOnload=='function')wpOnload()
614	</script>
	@@ -617,32 +633,6 @@ if(typeof wpOnload=='function')wpOnload()
617	}
618	}
619
620	- /**
621	- * Handles login type enforcement
622	- *
623	- * @since 6.0
624	- * @access public
625	- *
626	- * @param string $username Username or email
627	- * @param string $password User's password
628	- */
629	- public function wp_authenticate( &$user_login ) {
630	- global $wpdb;
631	-
632	- $login_type = $this->get_option( 'login_type' );
633	-
634	- if ( 'default' == $login_type )
635	- return;
636	-
637	- if ( ! is_email( $user_login ) && 'email' == $login_type ) {
638	- $user_login = -1;
639	- } elseif ( is_email( $user_login ) ) {
640	- if ( $found = $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM $wpdb->users WHERE user_email = %s", $user_login ) ) )
641	- $user_login = $found;
642	- }
643	- }
644	-
645	-
646	/************************************************************************************************************************
647	* Filters
648	************************************************************************************************************************/
	@@ -832,6 +822,24 @@ if(typeof wpOnload=='function')wpOnload()
832	return $link;
833	}
834


















835
836	/************************************************************************************************************************
837	* Utilities
	@@ -1128,7 +1136,7 @@ if(typeof wpOnload=='function')wpOnload()
1128	if ( empty( $_POST['user_login'] ) ) {
1129	$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or e-mail address.', 'theme-my-login' ) );
1130	} else if ( strpos( $_POST['user_login'], '@' ) ) {
1131	- $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
1132	if ( empty( $user_data ) )
1133	$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no user registered with that email address.', 'theme-my-login' ) );
1134	} else {


21	* @since 6.3.2
22	* @const string
23	*/
24	+ const VERSION = '6.4.5';
25
26	/**
27	* Holds options key

143	add_action( 'wp_head', array( $this, 'wp_head' ) );
144	add_action( 'wp_footer', array( $this, 'wp_footer' ) );
145	add_action( 'wp_print_footer_scripts', array( $this, 'wp_print_footer_scripts' ) );

146
147	add_filter( 'site_url', array( $this, 'site_url' ), 10, 3 );
148	add_filter( 'logout_url', array( $this, 'logout_url' ), 10, 2 );

151	add_filter( 'wp_setup_nav_menu_item', array( $this, 'wp_setup_nav_menu_item' ) );
152	add_filter( 'wp_list_pages_excludes', array( $this, 'wp_list_pages_excludes' ) );
153	add_filter( 'page_link', array( $this, 'page_link' ), 10, 2 );
154	+ add_filter( 'authenticate', array( $this, 'authenticate' ), 20, 3 );
155
156	add_shortcode( 'theme-my-login', array( $this, 'shortcode' ) );
157	+
158	+ if ( 'username' == $this->get_option( 'login_type' ) ) {
159	+ remove_filter( 'authenticate', 'wp_authenticate_email_password', 20 );
160	+ } elseif ( 'email' == $this->get_option( 'login_type' ) ) {
161	+ remove_filter( 'authenticate', 'wp_authenticate_username_password', 20 );
162	+ }
163	}
164
165

483	$redirect_to = get_dashboard_url( $user->ID );
484	elseif ( ! $user->has_cap( 'edit_posts' ) )
485	$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
486	+
487	+ wp_redirect( $redirect_to );
488	+ exit;
489	}
490	wp_safe_redirect( $redirect_to );
491	exit;

610	try {
611	<?php if ( $user_login ) { ?>
612	d = document.getElementById('user_pass');
613	+ d.value = '';
614	<?php } else { ?>
615	d = document.getElementById('user_login');
616	+ <?php if ( 'invalid_username' == $this->errors->get_error_code() ) { ?>
617	+ if ( d.value != '' )
618	d.value = '';
619	+ <?php
620	+ }
621	+ } ?>
622	d.focus();
623	+ d.select();
624	} catch(e){}
625	}, 200 );
626	}
627	+
628	wp_attempt_focus();
629	if(typeof wpOnload=='function')wpOnload()
630	</script>

633	}
634	}
635


























636	/************************************************************************************************************************
637	* Filters
638	************************************************************************************************************************/

822	return $link;
823	}
824
825	+ /**
826	+ * Add proper message in case of e-mail login error
827	+ *
828	+ * @since 6.4.5
829	+ *
830	+ * @param null\|WP_Error\|WP_User $user
831	+ * @param string $username
832	+ * @param string $password
833	+ * @return null\|WP_User\|WP_Error
834	+ */
835	+ public function authenticate( $user, $username, $password ) {
836	+ if ( 'email' == $this->get_option( 'login_type' ) && null == $user ) {
837	+ return new WP_Error( 'invalid_email', __( '<strong>ERROR</strong>: Invalid email address.', 'theme-my-login' ) );
838	+ }
839	+
840	+ return $user;
841	+ }
842	+
843
844	/************************************************************************************************************************
845	* Utilities

1136	if ( empty( $_POST['user_login'] ) ) {
1137	$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or e-mail address.', 'theme-my-login' ) );
1138	} else if ( strpos( $_POST['user_login'], '@' ) ) {
1139	+ $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
1140	if ( empty( $user_data ) )
1141	$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no user registered with that email address.', 'theme-my-login' ) );
1142	} else {

languages/theme-my-login.pot CHANGED Viewed

	@@ -1,14 +1,14 @@
1	- # Copyright (C) ~~2015~~ Theme My Login
2	# This file is distributed under the same license as the Theme My Login package.
3	msgid ""
4	msgstr ""
5	"Project-Id-Version: Theme My Login 6.4.x\n"
6	"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-login\n"
7	- "POT-Creation-Date: ~~2015~~-10-16 15:51:39+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
11	- "PO-Revision-Date: ~~2015~~-MO-DA HO:MI+ZONE\n"
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14
	@@ -40,33 +40,33 @@ msgstr ""
40	msgid "Login Type"
41	msgstr ""
42
43	- #: admin/class-theme-my-login-admin.php:~~162~~
44	msgid "Enable \"theme-my-login.css\""
45	msgstr ""
46
47	- #: admin/class-theme-my-login-admin.php:~~163~~
48	msgid ""
49	"In order to keep changes between upgrades, you can store your customized "
50	"\"theme-my-login.css\" in your current theme directory."
51	msgstr ""
52
53	- #: admin/class-theme-my-login-admin.php:~~179~~
54	- msgid "Username ~~only~~"
55	msgstr ""
56
57	- #: admin/class-theme-my-login-admin.php:~~182~~
58	- msgid "~~E-mail~~ only"
59	msgstr ""
60
61	- #: admin/class-theme-my-login-admin.php:~~185 templates/login-form.php:16~~
62	- msgid "~~Username or~~ E-mail"
63	msgstr ""
64
65	- #: admin/class-theme-my-login-admin.php:~~189~~
66	msgid "Allow users to login using their username and/or e-mail address."
67	msgstr ""
68
69	- #: admin/class-theme-my-login-admin.php:~~205~~
70	msgid "Enable %s"
71	msgstr ""
72
	@@ -260,7 +260,7 @@ msgid "Username:"
260	msgstr ""
261
262	#: includes/class-theme-my-login-ms-signup.php:435
263	- #: modules/custom-passwords/custom-passwords.php:95
264	msgid "Password:"
265	msgstr ""
266
	@@ -293,7 +293,7 @@ msgid "Lost Password"
293	msgstr ""
294
295	#: includes/class-theme-my-login-template.php:167
296	- #: includes/class-theme-my-login.php:117 templates/login-form.php:37
297	msgid "Log In"
298	msgstr ""
299
	@@ -325,7 +325,7 @@ msgstr ""
325	msgid "A login form for your blog."
326	msgstr ""
327
328	- #. #-#-#-#-# plugin.pot (Theme My Login 6.4) #-#-#-#-#
329	#. Plugin Name of the plugin/theme
330	#: includes/class-theme-my-login-widget.php:26
331	msgid "Theme My Login"
	@@ -376,81 +376,81 @@ msgid "Log Out"
376	msgstr ""
377
378	#: includes/class-theme-my-login.php:121
379	- #: modules/custom-email/admin/custom-email-admin.php:~~102~~
380	- #: templates/resetpass-form.php:31
381	msgid "Reset Password"
382	msgstr ""
383
384	- #: includes/class-theme-my-login.php:~~349~~
385	msgid ""
386	"Your password reset link appears to be invalid. Please request a new link "
387	"below."
388	msgstr ""
389
390	- #: includes/class-theme-my-login.php:~~351~~
391	msgid "Your password reset link has expired. Please request a new link below."
392	msgstr ""
393
394	- #: includes/class-theme-my-login.php:~~390~~
395	msgid "The passwords do not match."
396	msgstr ""
397
398	- #: includes/class-theme-my-login.php:~~492~~
399	msgid "You are now logged out."
400	msgstr ""
401
402	- #: includes/class-theme-my-login.php:~~494~~
403	msgid "User registration is currently not allowed."
404	msgstr ""
405
406	- #: includes/class-theme-my-login.php:~~496~~
407	msgid "Check your e-mail for the confirmation link."
408	msgstr ""
409
410	- #: includes/class-theme-my-login.php:~~498~~
411	msgid "Your password has been reset."
412	msgstr ""
413
414	- #: includes/class-theme-my-login.php:~~500~~
415	msgid "Registration complete. Please check your e-mail."
416	msgstr ""
417
418	- #: includes/class-theme-my-login.php:~~502~~
419	msgid "Your session has expired. Please log-in again."
420	msgstr ""
421
422	- #: includes/class-theme-my-login.php:~~504~~
423	msgid ""
424	"<strong>You have successfully updated WordPress!</strong> Please log back in "
425	"to experience the awesomeness."
426	msgstr ""
427
428	- #: includes/class-theme-my-login.php:~~506~~
429	msgid "Please log in to continue."
430	msgstr ""
431
432	- #: includes/class-theme-my-login.php:~~1133~~
433	- msgid "<strong>ERROR</strong>: ~~Enter~~ a ~~username or e-mail~~ address."
434	msgstr ""
435
436	#: includes/class-theme-my-login.php:1137




437	msgid ""
438	"<strong>ERROR</strong>: There is no user registered with that email address."
439	msgstr ""
440
441	- #: includes/class-theme-my-login.php:~~1149~~
442	msgid "<strong>ERROR</strong>: Invalid username or e-mail."
443	msgstr ""
444
445	- #: includes/class-theme-my-login.php:~~1163~~
446	- msgid "Password reset is not allowed for this user"
447	- msgstr ""
448	-
449	- #: includes/class-theme-my-login.php:1180
450	msgid "Someone requested that the password be reset for the following account:"
451	msgstr ""
452
453	- #: includes/class-theme-my-login.php:~~1182~~
454	#: modules/custom-email/custom-email.php:841
455	#: modules/custom-email/custom-email.php:870
456	#: modules/user-moderation/admin/user-moderation-admin.php:382
	@@ -458,152 +458,127 @@ msgstr ""
458	msgid "Username: %s"
459	msgstr ""
460
461	- #: includes/class-theme-my-login.php:~~1183~~
462	msgid "If this was a mistake, just ignore this email and nothing will happen."
463	msgstr ""
464
465	- #: includes/class-theme-my-login.php:~~1184~~
466	msgid "To reset your password, visit the following address:"
467	msgstr ""
468
469	- #: includes/class-theme-my-login.php:~~1195~~
470	msgid "[%s] Password Reset"
471	msgstr ""
472
473	- #: includes/class-theme-my-login.php:~~1201~~
474	#: modules/user-moderation/admin/user-moderation-admin.php:252
475	#: modules/user-moderation/admin/user-moderation-admin.php:394
476	#: modules/user-moderation/admin/user-moderation-admin.php:436
477	msgid "The e-mail could not be sent."
478	msgstr ""
479
480	- #: includes/class-theme-my-login.php:~~1201~~
481	#: modules/user-moderation/admin/user-moderation-admin.php:252
482	#: modules/user-moderation/admin/user-moderation-admin.php:394
483	#: modules/user-moderation/admin/user-moderation-admin.php:436
484	msgid "Possible reason: your host may have disabled the mail() function..."
485	msgstr ""
486
487	- #: ~~includes~~/~~class~~-~~theme~~-my-~~login~~.php:~~1245~~
488	- ~~msgid~~ ~~"<strong>ERROR</strong>: Please enter a username~~."
489	- msgstr ""
490	-
491	- #: includes/class-theme-my-login.php:1247
492	- msgid ""
493	- "<strong>ERROR</strong>: This username is invalid because it uses illegal "
494	- "characters. Please enter a valid username."
495	- msgstr ""
496	-
497	- #: includes/class-theme-my-login.php:1250
498	- msgid ""
499	- "<strong>ERROR</strong>: This username is already registered, please choose "
500	- "another one."
501	- msgstr ""
502	-
503	- #: includes/class-theme-my-login.php:1255
504	- msgid "<strong>ERROR</strong>: Please type your e-mail address."
505	- msgstr ""
506	-
507	- #: includes/class-theme-my-login.php:1257
508	- msgid "<strong>ERROR</strong>: The email address isn’t correct."
509	- msgstr ""
510	-
511	- #: includes/class-theme-my-login.php:1260
512	- msgid ""
513	- "<strong>ERROR</strong>: This email is already registered, please choose "
514	- "another one."
515	- msgstr ""
516	-
517	- #: includes/class-theme-my-login.php:1273
518	- msgid ""
519	- "<strong>ERROR</strong>: Couldn’t register you... please contact the <a "
520	- "href=\"mailto:%s\">webmaster</a> !"
521	- msgstr ""
522	-
523	- #: modules/custom-email/admin/custom-email-admin.php:92
524	- #: modules/custom-email/admin/custom-email-admin.php:150
525	msgid "Theme My Login Custom E-mail Settings"
526	msgstr ""
527
528	- #: modules/custom-email/admin/custom-email-admin.php:93
529	- #: templates/login-form.php:14 templates/profile-form.php:96
530	#: templates/register-form.php:19
531	msgid "E-mail"
532	msgstr ""
533
534	- #: modules/custom-email/admin/custom-email-admin.php:99
535	msgid "New User"
536	msgstr ""
537
538	- #: modules/custom-email/admin/custom-email-admin.php:~~100~~
539	msgid "New User Admin"
540	msgstr ""
541
542	- #: modules/custom-email/admin/custom-email-admin.php:~~101~~
543	msgid "Retrieve Password"
544	msgstr ""
545
546	- #: modules/custom-email/admin/custom-email-admin.php:~~106~~
547	msgid "User Activation"
548	msgstr ""
549
550	- #: modules/custom-email/admin/custom-email-admin.php:~~107~~
551	msgid "User Approval"
552	msgstr ""
553
554	- #: modules/custom-email/admin/custom-email-admin.php:~~108~~
555	msgid "User Approval Admin"
556	msgstr ""
557
558	- #: modules/custom-email/admin/custom-email-admin.php:~~109~~
559	msgid "User Denial"
560	msgstr ""
561
562	- #: modules/custom-email/admin/custom-email-admin.php:~~179~~
563	msgid "This e-mail will be sent to a new user upon registration."
564	msgstr ""
565
566	- #: modules/custom-email/admin/custom-email-admin.php:~~180~~
567	- #: modules/custom-email/admin/custom-email-admin.php:~~285~~
568	- #: modules/custom-email/admin/custom-email-admin.php:~~439~~
569	msgid ""
570	"Please be sure to include the variable %reseturl% or else the user will not "
571	"be able to recover their password!"
572	msgstr ""
573
574	- #: modules/custom-email/admin/custom-email-admin.php:~~181~~
575	- #: modules/custom-email/admin/custom-email-admin.php:~~228~~
576	- #: modules/custom-email/admin/custom-email-admin.php:~~286~~
577	- #: modules/custom-email/admin/custom-email-admin.php:~~333~~
578	- #: modules/custom-email/admin/custom-email-admin.php:~~392~~
579	- #: modules/custom-email/admin/custom-email-admin.php:~~440~~
580	- #: modules/custom-email/admin/custom-email-admin.php:~~487~~
581	- #: modules/custom-email/admin/custom-email-admin.php:~~545~~
582	msgid "If any field is left empty, the default will be used instead."
583	msgstr ""
584
585	- #: modules/custom-email/admin/custom-email-admin.php:~~185~~
586	- #: modules/custom-email/admin/custom-email-admin.php:~~236~~
587	- #: modules/custom-email/admin/custom-email-admin.php:~~290~~
588	- #: modules/custom-email/admin/custom-email-admin.php:~~341~~
589	- #: modules/custom-email/admin/custom-email-admin.php:~~396~~
590	- #: modules/custom-email/admin/custom-email-admin.php:~~444~~
591	- #: modules/custom-email/admin/custom-email-admin.php:~~495~~
592	- #: modules/custom-email/admin/custom-email-admin.php:~~549~~
593	msgid "From Name"
594	msgstr ""
595
596	- #: modules/custom-email/admin/custom-email-admin.php:~~189~~
597	- #: modules/custom-email/admin/custom-email-admin.php:~~240~~
598	- #: modules/custom-email/admin/custom-email-admin.php:~~294~~
599	- #: modules/custom-email/admin/custom-email-admin.php:~~345~~
600	- #: modules/custom-email/admin/custom-email-admin.php:~~400~~
601	- #: modules/custom-email/admin/custom-email-admin.php:~~448~~
602	- #: modules/custom-email/admin/custom-email-admin.php:~~499~~
603	- #: modules/custom-email/admin/custom-email-admin.php:~~553~~
604	msgid "From E-mail"
605	msgstr ""
606











607	#: modules/custom-email/admin/custom-email-admin.php:193
608	#: modules/custom-email/admin/custom-email-admin.php:244
609	#: modules/custom-email/admin/custom-email-admin.php:298
	@@ -612,129 +587,118 @@ msgstr ""
612	#: modules/custom-email/admin/custom-email-admin.php:452
613	#: modules/custom-email/admin/custom-email-admin.php:503
614	#: modules/custom-email/admin/custom-email-admin.php:557
615	- msgid "E-mail Format"
616	- msgstr ""
617	-
618	- #: modules/custom-email/admin/custom-email-admin.php:196
619	- #: modules/custom-email/admin/custom-email-admin.php:247
620	- #: modules/custom-email/admin/custom-email-admin.php:301
621	- #: modules/custom-email/admin/custom-email-admin.php:352
622	- #: modules/custom-email/admin/custom-email-admin.php:407
623	- #: modules/custom-email/admin/custom-email-admin.php:455
624	- #: modules/custom-email/admin/custom-email-admin.php:506
625	- #: modules/custom-email/admin/custom-email-admin.php:560
626	msgid "Plain Text"
627	msgstr ""
628
629	- #: modules/custom-email/admin/custom-email-admin.php:~~197~~
630	- #: modules/custom-email/admin/custom-email-admin.php:~~248~~
631	- #: modules/custom-email/admin/custom-email-admin.php:~~302~~
632	- #: modules/custom-email/admin/custom-email-admin.php:~~353~~
633	- #: modules/custom-email/admin/custom-email-admin.php:~~408~~
634	- #: modules/custom-email/admin/custom-email-admin.php:~~456~~
635	- #: modules/custom-email/admin/custom-email-admin.php:~~507~~
636	- #: modules/custom-email/admin/custom-email-admin.php:~~561~~
637	msgid "HTML"
638	msgstr ""
639
640	- #: modules/custom-email/admin/custom-email-admin.php:~~202~~
641	- #: modules/custom-email/admin/custom-email-admin.php:~~252~~
642	- #: modules/custom-email/admin/custom-email-admin.php:~~307~~
643	- #: modules/custom-email/admin/custom-email-admin.php:~~358~~
644	- #: modules/custom-email/admin/custom-email-admin.php:~~413~~
645	- #: modules/custom-email/admin/custom-email-admin.php:~~461~~
646	- #: modules/custom-email/admin/custom-email-admin.php:~~512~~
647	- #: modules/custom-email/admin/custom-email-admin.php:~~566~~
648	msgid "Subject"
649	msgstr ""
650
651	- #: modules/custom-email/admin/custom-email-admin.php:~~206~~
652	- #: modules/custom-email/admin/custom-email-admin.php:~~256~~
653	- #: modules/custom-email/admin/custom-email-admin.php:~~311~~
654	- #: modules/custom-email/admin/custom-email-admin.php:~~362~~
655	- #: modules/custom-email/admin/custom-email-admin.php:~~417~~
656	- #: modules/custom-email/admin/custom-email-admin.php:~~465~~
657	- #: modules/custom-email/admin/custom-email-admin.php:~~516~~
658	- #: modules/custom-email/admin/custom-email-admin.php:~~570~~
659	msgid "Message"
660	msgstr ""
661
662	- #: modules/custom-email/admin/custom-email-admin.php:~~208~~
663	- #: modules/custom-email/admin/custom-email-admin.php:~~258~~
664	- #: modules/custom-email/admin/custom-email-admin.php:~~313~~
665	- #: modules/custom-email/admin/custom-email-admin.php:~~364~~
666	- #: modules/custom-email/admin/custom-email-admin.php:~~419~~
667	- #: modules/custom-email/admin/custom-email-admin.php:~~467~~
668	- #: modules/custom-email/admin/custom-email-admin.php:~~518~~
669	- #: modules/custom-email/admin/custom-email-admin.php:~~572~~
670	msgid "Available Variables"
671	msgstr ""
672
673	- #: modules/custom-email/admin/custom-email-admin.php:~~227~~
674	msgid ""
675	"This e-mail will be sent to the e-mail address or addresses (multiple "
676	"addresses may be separated by commas) specified below, upon new user "
677	"registration."
678	msgstr ""
679
680	- #: modules/custom-email/admin/custom-email-admin.php:~~232~~
681	- #: modules/custom-email/admin/custom-email-admin.php:~~337~~
682	- #: modules/custom-email/admin/custom-email-admin.php:~~491~~
683	msgid "To"
684	msgstr ""
685
686	- #: modules/custom-email/admin/custom-email-admin.php:~~266~~
687	- #: modules/custom-email/admin/custom-email-admin.php:~~372~~
688	- #: modules/custom-email/admin/custom-email-admin.php:~~526~~
689	msgid "Disable Admin Notification"
690	msgstr ""
691
692	- #: modules/custom-email/admin/custom-email-admin.php:~~284~~
693	msgid ""
694	"This e-mail will be sent to a user when they attempt to recover their "
695	"password."
696	msgstr ""
697
698	- #: modules/custom-email/admin/custom-email-admin.php:~~332~~
699	msgid ""
700	"This e-mail will be sent to the e-mail address or addresses (multiple "
701	"addresses may be separated by commas) specified below, upon user password "
702	"change."
703	msgstr ""
704
705	- #: modules/custom-email/admin/custom-email-admin.php:~~390~~
706	msgid ""
707	"This e-mail will be sent to a new user upon registration when \"E-mail "
708	"Confirmation\" is checked for \"User Moderation\"."
709	msgstr ""
710
711	- #: modules/custom-email/admin/custom-email-admin.php:~~391~~
712	msgid ""
713	"Please be sure to include the variable %activateurl% or else the user will "
714	"not be able to activate their account!"
715	msgstr ""
716
717	- #: modules/custom-email/admin/custom-email-admin.php:~~438~~
718	msgid ""
719	"This e-mail will be sent to a new user upon admin approval when \"Admin "
720	"Approval\" is checked for \"User Moderation\"."
721	msgstr ""
722
723	- #: modules/custom-email/admin/custom-email-admin.php:~~486~~
724	msgid ""
725	"This e-mail will be sent to the e-mail address or addresses (multiple "
726	"addresses may be separated by commas) specified below upon user registration "
727	"when \"Admin Approval\" is checked for \"User Moderation\"."
728	msgstr ""
729
730	- #: modules/custom-email/admin/custom-email-admin.php:~~544~~
731	msgid ""
732	"This e-mail will be sent to a user who is deleted/denied when \"Admin "
733	"Approval\" is checked for \"User Moderation\" and the user's role is "
734	"\"Pending\"."
735	msgstr ""
736
737	- #: modules/custom-email/admin/custom-email-admin.php:~~580~~
738	msgid "Disable Notification"
739	msgstr ""
740
	@@ -768,54 +732,54 @@ msgstr ""
768	msgid "Password Lost and Changed for user: %s"
769	msgstr ""
770
771	- #: modules/custom-passwords/custom-passwords.php:68
772	- #: templates/login-form.php:24
773	msgid "Password"
774	msgstr ""
775
776	- #: modules/custom-passwords/custom-passwords.php:70
777	#: templates/profile-form.php:174
778	msgid "Confirm Password"
779	msgstr ""
780
781	- #: modules/custom-passwords/custom-passwords.php:~~100~~
782	msgid "(Must be at least 6 characters.)"
783	msgstr ""
784
785	- #: modules/custom-passwords/custom-passwords.php:~~102~~
786	msgid "Confirm Password:"
787	msgstr ""
788
789	- #: modules/custom-passwords/custom-passwords.php:~~104~~
790	msgid "Confirm that you've typed your password correctly."
791	msgstr ""
792
793	- #: modules/custom-passwords/custom-passwords.php:~~141~~
794	msgid "<strong>ERROR</strong>: Please enter your password twice."
795	msgstr ""
796
797	- #: modules/custom-passwords/custom-passwords.php:~~145~~
798	msgid "<strong>ERROR</strong>: Passwords may not contain the character \"\\\"."
799	msgstr ""
800
801	- #: modules/custom-passwords/custom-passwords.php:~~149~~
802	msgid ""
803	"<strong>ERROR</strong>: Please enter the same password in the two password "
804	"fields."
805	msgstr ""
806
807	- #: modules/custom-passwords/custom-passwords.php:~~153~~
808	msgid ""
809	"<strong>ERROR</strong>: Your password must be at least 6 characters in "
810	"length."
811	msgstr ""
812
813	- #: modules/custom-passwords/custom-passwords.php:~~282~~
814	msgid "Registration complete. You may now log in."
815	msgstr ""
816
817	#: modules/custom-redirection/admin/custom-redirection-admin.php:86
818	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~134~~
819	msgid "Theme My Login Custom Redirection Settings"
820	msgstr ""
821
	@@ -823,49 +787,49 @@ msgstr ""
823	msgid "Redirection"
824	msgstr ""
825
826	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~167~~
827	msgid "Log in"
828	msgstr ""
829
830	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~169~~
831	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~183~~
832	msgid "Default"
833	msgstr ""
834
835	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~170~~
836	msgid ""
837	"Check this option to send the user to their WordPress Dashboard/Profile."
838	msgstr ""
839
840	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~172~~
841	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~186~~
842	msgid "Referer"
843	msgstr ""
844
845	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~173~~
846	msgid ""
847	"Check this option to send the user back to the page they were visiting "
848	"before logging in."
849	msgstr ""
850
851	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~177~~
852	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~191~~
853	msgid ""
854	"Check this option to send the user to a custom location, specified by the "
855	"textbox above."
856	msgstr ""
857
858	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~181~~
859	msgid "Log out"
860	msgstr ""
861
862	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~184~~
863	msgid ""
864	"Check this option to send the user to the log in page, displaying a message "
865	"that they have successfully logged out."
866	msgstr ""
867
868	- #: modules/custom-redirection/admin/custom-redirection-admin.php:~~187~~
869	msgid ""
870	"Check this option to send the user back to the page they were visiting "
871	"before logging out. (Note: If the previous page being visited was an admin "
	@@ -873,7 +837,7 @@ msgid ""
873	msgstr ""
874
875	#: modules/custom-user-links/admin/custom-user-links-admin.php:94
876	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~145~~
877	msgid "Theme My Login Custom User Links Settings"
878	msgstr ""
879
	@@ -881,25 +845,25 @@ msgstr ""
881	msgid "User Links"
882	msgstr ""
883
884	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~182~~
885	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~232~~
886	msgid "Title"
887	msgstr ""
888
889	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~183~~
890	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~233~~
891	msgid "URL"
892	msgstr ""
893
894	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~206~~
895	msgid "Add Link"
896	msgstr ""
897
898	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~236~~
899	msgid "Delete"
900	msgstr ""
901
902	- #: modules/custom-user-links/admin/custom-user-links-admin.php:~~238~~
903	msgid "Update"
904	msgstr ""
905
	@@ -1250,20 +1214,24 @@ msgstr ""
1250	msgid "To approve or deny this user:"
1251	msgstr ""
1252
1253	- #: templates/login-form.php:18 templates/profile-form.php:36
1254	#: templates/register-form.php:13
1255	msgid "Username"
1256	msgstr ""
1257
1258	- #: templates/login-form.php:33
1259	msgid "Remember Me"
1260	msgstr ""
1261
1262	- #: templates/lostpassword-form.php:12




1263	msgid "Username or E-mail:"
1264	msgstr ""
1265
1266	- #: templates/lostpassword-form.php:19
1267	msgid "Get New Password"
1268	msgstr ""
1269
	@@ -1502,15 +1470,15 @@ msgstr ""
1502	msgid "Registration confirmation will be e-mailed to you."
1503	msgstr ""
1504
1505	- #: templates/resetpass-form.php:12
1506	msgid "New password"
1507	msgstr ""
1508
1509	- #: templates/resetpass-form.php:17
1510	msgid "Strength indicator"
1511	msgstr ""
1512
1513	- #: templates/resetpass-form.php:22
1514	msgid "Confirm new password"
1515	msgstr ""
1516


1	+ # Copyright (C) 2016 Theme My Login
2	# This file is distributed under the same license as the Theme My Login package.
3	msgid ""
4	msgstr ""
5	"Project-Id-Version: Theme My Login 6.4.x\n"
6	"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-login\n"
7	+ "POT-Creation-Date: 2016-05-21 23:51:25+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
11	+ "PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14

40	msgid "Login Type"
41	msgstr ""
42
43	+ #: admin/class-theme-my-login-admin.php:161
44	msgid "Enable \"theme-my-login.css\""
45	msgstr ""
46
47	+ #: admin/class-theme-my-login-admin.php:162
48	msgid ""
49	"In order to keep changes between upgrades, you can store your customized "
50	"\"theme-my-login.css\" in your current theme directory."
51	msgstr ""
52
53	+ #: admin/class-theme-my-login-admin.php:178 templates/login-form.php:18
54	+ msgid "Username or E-mail"
55	msgstr ""
56
57	+ #: admin/class-theme-my-login-admin.php:181
58	+ msgid "Username only"
59	msgstr ""
60
61	+ #: admin/class-theme-my-login-admin.php:184
62	+ msgid "E-mail only"
63	msgstr ""
64
65	+ #: admin/class-theme-my-login-admin.php:188
66	msgid "Allow users to login using their username and/or e-mail address."
67	msgstr ""
68
69	+ #: admin/class-theme-my-login-admin.php:204
70	msgid "Enable %s"
71	msgstr ""
72

260	msgstr ""
261
262	#: includes/class-theme-my-login-ms-signup.php:435
263	+ #: modules/custom-passwords/custom-passwords.php:99
264	msgid "Password:"
265	msgstr ""
266

293	msgstr ""
294
295	#: includes/class-theme-my-login-template.php:167
296	+ #: includes/class-theme-my-login.php:117 templates/login-form.php:38
297	msgid "Log In"
298	msgstr ""
299

325	msgid "A login form for your blog."
326	msgstr ""
327
328	+ #. #-#-#-#-# plugin.pot (Theme My Login 6.4.4) #-#-#-#-#
329	#. Plugin Name of the plugin/theme
330	#: includes/class-theme-my-login-widget.php:26
331	msgid "Theme My Login"

376	msgstr ""
377
378	#: includes/class-theme-my-login.php:121
379	+ #: modules/custom-email/admin/custom-email-admin.php:100
380	+ #: templates/resetpass-form.php:35
381	msgid "Reset Password"
382	msgstr ""
383
384	+ #: includes/class-theme-my-login.php:364
385	msgid ""
386	"Your password reset link appears to be invalid. Please request a new link "
387	"below."
388	msgstr ""
389
390	+ #: includes/class-theme-my-login.php:366
391	msgid "Your password reset link has expired. Please request a new link below."
392	msgstr ""
393
394	+ #: includes/class-theme-my-login.php:404
395	msgid "The passwords do not match."
396	msgstr ""
397
398	+ #: includes/class-theme-my-login.php:503
399	msgid "You are now logged out."
400	msgstr ""
401
402	+ #: includes/class-theme-my-login.php:505
403	msgid "User registration is currently not allowed."
404	msgstr ""
405
406	+ #: includes/class-theme-my-login.php:507
407	msgid "Check your e-mail for the confirmation link."
408	msgstr ""
409
410	+ #: includes/class-theme-my-login.php:509
411	msgid "Your password has been reset."
412	msgstr ""
413
414	+ #: includes/class-theme-my-login.php:511
415	msgid "Registration complete. Please check your e-mail."
416	msgstr ""
417
418	+ #: includes/class-theme-my-login.php:513
419	msgid "Your session has expired. Please log-in again."
420	msgstr ""
421
422	+ #: includes/class-theme-my-login.php:515
423	msgid ""
424	"<strong>You have successfully updated WordPress!</strong> Please log back in "
425	"to experience the awesomeness."
426	msgstr ""
427
428	+ #: includes/class-theme-my-login.php:517
429	msgid "Please log in to continue."
430	msgstr ""
431
432	+ #: includes/class-theme-my-login.php:837
433	+ msgid "<strong>ERROR</strong>: Invalid email address."
434	msgstr ""
435
436	#: includes/class-theme-my-login.php:1137
437	+ msgid "<strong>ERROR</strong>: Enter a username or e-mail address."
438	+ msgstr ""
439	+
440	+ #: includes/class-theme-my-login.php:1141
441	msgid ""
442	"<strong>ERROR</strong>: There is no user registered with that email address."
443	msgstr ""
444
445	+ #: includes/class-theme-my-login.php:1153
446	msgid "<strong>ERROR</strong>: Invalid username or e-mail."
447	msgstr ""
448
449	+ #: includes/class-theme-my-login.php:1166




450	msgid "Someone requested that the password be reset for the following account:"
451	msgstr ""
452
453	+ #: includes/class-theme-my-login.php:1168
454	#: modules/custom-email/custom-email.php:841
455	#: modules/custom-email/custom-email.php:870
456	#: modules/user-moderation/admin/user-moderation-admin.php:382

458	msgid "Username: %s"
459	msgstr ""
460
461	+ #: includes/class-theme-my-login.php:1169
462	msgid "If this was a mistake, just ignore this email and nothing will happen."
463	msgstr ""
464
465	+ #: includes/class-theme-my-login.php:1170
466	msgid "To reset your password, visit the following address:"
467	msgstr ""
468
469	+ #: includes/class-theme-my-login.php:1181
470	msgid "[%s] Password Reset"
471	msgstr ""
472
473	+ #: includes/class-theme-my-login.php:1187
474	#: modules/user-moderation/admin/user-moderation-admin.php:252
475	#: modules/user-moderation/admin/user-moderation-admin.php:394
476	#: modules/user-moderation/admin/user-moderation-admin.php:436
477	msgid "The e-mail could not be sent."
478	msgstr ""
479
480	+ #: includes/class-theme-my-login.php:1187
481	#: modules/user-moderation/admin/user-moderation-admin.php:252
482	#: modules/user-moderation/admin/user-moderation-admin.php:394
483	#: modules/user-moderation/admin/user-moderation-admin.php:436
484	msgid "Possible reason: your host may have disabled the mail() function..."
485	msgstr ""
486
487	+ #: modules/custom-email/admin/custom-email-admin.php:90
488	+ #: modules/custom-email/admin/custom-email-admin.php:147




































489	msgid "Theme My Login Custom E-mail Settings"
490	msgstr ""
491
492	+ #: modules/custom-email/admin/custom-email-admin.php:91
493	+ #: templates/login-form.php:16 templates/profile-form.php:96
494	#: templates/register-form.php:19
495	msgid "E-mail"
496	msgstr ""
497
498	+ #: modules/custom-email/admin/custom-email-admin.php:97
499	msgid "New User"
500	msgstr ""
501
502	+ #: modules/custom-email/admin/custom-email-admin.php:98
503	msgid "New User Admin"
504	msgstr ""
505
506	+ #: modules/custom-email/admin/custom-email-admin.php:99
507	msgid "Retrieve Password"
508	msgstr ""
509
510	+ #: modules/custom-email/admin/custom-email-admin.php:104
511	msgid "User Activation"
512	msgstr ""
513
514	+ #: modules/custom-email/admin/custom-email-admin.php:105
515	msgid "User Approval"
516	msgstr ""
517
518	+ #: modules/custom-email/admin/custom-email-admin.php:106
519	msgid "User Approval Admin"
520	msgstr ""
521
522	+ #: modules/custom-email/admin/custom-email-admin.php:107
523	msgid "User Denial"
524	msgstr ""
525
526	+ #: modules/custom-email/admin/custom-email-admin.php:176
527	msgid "This e-mail will be sent to a new user upon registration."
528	msgstr ""
529
530	+ #: modules/custom-email/admin/custom-email-admin.php:177
531	+ #: modules/custom-email/admin/custom-email-admin.php:282
532	+ #: modules/custom-email/admin/custom-email-admin.php:436
533	msgid ""
534	"Please be sure to include the variable %reseturl% or else the user will not "
535	"be able to recover their password!"
536	msgstr ""
537
538	+ #: modules/custom-email/admin/custom-email-admin.php:178
539	+ #: modules/custom-email/admin/custom-email-admin.php:225
540	+ #: modules/custom-email/admin/custom-email-admin.php:283
541	+ #: modules/custom-email/admin/custom-email-admin.php:330
542	+ #: modules/custom-email/admin/custom-email-admin.php:389
543	+ #: modules/custom-email/admin/custom-email-admin.php:437
544	+ #: modules/custom-email/admin/custom-email-admin.php:484
545	+ #: modules/custom-email/admin/custom-email-admin.php:542
546	msgid "If any field is left empty, the default will be used instead."
547	msgstr ""
548
549	+ #: modules/custom-email/admin/custom-email-admin.php:182
550	+ #: modules/custom-email/admin/custom-email-admin.php:233
551	+ #: modules/custom-email/admin/custom-email-admin.php:287
552	+ #: modules/custom-email/admin/custom-email-admin.php:338
553	+ #: modules/custom-email/admin/custom-email-admin.php:393
554	+ #: modules/custom-email/admin/custom-email-admin.php:441
555	+ #: modules/custom-email/admin/custom-email-admin.php:492
556	+ #: modules/custom-email/admin/custom-email-admin.php:546
557	msgid "From Name"
558	msgstr ""
559
560	+ #: modules/custom-email/admin/custom-email-admin.php:186
561	+ #: modules/custom-email/admin/custom-email-admin.php:237
562	+ #: modules/custom-email/admin/custom-email-admin.php:291
563	+ #: modules/custom-email/admin/custom-email-admin.php:342
564	+ #: modules/custom-email/admin/custom-email-admin.php:397
565	+ #: modules/custom-email/admin/custom-email-admin.php:445
566	+ #: modules/custom-email/admin/custom-email-admin.php:496
567	+ #: modules/custom-email/admin/custom-email-admin.php:550
568	msgid "From E-mail"
569	msgstr ""
570
571	+ #: modules/custom-email/admin/custom-email-admin.php:190
572	+ #: modules/custom-email/admin/custom-email-admin.php:241
573	+ #: modules/custom-email/admin/custom-email-admin.php:295
574	+ #: modules/custom-email/admin/custom-email-admin.php:346
575	+ #: modules/custom-email/admin/custom-email-admin.php:401
576	+ #: modules/custom-email/admin/custom-email-admin.php:449
577	+ #: modules/custom-email/admin/custom-email-admin.php:500
578	+ #: modules/custom-email/admin/custom-email-admin.php:554
579	+ msgid "E-mail Format"
580	+ msgstr ""
581	+
582	#: modules/custom-email/admin/custom-email-admin.php:193
583	#: modules/custom-email/admin/custom-email-admin.php:244
584	#: modules/custom-email/admin/custom-email-admin.php:298

587	#: modules/custom-email/admin/custom-email-admin.php:452
588	#: modules/custom-email/admin/custom-email-admin.php:503
589	#: modules/custom-email/admin/custom-email-admin.php:557











590	msgid "Plain Text"
591	msgstr ""
592
593	+ #: modules/custom-email/admin/custom-email-admin.php:194
594	+ #: modules/custom-email/admin/custom-email-admin.php:245
595	+ #: modules/custom-email/admin/custom-email-admin.php:299
596	+ #: modules/custom-email/admin/custom-email-admin.php:350
597	+ #: modules/custom-email/admin/custom-email-admin.php:405
598	+ #: modules/custom-email/admin/custom-email-admin.php:453
599	+ #: modules/custom-email/admin/custom-email-admin.php:504
600	+ #: modules/custom-email/admin/custom-email-admin.php:558
601	msgid "HTML"
602	msgstr ""
603
604	+ #: modules/custom-email/admin/custom-email-admin.php:199
605	+ #: modules/custom-email/admin/custom-email-admin.php:249
606	+ #: modules/custom-email/admin/custom-email-admin.php:304
607	+ #: modules/custom-email/admin/custom-email-admin.php:355
608	+ #: modules/custom-email/admin/custom-email-admin.php:410
609	+ #: modules/custom-email/admin/custom-email-admin.php:458
610	+ #: modules/custom-email/admin/custom-email-admin.php:509
611	+ #: modules/custom-email/admin/custom-email-admin.php:563
612	msgid "Subject"
613	msgstr ""
614
615	+ #: modules/custom-email/admin/custom-email-admin.php:203
616	+ #: modules/custom-email/admin/custom-email-admin.php:253
617	+ #: modules/custom-email/admin/custom-email-admin.php:308
618	+ #: modules/custom-email/admin/custom-email-admin.php:359
619	+ #: modules/custom-email/admin/custom-email-admin.php:414
620	+ #: modules/custom-email/admin/custom-email-admin.php:462
621	+ #: modules/custom-email/admin/custom-email-admin.php:513
622	+ #: modules/custom-email/admin/custom-email-admin.php:567
623	msgid "Message"
624	msgstr ""
625
626	+ #: modules/custom-email/admin/custom-email-admin.php:205
627	+ #: modules/custom-email/admin/custom-email-admin.php:255
628	+ #: modules/custom-email/admin/custom-email-admin.php:310
629	+ #: modules/custom-email/admin/custom-email-admin.php:361
630	+ #: modules/custom-email/admin/custom-email-admin.php:416
631	+ #: modules/custom-email/admin/custom-email-admin.php:464
632	+ #: modules/custom-email/admin/custom-email-admin.php:515
633	+ #: modules/custom-email/admin/custom-email-admin.php:569
634	msgid "Available Variables"
635	msgstr ""
636
637	+ #: modules/custom-email/admin/custom-email-admin.php:224
638	msgid ""
639	"This e-mail will be sent to the e-mail address or addresses (multiple "
640	"addresses may be separated by commas) specified below, upon new user "
641	"registration."
642	msgstr ""
643
644	+ #: modules/custom-email/admin/custom-email-admin.php:229
645	+ #: modules/custom-email/admin/custom-email-admin.php:334
646	+ #: modules/custom-email/admin/custom-email-admin.php:488
647	msgid "To"
648	msgstr ""
649
650	+ #: modules/custom-email/admin/custom-email-admin.php:263
651	+ #: modules/custom-email/admin/custom-email-admin.php:369
652	+ #: modules/custom-email/admin/custom-email-admin.php:523
653	msgid "Disable Admin Notification"
654	msgstr ""
655
656	+ #: modules/custom-email/admin/custom-email-admin.php:281
657	msgid ""
658	"This e-mail will be sent to a user when they attempt to recover their "
659	"password."
660	msgstr ""
661
662	+ #: modules/custom-email/admin/custom-email-admin.php:329
663	msgid ""
664	"This e-mail will be sent to the e-mail address or addresses (multiple "
665	"addresses may be separated by commas) specified below, upon user password "
666	"change."
667	msgstr ""
668
669	+ #: modules/custom-email/admin/custom-email-admin.php:387
670	msgid ""
671	"This e-mail will be sent to a new user upon registration when \"E-mail "
672	"Confirmation\" is checked for \"User Moderation\"."
673	msgstr ""
674
675	+ #: modules/custom-email/admin/custom-email-admin.php:388
676	msgid ""
677	"Please be sure to include the variable %activateurl% or else the user will "
678	"not be able to activate their account!"
679	msgstr ""
680
681	+ #: modules/custom-email/admin/custom-email-admin.php:435
682	msgid ""
683	"This e-mail will be sent to a new user upon admin approval when \"Admin "
684	"Approval\" is checked for \"User Moderation\"."
685	msgstr ""
686
687	+ #: modules/custom-email/admin/custom-email-admin.php:483
688	msgid ""
689	"This e-mail will be sent to the e-mail address or addresses (multiple "
690	"addresses may be separated by commas) specified below upon user registration "
691	"when \"Admin Approval\" is checked for \"User Moderation\"."
692	msgstr ""
693
694	+ #: modules/custom-email/admin/custom-email-admin.php:541
695	msgid ""
696	"This e-mail will be sent to a user who is deleted/denied when \"Admin "
697	"Approval\" is checked for \"User Moderation\" and the user's role is "
698	"\"Pending\"."
699	msgstr ""
700
701	+ #: modules/custom-email/admin/custom-email-admin.php:577
702	msgid "Disable Notification"
703	msgstr ""
704

732	msgid "Password Lost and Changed for user: %s"
733	msgstr ""
734
735	+ #: modules/custom-passwords/custom-passwords.php:69
736	+ #: templates/login-form.php:25
737	msgid "Password"
738	msgstr ""
739
740	+ #: modules/custom-passwords/custom-passwords.php:73
741	#: templates/profile-form.php:174
742	msgid "Confirm Password"
743	msgstr ""
744
745	+ #: modules/custom-passwords/custom-passwords.php:104
746	msgid "(Must be at least 6 characters.)"
747	msgstr ""
748
749	+ #: modules/custom-passwords/custom-passwords.php:106
750	msgid "Confirm Password:"
751	msgstr ""
752
753	+ #: modules/custom-passwords/custom-passwords.php:108
754	msgid "Confirm that you've typed your password correctly."
755	msgstr ""
756
757	+ #: modules/custom-passwords/custom-passwords.php:145
758	msgid "<strong>ERROR</strong>: Please enter your password twice."
759	msgstr ""
760
761	+ #: modules/custom-passwords/custom-passwords.php:149
762	msgid "<strong>ERROR</strong>: Passwords may not contain the character \"\\\"."
763	msgstr ""
764
765	+ #: modules/custom-passwords/custom-passwords.php:153
766	msgid ""
767	"<strong>ERROR</strong>: Please enter the same password in the two password "
768	"fields."
769	msgstr ""
770
771	+ #: modules/custom-passwords/custom-passwords.php:157
772	msgid ""
773	"<strong>ERROR</strong>: Your password must be at least 6 characters in "
774	"length."
775	msgstr ""
776
777	+ #: modules/custom-passwords/custom-passwords.php:286
778	msgid "Registration complete. You may now log in."
779	msgstr ""
780
781	#: modules/custom-redirection/admin/custom-redirection-admin.php:86
782	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:133
783	msgid "Theme My Login Custom Redirection Settings"
784	msgstr ""
785

787	msgid "Redirection"
788	msgstr ""
789
790	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:166
791	msgid "Log in"
792	msgstr ""
793
794	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:168
795	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:182
796	msgid "Default"
797	msgstr ""
798
799	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:169
800	msgid ""
801	"Check this option to send the user to their WordPress Dashboard/Profile."
802	msgstr ""
803
804	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:171
805	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:185
806	msgid "Referer"
807	msgstr ""
808
809	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:172
810	msgid ""
811	"Check this option to send the user back to the page they were visiting "
812	"before logging in."
813	msgstr ""
814
815	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:176
816	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:190
817	msgid ""
818	"Check this option to send the user to a custom location, specified by the "
819	"textbox above."
820	msgstr ""
821
822	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:180
823	msgid "Log out"
824	msgstr ""
825
826	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:183
827	msgid ""
828	"Check this option to send the user to the log in page, displaying a message "
829	"that they have successfully logged out."
830	msgstr ""
831
832	+ #: modules/custom-redirection/admin/custom-redirection-admin.php:186
833	msgid ""
834	"Check this option to send the user back to the page they were visiting "
835	"before logging out. (Note: If the previous page being visited was an admin "

837	msgstr ""
838
839	#: modules/custom-user-links/admin/custom-user-links-admin.php:94
840	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:144
841	msgid "Theme My Login Custom User Links Settings"
842	msgstr ""
843

845	msgid "User Links"
846	msgstr ""
847
848	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:181
849	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:231
850	msgid "Title"
851	msgstr ""
852
853	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:182
854	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:232
855	msgid "URL"
856	msgstr ""
857
858	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:205
859	msgid "Add Link"
860	msgstr ""
861
862	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:235
863	msgid "Delete"
864	msgstr ""
865
866	+ #: modules/custom-user-links/admin/custom-user-links-admin.php:237
867	msgid "Update"
868	msgstr ""
869

1214	msgid "To approve or deny this user:"
1215	msgstr ""
1216
1217	+ #: templates/login-form.php:14 templates/profile-form.php:36
1218	#: templates/register-form.php:13
1219	msgid "Username"
1220	msgstr ""
1221
1222	+ #: templates/login-form.php:34
1223	msgid "Remember Me"
1224	msgstr ""
1225
1226	+ #: templates/lostpassword-form.php:14
1227	+ msgid "E-mail:"
1228	+ msgstr ""
1229	+
1230	+ #: templates/lostpassword-form.php:16
1231	msgid "Username or E-mail:"
1232	msgstr ""
1233
1234	+ #: templates/lostpassword-form.php:24
1235	msgid "Get New Password"
1236	msgstr ""
1237

1470	msgid "Registration confirmation will be e-mailed to you."
1471	msgstr ""
1472
1473	+ #: templates/resetpass-form.php:14
1474	msgid "New password"
1475	msgstr ""
1476
1477	+ #: templates/resetpass-form.php:21
1478	msgid "Strength indicator"
1479	msgstr ""
1480
1481	+ #: templates/resetpass-form.php:26
1482	msgid "Confirm new password"
1483	msgstr ""
1484

modules/custom-email/admin/custom-email-admin.php CHANGED Viewed

	@@ -593,12 +593,12 @@ class Theme_My_Login_Custom_Email_Admin extends Theme_My_Login_Abstract {
593	* @return string\|array Sanitized settings
594	*/
595	public function save_settings( $settings ) {
596	- $settings['new_user']['admin_disable'] = isset( $settings['new_user']['admin_disable'] );
597	- $settings['reset_pass']['admin_disable'] = isset( $settings['reset_pass']['admin_disable'] );
598
599	if ( class_exists( 'Theme_My_Login_User_Moderation' ) ) {
600	- $settings['user_approval']['admin_disable'] = isset( $settings['user_approval']['admin_disable'] );
601	- $settings['user_denial']['disable'] = isset( $settings['user_denial']['disable'] );
602	}
603
604	$settings = Theme_My_Login_Common::array_merge_recursive( $this->get_options(), $settings );


593	* @return string\|array Sanitized settings
594	*/
595	public function save_settings( $settings ) {
596	+ $settings['new_user']['admin_disable'] = isset( $settings['new_user']['admin_disable'] ) ? (bool) $settings['new_user']['admin_disable'] : false;
597	+ $settings['reset_pass']['admin_disable'] = isset( $settings['reset_pass']['admin_disable'] ) ? (bool) $settings['reset_pass']['admin_disable'] : false;
598
599	if ( class_exists( 'Theme_My_Login_User_Moderation' ) ) {
600	+ $settings['user_approval']['admin_disable'] = isset( $settings['user_approval']['admin_disable'] ) ? (bool) $settings['user_approval']['admin_disable'] : false;
601	+ $settings['user_denial']['disable'] = isset( $settings['user_denial']['disable'] ) ? (bool) $settings['user_denial']['admin_disable'] : false;
602	}
603
604	$settings = Theme_My_Login_Common::array_merge_recursive( $this->get_options(), $settings );

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

	@@ -83,8 +83,7 @@ class Theme_My_Login_Custom_Email extends Theme_My_Login_Abstract {
83	'admin_mail_from_name' => '',
84	'admin_mail_content_type' => '',
85	'admin_title' => '',
86	- 'admin_message' => '',
87	- 'admin_disable' => false
88	),
89	'retrieve_pass' => array(
90	'mail_from' => '',
	@@ -99,8 +98,7 @@ class Theme_My_Login_Custom_Email extends Theme_My_Login_Abstract {
99	'admin_mail_from_name' => '',
100	'admin_mail_content_type' => '',
101	'admin_title' => '',
102	- 'admin_message' => '',
103	- 'admin_disable' => false
104	)
105	);
106	}


83	'admin_mail_from_name' => '',
84	'admin_mail_content_type' => '',
85	'admin_title' => '',
86	+ 'admin_message' => ''

87	),
88	'retrieve_pass' => array(
89	'mail_from' => '',

98	'admin_mail_from_name' => '',
99	'admin_mail_content_type' => '',
100	'admin_title' => '',
101	+ 'admin_message' => ''

102	)
103	);
104	}

readme.txt CHANGED Viewed

	@@ -2,9 +2,9 @@
2	Contributors: jfarthing84
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EZLVANPT4A9SW
4	Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5	- Requires at least: 4.4
6	- Tested up to: 4.4
7	- Stable tag: 6.4.4
8
9	Themes the WordPress login pages according to your theme.
10
	@@ -57,6 +57,13 @@ Please visit http://www.jfarthing.com/development/theme-my-login.
57
58	== Changelog ==
59







60	= 6.4.4 =
61	* Fix file loading for non-standard directory setups
62	* Fix language files not loading properly


2	Contributors: jfarthing84
3	Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EZLVANPT4A9SW
4	Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5	+ Requires at least: 4.5
6	+ Tested up to: 4.5.2
7	+ Stable tag: 6.4.5
8
9	Themes the WordPress login pages according to your theme.
10

57
58	== Changelog ==
59
60	+ = 6.4.5 =
61	+ * Don't clear username input on login form when autofocusing
62	+ * Fix custom e-mail disable checkboxes defaulting to being checked
63	+ * Fix login type functionality
64	+ * Bring wp-login.php duplicated code up to date
65	+ * Require WordPress 4.5
66	+
67	= 6.4.4 =
68	* Fix file loading for non-standard directory setups
69	* Fix language files not loading properly

templates/login-form.php CHANGED Viewed

	@@ -10,12 +10,13 @@ Theme My Login will always look in your theme's directory first, before using th
10	<form name="loginform" id="loginform<?php $template->the_instance(); ?>" action="<?php $template->the_action_url( 'login', 'login_post' ); ?>" method="post">
11	<p class="tml-user-login-wrap">
12	<label for="user_login<?php $template->the_instance(); ?>"><?php
13	- if ( '~~email~~' == $theme_my_login->get_option( 'login_type' ) )


14	_e( 'E-mail', 'theme-my-login' );
15	- ~~elseif~~ ( ~~'both' == $theme_my_login->get_option( 'login_type' ) )~~
16	_e( 'Username or E-mail', 'theme-my-login' );
17	- ~~else~~
18	- _e( 'Username', 'theme-my-login' );
19	?></label>
20	<input type="text" name="log" id="user_login<?php $template->the_instance(); ?>" class="input" value="<?php $template->the_posted_value( 'log' ); ?>" size="20" />
21	</p>


10	<form name="loginform" id="loginform<?php $template->the_instance(); ?>" action="<?php $template->the_action_url( 'login', 'login_post' ); ?>" method="post">
11	<p class="tml-user-login-wrap">
12	<label for="user_login<?php $template->the_instance(); ?>"><?php
13	+ if ( 'username' == $theme_my_login->get_option( 'login_type' ) ) {
14	+ _e( 'Username', 'theme-my-login' );
15	+ } elseif ( 'email' == $theme_my_login->get_option( 'login_type' ) ) {
16	_e( 'E-mail', 'theme-my-login' );
17	+ } else {
18	_e( 'Username or E-mail', 'theme-my-login' );
19	+ }

20	?></label>
21	<input type="text" name="log" id="user_login<?php $template->the_instance(); ?>" class="input" value="<?php $template->the_posted_value( 'log' ); ?>" size="20" />
22	</p>

templates/lostpassword-form.php CHANGED Viewed

	@@ -9,7 +9,12 @@ Theme My Login will always look in your theme's directory first, before using th
9	<?php $template->the_errors(); ?>
10	<form name="lostpasswordform" id="lostpasswordform<?php $template->the_instance(); ?>" action="<?php $template->the_action_url( 'lostpassword', 'login_post' ); ?>" method="post">
11	<p class="tml-user-login-wrap">
12	- <label for="user_login<?php $template->the_instance(); ?>"><?php ~~_e( 'Username or E-mail:', 'theme-my-login' ); ?></label>~~





13	<input type="text" name="user_login" id="user_login<?php $template->the_instance(); ?>" class="input" value="<?php $template->the_posted_value( 'user_login' ); ?>" size="20" />
14	</p>
15


9	<?php $template->the_errors(); ?>
10	<form name="lostpasswordform" id="lostpasswordform<?php $template->the_instance(); ?>" action="<?php $template->the_action_url( 'lostpassword', 'login_post' ); ?>" method="post">
11	<p class="tml-user-login-wrap">
12	+ <label for="user_login<?php $template->the_instance(); ?>"><?php
13	+ if ( 'email' == $theme_my_login->get_option( 'login_type' ) ) {
14	+ _e( 'E-mail:', 'theme-my-login' );
15	+ } else {
16	+ _e( 'Username or E-mail:', 'theme-my-login' );
17	+ } ?></label>
18	<input type="text" name="user_login" id="user_login<?php $template->the_instance(); ?>" class="input" value="<?php $template->the_posted_value( 'user_login' ); ?>" size="20" />
19	</p>
20

theme-my-login.php CHANGED Viewed

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


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