Theme My Login - Version 6.4.7

Version Description

  • Don't allow locked users to log in using their email address
Download this release

Release Info

Developer jfarthing84
Plugin Icon 128x128 Theme My Login
Version 6.4.7
Comparing to
See all releases

Code changes from version 6.4.6 to 6.4.7

Files changed (5) hide show
  1. includes/class-theme-my-login.php +1 -2
  2. languages/theme-my-login.pot +18 -17
  3. modules/security/security.php +2 -2
  4. readme.txt +5 -3
  5. theme-my-login.php +1 -1
includes/class-theme-my-login.php CHANGED
@@ -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.6';
25
 
26
  /**
27
  * Holds options key
@@ -1190,4 +1190,3 @@ if(typeof wpOnload=='function')wpOnload()
1190
  }
1191
  }
1192
  endif; // Class exists
1193
-
21
  * @since 6.3.2
22
  * @const string
23
  */
24
+ const VERSION = '6.4.7';
25
 
26
  /**
27
  * Holds options key
1190
  }
1191
  }
1192
  endif; // Class exists
 
languages/theme-my-login.pot CHANGED
@@ -1,14 +1,15 @@
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.6\n"
6
- "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-login\n"
7
- "POT-Creation-Date: 2016-10-22 19:06:57+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
 
@@ -325,7 +326,7 @@ msgstr ""
325
  msgid "A login form for your blog."
326
  msgstr ""
327
 
328
- #. #-#-#-#-# plugin.pot (Theme My Login 6.4.6) #-#-#-#-#
329
  #. Plugin Name of the plugin/theme
330
  #: includes/class-theme-my-login-widget.php:26
331
  msgid "Theme My Login"
@@ -994,51 +995,51 @@ msgstr ""
994
  msgid "Invalid key"
995
  msgstr ""
996
 
997
- #: modules/security/security.php:226 modules/security/security.php:249
998
  msgid ""
999
  "<strong>ERROR</strong>: This account has been locked because of too many "
1000
  "failed login attempts. You may try again in %s."
1001
  msgstr ""
1002
 
1003
- #: modules/security/security.php:228
1004
  msgid "<strong>ERROR</strong>: This account has been locked."
1005
  msgstr ""
1006
 
1007
- #: modules/security/security.php:293
1008
  msgid "Failed Login Attempts"
1009
  msgstr ""
1010
 
1011
- #: modules/security/security.php:297
1012
  msgid "IP Address"
1013
  msgstr ""
1014
 
1015
- #: modules/security/security.php:298
1016
  msgid "Date"
1017
  msgstr ""
1018
 
1019
- #: modules/security/security.php:301 modules/security/security.php:604
1020
  msgid "Y/m/d g:i:s A"
1021
  msgstr ""
1022
 
1023
- #: modules/security/security.php:306
1024
  msgid "%s ago"
1025
  msgstr ""
1026
 
1027
- #: modules/security/security.php:308
1028
  msgid "Y/m/d"
1029
  msgstr ""
1030
 
1031
- #: modules/security/security.php:596
1032
  msgid "[%s] Account Locked"
1033
  msgstr ""
1034
 
1035
- #: modules/security/security.php:597
1036
  msgid ""
1037
  "For your security, your account has been locked because of too many failed "
1038
  "login attempts. To unlock your account please click the following link: "
1039
  msgstr ""
1040
 
1041
- #: modules/security/security.php:602
1042
  msgid "The following attempts resulted in the lock:"
1043
  msgstr ""
1044
 
1
+ # Copyright (C) 2017 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.7\n"
6
+ "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-"
7
+ "login-6.4\n"
8
+ "POT-Creation-Date: 2017-01-06 18:03:10+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
12
+ "PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
 
326
  msgid "A login form for your blog."
327
  msgstr ""
328
 
329
+ #. #-#-#-#-# theme-my-login.pot (Theme My Login 6.4.7) #-#-#-#-#
330
  #. Plugin Name of the plugin/theme
331
  #: includes/class-theme-my-login-widget.php:26
332
  msgid "Theme My Login"
995
  msgid "Invalid key"
996
  msgstr ""
997
 
998
+ #: modules/security/security.php:227 modules/security/security.php:250
999
  msgid ""
1000
  "<strong>ERROR</strong>: This account has been locked because of too many "
1001
  "failed login attempts. You may try again in %s."
1002
  msgstr ""
1003
 
1004
+ #: modules/security/security.php:229
1005
  msgid "<strong>ERROR</strong>: This account has been locked."
1006
  msgstr ""
1007
 
1008
+ #: modules/security/security.php:294
1009
  msgid "Failed Login Attempts"
1010
  msgstr ""
1011
 
1012
+ #: modules/security/security.php:298
1013
  msgid "IP Address"
1014
  msgstr ""
1015
 
1016
+ #: modules/security/security.php:299
1017
  msgid "Date"
1018
  msgstr ""
1019
 
1020
+ #: modules/security/security.php:302 modules/security/security.php:605
1021
  msgid "Y/m/d g:i:s A"
1022
  msgstr ""
1023
 
1024
+ #: modules/security/security.php:307
1025
  msgid "%s ago"
1026
  msgstr ""
1027
 
1028
+ #: modules/security/security.php:309
1029
  msgid "Y/m/d"
1030
  msgstr ""
1031
 
1032
+ #: modules/security/security.php:597
1033
  msgid "[%s] Account Locked"
1034
  msgstr ""
1035
 
1036
+ #: modules/security/security.php:598
1037
  msgid ""
1038
  "For your security, your account has been locked because of too many failed "
1039
  "login attempts. To unlock your account please click the following link: "
1040
  msgstr ""
1041
 
1042
+ #: modules/security/security.php:603
1043
  msgid "The following attempts resulted in the lock:"
1044
  msgstr ""
1045
 
modules/security/security.php CHANGED
@@ -212,7 +212,8 @@ class Theme_My_Login_Security extends Theme_My_Login_Abstract {
212
  */
213
  public function authenticate( $user, $username, $password ) {
214
  // Make sure user exists
215
- if ( ! $userdata = get_user_by( 'login', $username ) )
 
216
  return $user;
217
 
218
  // Current time
@@ -620,4 +621,3 @@ endif;
620
 
621
  if ( is_admin() )
622
  include_once( dirname( __FILE__ ) . '/admin/security-admin.php' );
623
-
212
  */
213
  public function authenticate( $user, $username, $password ) {
214
  // Make sure user exists
215
+ $field = is_email( $username ) ? 'email' : 'login';
216
+ if ( ! $userdata = get_user_by( $field, $username ) )
217
  return $user;
218
 
219
  // Current time
621
 
622
  if ( is_admin() )
623
  include_once( dirname( __FILE__ ) . '/admin/security-admin.php' );
 
readme.txt CHANGED
@@ -3,8 +3,8 @@ 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.6.1
7
- Stable tag: 6.4.6
8
 
9
  Themes the WordPress login pages according to your theme.
10
 
@@ -57,6 +57,9 @@ Please visit https://wordpress.org/support/plugin/theme-my-login.
57
 
58
  == Changelog ==
59
 
 
 
 
60
  = 6.4.6 =
61
  * Fix errors and messages not displaying
62
  * Don't add reCAPTCHA errors when adding a user via wp-admin or WP-CLI
@@ -530,4 +533,3 @@ Please visit https://wordpress.org/support/plugin/theme-my-login.
530
 
531
  = 1.0.0 =
532
  * Initial release version
533
-
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.7.1
7
+ Stable tag: 6.4.7
8
 
9
  Themes the WordPress login pages according to your theme.
10
 
57
 
58
  == Changelog ==
59
 
60
+ = 6.4.7 =
61
+ * Don't allow locked users to log in using their email address
62
+
63
  = 6.4.6 =
64
  * Fix errors and messages not displaying
65
  * Don't add reCAPTCHA errors when adding a user via wp-admin or WP-CLI
533
 
534
  = 1.0.0 =
535
  * Initial release version
 
theme-my-login.php CHANGED
@@ -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.6
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.7
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login