A lot code rewritten:

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2b9a008104a0f62eba50c5211716320e03192b45..e9a5e8a79b5df96b1d141d75075a596efc74a718 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -169,7 +169,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                                array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__);
 
                        // Admin account saved
-                       $message = getMessage('ADMIN_ACCOUNT_SAVED');
+                       $message = '{--ADMIN_ACCOUNT_SAVED--}';
                } elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) {
                        // Update only if both passwords match
                        if (($postData['pass1'][$id] == $postData['pass2'][$id])) {
@@ -191,9 +191,9 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                                        // Set timeout cookie
                                        setSession('admin_last', time());
 
-                                       if ($login != getSession('admin_login')) {
+                                       if ($adminId != getSession('admin_id')) {
                                                // Update login cookie
-                                               setSession('admin_login', $login);
+                                               setSession('admin_id', $adminId);
 
                                                // Update password cookie as well?
                                                if (!empty($add)) setSession('admin_md5', $hash);
@@ -246,10 +246,10 @@ LIMIT 1",
                                }
 
                                // Admin account saved
-                               $message = getMessage('ADMIN_ACCOUNT_SAVED');
+                               $message = '{--ADMIN_ACCOUNT_SAVED--}';
                        } else {
                                // Passwords did not match
-                               $message = getMessage('ADMINS_ERROR_PASS_MISMATCH');
+                               $message = '{--ADMINS_ERROR_PASS_MISMATCH--}';
                        }
                } else {
                        // Update whole array
@@ -291,7 +291,7 @@ function adminsEditAdminAccount ($postData) {
        $currMode = getAdminDefaultAcl(getCurrentAdminId());
 
        // Begin the edit loop
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        foreach ($postData['sel'] as $id => $selected) {
                // Secure id number
                $id = bigintval($id);
@@ -305,24 +305,22 @@ function adminsEditAdminAccount ($postData) {
                        SQL_FREERESULT($result);
 
                        // Prepare some more data for the template
-                       $content['sw'] = $SW;
                        $content['id'] = $id;
 
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow chaning it
-                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array(getMessage('ADMINS_ALLOW_MODE'), getMessage('ADMINS_DENY_MODE')), $content['mode']);
+                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
                        } else {
                                // Don't allow it
                                $content['mode'] = ' ';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(getMessage('ADMINS_GLOBAL_LA_SETTING'), getMessage('ADMINS_OLD_LA_SETTING'), getMessage('ADMINS_NEW_LA_SETTING')), $content['la_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']);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
-                       $SW = 3 - $SW;
-               }
-       }
+               } // END - if
+       } // END - foreach
 
        // Load template
        loadTemplate('admin_edit_admins', false, $OUT);
@@ -336,7 +334,7 @@ function adminsDeleteAdminAccount ($postData) {
        SQL_FREERESULT($result_main);
        if ($accounts > 1) {
                // Delete accounts
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                foreach ($postData['sel'] as $id => $selected) {
                        // Secure id number
                        $id = bigintval($id);
@@ -348,18 +346,16 @@ function adminsDeleteAdminAccount ($postData) {
                                // Entry found
                                $content = SQL_FETCHARRAY($result);
                                SQL_FREERESULT($result);
-                               $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE');
-                               $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
+                               $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
+                               $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
                                // Prepare some more data
-                               $content['sw'] = $SW;
                                $content['id'] = $id;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_del_admins_row', true, $content);
-                               $SW = 3 - $SW;
-                       }
-               }
+                       } // END - if
+               } // END - foreach
 
                // Load template
                loadTemplate('admin_del_admins', false, $OUT);
@@ -397,20 +393,18 @@ function adminsRemoveAdminAccount ($postData) {
 function adminsListAdminAccounts() {
        // Select all admin accounts
        $result = SQL_QUERY("SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC", __FUNCTION__, __LINE__);
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
-               $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE');
-               $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
+               $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
+               $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
                // Prepare some more data
-               $content['sw']         = $SW;
                $content['email_link'] = generateEmailLink($content['id'], 'admins');
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_admins_row', true, $content);
-               $SW = 3 - $SW;
-       }
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);