From 2b315dce3249a531bf3cbe1b846fffa3019c7f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:00:29 +0200 Subject: [PATCH 1/8] Update lan_admin.php --- e107_languages/English/admin/lan_admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 9e12058ac..d00c5957a 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -466,6 +466,7 @@ define("LAN_UI_BATCH_DEATTACH_SUCCESS", "[x] removed from [y] record(s)."); define("LAN_UI_EDIT_LABEL", "Update record #[x]"); define("LAN_UI_CREATE_LABEL", "Create new record"); define("LAN_UI_PREF_LABEL", "Settings"); +define("LAN_UI_PASSWORD_WARNING", "It is HIGHLY recommended that you [change your password encoding] to the PHP Default. (Password hashes will be automatically upgraded during user login.)"); define("LAN_UI_DELETE_LABEL", "Confirm Delete"); define("LAN_UI_DELETE_WARNING", "You are about to delete [x] records. Please confirm to continue."); define("LAN_UI_BATCH_CREATELINK", "Create Link"); From 1b05023d0360482bfc13e19e3b45b67c2cdc6c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:02:56 +0200 Subject: [PATCH 2/8] Add lang code --- e107_admin/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 0902c064a..56a09ef90 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -535,7 +535,7 @@ TMPO; if($us->passwordAPIExists() === true && $us->getDefaultHashType() !== PASSWORD_E107_PHP && e107::pref('core','password_CHAP')==0) { - $message = "It is HIGHLY recommended that you [change your password encoding] to the PHP Default. (Password hashes will be automatically upgraded during user login.)"; + $message = LAN_UI_PASSWORD_WARNING; $srch = array('[',']'); $repl = array("",""); $mes->addWarning(str_replace($srch,$repl,$message)); From d60db215ef4ed938f4aabd150efb43a85b9d0365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:19:24 +0200 Subject: [PATCH 3/8] Update lan_prefs.php --- e107_languages/English/admin/lan_prefs.php | 1 + 1 file changed, 1 insertion(+) diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php index dbb63c8c7..781dcec60 100644 --- a/e107_languages/English/admin/lan_prefs.php +++ b/e107_languages/English/admin/lan_prefs.php @@ -294,3 +294,4 @@ define("PRFLAN_272", "Session Lifetime"); define("PRFLAN_273", "Lifetime in seconds. 0 = until the browser is closed. "); define("PRFLAN_274", "Contact form will only be visible to this userclass group."); define("PRFLAN_275", "View this page using https (SSL) to modify this option"); +define("PRFLAN_276", "PHP Default (Preferred)"); From db24e265787be3e2fd74a710d77a36ace7ecc66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:20:39 +0200 Subject: [PATCH 4/8] Update prefs.php --- e107_admin/prefs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 83ac79286..a1e74f8e0 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1411,7 +1411,7 @@ $text .= " if(function_exists('password_verify')) // ie. php 5.5 or higher { - $pwdEncodeOpts[3] = "PHP Default (Preferred)"; + $pwdEncodeOpts[3] = PRFLAN_276; } From 4c0ac0d9550a46b1e21caf187d54a115e9db9e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:57:29 +0200 Subject: [PATCH 5/8] Update lan_admin.php --- e107_languages/English/admin/lan_admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index d00c5957a..f85128f38 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -466,7 +466,7 @@ define("LAN_UI_BATCH_DEATTACH_SUCCESS", "[x] removed from [y] record(s)."); define("LAN_UI_EDIT_LABEL", "Update record #[x]"); define("LAN_UI_CREATE_LABEL", "Create new record"); define("LAN_UI_PREF_LABEL", "Settings"); -define("LAN_UI_PASSWORD_WARNING", "It is HIGHLY recommended that you [change your password encoding] to the PHP Default. (Password hashes will be automatically upgraded during user login.)"); +define("LAN_UI_PASSWORD_WARNING", "It is HIGHLY recommended that you [change your password encoding] to the PHP Default.[br](Password hashes will be automatically upgraded during user login.)"); define("LAN_UI_DELETE_LABEL", "Confirm Delete"); define("LAN_UI_DELETE_WARNING", "You are about to delete [x] records. Please confirm to continue."); define("LAN_UI_BATCH_CREATELINK", "Create Link"); From 52c4719ed58db78e7862bb1598be3f6a4012faed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Apr 2017 15:58:27 +0200 Subject: [PATCH 6/8] Update admin.php --- e107_admin/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 56a09ef90..043500f1a 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -535,7 +535,7 @@ TMPO; if($us->passwordAPIExists() === true && $us->getDefaultHashType() !== PASSWORD_E107_PHP && e107::pref('core','password_CHAP')==0) { - $message = LAN_UI_PASSWORD_WARNING; + $message = e107::getParser()->toHTML(LAN_UI_PASSWORD_WARNING, true); $srch = array('[',']'); $repl = array("",""); $mes->addWarning(str_replace($srch,$repl,$message)); From c9c7a1a8cc0f8580317e16850fab25e01eeb045c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 2 May 2017 06:45:49 +0200 Subject: [PATCH 7/8] Update admin.php --- e107_admin/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 043500f1a..5aa6f1417 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -535,7 +535,7 @@ TMPO; if($us->passwordAPIExists() === true && $us->getDefaultHashType() !== PASSWORD_E107_PHP && e107::pref('core','password_CHAP')==0) { - $message = e107::getParser()->toHTML(LAN_UI_PASSWORD_WARNING, true); + $message = LAN_PASSWORD_WARNING; $srch = array('[',']'); $repl = array("",""); $mes->addWarning(str_replace($srch,$repl,$message)); From 9fa9d66a6179bf5348b62f5367a71518a98c8918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 2 May 2017 06:47:57 +0200 Subject: [PATCH 8/8] Update lan_admin.php --- e107_languages/English/admin/lan_admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index f85128f38..3179360f0 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -332,6 +332,7 @@ define("LAN_OPTIONAL", "optional"); define("LAN_INACTIVE","Inactive"); define("LAN_ACTIVATE","Activate"); define("LAN_ACCEPT","Accept"); +define("LAN_PASSWORD_WARNING", "It is HIGHLY recommended that you [change your password encoding] to the PHP Default. (Password hashes will be automatically upgraded during user login.)"); define("LAN_PENDING","Pending"); define("LAN_SUBMITTED","Submitted"); define("LAN_POSTED_BY_X","Posted by [x] [y]"); @@ -466,7 +467,6 @@ define("LAN_UI_BATCH_DEATTACH_SUCCESS", "[x] removed from [y] record(s)."); define("LAN_UI_EDIT_LABEL", "Update record #[x]"); define("LAN_UI_CREATE_LABEL", "Create new record"); define("LAN_UI_PREF_LABEL", "Settings"); -define("LAN_UI_PASSWORD_WARNING", "It is HIGHLY recommended that you [change your password encoding] to the PHP Default.[br](Password hashes will be automatically upgraded during user login.)"); define("LAN_UI_DELETE_LABEL", "Confirm Delete"); define("LAN_UI_DELETE_WARNING", "You are about to delete [x] records. Please confirm to continue."); define("LAN_UI_BATCH_CREATELINK", "Create Link");