X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=3e3b5124a42578cab52ef822ddc9e665dc1ed86b;hp=9d357e6dadcc14ddd7c92c97547e75994b5b96de;hb=668485e1cdc24a6d918c41ea1f2214566ed71226;hpb=3b85bd5030ad591b0c5cb038ca534a7b50e1b319

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 9d357e6dad..3e3b5124a4 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -50,7 +50,7 @@ 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; }
+			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__);
@@ -105,7 +105,7 @@ 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") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module']))) {
+	if (GET_EXT_VERSION("cache") >= "0.1.2") {
 		// Is the module cached?
 		if (isset($cacheArray['modules']['locked'][$mod_chk])) {
 			// Check cache
@@ -115,7 +115,7 @@ 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!
@@ -132,37 +132,40 @@ function CHECK_MODULE ($mod) {
 		}
 	}
 
-	// Check returned values against current access permissions
-	//
-	//  Admin access            ----- Guest access -----           --- Guest   or   member? ---
-	if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_MEMBER())))) {
-		// If you are admin you are welcome for everything!
-		$ret = "done";
-	} elseif ($locked == "Y") {
-		// Module is locked
-		$ret = "locked";
-	} elseif (($mem == "Y") && (!IS_MEMBER())) {
-		// You have to login first!
-		$ret = "mem_only";
-	} elseif (($admin == "Y") && (!IS_ADMIN())) {
-		// Only the Admin is allowed to enter this module!
-		$ret = "admin_only";
-	}
+	// Is the module found?
+	if ($found) {
+		// Check returned values against current access permissions
+		//
+		//  Admin access            ----- Guest access -----           --- Guest   or   member? ---
+		if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_MEMBER())))) {
+			// If you are admin you are welcome for everything!
+			$ret = "done";
+		} elseif ($locked == "Y") {
+			// Module is locked
+			$ret = "locked";
+		} elseif (($mem == "Y") && (!IS_MEMBER())) {
+			// You have to login first!
+			$ret = "mem_only";
+		} elseif (($admin == "Y") && (!IS_ADMIN())) {
+			// Only the Admin is allowed to enter this module!
+			$ret = "admin_only";
+		}
+	} // END - if
 
 	// Still no luck or not found?
-	if (($ret == "major") || ($ret == "cache_miss") || (!$found)) {
+	if (($ret == "cache_miss") || (!$found)) {
 		//              ----- Legacy module -----                                   ---- Module in base folder  ----                       --- Module with extension's name ---
 		if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", PATH, $extension, $mod)))) {
 			// Data is missing so we add it
 			if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
 				// Since 0.3.6 we have a has_menu column, this took me a half hour
 				// to find a loop here... *sigh*
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
+				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
 ('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);
 			} else {
 				// Wrong/missing sql_patches!
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
+				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
 (module, locked, hidden, mem_only, admin_only) VALUES
 ('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);
 			}
@@ -182,7 +185,17 @@ function CHECK_MODULE ($mod) {
 			// Module not found we don't add it to the database
 			$ret = "404";
 		}
-	} // END - if
+	} elseif (!$found) {
+		// Problem with module detected
+		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s",
+			$mod,
+			$ret,
+			$locked,
+			$hidden,
+			$mem,
+			$admin
+		));
+	}
 
 	// Return the value
 	return $ret;
@@ -267,7 +280,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 +291,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 +300,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 +386,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,7 +461,7 @@ 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]);
@@ -667,88 +669,33 @@ 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;
 	$ADD = "";
 	if ((!IS_ADMIN()) && ($MODE != "admin")) $ADD = " AND locked='N'";
 	//* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
-	if (($MODE != "admin") && ($UPDATE))
-	{
+	if (($MODE != "admin") && ($UPDATE)) {
 		// Update guest or member menu
 		$SQL = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s_menu SET counter=counter+1 WHERE action='%s' AND what='%s'".$ADD." LIMIT 1",
-		 array($MODE, $act, $wht), __FILE__, __LINE__, false);
-	}
-	 elseif ($wht != "overview")
-	{
+			array($MODE, $act, $wht), __FILE__, __LINE__, false);
+	} elseif ($wht != "overview") {
 		// Other actions
 		$SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s'".$ADD." ORDER BY action DESC LIMIT 1",
-		 array($MODE, $act), __FILE__, __LINE__, false);
-	}
-	 else
-	{
+			array($MODE, $act), __FILE__, __LINE__, false);
+	} else {
 		// Admin login overview
 		$SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND (what='' OR what IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",
-		 array($MODE, $act), __FILE__, __LINE__, false);
+			array($MODE, $act), __FILE__, __LINE__, false);
 	}
 
 	// Run SQL command
 	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
-	if ($UPDATE)
-	{
+	if ($UPDATE) {
 		if (SQL_AFFECTEDROWS() == 1) $ret = true;
 		//* DEBUG: */ debug_print_backtrace();
-	}
-	 else
-	{
+	} else {
 		if (SQL_NUMROWS($result) == 1) {
-			list($id, $wht2) = SQL_FETCHROW($result);
 			//* DEBUG: */ echo __LINE__."+".$SQL."+<br />\n";
 			//* DEBUG: */ echo __LINE__."*".$id."/".$wht."/".$wht2."*<br />\n";
 			$ret = true;
@@ -767,7 +714,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
@@ -853,7 +800,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 +846,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 {
@@ -915,7 +862,7 @@ function SEND_MODE_MAILS($mod, $modes)
 function COUNT_MODULE($mod) {
 	if ($mod != "css") {
 		// Do count all other modules but not accesses on CSS file css.php!
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_mod_reg SET clicks=clicks+1 WHERE module='%s' LIMIT 1",
+		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_mod_reg SET clicks=clicks+1 WHERE module='%s' LIMIT 1",
 			array($mod), __FILE__, __LINE__);
 	} // END - if
 }
@@ -929,7 +876,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") {
@@ -1061,7 +1008,7 @@ function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fa
 			if (SQL_NUMROWS($result) == 0)
 			{
 				// No, so we add one!
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",
+				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",
 				 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
 				$ret = "done";
 			}
@@ -1129,7 +1076,7 @@ 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; }
 		}
 	} elseif (!EXT_IS_ACTIVE("cache")) {
 		// Get referal data
@@ -1164,7 +1111,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  */
 function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
 	//* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
-	global $DEPTH, $_CONFIG, $DATA, $cacheArray;
+	global $_CONFIG, $DATA, $cacheArray;
 
 	// Convert mode to lower-case
 	$add_mode = strtolower($add_mode);
@@ -1183,14 +1130,14 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 	} // END - if
 
 	// Count up referal depth
-	if (!isset($DEPTH)) {
+	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />\n";
-		$DEPTH = 0;
+		$GLOBALS['ref_level'] = 0;
 	} else {
 		// Increase referal level
-		$DEPTH++;
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$DEPTH}<br />\n";
+		$GLOBALS['ref_level']++;
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />\n";
 	}
 
 	// Default is "normal" points
@@ -1201,7 +1148,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
 	// Check user account
 	$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__);
+		array(bigintval($uid)), __FILE__, __LINE__);
 
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
 	if (SQL_NUMROWS($result_user) == 1) {
@@ -1210,32 +1157,33 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 		$cacheArray['add_uid'][$ref] = $uid;
 
 		// Get percents
-		$per = GET_REF_LEVEL_PERCENTS($DEPTH);
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},depth={$DEPTH},per={$per},mode={$add_mode}<br />\n";
+		$per = GET_REF_LEVEL_PERCENTS($GLOBALS['ref_level']);
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />\n";
 
 		// Some percents found?
 		if ($per > 0) {
 			// Calculate new points
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},per={$per},depth={$DEPTH}<br />\n";
+			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />\n";
 			$ref_points = $points * $per / 100;
 
 			// Pay refback here if level > 0 and in ref-mode
-			if ((EXT_IS_ACTIVE("refback")) && ($DEPTH > 0) && ($per < 100) && ($add_mode == "ref") && (isset($cacheArray['add_uid'][$uid]))) {
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$DEPTH} - BEFORE!<br />\n";
+			if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($cacheArray['add_uid'][$uid]))) {
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />\n";
 				$ref_points = ADD_REFBACK_POINTS($cacheArray['add_uid'][$uid], $uid, $points, $ref_points);
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$DEPTH} - AFTER!<br />\n";
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />\n";
 			} // END - if
 
 			// Update points...
 			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET %s=%s+%s WHERE userid=%s AND ref_depth='%s' LIMIT 1",
-			 array($data, $data, $ref_points, bigintval($uid), bigintval($DEPTH)), __FILE__, __LINE__);
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$DEPTH},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
+				array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __FILE__, __LINE__);
+			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 
 			// No entry updated?
 			if (SQL_AFFECTEDROWS() < 1) {
 				// First ref in this level! :-)
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid,ref_depth,%s) VALUES (%s,%s,%s)",
-				 array($data, bigintval($uid), bigintval($DEPTH), $ref_points), __FILE__, __LINE__);
+				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid,ref_depth,%s) VALUES (%s,'%s',%s)",
+					array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FILE__, __LINE__);
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />\n";
 			} // END - if
 
 			// Update mediadata as well
@@ -1249,7 +1197,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 				// Prepare content
 				$content = array(
 					'percent' => $per,
-					'level'   => bigintval($DEPTH),
+					'level'   => bigintval($GLOBALS['ref_level']),
 					'points'  => $ref_points,
 					'refid'   => bigintval($ref)
 				);
@@ -1280,7 +1228,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 			if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == "ref")) {
 				// Then let's credit him here...
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref},points={$points} - ADVANCE!<br />\n";
-				ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $DEPTH), $ref, $points, $send_notify, $ref, $locked);
+				ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $send_notify, $ref, $locked);
 			} // END - if
 		} // END - if
 	} // END - if
@@ -1298,14 +1246,14 @@ function UPDATE_REF_COUNTER ($uid) {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['ref_level'][$uid]}<br />\n";
 
 	// Update counter
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
+	SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
 		array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
 
 	// When no entry was updated then we have to create it here
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS()."<br />\n";
 	if (SQL_AFFECTEDROWS() < 1) {
 		// First count!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)",
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)",
 			array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
 	} // END - if
@@ -1340,75 +1288,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 +1303,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 +1327,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 +1372,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,17 +1400,17 @@ 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__);
-		if (SQL_NUMROWS($result) == 1) {
+			array(bigintval($aid)), __FILE__, __LINE__);
+		if (SQL_NUMROWS($result_aid) == 1) {
 			// Get data
 			list($ret) = SQL_FETCHROW($result_aid);
 
@@ -1537,12 +1430,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",
@@ -1606,13 +1499,10 @@ 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'])
-	{
-		// Free memory
-		SQL_FREERESULT($result);
+	// Check total amount of users
+	$totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND max_mails > 0");
 
+	if ($totalUsers >= getConfig('activate_xchange')) {
 		// Activate System
 		$SQLs = array(
 			"UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
@@ -1621,12 +1511,11 @@ function activateExchange() {
 		);
 
 		// Run SQLs
-		foreach ($SQLs as $sql) {
-			$result = SQL_QUERY($sql, __FILE__, __LINE__);
-		}
+		RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
 
-		// @TODO Destroy cache
-	}
+		// Rebuild cache
+		REBUILD_CACHE("config", "config");
+	} // END - if
 }
 //
 function DELETE_USER_ACCOUNT($uid, $reason)
@@ -1643,7 +1532,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 		SQL_FREERESULT($result);
 
 		// Delete points entries as well
-		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 
 		// Update mediadata as well
 		if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
@@ -1656,12 +1545,12 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
 	// Delete category selections as well...
-	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s",
+	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s",
 	 array(bigintval($uid)), __FILE__, __LINE__);
 
 	// Remove from rallye if found
 	if (EXT_IS_ACTIVE("rallye")) {
-		$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE userid=%s",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE userid=%s",
 		 array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
@@ -1670,36 +1559,36 @@ 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__);
+	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) {
-	global $_CONFIG, $DEPTH;
+	global $_CONFIG;
 
 	// 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."\" />");
 	} // END - if
 
 	// Remove depth
-	unset($DEPTH);
+	unset($GLOBALS['ref_level']);
 }
 //
 function ADD_JACKPOT($points) {
 	$result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Create line
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Update points
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",
+		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",
 			array($points), __FILE__, __LINE__);
 	}
 }
@@ -1781,7 +1670,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:
@@ -1793,60 +1682,10 @@ function GET_WHAT($modCheck) {
 	return $wht;
 }
 
-// Checks if the module has a menu
-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 ((IS_ADMIN()) && ($mod == "admin")) {
-			// Admin module has always a menu!
-			$ret = true;
-		}
-	} 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__);
-
-		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
-			// Load "has_menu" column
-			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
-	//* DEBUG: */ var_dump($ret);
-	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",
+	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
@@ -2043,7 +1882,7 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco
 		if ($mode == "html") $HTML = "Y";
 
 		// Add HTML mail
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
  array(
@@ -2060,7 +1899,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
 ), __FILE__, __LINE__);
 	} else {
 		// Add regular mail
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
  array(
@@ -2112,11 +1951,11 @@ 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__);
+		 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__);
+		 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
 	}
 
 	// Entries found?
@@ -2241,7 +2080,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