X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=e9a5e8a79b5df96b1d141d75075a596efc74a718;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=b06ff86814c4c76b0c7849afaedd6abb593bd88e;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index b06ff86814..e9a5e8a79b 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -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);
@@ -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);
@@ -352,14 +350,12 @@ function adminsDeleteAdminAccount ($postData) {
 				$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']    = '{--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);