Moved to this position, so both are closer to each other

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 5f5075a574ff7e8f131933632b448db9ea4fd8cf..e50ce362a3a9b6f3e72e81c345232f853d9e3f5e 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -47,15 +47,12 @@ function isAdminsAllowedByAcl ($action, $what) {
 
        if (($action == 'login') || ($action == 'logout')) {
                // If action is login or logout allow allways!
-               return true;
+               return TRUE;
        } elseif (isset($GLOBALS[__FUNCTION__][$adminId][$action][$what])) {
                // If we have cache, use it
                return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
        }
 
-       // But default result is failed
-       $GLOBALS[__FUNCTION__][$action][$what] = false;
-
        // Get admin's defult access right
        $default = getAdminDefaultAcl($adminId);
 
@@ -68,7 +65,7 @@ function isAdminsAllowedByAcl ($action, $what) {
                $parent = isAdminsAllowedByAcl($parent_action, '');
        } else {
                // Anything else is true!
-               $parent = false;
+               $parent = FALSE;
        }
 
        // Shall I test for a main or sub menu? (action or what?)
@@ -102,7 +99,7 @@ function isAdminsAllowedByAcl ($action, $what) {
                }
        } elseif (!isExtensionActive('cache')) {
                // Extension ext-cache is absent, so load it from database
-               $result = false;
+               $result = FALSE;
                if (!empty($action)) {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' LIMIT 1",
@@ -123,11 +120,14 @@ function isAdminsAllowedByAcl ($action, $what) {
                SQL_FREERESULT($result);
        }
 
+       // But default result is failed
+       $GLOBALS[__FUNCTION__][$adminId][$action][$what] = FALSE;
+
        // Check ACL and (maybe) allow
        //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent));
-       if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === true) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === false))) {
+       if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === TRUE) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === FALSE))) {
                // Access is granted
-               $GLOBALS[__FUNCTION__][$adminId][$action][$what] = true;
+               $GLOBALS[__FUNCTION__][$adminId][$action][$what] = TRUE;
        } // END - if
 
        // Return value
@@ -172,7 +172,7 @@ LIMIT 1",
 }
 
 // Change a lot admin account
-function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = true) {
+function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = TRUE) {
        // Begin the update
        $cache_update = '0';
        $message = '';
@@ -180,27 +180,31 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t
        foreach ($postData['login'] as $id => $login) {
                // Secure id number
                $id = bigintval($id);
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login);
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login);
 
                // When both passwords match update admin account
                if ((!empty($element)) && (isset($postData[$element]))) {
                        // Save this setting
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
-                               array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__);
+                               array(
+                                       $element,
+                                       $postData[$element][$id],
+                                       $id
+                               ), __FUNCTION__, __LINE__);
 
                        // Admin account saved
                        $message = '{--ADMIN_ACCOUNT_SAVED--}';
-               } elseif ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) {
+               } elseif ((!empty($postData['password1'])) && (!empty($postData['password2']))) {
                        // Update only if both passwords match
-                       if (($postData['pass1'][$id] == $postData['pass2'][$id])) {
+                       if (($postData['password1'][$id] == $postData['password2'][$id])) {
                                // Save only when both passwords are the same (also when they are empty)
                                $add = ''; $cache_update = 1;
 
                                // Generate hash
-                               $hash = generateHash($postData['pass1'][$id]);
+                               $hash = generateHash($postData['password1'][$id]);
 
                                // Save password when set
-                               if (!empty($postData['pass1'][$id])) {
+                               if (!empty($postData['password1'][$id])) {
                                        $add = sprintf(",`password`='%s'", SQL_ESCAPE($hash));
                                } // END - if
 
@@ -221,7 +225,7 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t
                                                if (!empty($add)) {
                                                        setAdminMd5($hash);
                                                } // END - if
-                                       } elseif (generateHash($postData['pass1'][$id], $salt) != getAdminMd5()) {
+                                       } elseif (generateHash($postData['password1'][$id], $salt) != getAdminMd5()) {
                                                // Update password cookie
                                                setAdminMd5($hash);
                                        }
@@ -294,7 +298,7 @@ LIMIT 1",
        } // END - foreach
 
        // Display message if not empty and allowed
-       if ((!empty($message)) && ($displayMessage === true)) {
+       if ((!empty($message)) && ($displayMessage === TRUE)) {
                // Display it
                displayMessage($message);
        } // END - if
@@ -318,7 +322,7 @@ function adminsEditAdminAccount ($postData) {
                $id = bigintval($id);
 
                // Get the admin's data
-               $result = SQL_QUERY_ESC("SELECT `login`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `login`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                        array($id), __FUNCTION__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
                        // Entry found
@@ -337,7 +341,7 @@ function adminsEditAdminAccount ($postData) {
                        }
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_admins_row', TRUE, $content);
                } // END - if
 
                // Free result
@@ -345,7 +349,7 @@ function adminsEditAdminAccount ($postData) {
        } // END - foreach
 
        // Load template
-       loadTemplate('admin_edit_admins', false, $OUT);
+       loadTemplate('admin_edit_admins', FALSE, $OUT);
 }
 
 // Generate access mode selection box for given admin id
@@ -403,7 +407,7 @@ function generateAdminMenuModeSelectionBox ($adminId = NULL) {
 // Delete given admin accounts
 function adminsDeleteAdminAccount ($postData) {
        // Check if this account is the last one which cannot be deleted...
-       if (countSumTotalData('', 'admins', 'id', '', true) > 1) {
+       if (countSumTotalData('', 'admins', 'id', '', TRUE) > 1) {
                // Delete accounts
                $OUT = '';
                foreach ($postData['sel'] as $id => $selected) {
@@ -411,10 +415,10 @@ function adminsDeleteAdminAccount ($postData) {
                        $id = bigintval($id);
 
                        // Get the admin's data
-                       $result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `access_mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS `access_mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                                array($id), __FUNCTION__, __LINE__);
 
-                       // Do we have an entry?
+                       // Is there an entry?
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
@@ -425,7 +429,7 @@ function adminsDeleteAdminAccount ($postData) {
                                $content['id'] = $id;
 
                                // Load row template and switch color
-                               $OUT .= loadTemplate('admin_delete_admins_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_admins_row', TRUE, $content);
                        } // END - if
 
                        // Free result
@@ -433,7 +437,7 @@ function adminsDeleteAdminAccount ($postData) {
                } // END - foreach
 
                // Load template
-               loadTemplate('admin_delete_admins', false, $OUT);
+               loadTemplate('admin_delete_admins', FALSE, $OUT);
        } else {
                // Cannot delete last account!
                displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
@@ -484,14 +488,14 @@ ORDER BY
                $content['la_mode']     = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                // Load row template and switch color
-               $OUT .= loadTemplate('admin_list_admins_row', true, $content);
+               $OUT .= loadTemplate('admin_list_admins_row', TRUE, $content);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Load template
-       loadTemplate('admin_list_admins', false, $OUT);
+       loadTemplate('admin_list_admins', FALSE, $OUT);
 }
 
 // Sends out mail to all administrators
@@ -509,9 +513,12 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
 
        // No entries found?
        if (SQL_HASZERONUMS($result)) {
-               // Create new entry (to all admins)
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`,`mail_template`) VALUES (0, '%s')",
-                       array($template), __FUNCTION__, __LINE__);
+               // Is ext-admins' version at least 0.7.9?
+               if (isExtensionInstalledAndNewer('admins', '0.7.9')) {
+                       // Create new entry (to all admins)
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (NULL, '%s')",
+                               array($template), __FUNCTION__, __LINE__);
+               } // END - if
 
                // Select all email adresses (default)
                $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
@@ -528,7 +535,7 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
                SQL_FREERESULT($result);
 
                // Init result
-               $result = false;
+               $result = FALSE;
 
                // "implode" ids and query string
                $adminId = implode(',', $adminIds);
@@ -547,6 +554,9 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
                                        $userid
                                ));
                        }
+
+                       // Abort here as below while() loop will cause problems
+                       return;
                } elseif (($adminId == '0') || (empty($adminId))) {
                        // Select all email adresses
                        $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
@@ -564,7 +574,7 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
        // Is the template a bug report?
        if ($template == 'admin_report_bug') {
                // Then set 'Reply-To:' again
-               $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+               $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
        } // END - if
 
        // Load email addresses and send away
@@ -672,7 +682,7 @@ function getAdminLoginFailures ($adminId) {
                $result = SQL_QUERY_ESC("SELECT `login_failures` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                        array($adminId), __FUNCTION__, __LINE__);
 
-               // Do we have an entry?
+               // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Get it
                        $data = SQL_FETCHARRAY($result);
@@ -708,7 +718,7 @@ function getAdminLastFailure ($adminId) {
                $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`last_failure`) AS `last_failure` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                        array($adminId), __FUNCTION__, __LINE__);
 
-               // Do we have an entry?
+               // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Get it
                        $data = SQL_FETCHARRAY($result);
@@ -731,5 +741,10 @@ function isAdminsExpertWarningEnabled () {
        return (getAminsExpertWarning() == 'Y');
 }
 
+// Wrapper function to check whether expert setting is enabled
+function isAdminsExpertSettingEnabled () {
+       return (getAminsExpertSettings() == 'Y');
+}
+
 // [EOF]
 ?>