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 0bc05eba306009d205f015bfad3085b31fb62922..f5a70264af536ecb155eccc65ca7de42dc8de978 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -72,8 +72,9 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
 
 // This function will be executed when the admin is not logged in and has submitted his login data
 function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
-       // First of all, no admin login is found
+       // First of all, no admin login is found, so the admin hash is null
        $ret = '404';
+       $adminHash = null;
 
        // Get admin id from login
        $adminId = getAdminId($adminLogin);
@@ -217,11 +218,11 @@ LIMIT 1",
                        // Access denied
                        loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
                } else {
-                       // Include file not found! :-(
+                       // Include file not found :-(
                        loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
                }
        } else {
-               // Invalid action/what pair found!
+               // Invalid action/what pair found
                loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
        }
 
@@ -647,7 +648,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 // Check "logical-area-mode"
 function adminGetMenuMode () {
        // Set the default menu mode as the mode for all admins
-       $mode = getAdminMenu();
+       $mode = 'global';
+
+       // If sql_patches is up-to-date enough, use the configuration
+       if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
+               $mode = getAdminMenu();
+       } // END - if
+
+       // Backup it
        $adminMode = $mode;
 
        // Get admin id
@@ -1110,7 +1118,7 @@ function sendAdminPasswordResetLink ($email) {
 
        // Is there an account?
        if (SQL_HASZERONUMS($result)) {
-               // No account found!
+               // No account found
                return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
        } // END - if
 
@@ -1121,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
@@ -1152,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);
@@ -1303,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