X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=385f7375d9e220eae2883a071cf78b17ec2886e1;hp=6efa17c2590da99255656c04eb493f19ac4dd788;hb=0e899620c7a065952d6787c236fb2b33ae337d6a;hpb=4d6226782aa4ba157dca8c3891412ba50159481f

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 6efa17c259..385f7375d9 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -64,14 +64,14 @@ function REGISTER_ADMIN ($user, $md5)
 // Only be executed on login procedure!
 function CHECK_ADMIN_LOGIN ($admin_login, $password)
 {
-	global $ADMINS, $CONFIG, $CACHE;
+	global $cacheArray, $_CONFIG, $cacheInstance;
 	$ret = "404"; $pass = "";
-	if (!empty($ADMINS['aid'][$admin_login]))
+	if (!empty($cacheArray['admins']['aid'][$admin_login]))
 	{
 		// Get password from cache
-		$pass = $ADMINS['password'][$admin_login];
+		$pass = $cacheArray['admins']['password'][$admin_login];
 		$ret = "pass";
-		$CONFIG['cache_hits']++;
+		$_CONFIG['cache_hits']++;
 	}
 	 else
 	{
@@ -86,7 +86,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 		}
 	}
 
-	//* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<BR>";
+	//* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<br />";
 	if ((strlen($pass) == 32) && ($pass == md5($password)))
 	{
 		// Generate new hash
@@ -111,9 +111,9 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 		 array($pass, $admin_login), __FILE__, __LINE__);
 
 		// Shall I remove the cache file?
-		if ((EXT_IS_ACTIVE("cache")) && ($CACHE != false))
+		if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false))
 		{
-			if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+			if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
 		}
 
 		// Password matches!
@@ -127,38 +127,34 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 	return $ret;
 }
 // Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password)
-{
-	global $ADMINS, $CONFIG;
+function CHECK_ADMIN_COOKIES ($admin_login, $password) {
+	global $cacheArray, $_CONFIG;
 	$ret = "404"; $pass = "";
-	if (!empty($ADMINS['aid'][$admin_login]))
-	{
+	if (!empty($cacheArray['admins']['aid'][$admin_login])) {
 		// Get password from cache
-		$pass = $ADMINS['password'][$admin_login];
+		$pass = $cacheArray['admins']['password'][$admin_login];
 		$ret = "pass";
-		$CONFIG['cache_hits']++;
-	}
-	 else
-	{
+		$_CONFIG['cache_hits']++;
+	} else {
 		// Get password from DB
 		$result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
 		 array($admin_login), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
 			$ret = "pass";
 			list($pass) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		}
 	}
 
-	//* DEBUG: */ echo "*".$pass."/".$password."<BR>";
+	//* DEBUG: */ echo "*".$pass."/".$password."<br />";
 
 	// Check if password matches
-	if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password)))
-	{
+	if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) {
 		// Passwords matches!
 		$ret = "done";
 	}
+
+	// Return result
 	return $ret;
 }
 //
@@ -169,10 +165,10 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 	{
 		$search = "CFG: ".$comment;
 		$tmp = $file.".tmp";
-		$fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<BR>");
+		$fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
 		if ($fp)
 		{
-			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
 			if ($fp_tmp)
 			{
 				while (! feof($fp))
@@ -219,18 +215,18 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 	}
 	 else
 	{
-		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
+		OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
 	}
 }
 //
 function ADMIN_DO_ACTION($wht)
 {
-	global $menuDesription, $menuTitle, $CONFIG, $EXTENSIONS, $link, $DATA;
+	global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA;
 	//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
 	if (EXT_IS_ACTIVE("cache"))
 	{
 		// Include cache instance
-		global $CACHE;
+		global $cacheInstance;
 	}
 
 	// Remove any spaces from variable
@@ -249,8 +245,8 @@ function ADMIN_DO_ACTION($wht)
 	$act = GET_ACTION($GLOBALS['module'], $wht);
 
 	// Define admin login name and ID number
-	define('__ADMIN_LOGIN', SQL_ESCAPE($_COOKIE['admin_login']));
-	define('__ADMIN_ID'   , GET_ADMIN_ID($_COOKIE['admin_login']));
+	define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login')));
+	define('__ADMIN_ID'   , GET_ADMIN_ID(get_session('admin_login')));
 
 	// Preload templates
 	if (EXT_IS_ACTIVE("admins")) {
@@ -304,7 +300,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 //
 function ADD_ADMIN_MENU($act, $wht,$return=false)
 {
-	global $_GET, $menuDesription, $menuTitle, $link;
+	global $menuDesription, $menuTitle, $link;
 	$SUB = false;
 
 	// Menu descriptions
@@ -457,7 +453,6 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
 //
 function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
 {
-	global $_GET;
 	// Output selection form with all confirmed user accounts listed
 	$result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__);
 	$OUT = "";
@@ -522,9 +517,9 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
 	return $OUT;
 }
 //
-function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $translateComma = array(), $alwaysAdd=false)
+function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma = array(), $alwaysAdd=false)
 {
-	global $CONFIG, $CFG_CACHE, $CACHE;
+	global $_CONFIG, $cacheArray, $cacheInstance;
 	$DATA = array();
 	$skip = false; $TEST2 = "";
 	foreach ($POST as $id=>$val) {
@@ -579,7 +574,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
 				}
 
 				// Update current configuration
-				$CONFIG[$id] = $val;
+				$_CONFIG[$id] = $val;
 			}
 		}
 	}
@@ -587,10 +582,10 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
 	// Check if entry does exist
 	$result = false;
 	if (!$alwaysAdd) {
-		if (!empty($WHERE)) {
-			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." WHERE ".$WHERE." LIMIT 1", __FILE__, __LINE__);
+		if (!empty($whereStatement)) {
+			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
 		} else {
-			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." LIMIT 1", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__);
 		}
 	}
 
@@ -599,7 +594,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
 		$DATA_UPDATE = implode(", ", $DATA);
 
 		// Generate SQL string
-		$SQL = "UPDATE "._MYSQL_PREFIX.$TABLE." SET ".$DATA_UPDATE." WHERE ".$WHERE." LIMIT 1";
+		$SQL = "UPDATE "._MYSQL_PREFIX.$tableName." SET ".$DATA_UPDATE." WHERE ".$whereStatement." LIMIT 1";
 	} else {
 		// Add Line (does only work with auto_increment!
 		$KEYs = array(); $VALUEs = array();
@@ -614,7 +609,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
 		$VALUEs = implode(", ", $VALUEs);
 
 		// Generate SQL string
-		$SQL = "INSERT INTO "._MYSQL_PREFIX.$TABLE." (".$KEYs.") VALUES(".$VALUEs.")";
+		$SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES(".$VALUEs.")";
 	}
 
 	// Free memory
@@ -624,10 +619,10 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
 	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 	// Is the config table updated and the cache extension installed?
-	if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($TABLE == "_config")) {
+	if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) {
 		// Remove it here...
-		if ($CACHE->cache_file("config", true)) $CACHE->cache_destroy();
-		unset($CFG_CACHE);
+		if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
+		unset($cacheArray);
 	}
 
 	// Settings saved
@@ -672,30 +667,30 @@ function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user")
 		return $title;
 	}
 
-	//* DEBUG: */ echo "A:".$title."<BR>";
+	//* DEBUG: */ echo "A:".$title."<br />";
 	// Return link
 	return "<A href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
 }
 //
 function ADMIN_CHECK_MENU_MODE()
 {
-	global $CONFIG, $ADMINS, $_COOKIE;
+	global $_CONFIG, $cacheArray;
 
 	// Set the global mode as the mode for all admins
-	$MODE = $CONFIG['admin_menu']; $ADMIN = $MODE;
+	$MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
 
 	// Check individual settings of current admin
-	if (isset($ADMINS['la_mode'][$_COOKIE['admin_login']]))
+	if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')]))
 	{
 		// Load from cache
-		$ADMIN = $ADMINS['la_mode'][$_COOKIE['admin_login']];
-		$CONFIG['cache_hits']++;
+		$ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
+		$_CONFIG['cache_hits']++;
 	}
 	 elseif (GET_EXT_VERSION("admins") >= "0.6.7")
 	{
 		// Load from database when version of "admins" is enough
 		$result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-		 array($_COOKIE['admin_login']), __FILE__, __LINE__);
+		 array(get_session('admin_login')), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
 			// Load data
@@ -714,7 +709,7 @@ function ADMIN_CHECK_MENU_MODE()
 }
 // Change activation status
 function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
-	global $CONFIG;
+	global $_CONFIG;
 	$cnt = 0; $newStatus = 'Y';
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" all through and count them
@@ -756,7 +751,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 }
 // Delete rows by given ID numbers
 function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $row, $columns = array(), $filterFunctions = array(), $deleteNow=false, $idRow="id") {
-	global $CONFIG;
+	global $_CONFIG;
 	$OUT = ""; $SW = 2;
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" through all entries and count them