X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=da0aa7159611826a404838f107ab7fd70ba07e1f;hp=bbd581d8a03a6b3a09768c36d7eb2ab3690622d1;hb=5e5fba72f1686dc9ae819f545253f0d99b4ebcba;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index bbd581d8a0..da0aa71596 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -41,15 +41,15 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 //
 function ADD_MODULE_TITLE($mod)
 {
-	global $MODULES, $_CONFIG;
+	global $cacheArray, $_CONFIG;
 	$name = ""; $result = false;
 	// Load title
 	if (!mxchange_installing)
 	{
-		if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module'])) && (isset($MODULES['module'][$mod])))
+		if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module'])) && (isset($cacheArray['modules']['module'][$mod])))
 		{
 			// Load from cache
-			$name = $MODULES['title'][$mod];
+			$name = $cacheArray['modules']['title'][$mod];
 
 			// Update cache hits
 			$_CONFIG['cache_hits']++;
@@ -82,7 +82,7 @@ function ADD_MODULE_TITLE($mod)
 // Check validity of a given module name (no file extension)
 function CHECK_MODULE($mod) {
 	// We need them now here...
-	global $MODULES, $_CONFIG, $CACHE;
+	global $cacheArray, $_CONFIG, $cacheInstance;
 
 	// Filter module name (names with low chars and underlines are fine!)
 	$mod = preg_replace("/[^a-z_]/", "", $mod);
@@ -108,14 +108,14 @@ function CHECK_MODULE($mod) {
 
 	// Check if cache is latest version
 	$locked = 'Y'; $hidden = 'N'; $admin = 'N'; $mem = 'N'; $found = false;
-	if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module']))) {
+	if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module']))) {
 		// Is the module cached?
-		if (isset($MODULES['locked'][$mod_chk])) {
+		if (isset($cacheArray['modules']['locked'][$mod_chk])) {
 			// Check cache
-			$locked = $MODULES['locked'][$mod_chk];
-			$hidden = $MODULES['hidden'][$mod_chk];
-			$admin  = $MODULES['admin_only'][$mod_chk];
-			$mem    = $MODULES['mem_only'][$mod_chk];
+			$locked = $cacheArray['modules']['locked'][$mod_chk];
+			$hidden = $cacheArray['modules']['hidden'][$mod_chk];
+			$admin  = $cacheArray['modules']['admin_only'][$mod_chk];
+			$mem    = $cacheArray['modules']['mem_only'][$mod_chk];
 
 			// Update cache hits
 			$_CONFIG['cache_hits']++;
@@ -178,8 +178,8 @@ function CHECK_MODULE($mod) {
 
 			// Destroy cache here
 			if (GET_EXT_VERSION("cache") >= "0.1.2") {
-				if ($CACHE->cache_file("mod_reg", true)) $CACHE->cache_destroy();
-				unset($MODULES);
+				if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
+				unset($cacheArray['modules']);
 			}
 
 			// And reload data
@@ -235,8 +235,8 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true)
 			}
 			break;
 		}
-		$DUMMY = substr($search, 0, -4);
-		$AND .= " AND action='".GET_ACTION($ACC_LVL, $DUMMY)."'";
+		$dummy = substr($search, 0, -4);
+		$AND .= " AND action='".GET_ACTION($ACC_LVL, $dummy)."'";
 	} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
 		// Sponsor / engine menu
 		$type = "what";
@@ -389,7 +389,7 @@ function ADD_MENU($MODE, $act, $wht) {
 // This patched function will reduce many SELECT queries for the specified or current admin login
 function IS_ADMIN($admin="")
 {
-	global $_SESSION, $ADMINS, $_CONFIG;
+	global $cacheArray, $_CONFIG;
 	$ret = false; $passCookie = ""; $valPass = "";
 	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
 
@@ -401,13 +401,13 @@ function IS_ADMIN($admin="")
 	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."<br />";
 
 	// Search in array for entry
-	if ((!empty($passCookie)) && (isset($ADMINS['password'][$admin])) && (!empty($admin)))
+	if ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin)))
 	{
 		// Count cache hits
 		$_CONFIG['cache_hits']++;
 
 		// Login data is valid or not?
-		$valPass = generatePassString($ADMINS['password'][$admin]);
+		$valPass = generatePassString($cacheArray['admins']['password'][$admin]);
 	}
 	 elseif (!empty($admin))
 	{
@@ -538,7 +538,7 @@ function WHAT_IS_VALID($act, $wht, $type="guest")
 //
 function IS_LOGGED_IN()
 {
-	global $_SESSION, $status, $LAST;
+	global $status, $LAST;
 	if (!is_array($LAST)) $LAST = array();
 	$ret = false;
 
@@ -1130,7 +1130,7 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 //
 function UPDATE_REF_COUNTER($uid)
 {
-	global $REF_LVL, $link, $CACHE;
+	global $REF_LVL, $link, $cacheInstance;
 	// Make it sure referral level zero (member him-/herself) is at least selected
 	if (empty($REF_LVL)) $REF_LVL = "0";
 
@@ -1163,7 +1163,7 @@ function UPDATE_REF_COUNTER($uid)
 	 elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2"))
 	{
 		// Remove cache here
-		if ($CACHE->cache_file("refsystem", true)) $CACHE->cache_destroy();
+		if ($cacheInstance->cache_file("refsystem", true)) $cacheInstance->cache_destroy();
 	}
 }
 //
@@ -1233,9 +1233,8 @@ WHERE sid='%s' LIMIT 1",
 	}
 
 	// Purge old entries
-	$TIMEOUT = time() - $_CONFIG['online_timeout'];
-	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= %d",
-	 array($TIMEOUT), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %d)",
+	 array($_CONFIG['online_timeout']), __FILE__, __LINE__);
 }
 // OBSULETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS($subj, $msg)
@@ -1251,12 +1250,12 @@ function SEND_ADMIN_EMAILS($subj, $msg)
 // Get ID number from administrator's login name
 function GET_ADMIN_ID($login)
 {
-	global $ADMINS;
+	global $cacheArray;
 	$ret = "-1";
-	if (!empty($ADMINS['aid'][$login]))
+	if (!empty($cacheArray['admins']['aid'][$login]))
 	{
 		// Check cache
-		$ret = $ADMINS['aid'][$login];
+		$ret = $cacheArray['admins']['aid'][$login];
 		if (empty($ret)) $ret = "-1";
 	}
 	 else
@@ -1276,12 +1275,12 @@ function GET_ADMIN_ID($login)
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH($login)
 {
-	global $ADMINS;
+	global $cacheArray;
 	$ret = "-1";
-	if (!empty($ADMINS['password'][$login]))
+	if (!empty($cacheArray['admins']['password'][$login]))
 	{
 		// Check cache
-		$ret = $ADMINS['password'][$login];
+		$ret = $cacheArray['admins']['password'][$login];
 		if (empty($ret)) $ret = "-1";
 	}
 	 else
@@ -1300,12 +1299,12 @@ function GET_ADMIN_HASH($login)
 //
 function GET_ADMIN_LOGIN($aid)
 {
-	global $ADMINS;
+	global $cacheArray;
 	$ret = "***";
-	if (!empty($ADMINS['login']['aid']))
+	if (!empty($cacheArray['admins']['login']['aid']))
 	{
 		// Check cache
-		if (!empty($ADMINS['login'][$aid]))	$ret = $ADMINS['login'][$aid];
+		if (!empty($cacheArray['admins']['login'][$aid]))	$ret = $cacheArray['admins']['login'][$aid];
 		if (empty($ret)) $ret = "***";
 	}
 	 else
@@ -1388,7 +1387,7 @@ function activateExchange() {
 		$SQLs = array(
 			"UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
 			"UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='order' OR what='unconfirmed' LIMIT 2",
-			"UPDATE "._MYSQL_PREFIX."_config SET activate_xchange='0' WHERE config='0' LIMIT 1"
+			"UPDATE "._MYSQL_PREFIX."_config SET activate_xchange='0' WHERE config=0 LIMIT 1"
 		);
 
 		// Run SQLs
@@ -1508,36 +1507,38 @@ function SUB_JACKPOT($points)
 	}
 }
 //
-function IS_DEMO()
-{
-	global $_SESSION;
+function IS_DEMO() {
 	return ((EXT_IS_ACTIVE("demo")) && ($_SESSION['admin_login'] == "demo"));
 }
 //
 function LOAD_CONFIG($no="0")
 {
-	global $CFG_CACHE, $_CONFIG;
-	$CFG_DUMMY = false;
+	global $cacheArray;
+	$CFG_DUMMY = array();
+
 	// Check for cache extension, cache-array and if the requested configuration is in cache
-	if ((is_array($CFG_CACHE)) && (isset($CFG_CACHE['config'][$no])))
-	{
+	if ((is_array($cacheArray)) && (isset($cacheArray['config'][$no])) && (is_array($cacheArray['config'][$no]))) {
 		// Load config from cache
-		$CFG_DUMMY = array();
-		foreach ($CFG_CACHE as $element=>$cfgs)
-		{
-			$CFG_DUMMY[$element] = $cfgs[$no];
+		//* DEBUG: */ echo gettype($cacheArray['config'][$no])."<br />\n";
+		foreach ($cacheArray['config'][$no] as $key=>$value) {
+			$CFG_DUMMY[$key] = $value;
 		}
 
 		// Count cache hits
-		$_CONFIG['cache_hits']++;
-	}
-	 else
-	{
+		$CFG_DUMMY['cache_hits']++;
+	} else {
 		// Load config from DB
-		$result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config='%d' LIMIT 1",
-		 array(bigintval($no)), __FILE__, __LINE__);
+		$result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",
+			array(bigintval($no)), __FILE__, __LINE__);
+
+		// Get config from database
 		$CFG_DUMMY = SQL_FETCHARRAY($result_config);
+
+		// Free result
 		SQL_FREERESULT($result_config);
+
+		// Remember this config in the array
+		$cacheArray['config'][$no] = $CFG_DUMMY;
 	}
 
 	// Return config array
@@ -1570,22 +1571,22 @@ function GET_WHAT($MOD_CHECK)
 //
 function MODULE_HAS_MENU($mod)
 {
-	global $EXTENSIONS, $MODULES, $_CONFIG;
+	global $cacheArray, $_CONFIG;
 
 	// All is false by default
 	$ret = false;
 	if (GET_EXT_VERSION("cache") >= "0.1.2")
 	{
-		if (isset($MODULES['has_menu'][$mod]))
+		if (isset($cacheArray['modules']['has_menu'][$mod]))
 		{
 			// Check module cache and count hit
-			if ($MODULES['has_menu'][$mod] == 'Y') $ret = true;
+			if ($cacheArray['modules']['has_menu'][$mod] == 'Y') $ret = true;
 			$_CONFIG['cache_hits']++;
 		}
-		 elseif (isset($EXTENSIONS['ext_menu'][$mod]))
+		 elseif (isset($cacheArray['extensions']['ext_menu'][$mod]))
 		{
 			// Check cache and count hit
-			if ($EXTENSIONS['ext_menu'][$mod] == 'Y') $ret = true;
+			if ($cacheArray['extensions']['ext_menu'][$mod] == 'Y') $ret = true;
 			$_CONFIG['cache_hits']++;
 		}
 	}