X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilter%2Fadmins_filter.php;h=7e5faa555716d506255063b18d16adf5679ebd26;hb=3e4fd7d36d85a58509b19060ae892f37299be92e;hp=81beec2b1920ee17ab0fe9d758a2c26169479687;hpb=8e75638e5249c1aa9f8f98af118f89108c7eeebc;p=mailer.git

diff --git a/inc/filter/admins_filter.php b/inc/filter/admins_filter.php
index 81beec2b19..7e5faa5557 100644
--- a/inc/filter/admins_filter.php
+++ b/inc/filter/admins_filter.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,25 +43,28 @@ if (!defined('__SECURITY')) {
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
 	// Is the admins extension updated? (should be!)
-	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`';
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+	if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ',`default_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`';
 
 	// Return it
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 	return $add;
 }
 
 // Reset the login failures
-function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
+function FILTER_RESET_ADMINS_LOGIN_FAILURES ($filterData) {
 	// Store it in session
-	setSession('mailer_admin_failures'    , getAdminLoginFailures($data['id']));
-	setSession('mailer_admin_last_failure', getAdminLastFailure($data['id']));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+	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);
@@ -70,13 +73,15 @@ function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
 	rebuildCache('admin');
 
 	// Return the data for further processing
-	return $data;
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+	return $filterData;
 }
 
 // Count the login failure
-function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) {
+function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($filterData) {
 	// Prepare update data
-	$postData['login'][getCurrentAdminId()]          = $data['login'];
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+	$postData['login'][getCurrentAdminId()]          = $filterData['login'];
 	$postData['login_failures'][getCurrentAdminId()] = '`login_failures`+1';
 	$postData['last_failure'][getCurrentAdminId()]   = 'NOW()';
 
@@ -87,16 +92,18 @@ function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) {
 	rebuildCache('admin');
 
 	// Return the data for further processing
-	return $data;
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+	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
-	$newHash = generateHash($data['plain_pass']);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+	$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
@@ -104,13 +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
-	return $data;
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+	return $filterData;
 }
 
 // [EOF]