Wrapper function isAdminsExpertWarningEnabled() introduced

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 126e4dd5beff94265cf4f025fa1735d47e6d114d..f5a70264af536ecb155eccc65ca7de42dc8de978 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1129,20 +1129,20 @@ function sendAdminPasswordResetLink ($email) {
        SQL_FREERESULT($result);
 
        // Generate hash for reset link
-       $content['hash'] = generateHash(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+       $content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
        // Remove some data
        unset($content['id']);
        unset($content['password']);
 
        // Prepare email
-       $mailText = loadEmailTemplate('form_reset_password', $content);
+       $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
        // Prepare output
-       return '{--ADMIN_RESET_LINK_SENT--}';
+       return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
@@ -1160,7 +1160,7 @@ function adminResetValidateHashLogin ($hash, $login) {
                $content = SQL_FETCHARRAY($result);
 
                // Generate hash again
-               $hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+               $hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
                // Does both match?
                $valid = ($hash == $hashFromData);
@@ -1311,7 +1311,7 @@ function doVerifyExpertSettings () {
                // Is he allowed?
                if ($expertSettings == 'Y') {
                        // Okay, does he want to see them?
-                       if (getAminsExpertWarning() == 'Y') {
+                       if (isAdminsExpertWarningEnabled()) {
                                // Ask for them
                                if (isFormSent()) {
                                        // Is the element set, then we need to change the admin