From 7b12fdfb00b801dcee16bb69f31d9df0bf87fdd1 Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Wed, 24 Feb 2016 17:43:38 +0000
Subject: [PATCH] Issue #6 Replace LAN_nnn with LAN_INCORRECT_PASSWORD

Issue #6 Replace LAN_nnn with LAN_INCORRECT_PASSWORD
---
 e107_languages/English/English.php          | 3 ++-
 e107_languages/English/lan_page.php         | 2 +-
 e107_languages/English/lan_signup.php       | 2 +-
 e107_languages/English/lan_usersettings.php | 2 +-
 page.php                                    | 2 +-
 signup.php                                  | 2 +-
 usersettings.php                            | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index c067b6117..472d951ee 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -85,7 +85,7 @@ define("LAN_DATE","Date");
 define("LAN_DATE_POSTED", "Date posted");
 define("LAN_JSCONFIRM","Are you sure?");
 define("LAN_IP", "IP Address");
-define("LAN_AUTHOR",	"Author");
+define("LAN_AUTHOR","Author");
 define("LAN_CATEGORY", "Category");
 define("LAN_GUEST", "Guest");
 define("LAN_NEXT", "Next");
@@ -94,6 +94,7 @@ define("LAN_LOGIN", "Login");
 define("LAN_LOGOUT", "Logout");
 define("LAN_SETTINGS", "Settings");
 define("LAN_PASSWORD", "Password");
+define("LAN_INCORRECT_PASSWORD", "Incorrect Password");
 define("LAN_TYPE", "Type");
 define("LAN_SCREENSHOT", "Screenshot");
 define("LAN_FILE", "File");
diff --git a/e107_languages/English/lan_page.php b/e107_languages/English/lan_page.php
index d570af9dd..6ef54f2e1 100644
--- a/e107_languages/English/lan_page.php
+++ b/e107_languages/English/lan_page.php
@@ -16,7 +16,7 @@ define("LAN_PAGE_3", "Requested page does not exist");
 define("LAN_PAGE_4", "Rate this page");
 define("LAN_PAGE_5", "Thank you for rating this page");
 define("LAN_PAGE_6", "You do not have permission to view this page");
-define("LAN_PAGE_7", "Incorrect password");
+//define("LAN_PAGE_7", "Incorrect password");//LAN_INCORRECT_PASSWORD
 define("LAN_PAGE_8", "Password Protected Page");
 //define("LAN_PAGE_9", "Password");//LAN_PASSWORD
 define("LAN_PAGE_10", "Submit");
diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php
index e70d38fd5..e5734da29 100644
--- a/e107_languages/English/lan_signup.php
+++ b/e107_languages/English/lan_signup.php
@@ -84,7 +84,7 @@ define("LAN_SIGNUP_48", "Username or Email");
 define("LAN_SIGNUP_49", "If you registered with the wrong email address, as well as filling in the box above, type a new email address and your password here:");
 define("LAN_SIGNUP_50", "New Email");
 define("LAN_SIGNUP_51", "Old Password");
-define("LAN_SIGNUP_52", "Incorrect Password");
+//define("LAN_SIGNUP_52", "Incorrect Password");//LAN_INCORRECT_PASSWORD
 define("LAN_SIGNUP_53", "field failed validation test");
 define("LAN_SIGNUP_54", "Click here to fill in your details to register");
 //define("LAN_SIGNUP_55", "That display name is too long. Please choose another");
diff --git a/e107_languages/English/lan_usersettings.php b/e107_languages/English/lan_usersettings.php
index cde972a4d..81b6e33ac 100644
--- a/e107_languages/English/lan_usersettings.php
+++ b/e107_languages/English/lan_usersettings.php
@@ -88,7 +88,7 @@ define("LAN_USET_18", "User data changed by admin: --ID--, login name: --LOGNAME
 //define("LAN_USET_19", "Custom Title");			Now LAN_USER_74
 define("LAN_USET_20", "You must also change the user's password if you are changing their login name or email address");
 define("LAN_USET_21", "Please validate the changes by re-entering your password: ");
-define("LAN_USET_22", "Invalid password!"); // TODO LAN common?
+//define("LAN_USET_22", "Invalid password!"); // LAN_INCORRECT_PASSWORD
 define("LAN_USET_23", "Leave blank to keep existing password");		// LAN_401
 define("LAN_USET_24", "New password: ");							// LAN_152
 define("LAN_USET_25", "Re-type new password: ");					// LAN_153
diff --git a/page.php b/page.php
index b39a68796..7c68d54ca 100644
--- a/page.php
+++ b/page.php
@@ -986,7 +986,7 @@ class pageClass
 			}
 			else
 			{
-				e107::getMessage()->addError(LAN_PAGE_7);
+				e107::getMessage()->addError(LAN_INCORRECT_PASSWORD);
 			}
 		}
 		else
diff --git a/signup.php b/signup.php
index 97190eabd..8155f5976 100644
--- a/signup.php
+++ b/signup.php
@@ -234,7 +234,7 @@ class signup
 			}
 			else
 			{
-				message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
+				message_handler("ALERT",LAN_INCORRECT_PASSWORD); // Incorrect Password.
 				return false;
 			}
 		}
diff --git a/usersettings.php b/usersettings.php
index f09bfc8b6..e846236ee 100644
--- a/usersettings.php
+++ b/usersettings.php
@@ -370,7 +370,7 @@ elseif (isset($_POST['SaveValidatedInfo']))
 		if ($userMethods->CheckPassword($_POST['currentpassword'], $udata['user_loginname'], $udata['user_password']) === false) // Use old data to validate
 
 		{  // Invalid password
-			echo "<br />".LAN_USET_22."<br />";
+			echo "<br />".LAN_INCORRECT_PASSWORD."<br />";
 			if(!$adminEdit)
 			{
 				require_once (FOOTERF);