X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e4d76e465d110190dc27f13898a8c0764889901f;hp=39a7f86b4d60380dca84b185cb05dfceb0db87c1;hb=381133ea5f3925617f114d4dd3ef735be1903ef8;hpb=53b5edd1ee2b126087000ff842ac7bd0feea8814

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 39a7f86b4d..e4d76e465d 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -50,8 +50,8 @@ function ADD_MODULE_TITLE($mod) {
 			$name = $cacheArray['modules']['title'][$mod];
 
 			// Update cache hits
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-		} else {
+			if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		} elseif (!EXT_IS_ACTIVE("cache")) {
 			// Load from database
 			$result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
 			list($name) = SQL_FETCHROW($result);
@@ -115,13 +115,13 @@ function CHECK_MODULE ($mod) {
 			$mem    = $cacheArray['modules']['mem_only'][$mod_chk];
 
 			// Update cache hits
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+			if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 			$found = true;
 		} else {
 			// No, then we have to update it!
 			$ret = "cache_miss";
 		}
-	} else {
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Check for module in database
 		$result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
@@ -267,7 +267,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 
 	// Get the title from menu
 	$result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE %s='%s' ".$AND." LIMIT 1",
-	 array($ACC_LVL, $type, $search), __FILE__, __LINE__);
+		array($ACC_LVL, $type, $search), __FILE__, __LINE__);
 
 	// Menu found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -278,7 +278,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 		if ($return) {
 			// Return title
 			return $ret;
-		} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($_CONFIG['youre_here'] == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
+		} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
 			// Output HTML code
 			$OUT = $prefix."<STRONG><A class=\"you_are_here\" href=\"".URL."/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</A></STRONG>\n";
 
@@ -287,24 +287,13 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 			//* DEBUG: */ die("<pre>".print_r($_CONFIG, true)."</pre>");
 			if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
 				//* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
-				$OUT .= "</div>\n";
-
-				// Extension removeip activated?
-				if ((EXT_IS_ACTIVE("removeip")) && (isset($_CONFIG['removeip_'.strtolower($ACC_LVL).'_show'])) && ($_CONFIG['removeip_'.strtolower($ACC_LVL).'_show'] == "Y")) {
-					// Add anoymity/privacy infos
-					$OUT .= REMOVEIP_ADD_INFOS();
-				} // END - if
-
-				// Add line-break tag
-				$OUT .= "<br />\n";
+				// Add closing div and br-tag
+				$OUT .= "</div><br />\n";
 				$NAV_DEPTH = "0";
 
-				// Handle failed logins here if not in guest
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):type={$type},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$ACC_LVL}<br />\n";
-				if ((($type == "what") || ($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == $_CONFIG['index_home']))) && ($ACC_LVL != "guest") && ((GET_EXT_VERSION("sql_patches") >= "0.4.7") || (GET_EXT_VERSION("admins") >= "0.7.0"))) {
-					// Handle failture
-					$OUT .= HANDLE_LOGIN_FAILTURES($ACC_LVL);
-				} // END - if
+				// Run the filter chain
+				$ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
+				$OUT .= $ret['content'];
 			} // END - if
 		}
 	} // END - if
@@ -384,7 +373,7 @@ function ADD_MENU($MODE, $act, $wht) {
 					}
 
 					// Menu title
-					$content .= $_CONFIG['menu_blur_spacer'].$sub_title;
+					$content .= getConfig('menu_blur_spacer') . $sub_title;
 
 					if ($test) {
 						$content .= "</A>";
@@ -459,17 +448,17 @@ function IS_ADMIN($admin="")
 		$valPass = $cacheArray['admin_hash'];
 	} elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
 		// Count cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
 		// Login data is valid or not?
 		$valPass = generatePassString($cacheArray['admins']['password'][$admin]);
 
 		// Cache it away
 		$cacheArray['admin_hash'] = $valPass;
-	} elseif (!empty($admin)) {
+	} elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
 		// Search for admin
 		$result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-		 array($admin), __FILE__, __LINE__);
+			array($admin), __FILE__, __LINE__);
 
 		// Is he admin?
 		$passDB = "";
@@ -571,7 +560,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
 function SEARCH_EMAIL_USERTAB($email)
 {
 	$ret = false;
-	$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE email LIKE '{PER}%s{PER}' LIMIT 1", array($email), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE email LIKE '{PER}%s{PER}' LIMIT 1", array($email), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) $ret = true;
 	SQL_FREERESULT($result);
 	return $ret;
@@ -614,7 +603,7 @@ function IS_MEMBER()
 	if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime')) && (defined('COOKIE_PATH')))
 	{
 		// Cookies are set with values, but are they valid?
-		$result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 		 array($GLOBALS['userid']), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1)
 		{
@@ -667,52 +656,6 @@ function IS_MEMBER()
 	return $ret;
 }
 //
-function UPDATE_LOGIN_DATA () {
-	global $LAST, $_CONFIG;
-	if (!is_array($LAST)) $LAST = array();
-
-	// Recheck if logged in
-	if (!IS_MEMBER()) return false;
-
-	// Secure user ID
-	$GLOBALS['userid'] = bigintval(get_session('userid'));
-
-	// Extract last online time (life) and how long is auto-login valid (time)
-	$newl = time() + bigintval(get_session('lifetime'));
-
-	// Load last module and last online time
-	$result = SQL_QUERY_ESC("SELECT last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
-		// Load last module and online time
-		list($mod, $onl) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-
-		// Maybe first login time?
-		if (empty($mod)) $mod = "login";
-
-		if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", get_session('u_hash'), $newl, COOKIE_PATH) && set_session("lifetime", bigintval(get_session('lifetime')), $newl, COOKIE_PATH)) {
-			// This will be displayed on welcome page! :-)
-			if (empty($LAST['module'])) {
-				$LAST['module'] = $mod; $LAST['online'] = $onl;
-			} // END - if
-
-			// "what" not set?
-			if (empty($GLOBALS['what'])) {
-				// Fix it to default
-			 	$GLOBALS['what'] = "welcome";
-			 	if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home'];
-			} // END - if
-
-			// Update last module / online time
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
-			 array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
-		}
-	}  else {
-		// Destroy session, we cannot update!
-		destroy_user_session();
-	}
-}
-//
 function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
 {
 	$ret = false;
@@ -767,7 +710,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what")
 	// Fix empty "what"
 	if (empty($wht)) {
 		$wht = "welcome";
-		if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home'];
+		if (getConfig('index_home') != "") $wht = getConfig('index_home');
 	} // END - if
 
 	// Default is not found
@@ -793,7 +736,7 @@ function SEND_MODE_MAILS($mod, $modes)
 	global $_CONFIG, $DATA;
 
 	// Load hash
-	$result_main = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+	$result_main = SQL_QUERY_ESC("SELECT password FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
 		array($GLOBALS['userid']), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_main) == 1) {
 		// Load hash from database
@@ -806,7 +749,7 @@ function SEND_MODE_MAILS($mod, $modes)
 		$hash = generatePassString($hashDB);
 		if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
 			// Load user's data
-			$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND password='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND password='%s' LIMIT 1",
 				array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load the data
@@ -853,7 +796,7 @@ function SEND_MODE_MAILS($mod, $modes)
 					// Load template
 					$msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']);
 
-					if ($_CONFIG['admin_notify'] == "Y") {
+					if (getConfig('admin_notify') == "Y") {
 						// The admin needs to be notified about a profile change
 						$msg_admin = "admin_mydata_notify";
 						$sub_adm   = ADMIN_CHANGED_DATA;
@@ -899,7 +842,7 @@ function SEND_MODE_MAILS($mod, $modes)
 		if ((!empty($sub_adm)) && (!empty($msg_admin))) {
 			// Send admin mail
 			SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
-		} elseif ($_CONFIG['admin_notify'] == "Y") {
+		} elseif (getConfig('admin_notify') == "Y") {
 			// Cannot send mails to admin!
 			$content = CANNOT_SEND_ADMIN_MAILS;
 		} else {
@@ -929,7 +872,7 @@ function GET_ACTION ($MODE, &$wht)
 	//* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=<br />";
 	if ((empty($wht)) && ($MODE != "admin")) {
 		$wht = "welcome";
-		if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home'];
+		if (getConfig('index_home') != "") $wht = getConfig('index_home');
 	} // END - if
 
 	if ($MODE == "admin") {
@@ -945,7 +888,7 @@ function GET_ACTION ($MODE, &$wht)
 		// Get it directly from URL
 		return $GLOBALS['action'];
 	}
-	//* DEBUG: */ echo __LINE__."*".$ret."*<br />\n";
+	//* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
 
 	if (MODULE_HAS_MENU($MODE)) {
 		// Rewriting modules to menu
@@ -959,7 +902,7 @@ function GET_ACTION ($MODE, &$wht)
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT action FROM "._MYSQL_PREFIX."_%s_menu WHERE what='%s' LIMIT 1",
-		 array($MODE, $wht), __FILE__, __LINE__);
+			array($MODE, $wht), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			list($ret) = SQL_FETCHROW($result);
@@ -1129,9 +1072,9 @@ function GET_REF_LEVEL_PERCENTS ($level) {
 			$per = $cacheArray['ref_depths']['percents'][$key];
 
 			// Count cache hit
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+			if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 		}
-	} else {
+	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Get referal data
 		$result_lvl = SQL_QUERY_ESC("SELECT percents FROM "._MYSQL_PREFIX."_refdepths WHERE level='%s' LIMIT 1",
 			array(bigintval($level)), __FILE__, __LINE__);
@@ -1200,7 +1143,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 	if ($locked) $data = "locked_points";
 
 	// Check user account
-	$result_user = SQL_QUERY_ESC("SELECT refid, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+	$result_user = SQL_QUERY_ESC("SELECT refid, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
 	 array(bigintval($uid)), __FILE__, __LINE__);
 
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
@@ -1311,7 +1254,7 @@ function UPDATE_REF_COUNTER ($uid) {
 	} // END - if
 
 	// Check for his referal
-	$result = SQL_QUERY_ESC("SELECT refid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT refid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 		array(bigintval($uid)), __FILE__, __LINE__);
 
 	// Load refid
@@ -1340,75 +1283,7 @@ function UPDATE_REF_COUNTER ($uid) {
 		UPDATE_REFBACK_TABLE($uid);
 	} // END - if
 }
-// Updates/extends the online list
-function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) {
-	global $_CONFIG;
-
-	// Do not update online list when extension is deactivated
-	if (!EXT_IS_ACTIVE("online", true)) return;
-
-	// Empty session?
-	if (empty($SID)) {
-		// This is invalid here!
-		print "Invalid session. Backtrace:<pre>";
-		debug_print_backtrace();
-		die("</pre>");
-	} // END - if
-
-	// Initialize variables
-	$uid = 0; $rid = 0; $MEM = "N"; $ADMIN = "N";
-
-	// Valid userid?
-	if ((!empty($GLOBALS['userid'])) && ($GLOBALS['userid'] > 0) && (IS_MEMBER())) {
-		// Is valid user
-		$uid = bigintval($GLOBALS['userid']);
-		$MEM = "Y";
-	} // END - if
-
-	if (IS_ADMIN()) {
-		// Is administrator
-		$ADMIN = "Y";
-	} // END - if
-
-	if (isSessionVariableSet('refid')) {
-		// Check cookie
-		if (get_session('refid') > 0) $rid = bigintval($GLOBALS['refid']);
-	} // END - if
-
-	// Now search for the user
-	$result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_online
-WHERE sid='%s' LIMIT 1",
- array($SID), __FILE__, __LINE__);
-
-	// Entry found?
-	if (SQL_NUMROWS($result) == 1) {
-		// Then update it
-		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET
-module='%s',
-action='%s',
-what='%s',
-userid=%s,
-refid=%s,
-is_member='%s',
-is_admin='%s',
-timestamp=UNIX_TIMESTAMP()
-WHERE sid='%s' LIMIT 1",
-			array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID), __FILE__, __LINE__
-		);
-	} else {
-		// No entry does exists so we simply add it!
-		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
-			array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, GET_REMOTE_ADDR()), __FILE__, __LINE__
-		);
-	}
-
-	// Free result
-	SQL_FREERESULT($result);
 
-	// Purge old entries
-	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
-	 array($_CONFIG['online_timeout']), __FILE__, __LINE__);
-}
 // OBSOLETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS ($subj, $msg) {
 	// Load all admin email addresses
@@ -1423,16 +1298,17 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 
 	// Really simple... ;-)
 }
+
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
 	global $cacheArray, $_CONFIG;
 	$ret = "-1";
-	if (!empty($cacheArray['admins']['aid'][$login])) {
+	if (isset($cacheArray['admins']['aid'][$login])) {
 		// Check cache
 		$ret = $cacheArray['admins']['aid'][$login];
 
 		// Update cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
@@ -1446,18 +1322,30 @@ function GET_ADMIN_ID ($login) {
 	}
 	return $ret;
 }
-//
+
+// "Getter" for current admin id
+function GET_CURRENT_ADMIN_ID () {
+	// Get the admin login from session
+	$adminLogin = get_session('admin_login');
+
+	// "Solve" it into an id
+	$adminId = GET_ADMIN_ID($adminLogin);
+
+	// Secure and return it
+	return bigintval($adminId);
+}
+
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH ($aid)
 {
 	global $cacheArray, $_CONFIG;
 	$ret = "-1";
-	if (!empty($cacheArray['admins']['password'][$aid])) {
+	if (isset($cacheArray['admins']['password'][$aid])) {
 		// Check cache
 		$ret = $cacheArray['admins']['password'][$aid];
 
 		// Update cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1479,12 +1367,12 @@ function GET_ADMIN_HASH ($aid)
 function GET_ADMIN_LOGIN ($aid) {
 	global $cacheArray, $_CONFIG;
 	$ret = "***";
-	if (!empty($cacheArray['admins']['login'][$aid])) {
+	if (isset($cacheArray['admins']['login'][$aid])) {
 		// Get cache
 		$ret = $cacheArray['admins']['login'][$aid];
 
 		// Update cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1507,16 +1395,16 @@ function GET_ADMIN_EMAIL ($aid) {
 	global $cacheArray, $_CONFIG;
 
 	$ret = "***";
-	if (!empty($cacheArray['admins']['email'][$aid])) {
+	if (isset($cacheArray['admins']['email'][$aid])) {
 		// Get cache
 		$ret = $cacheArray['admins']['email'][$aid];
 
 		// Update cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
-			array(bigintval($ret)), __FILE__, __LINE__);
+			array(bigintval($aid)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Get data
 			list($ret) = SQL_FETCHROW($result_aid);
@@ -1537,12 +1425,12 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
 	global $cacheArray, $_CONFIG;
 
 	$ret = "***";
-	if (!empty($cacheArray['admins']['def_acl'][$aid])) {
+	if (isset($cacheArray['admins']['def_acl'][$aid])) {
 		// Use cache
 		$ret = $cacheArray['admins']['def_acl'][$aid];
 
 		// Update cache hits
-		if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+		if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Load from database
 		$result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
@@ -1607,8 +1495,8 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
 // Activate exchange (DEPERECATED???)
 function activateExchange() {
 	global $_CONFIG;
-	$result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) >= $_CONFIG['activate_xchange'])
+	$result = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) >= getConfig('activate_xchange'))
 	{
 		// Free memory
 		SQL_FREERESULT($result);
@@ -1616,8 +1504,8 @@ function activateExchange() {
 		// Activate System
 		$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."_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"
 		);
 
 		// Run SQLs
@@ -1634,7 +1522,7 @@ function DELETE_USER_ACCOUNT($uid, $reason)
 	$points = 0;
 	$result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON p.userid=d.userid
 WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
@@ -1670,7 +1558,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 	SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
 
 	// Ok, delete the account!
-	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 }
 //
 function META_DESCRIPTION ($mod, $wht) {
@@ -1679,7 +1567,7 @@ function META_DESCRIPTION ($mod, $wht) {
 	// Exclude admin and member's area
 	if (($mod != "admin") && ($mod != "login")) {
 		// Construct dynamic description
-		$DESCR = MAIN_TITLE." ".trim($_CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true);
+		$DESCR = MAIN_TITLE." ".trim(getConfig('title_middle'))." ".ADD_DESCR("guest", "what-".$wht, true);
 
 		// Output it directly
 		OUTPUT_HTML("<meta name=\"description\" content=\"".$DESCR."\" />");
@@ -1700,7 +1588,7 @@ function ADD_JACKPOT($points) {
 
 		// Update points
 		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",
-		 array($points), __FILE__, __LINE__);
+			array($points), __FILE__, __LINE__);
 	}
 }
 //
@@ -1748,9 +1636,9 @@ function LOAD_CONFIG ($no="0") {
 		if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
 			$CFG_DUMMY['cache_hits']++;
 		} // END - if
-	} else {
+	} elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
 		// Load config from DB
-		$result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",
+		$result_config = SQL_QUERY_ESC("SELECT * FROM `"._MYSQL_PREFIX."_config` WHERE config=%d LIMIT 1",
 			array(bigintval($no)), __FILE__, __LINE__);
 
 		// Get config from database
@@ -1781,7 +1669,7 @@ function GET_WHAT($modCheck) {
 	case "login":
 	case "index":
 		$wht = "welcome";
-		if (($modCheck == "index") && (!empty($_CONFIG['index_home']))) $wht = $_CONFIG['index_home'];
+		if (($modCheck == "index") && (getConfig('index_home') != "")) $wht = getConfig('index_home');
 		break;
 
 	default:
@@ -1792,53 +1680,11 @@ function GET_WHAT($modCheck) {
 	// Return what value
 	return $wht;
 }
-//
-function MODULE_HAS_MENU($mod, $forceDb = false) {
-	global $cacheArray, $_CONFIG;
-
-	// All is false by default
-	$ret = false;
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):mod={$mod},cache=".GET_EXT_VERSION("cache")."<br />\n";
-	if (GET_EXT_VERSION("cache") >= "0.1.2") {
-		// Cache version is okay, so let's check the cache!
-		if (isset($cacheArray['modules']['has_menu'][$mod])) {
-			// Check module cache and count hit
-			$ret = ($cacheArray['modules']['has_menu'][$mod] == "Y");
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-		} elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) {
-			// Check cache and count hit
-			$ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-		}
-	} elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
-		// Check database for entry
-		$result = SQL_QUERY_ESC("SELECT has_menu FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1",
-		 array($mod), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
-			list($has_menu) = SQL_FETCHROW($result);
-
-			// Fake cache... ;-)
-			$cacheArray['extensions']['ext_menu'][$mod] = $has_menu;
-
-			// Does it have a menu?
-			$ret = ($has_menu == "Y");
-		} // END  - if
-
-		// Free memory
-		SQL_FREERESULT($result);
-	} elseif (GET_EXT_VERSION("sql_patches") == "") {
-		// No sql_patches installed, so maybe in admin area?
-		$ret = ((IS_ADMIN()) && ($mod == "admin")); // Then there is a menu!
-	}
-
-	// Return status
-	return $ret;
-}
 
 // Subtract points from database and mediadata cache
 function SUB_POINTS ($subject, $uid, $points) {
 	// Add points to used points
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
 	 array($points, bigintval($uid)), __FILE__, __LINE__);
 
 	// Insert booking record
@@ -1899,7 +1745,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 
 	// Run database update
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
-	SQL_QUERY("UPDATE "._MYSQL_PREFIX."_config SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
+	SQL_QUERY("UPDATE `"._MYSQL_PREFIX."_config` SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
 
 	// Get affected rows
 	$affectedRows = SQL_AFFECTEDROWS();
@@ -1909,58 +1755,6 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 	REBUILD_CACHE("config", "config");
 }
 
-// Creates a new task for updated extension
-function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
-	// Check if task is not there
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE subject='%s' LIMIT 1",
-		array($subject), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 0) {
-		// Task not created so it's a brand-new extension which we need to register and create a task for!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",
-			array($admin_id, $subject, $notes), __FILE__, __LINE__);
-	} // END - if
-
-	// Free memory
-	SQL_FREERESULT($result);
-}
-
-// Creates a new task for newly installed extension
-function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
-	// Not installed and do we have created a task for the admin?
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
-		array($subject), __FILE__, __LINE__);
-	if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == "")) {
-		// Template file
-		$tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
-			PATH,
-			GET_LANGUAGE(),
-			$ext
-		);
-
-		// Load text for task
-		if (FILE_READABLE($tpl)) {
-			// Load extension's own text template (HTML!)
-			$msg = LOAD_TEMPLATE("ext_".$ext, true);
-		} else {
-			// Load default message
-			$msg = LOAD_TEMPLATE("admin_new_ext", "", 0);
-		}
-
-		// Task not created so it's a brand-new extension which we need to register and create a task for!
-		$result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
-			array(
-				$admin_id,
-				$subject,
-				SQL_ESCAPE($msg),
-			),  __FILE__, __LINE__, true, false
-		);
-	} // END - if
-
-	// Free memory
-	SQL_FREERESULT($result);
-}
-
 // Prepares an SQL statement part for HTML mail and/or holiday depency
 function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 	// Exclude no users by default
@@ -2155,12 +1949,12 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 
 	if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
 		// Only include HTML receivers
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
-		 array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], $receiver), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT d.userid FROM `"._MYSQL_PREFIX."_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+		 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
 	} else {
 		// Include all
-		$result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
-		 array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], $receiver), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT d.userid FROM `"._MYSQL_PREFIX."_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+		 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
 	}
 
 	// Entries found?
@@ -2256,7 +2050,7 @@ function GET_USER_REF_POINTS ($uid, $level) {
 FROM "._MYSQL_PREFIX."_user_refs AS ur
 LEFT JOIN "._MYSQL_PREFIX."_user_points AS up
 ON ur.refid=up.userid AND ur.level=0
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS ud
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS ud
 ON ur.refid=ud.userid
 WHERE ur.userid=%s AND ur.level=%s
 ORDER BY ur.refid ASC",
@@ -2285,7 +2079,7 @@ ORDER BY ur.refid ASC",
 			$row['activity'] = MEMBER_ACTIVITY_ACTIVE;
 
 			// Is autopurge installed and the user inactive?
-			if ((EXT_IS_ACTIVE("autopurge")) && ((time() - $_CONFIG['ap_inactive_since']) >= $row['last_online']))  {
+			if ((EXT_IS_ACTIVE("autopurge")) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
 				// Inactive user!
 				$row['activity'] = MEMBER_ACTIVITY_INACTIVE;
 			} // END - if