New wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index e9a5e8a79b5df96b1d141d75075a596efc74a718..344b5909ffa60d37fa9f034c5454e8328797ef36 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -482,20 +482,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 +503,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 +519,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 +540,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 +552,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 +588,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) {
@@ -642,8 +642,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'];