Naming convention applied to language strings, new API function added:

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index e9a5e8a79b5df96b1d141d75075a596efc74a718..99f026b48052a0f218e423385005e4cd50849e8f 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -282,7 +282,7 @@ LIMIT 1",
        } // END - if
 
        // Remove cache file
-       runFilterChain('post_admin_edited', postRequestArray());
+       runFilterChain('post_form_submited', postRequestArray());
 }
 
 // Make admin accounts editable
@@ -329,10 +329,7 @@ function adminsEditAdminAccount ($postData) {
 // Delete given admin accounts
 function adminsDeleteAdminAccount ($postData) {
        // Check if this account is the last one which cannot be deleted...
-       $result_main = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins`", __FUNCTION__, __LINE__);
-       $accounts = SQL_NUMROWS($result_main);
-       SQL_FREERESULT($result_main);
-       if ($accounts > 1) {
+       if (countSumTotalData('', 'admins', 'id', '', true) > 1) {
                // Delete accounts
                $OUT = '';
                foreach ($postData['sel'] as $id => $selected) {
@@ -340,12 +337,13 @@ function adminsDeleteAdminAccount ($postData) {
                        $id = bigintval($id);
 
                        // Get the admin's data
-                       $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS `mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
                                array($id), __FUNCTION__, __LINE__);
+
+                       // Do we have an entry?
                        if (SQL_NUMROWS($result) == 1) {
-                               // Entry found
+                               // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
-                               SQL_FREERESULT($result);
                                $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
                                $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
@@ -355,6 +353,9 @@ function adminsDeleteAdminAccount ($postData) {
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_del_admins_row', true, $content);
                        } // END - if
+
+                       // Free result
+                       SQL_FREERESULT($result);
                } // END - foreach
 
                // Load template
@@ -386,22 +387,19 @@ function adminsRemoveAdminAccount ($postData) {
        }
 
        // Remove cache if cache system is activated
-       runFilterChain('post_admin_deleted', postRequestArray());
+       runFilterChain('post_form_deleted', postRequestArray());
 }
 
 // List all admin accounts
 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__);
+       $result = SQL_QUERY('SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
                $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
                $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
-               // Prepare some more data
-               $content['email_link'] = generateEmailLink($content['id'], 'admins');
-
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_admins_row', true, $content);
        } // END - while
@@ -459,7 +457,7 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
                        }
                } elseif (($adminId == '0') || (empty($adminId))) {
                        // Select all email adresses
-                       $result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC",
+                       $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
                                __FUNCTION__, __LINE__);
                } else {
                        // If Admin-Id is not "to-all" select
@@ -482,20 +480,20 @@ function getAminsExpertSettings () {
        // Default is has not the right
        $data['expert_settings'] = 'N';
 
-       // Get current admin login
-       $admin = getAdminLogin(getCurrentAdminId());
+       // Get current admin Id
+       $adminId = getCurrentAdminId();
 
        // Lookup settings in cache
-       if (isset($GLOBALS['cache_array']['admin']['expert_settings'][$admin])) {
+       if (isset($GLOBALS['cache_array']['admin']['expert_settings'][$adminId])) {
                // Use cache
-               $data['expert_settings'] = $GLOBALS['cache_array']['admin']['expert_settings'][$admin];
+               $data['expert_settings'] = $GLOBALS['cache_array']['admin']['expert_settings'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
        } elseif (!isExtensionInstalled('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-                       array($admin), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array($adminId), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -503,7 +501,7 @@ function getAminsExpertSettings () {
                        $data = SQL_FETCHARRAY($result);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admin']['expert_settings'][$admin] = $data['expert_settings'];
+                       $GLOBALS['cache_array']['admin']['expert_settings'][$adminId] = $data['expert_settings'];
                } // END - if
 
                // Free memory
@@ -519,20 +517,20 @@ function getAminsExpertWarning () {
        // Default is has not the right
        $data['expert_warning'] = 'N';
 
-       // Get current admin login
-       $admin = getAdminLogin(getCurrentAdminId());
+       // Get current admin id
+       $adminId = getCurrentAdminId();
 
        // Lookup warning in cache
-       if (isset($GLOBALS['cache_array']['admin']['expert_warning'][$admin])) {
+       if (isset($GLOBALS['cache_array']['admin']['expert_warning'][$adminId])) {
                // Use cache
-               $data['expert_warning'] = $GLOBALS['cache_array']['admin']['expert_warning'][$admin];
+               $data['expert_warning'] = $GLOBALS['cache_array']['admin']['expert_warning'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
        } elseif (!isExtensionInstalled('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-                       array($admin), __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+                       array($adminId), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -540,7 +538,7 @@ function getAminsExpertWarning () {
                        $data = SQL_FETCHARRAY($result);
 
                        // Set cache
-                       $GLOBALS['cache_array']['admin']['expert_warning'][$admin] = $data['expert_warning'];
+                       $GLOBALS['cache_array']['admin']['expert_warning'][$adminId] = $data['expert_warning'];
                } // END - if
 
                // Free memory
@@ -552,26 +550,26 @@ function getAminsExpertWarning () {
 }
 
 // Get login_failures number from administrator's login name
-function getAdminLoginFailures ($adminLogin) {
+function getAdminLoginFailures ($adminId) {
        // Admin login should not be empty
-       if (empty($adminLogin)) {
-               debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
+       if (empty($adminId)) {
+               debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
        } // END - if
 
        // By default no admin is found
        $data['login_failures'] = '-1';
 
        // Check cache
-       if (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminLogin])) {
+       if (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminId])) {
                // Use it if found to save SQL queries
-               $data['login_failures'] = $GLOBALS['cache_array']['admin']['login_failures'][$adminLogin];
+               $data['login_failures'] = $GLOBALS['cache_array']['admin']['login_failures'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
        } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT `login_failures` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-                       array($adminLogin), __FUNCTION__, __LINE__);
+               $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?
                if (SQL_NUMROWS($result) == 1) {
@@ -588,26 +586,26 @@ function getAdminLoginFailures ($adminLogin) {
 }
 
 // Get last_failure number from administrator's login name
-function getAdminLastFailure ($adminLogin) {
+function getAdminLastFailure ($adminId) {
        // Admin login should not be empty
-       if (empty($adminLogin)) {
-               debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
+       if (empty($adminId)) {
+               debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
        } // END - if
 
        // By default no admin is found
        $data['last_failure'] = '-1';
 
        // Check cache
-       if (isset($GLOBALS['cache_array']['admin']['last_failure'][$adminLogin])) {
+       if (isset($GLOBALS['cache_array']['admin']['last_failure'][$adminId])) {
                // Use it if found to save SQL queries
-               $data['last_failure'] = $GLOBALS['cache_array']['admin']['last_failure'][$adminLogin];
+               $data['last_failure'] = $GLOBALS['cache_array']['admin']['last_failure'][$adminId];
 
                // Update cache hits
                incrementStatsEntry('cache_hits');
        } elseif (!isExtensionActive('cache')) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`last_failure`) AS `last_failure` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-                       array($adminLogin), __FUNCTION__, __LINE__);
+               $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?
                if (SQL_NUMROWS($result) == 1) {
@@ -623,9 +621,9 @@ function getAdminLastFailure ($adminLogin) {
        return $data['last_failure'];
 }
 
-//*****************************************************************************
-//                     Below only filter functions
-//*****************************************************************************
+//-----------------------------------------------------------------------------
+//                                Filter Functions
+//-----------------------------------------------------------------------------
 
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
@@ -642,8 +640,8 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
 // Reset the login failures
 function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
        // Store it in session
-       setSession('mailer_admin_failures'    , getAdminLoginFailures($data['login']));
-       setSession('mailer_admin_last_failure', getAdminLastFailure($data['login']));
+       setSession('mailer_admin_failures'    , getAdminLoginFailures($data['id']));
+       setSession('mailer_admin_last_failure', getAdminLastFailure($data['id']));
 
        // Prepare update data
        $postData['login'][getCurrentAdminId()]          = $data['login'];