A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / filter / admins_filter.php

diff --git a/inc/filter/admins_filter.php b/inc/filter/admins_filter.php
index 677f1d295b8d951952b2b769f57f15545084a4fe..2a46f82d613ef5f484c8084a533ecdab553f67c1 100644 (file)
--- a/inc/filter/admins_filter.php
+++ b/inc/filter/admins_filter.php
@@ -47,7 +47,7 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
        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`';
+       if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`,`expert_warning`';
 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
@@ -55,16 +55,16 @@ function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
 }
 
 // Reset the login failures
-function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
+function FILTER_RESET_ADMINS_LOGIN_FAILURES ($filterData) {
        // Store it in session
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       setSession('mailer_admin_failures'    , getAdminLoginFailures($data['id']));
-       setSession('mailer_admin_last_failure', getAdminLastFailure($data['id']));
+       setSession('mailer_admin_failures'    , getAdminLoginFailures($filterData['id']));
+       setSession('mailer_admin_last_failure', getAdminLastFailure($filterData['id']));
 
        // Prepare update data
-       $postData['login'][getCurrentAdminId()]          = $data['login'];
+       $postData['login'][getCurrentAdminId()]          = $filterData['login'];
        $postData['login_failures'][getCurrentAdminId()] = '0';
-       $postData['last_failure'][getCurrentAdminId()]   = null;
+       $postData['last_failure'][getCurrentAdminId()]   = NULL;
 
        // Change it in the admin
        adminsChangeAdminAccount($postData);
@@ -74,14 +74,14 @@ function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
 
        // Return the data for further processing
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // Count the login failure
-function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) {
+function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($filterData) {
        // Prepare update data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       $postData['login'][getCurrentAdminId()]          = $data['login'];
+       $postData['login'][getCurrentAdminId()]          = $filterData['login'];
        $postData['login_failures'][getCurrentAdminId()] = '`login_failures`+1';
        $postData['last_failure'][getCurrentAdminId()]   = 'NOW()';
 
@@ -93,17 +93,17 @@ function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) {
 
        // Return the data for further processing
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // Rehashes the given plain admin password and stores it the database
-function FILTER_REHASH_ADMINS_PASSWORD ($data) {
+function FILTER_REHASH_ADMINS_PASSWORD ($filterData) {
        // Generate new hash
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       $newHash = generateHash($data['plain_pass']);
+       $newHash = generateHash($filterData['plain_pass']);
 
        // Prepare update data
-       $postData['login'][getCurrentAdminId()]    = $data['login'];
+       $postData['login'][getCurrentAdminId()]    = $filterData['login'];
        $postData['password'][getCurrentAdminId()] = $newHash;
 
        // Change it in the admin
@@ -111,14 +111,14 @@ function FILTER_REHASH_ADMINS_PASSWORD ($data) {
 
        // Update cookie/session and data array
        setAdminMd5(encodeHashForCookie($newHash));
-       $data['pass_hash'] = $newHash;
+       $filterData['pass_hash'] = $newHash;
 
        // Always make sure the cache is destroyed
        rebuildCache('admin');
 
        // Return the data for further processing
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // [EOF]