Double question mark fixed

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 8802c5978f2f54d7a20d2e59a46af15c5cdc8037..7c6b73078f6bbd056c3ab169e0127cfcdc0cd444 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -249,7 +249,7 @@ LIMIT 1",
                                $message = '{--ADMIN_ACCOUNT_SAVED--}';
                        } else {
                                // Passwords did not match
-                               $message = '{--ADMINS_ERROR_PASS_MISMATCH--}';
+                               $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}';
                        }
                } else {
                        // Update whole array
@@ -281,7 +281,7 @@ LIMIT 1",
 
        // Display message
        if (!empty($message)) {
-               loadTemplate('admin_settings_saved', false, $message);
+               displayMessage($message);
        } // END - if
 
        // Remove cache file
@@ -313,12 +313,12 @@ function adminsEditAdminAccount ($postData) {
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow chaning it
-                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
+                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_MODE_ALLOW--}', '{--ADMIN_ADMINS_MODE_DENY--}'), $content['mode']);
                        } else {
                                // Don't allow it
                                $content['mode'] = ' ';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
+                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
@@ -347,8 +347,8 @@ function adminsDeleteAdminAccount ($postData) {
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
-                               $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
-                               $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
+                               $content['mode']    = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['mode'])    . '--}';
+                               $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                                // Prepare some more data
                                $content['id'] = $id;
@@ -365,7 +365,7 @@ function adminsDeleteAdminAccount ($postData) {
                loadTemplate('admin_delete_admins', false, $OUT);
        } else {
                // Cannot delete last account!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
+               displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
        }
 }
 
@@ -560,7 +560,7 @@ function getAdminLoginFailures ($adminId) {
        } // END - if
 
        // By default no admin is found
-       $data['login_failures'] = '-1';
+       $data['login_failures'] = -1;
 
        // Check cache
        if (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminId])) {
@@ -596,7 +596,7 @@ function getAdminLastFailure ($adminId) {
        } // END - if
 
        // By default no admin is found
-       $data['last_failure'] = '-1';
+       $data['last_failure'] = -1;
 
        // Check cache
        if (isset($GLOBALS['cache_array']['admin']['last_failure'][$adminId])) {
@@ -624,81 +624,13 @@ function getAdminLastFailure ($adminId) {
        return $data['last_failure'];
 }
 
-//-----------------------------------------------------------------------------
-//                                Filter Functions
-//-----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//                             Wrapper functions
+// ---------------------------------------------------------------------------
 
-// Filter for adding extra data to the query
-function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
-       // Is the admins extension updated? (should be!)
-       if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ', `default_acl` AS def_acl';
-       if (isExtensionInstalledAndNewer('admins', '0.6.7')) $add .= ', `la_mode`';
-       if (isExtensionInstalledAndNewer('admins', '0.7.2')) $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
-       if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`, `expert_warning`';
-
-       // Return it
-       return $add;
-}
-
-// Reset the login failures
-function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
-       // Store it in session
-       setSession('mailer_admin_failures'    , getAdminLoginFailures($data['id']));
-       setSession('mailer_admin_last_failure', getAdminLastFailure($data['id']));
-
-       // Prepare update data
-       $postData['login'][getCurrentAdminId()]          = $data['login'];
-       $postData['login_failures'][getCurrentAdminId()] = '0';
-       $postData['last_failure'][getCurrentAdminId()]   = null;
-
-       // Change it in the admin
-       adminsChangeAdminAccount($postData);
-
-       // Always make sure the cache is destroyed
-       rebuildCache('admin');
-
-       // Return the data for further processing
-       return $data;
-}
-
-// Count the login failure
-function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) {
-       // Prepare update data
-       $postData['login'][getCurrentAdminId()]          = $data['login'];
-       $postData['login_failures'][getCurrentAdminId()] = '`login_failures`+1';
-       $postData['last_failure'][getCurrentAdminId()]   = 'NOW()';
-
-       // Change it in the admin
-       adminsChangeAdminAccount($postData);
-
-       // Always make sure the cache is destroyed
-       rebuildCache('admin');
-
-       // Return the data for further processing
-       return $data;
-}
-
-// Rehashes the given plain admin password and stores it the database
-function FILTER_REHASH_ADMINS_PASSWORD ($data) {
-       // Generate new hash
-       $newHash = generateHash($data['plain_pass']);
-
-       // Prepare update data
-       $postData['login'][getCurrentAdminId()]    = $data['login'];
-       $postData['password'][getCurrentAdminId()] = $newHash;
-
-       // Change it in the admin
-       adminsChangeAdminAccount($postData);
-
-       // Update cookie/session and data array
-       setAdminMd5(encodeHashForCookie($newHash));
-       $data['pass_hash'] = $newHash;
-
-       // Always make sure the cache is destroyed
-       rebuildCache('admin');
-
-       // Return the data for further processing
-       return $data;
+// Wrapper function to check wether expert setting warning is enabled
+function isAdminsExpertWarningEnabled () {
+       return (getAminsExpertWarning() == 'Y');
 }
 
 // [EOF]