X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=102a3de242ca0f87ac1ffe51ce5cd1d5a58922cf;hp=302e9d2091f5477de43a17fa60ebe0bedd383968;hb=4e47eb8b83ed2fcd4320aeed8b8c460eb1c8fe4b;hpb=5071030af40e69ca4284642f44758964e18f5be8

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 302e9d2091..102a3de242 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -85,14 +85,14 @@ function getModuleTitle ($mod) {
 
 // "Getter" for module description
 function getModuleDescription ($mode, $wht, $column = 'what') {
-	// Fix empty "what"
+	// Fix empty 'what'
 	if (empty($wht)) {
-		$wht = "welcome";
+		$wht = 'welcome';
 		if (getConfig('index_home') != '') $wht = getConfig('index_home');
 	} // END - if
 
 	// Default is not found
-	$ret = "??? (".$wht.')';
+	$ret = '??? (' . $wht . ')';
 
 	// Look for title
 	$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
@@ -112,15 +112,15 @@ function getModuleDescription ($mode, $wht, $column = 'what') {
 // Check validity of a given module name (no file extension)
 function checkModulePermissions ($mod) {
 	// Filter module name (names with low chars and underlines are fine!)
-	$mod = preg_replace("/[^a-z_]/", '', $mod);
+	$mod = preg_replace('/[^a-z_]/', '', $mod);
 
 	// Check for prefix is a extension...
 	$modSplit = explode("_", $mod);
 	$extension = ''; $mod_chk = $mod;
-	//* DEBUG: */ echo __LINE__."*".count($modSplit)."*/".$mod."*<br />";
+	//* DEBUG: */ OUTPUT_HTML(__LINE__."*".count($modSplit)."*/".$mod."*<br />");
 	if (count($modSplit) == 2) {
 		// Okay, there is a seperator (_) in the name so is the first part a module?
-		//* DEBUG: */ echo __LINE__."*".$modSplit[0]."*<br />";
+		//* DEBUG: */ OUTPUT_HTML(__LINE__."*".$modSplit[0]."*<br />");
 		if (EXT_IS_ACTIVE($modSplit[0])) {
 			// The prefix is an extension's name, so let's set it
 			$extension = $modSplit[0]; $mod = $modSplit[1];
@@ -128,7 +128,7 @@ function checkModulePermissions ($mod) {
 	} // END - if
 
 	// Major error in module registry is the default
-	$ret = "major";
+	$ret = 'major';
 
 	// Check if script is installed if not return a 'done' to prevent some errors
 	if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
@@ -146,14 +146,16 @@ function checkModulePermissions ($mod) {
 	// Check if cache is latest version
 	if (GET_EXT_VERSION('cache') >= '0.1.2') {
 		// Is the cache there?
+		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using cache.');
 		if (!isset($GLOBALS['cache_array']['modules'])) {
-			// This should normally not happen...
-			debug_report_bug("Cache 'modules' is gone.");
+			// This happens when a new extension is registered while ext-cache is installed
+			$ret = 'cache_miss';
 		} // END - if
 
 		// Is the module cached?
 		if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
 			// Check cache
+			//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Cache found.');
 			$locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk];
 			$hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk];
 			$admin  = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk];
@@ -164,19 +166,27 @@ function checkModulePermissions ($mod) {
 			$found = true;
 		} else {
 			// No, then we have to update it!
-			$ret = "cache_miss";
+			$ret = 'cache_miss';
 		}
 	} 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), __FUNCTION__, __LINE__);
+		//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using 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), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Read data
+			//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Entry found.');
 			list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
 			$found = true;
+		} elseif (isDebugModeEnabled()) {
+			// Debug message only in debug-mode...
+			DEBUG_LOG(__FUNCTION__, __LINE__, 'Module ' . $mod_chk . ' not found!');
 		}
+
+		// Free result
+		SQL_FREERESULT($result);
 	}
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret);
 
 	// Is the module found?
 	if ($found === true) {
@@ -184,30 +194,33 @@ function checkModulePermissions ($mod) {
 		//
 		//  Admin access            ----- Guest access -----           --- Guest   or   member? ---
 		if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) {
+			// Count module
+			countModuleHit($mod_chk);
+
 			// If you are admin you are welcome for everything!
 			$ret = 'done';
 		} elseif ($locked == 'Y') {
 			// Module is locked
-			$ret = "locked";
+			$ret = 'locked';
 		} elseif (($mem == 'Y') && (!IS_MEMBER())) {
 			// You have to login first!
-			$ret = "mem_only";
+			$ret = 'mem_only';
 		} elseif (($admin == 'Y') && (!IS_ADMIN())) {
 			// Only the Admin is allowed to enter this module!
-			$ret = "admin_only";
+			$ret = 'admin_only';
 		} else {
 			// @TODO Nothing helped???
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
-			$ret,
-			$locked,
-			$admin,
-			$mem
+				$ret,
+				$locked,
+				$admin,
+				$mem
 			));
 		}
 	} // END - if
 
 	// Still no luck or not found?
-	if (($ret == "cache_miss") || (!$found)) {
+	if (($found === false) && (!EXT_IS_ACTIVE('cache')) && ($ret != 'done'))  {
 		//              ----- Legacy module -----                                               ---- Module in base folder  ----                       --- Module with extension's name ---
 		if ((isFileReadable(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
 			// Data is missing so we add it
@@ -215,23 +228,24 @@ function checkModulePermissions ($mod) {
 				// Since 0.3.6 we have a has_menu column, this took me a half hour
 				// to find a loop here... *sigh*
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
-(module, locked, hidden, mem_only, admin_only, has_menu) VALUES
+(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`) VALUES
 ('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
 			} else {
 				// Wrong/missing sql_patches!
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
-(module, locked, hidden, mem_only, admin_only) VALUES
+(`module`, `locked`, `hidden`, `mem_only`, `admin_only`) VALUES
 ('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
 			}
 
 			// Everthing is fine?
 			if (SQL_AFFECTEDROWS() < 1) {
 				// Something bad happend!
-				return "major";
+				return 'major';
 			} // END - if
 
 			// Destroy cache here
-			rebuildCacheFiles("modreg", "modreg");
+			// @TODO Rewrite this to a filter
+			rebuildCacheFiles('modreg', 'modreg');
 
 			// And reload data
 			$ret = checkModulePermissions($mod_chk);
@@ -239,24 +253,28 @@ function checkModulePermissions ($mod) {
 			// Module not found we don't add it to the database
 			$ret = '404';
 		}
-	} elseif (!$found) {
+	} elseif (($ret == 'cache_miss') && (getOutputMode() > -1)) {
+		// Rebuild the cache files
+		rebuildCacheFiles('modreg', 'modreg');
+	} elseif ($found === false) {
 		// 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
+			$mod,
+			$ret,
+			$locked,
+			$hidden,
+			$mem,
+			$admin
 		));
 	}
 
 	// Return the value
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret);
 	return $ret;
 }
 
 // Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+function ADD_DESCR ($accessLevel, $FQFN, $return = false, $output = true) {
 	// Use only filename of the FQFN...
 	$file = basename($FQFN);
 
@@ -266,11 +284,11 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 	$AND = '';
 
 	// First we have to do some analysis...
-	if (substr($file, 0, 7) == "action-") {
+	if (substr($file, 0, 7) == 'action-') {
 		// This is an action file!
-		$type = "action";
+		$type = 'action';
 		$search = substr($file, 7);
-		switch ($ACC_LVL) {
+		switch ($accessLevel) {
 			case 'admin':
 				$modCheck = 'admin';
 				break;
@@ -278,54 +296,55 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 			case 'sponsor':
 			case 'guest':
 			case 'member':
-				$modCheck = $GLOBALS['module'];
+				$modCheck = getModule();
 				break;
 		}
 		$AND = " AND (`what`='' OR `what` IS NULL)";
-	} elseif (substr($file, 0, 5) == "what-") {
+	} elseif (substr($file, 0, 5) == 'what-') {
 		// This is an admin what file!
-		$type = "what";
+		$type = 'what';
 		$search = substr($file, 5);
 		$AND = '';
-		switch ($ACC_LVL) {
+		switch ($accessLevel) {
 			case 'admin':
 				$modCheck = 'admin';
 				break;
 
 			case 'guest':
 			case 'member':
-				$modCheck = $GLOBALS['module'];
+				$modCheck = getModule();
 				if (!IS_ADMIN()) {
 					$AND = " AND `visible`='Y' AND `locked`='N'";
 				}
 				break;
 		}
+
 		$dummy = substr($search, 0, -4);
-		$AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'";
-	} elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
+		$AND .= " AND `action`='".getModeAction($accessLevel, $dummy)."'";
+	} elseif (($accessLevel == 'sponsor') || ($accessLevel == "engine")) {
 		// Sponsor / engine menu
-		$type     = "what";
+		$type     = 'what';
 		$search   = $file;
-		$modCheck = $GLOBALS['module'];
+		$modCheck = getModule();
 		$AND      = '';
 	} else {
 		// Other
-		$type     = "menu";
+		$type     = 'menu';
 		$search   = $file;
-		$modCheck = $GLOBALS['module'];
+		$modCheck = getModule();
 		$AND      = '';
 	}
 
 	// Begin the navigation line
 	if ((!isset($GLOBALS['nav_depth'])) && (!$return)) {
 		$GLOBALS['nav_depth'] = 0;
-		$prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</a></strong>";
+		$prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".getModule().$LINK_ADD."\">Home</a></strong>";
 	} else {
 		if (!$return) $GLOBALS['nav_depth']++;
 		$prefix = '';
 	}
 
-	$prefix .= "&nbsp;-&gt;&nbsp;";
+	$prefix .= '&nbsp;-&gt;&nbsp;';
 
 	// We need to remove .php and the end
 	if (substr($search, -4, 4) == '.php') {
@@ -335,7 +354,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $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), __FUNCTION__, __LINE__);
+	array($accessLevel, $type, $search), __FUNCTION__, __LINE__);
 
 	// Menu found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -348,18 +367,18 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 			return $ret;
 		} 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";
+			$OUT = $prefix . "<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=" . $modCheck . '&amp;' . $type . '=' . $search.$LINK_ADD . "\">" . $ret . "</a></strong>\n";
 
 			// Can we close the you-are-here navigation?
-			//* DEBUG: */ echo __LINE__."*".$type.'/'.$GLOBALS['what']."*<br />\n";
-			if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
-				//* DEBUG: */ echo __LINE__.'+'.$type."+<br />\n";
+			//* DEBUG: */ OUTPUT_HTML(__LINE__."*".$type.'/'.getWhat()."*<br />");
+			if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
+				//* DEBUG: */ OUTPUT_HTML(__LINE__.'+'.$type."+<br />");
 				// Add closing div and br-tag
 				$OUT .= "</div><br />\n";
 				$GLOBALS['nav_depth'] = '0';
 
 				// Run the filter chain
-				$ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
+				$ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
 				$OUT .= $ret['content'];
 			} // END - if
 		}
@@ -397,24 +416,24 @@ function ADD_MENU ($mode, $act, $wht) {
 	} // END - if
 
 	// Load SQL data and add the menu to the output stream...
-	$result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
-	array($mode), __FUNCTION__, __LINE__);
-	//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*<br />\n";
+	$result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort` ASC",
+		array($mode), __FUNCTION__, __LINE__);
+	//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.getWhat()."*<br />");
 	if (SQL_NUMROWS($result_main) > 0) {
 		OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$mode."_menu\">");
 		// There are menus available, so we simply display them... :)
 		while ($content = SQL_FETCHARRAY($result_main)) {
-			//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.$GLOBALS['what']."*<br />\n";
+			//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.getWhat()."*<br />");
 			// Init variables
-			$GLOBALS['block_mode'] = false;
+			enableBlockMode(false);
 			$act = $content['action'];
 
 			// Load menu header template
-			LOAD_TEMPLATE($mode."_menu_title", false, $content);
+			LOAD_TEMPLATE($mode . '_menu_title', false, $content);
 
 			// Sub menu
-			$result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
-			array($mode, $content['action']), __FUNCTION__, __LINE__);
+			$result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
+				array($mode, $content['action']), __FUNCTION__, __LINE__);
 
 			// Get number of rows
 			$ctl = SQL_NUMROWS($result_sub);
@@ -433,7 +452,7 @@ function ADD_MENU ($mode, $act, $wht) {
 					$OUT = '';
 
 					// Full file name for checking menu
-					//* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!<br />\n";
+					//* DEBUG: */ OUTPUT_HTML(__LINE__.":!!!!".$content['sub_what']."!!!<br />");
 					$INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
 					if (isIncludeReadable($INC)) {
 						if ((!empty($wht)) && (($wht == $content['sub_what']))) {
@@ -441,7 +460,7 @@ function ADD_MENU ($mode, $act, $wht) {
 						}
 
 						// Navigation link
-						$OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module']."&amp;what=".$content['sub_what']."\" target=\"_self\">";
+						$OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".getModule()."&amp;what=".$content['sub_what']."\" target=\"_self\">";
 					} else {
 						$OUT .= "<em>";
 					}
@@ -470,30 +489,32 @@ function ADD_MENU ($mode, $act, $wht) {
 
 					// Add regular menu row or bottom row?
 					if ($cnt < $ctl) {
-						LOAD_TEMPLATE($mode."_menu_row", false, $content);
+						LOAD_TEMPLATE($mode . '_menu_row', false, $content);
 					} else {
-						LOAD_TEMPLATE($mode."_menu_bottom", false, $content);
+						LOAD_TEMPLATE($mode . '_menu_bottom', false, $content);
 					}
 				}
 			} else {
 				// This is a menu block... ;-)
-				$GLOBALS['block_mode'] = true;
+				enableBlockMode();
+
+				// Load menu block
 				$INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
 				if (isFileReadable($INC_BLOCK)) {
 					// Load include file
 					if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("<tr>
 
   <td class=\"".$mode."_menu_whats\">");
-					//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+					//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
 					loadInclude($INC_BLOCK);
-					//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+					//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
 					if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("  </td>
 </tr>");
 				}
-				//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+				//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
 			}
 			$main_cnt++;
-			//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+			//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
 			if (SQL_NUMROWS($result_main) > $main_cnt) {
 				OUTPUT_HTML("<tr><td class=\"".$mode."_menu_seperator\"></td></tr>");
 			} // END - if
@@ -503,59 +524,63 @@ function ADD_MENU ($mode, $act, $wht) {
 		SQL_FREERESULT($result_main);
 
 		// Close table
-		//* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."*<br />");
 		OUTPUT_HTML("</table>");
-	}
+	} // END - if
 }
 
 // Checks wether the current user is a member
 function IS_MEMBER () {
-	// @TODO Why is this global??? #100
-	global $status;
-
-	if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
+	// By default no member
 	$ret = false;
 
+	// Fix missing 'last' array, damn stupid code :(((
+	// @TODO Try to rewrite this to one or more functions
+	if ((!isset($GLOBALS['last'])) || (!is_array($GLOBALS['last']))) $GLOBALS['last'] = array();
+
 	// is the cache entry there?
-	if (isset($GLOBALS['cache_array']['is_member'])) {
+	if (isset($GLOBALS['is_member'])) {
 		// Then return it
-		return $GLOBALS['cache_array']['is_member'];
+		return $GLOBALS['is_member'];
 	} // END - if
 
+	// Init global 'status'
+	$GLOBALS['status'] = false;
+
 	// Fix "deleted" cookies first
 	fixDeletedCookies(array('userid', 'u_hash'));
 
 	// Are cookies set?
 	if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 		// 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",
-		array(getUserId()), __FUNCTION__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `password`, `status`, `last_module`, `last_online` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+			array(getUserId()), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data from cookies
-			list($password, $status, $mod, $onl) = SQL_FETCHROW($result);
+			list($password, $GLOBALS['status'], $mod, $onl) = SQL_FETCHROW($result);
 
 			// Validate password by created the difference of it and the secret key
 			$valPass = generatePassString($password);
 
 			// Transfer last module and online time
 			if ((!empty($mod)) && (empty($GLOBALS['last']['module']))) {
+				// @TODO Try to rewrite this to one or more functions
 				$GLOBALS['last']['module'] = $mod;
 				$GLOBALS['last']['online'] = $onl;
 			} // END - if
 
 			// So did we now have valid data and an unlocked user?
-			//* DEBUG: */ echo $valPass."<br />".getSession('u_hash')."<br />";
-			if (($status == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
+			if (($GLOBALS['status'] == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
 				// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
 				$ret = true;
 			} else {
 				// Maybe got locked etc.
-				//* DEBUG: */ echo __LINE__."!!!<br />";
+				//* DEBUG: */ OUTPUT_HTML(__LINE__."!!!<br />");
 				destroyUserSession();
 			}
 		} else {
 			// Cookie data is invalid!
-			//* DEBUG: */ echo __LINE__."***<br />";
+			//* DEBUG: */ OUTPUT_HTML(__LINE__."***<br />");
 			destroyUserSession();
 		}
 
@@ -563,12 +588,12 @@ function IS_MEMBER () {
 		SQL_FREERESULT($result);
 	} else {
 		// Cookie data is invalid!
-		//* DEBUG: */ echo __LINE__."///<br />";
+		//* DEBUG: */ OUTPUT_HTML(__LINE__."///<br />");
 		destroyUserSession();
 	}
 
 	// Cache status
-	$GLOBALS['cache_array']['is_member'] = $ret;
+	$GLOBALS['is_member'] = $ret;
 
 	// Return status
 	return $ret;
@@ -578,7 +603,7 @@ function IS_MEMBER () {
 function IS_ADMIN ($admin = '') {
 	// Init variables
 	$ret = false; $passCookie = ''; $valPass = '';
-	//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
+	//* DEBUG: */ OUTPUT_HTML(__LINE__."ADMIN:".$admin."<br />");
 
 	// If admin login is not given take current from cookies...
 	if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
@@ -586,7 +611,7 @@ function IS_ADMIN ($admin = '') {
 		$admin = getSession('admin_login');
 		$passCookie = getSession('admin_md5');
 	}
-	//* DEBUG: */ echo __LINE__."ADMIN:".$admin.'/'.$passCookie."<br />";
+	//* DEBUG: */ OUTPUT_HTML(__LINE__."ADMIN:".$admin.'/'.$passCookie."<br />");
 
 	// Search in array for entry
 	if (isset($GLOBALS['cache_array']['admin_hash'])) {
@@ -625,12 +650,12 @@ function IS_ADMIN ($admin = '') {
 
 	if (!empty($valPass)) {
 		// Check if password is valid
-		//* DEBUG: */ print __FUNCTION__."*".$valPass.'/'.$passCookie."*<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."*".$valPass.'/'.$passCookie."*<br />");
 		$ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache'))));
-	}
+	} // END - if
 
 	// Return result of comparision
-	//* DEBUG: */ if (!$ret) echo __LINE__."OK!<br />";
+	//* DEBUG: */ if (!$ret) OUTPUT_HTML(__LINE__."OK!<br />");
 	return $ret;
 }
 
@@ -670,10 +695,10 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 		define('__MAX_RECEIVE_OPTIONS', $OUT);
 
 		// Load template
-		$OUT = LOAD_TEMPLATE($mode."_receive_table", true);
+		$OUT = LOAD_TEMPLATE($mode . '_receive_table', true);
 	} else {
 		// Maybe the admin has to setup some maximum values?
-		debug_report_bug("Nothing is being done here?");
+		debug_report_bug('Nothing is being done here?');
 	}
 
 	// Free result
@@ -722,19 +747,19 @@ function isMenuActionValid ($mode, $act, $wht, $UPDATE=false) {
 	$add = '';
 	if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-	//* DEBUG: */ echo __LINE__.':'.$mode.'/'.$act.'/'.$wht."*<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__LINE__.':'.$mode.'/'.$act.'/'.$wht."*<br />");
 	if (($mode != 'admin') && ($UPDATE === true)) {
 		// 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), __FUNCTION__, __LINE__, false);
-	} elseif (($wht != "overview") && (!empty($wht))) {
+			array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
+	} elseif (($wht != 'overview') && (!empty($wht))) {
 		// Other actions
-		$sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY action DESC LIMIT 1",
-		array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
+		$sql = SQL_QUERY_ESC("SELECT `id`, `what` FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY `action` DESC LIMIT 1",
+			array($mode, $act, $wht), __FUNCTION__, __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), __FUNCTION__, __LINE__, false);
+		$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), __FUNCTION__, __LINE__, false);
 	}
 
 	// Run SQL command
@@ -762,8 +787,8 @@ function sendModeMails ($mod, $modes) {
 	global $DATA;
 
 	// Load hash
-	$result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-	array(getUserId()), __FUNCTION__, __LINE__);
+	$result_main = SQL_QUERY_ESC("SELECT `password` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+		array(getUserId()), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_main) == 1) {
 		// Load hash from database
 		list($hashDB) = SQL_FETCHROW($result_main);
@@ -775,7 +800,7 @@ function sendModeMails ($mod, $modes) {
 		$hash = generatePassString($hashDB);
 		if (($hash == getSession('u_hash')) || (REQUEST_POST('pass1') == REQUEST_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(getUserId(), $hashDB), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load the data
@@ -819,16 +844,19 @@ function sendModeMails ($mod, $modes) {
 							$DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
 						} // END - if
 
+						// Merge content with data from POST
+						$content = merge_array($content, REQUEST_POST_ARRAY());
+
 						// Load template
-						$msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, getUserId());
+						$message = LOAD_EMAIL_TEMPLATE('member_mydata_notify', $content, getUserId());
 
 						if (getConfig('admin_notify') == 'Y') {
 							// The admin needs to be notified about a profile change
-							$msg_admin = "admin_mydata_notify";
+							$message_admin = 'admin_mydata_notify';
 							$sub_adm   = getMessage('ADMIN_CHANGED_DATA');
 						} else {
 							// No mail to admin
-							$msg_admin = '';
+							$message_admin = '';
 							$sub_adm   = '';
 						}
 
@@ -839,10 +867,10 @@ function sendModeMails ($mod, $modes) {
 						$content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
 						break;
 
-								default:
-									DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-									$content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
-									break;
+					default: // Unsupported module!
+						DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
+						$content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
+						break;
 				} // END - switch
 			} else {
 				// Could not load profile data
@@ -858,16 +886,16 @@ function sendModeMails ($mod, $modes) {
 	}
 
 	// Send email to user if required
-	if ((!empty($sub_mem)) && (!empty($msg))) {
+	if ((!empty($sub_mem)) && (!empty($message))) {
 		// Send member mail
-		sendEmail($DATA[7], $sub_mem, $msg);
+		sendEmail($DATA[7], $sub_mem, $message);
 	} // END - if
 
 	// Send only if no other error has occured
 	if (empty($content)) {
-		if ((!empty($sub_adm)) && (!empty($msg_admin))) {
+		if ((!empty($sub_adm)) && (!empty($message_admin))) {
 			// Send admin mail
-			sendAdminNotification($sub_adm, $msg_admin, $content, getUserId());
+			sendAdminNotification($sub_adm, $message_admin, $content, getUserId());
 		} elseif (getConfig('admin_notify') == 'Y') {
 			// Cannot send mails to admin!
 			$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
@@ -883,21 +911,19 @@ function sendModeMails ($mod, $modes) {
 
 // Update module counter
 function countModuleHit($mod) {
-	if ($mod != "css") {
-		// Do count all other modules but not accesses on CSS file css.php!
-		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET clicks=clicks+1 WHERE `module`='%s' LIMIT 1",
+	// Do count all other modules but not accesses on CSS file css.php!
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1",
 		array($mod), __FUNCTION__, __LINE__);
-	} // END - if
 }
 
 // Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, &$wht) {
+function getModeAction ($mode, $wht) {
 	// Init status
 	$ret = '';
 
-	//* DEBUG: */ echo __LINE__.'='.$mode.'/'.$wht.'/'.$GLOBALS['action']."=<br />";
+	//* DEBUG: */ OUTPUT_HTML(__LINE__.'='.$mode.'/'.$wht.'/'.getAction()."=<br />");
 	if ((empty($wht)) && ($mode != 'admin')) {
-		$wht = "welcome";
+		$wht = 'welcome';
 		if (getConfig('index_home') != '') $wht = getConfig('index_home');
 	} // END - if
 
@@ -906,29 +932,29 @@ function getModeAction ($mode, &$wht) {
 		if (REQUEST_ISSET_GET('action')) {
 			// Use from request!
 			return REQUEST_GET('action');
-		} elseif (!empty($GLOBALS['action'])) {
+		} elseif (isActionSet()) {
 			// Get it directly from URL
-			return $GLOBALS['action'];
-		} elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
+			return getAction();
+		} elseif (($wht == 'overview') || (!isWhatSet())) {
 			// Default value for admin area
-			$ret = "login";
+			$ret = 'login';
 		}
-	} elseif (!empty($GLOBALS['action'])) {
+	} elseif (isActionSet()) {
 		// Get it directly from URL
-		return $GLOBALS['action'];
+		return getAction();
 	}
-	//* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />");
 
 	// Does the module have a menu?
 	if (MODULE_HAS_MENU($mode)) {
 		// Rewriting modules to menu
 		switch ($mode) {
 			case 'index': $mode = 'guest';  break;
-			case "login": $mode = 'member'; break;
+			case 'login': $mode = 'member'; break;
 		} // END - switch
 
-		// Guest and member menu is "main" as the default
-		if (empty($ret)) $ret = "main";
+		// Guest and member menu is 'main' as the default
+		if (empty($ret)) $ret = 'main';
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
@@ -1029,7 +1055,7 @@ function getPaymentPoints ($pid, $lookFor = 'price') {
 }
 
 // Remove a receiver's ID from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus=false) {
+function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id = '', $bonus = false) {
 	// Default is not removed
 	$ret = 'failed';
 
@@ -1046,13 +1072,13 @@ function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus
 
 			// Try to look the entry up
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE %s='%s' AND `userid`=%s AND link_type='%s' LIMIT 1",
-			array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+				array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
 
 			// Was it *not* found?
 			if (SQL_NUMROWS($result) == 0) {
 				// So we add one!
-				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_links` (%s, userid, link_type) VALUES ('%s','%s','%s')",
-				array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_links` (`%s`, `userid`, `link_type`) VALUES ('%s','%s','%s')",
+					array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
 				$ret = 'done';
 			} else {
 				// Already found
@@ -1071,28 +1097,28 @@ function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus
 // Calculate sum (default) or count records of given criteria
 function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
 	$ret = 0;
-	//* DEBUG: */ echo $search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />\n';
+	//* DEBUG: */ OUTPUT_HTML($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />');
 	if ((empty($search)) && ($search != '0')) {
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
 			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
-			array($lookFor, $tableName), __FUNCTION__, __LINE__);
+				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
 			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
-			array($lookFor, $tableName), __FUNCTION__, __LINE__);
+				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		}
 	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
-		//* DEBUG: */ echo "COUNT!<br />\n";
+		//* DEBUG: */ OUTPUT_HTML("COUNT!<br />");
 		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
-		array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	} else {
 		// Add all rows
-		//* DEBUG: */ echo "SUM!<br />\n";
+		//* DEBUG: */ OUTPUT_HTML("SUM!<br />");
 		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
-		array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	}
 
 	// Load row
@@ -1162,7 +1188,7 @@ function getReferalLevelPercents ($level) {
  *               for default value will cause no referal will get points ever!!!)
  */
 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";
+	//* DEBUG: */ OUTPUT_HTML("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
 	global $DATA;
 
 	// Convert mode to lower-case
@@ -1184,12 +1210,12 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 	// Count up referal depth
 	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />");
 		$GLOBALS['ref_level'] = 0;
 	} else {
 		// Increase referal level
 		$GLOBALS['ref_level']++;
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal level increased. DEPTH={$GLOBALS['ref_level']}<br />");
 	}
 
 	// Default is 'normal' points
@@ -1199,10 +1225,10 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 	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",
-	array(bigintval($uid)), __FUNCTION__, __LINE__);
+	$result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+		array(bigintval($uid)), __FUNCTION__, __LINE__);
 
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />");
 	if (SQL_NUMROWS($result_user) == 1) {
 		// This is the user and his ref
 		list($ref, $email) = SQL_FETCHROW($result_user);
@@ -1210,32 +1236,32 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 
 		// Get percents
 		$per = getReferalLevelPercents($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";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}<br />");
 
 		// Some percents found?
 		if ($per > 0) {
 			// Calculate new points
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />\n";
+			//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},points={$points},per={$per},depth={$GLOBALS['ref_level']}<br />");
 			$ref_points = $points * $per / 100;
 
 			// Pay refback here if level > 0 and in ref-mode
 			if ((EXT_IS_ACTIVE('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />\n";
+				//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!<br />");
 				$ref_points = ADD_REFBACK_POINTS($GLOBALS['cache_array']['add_uid'][$uid], $uid, $points, $ref_points);
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />\n";
+				//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!<br />");
 			} // 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",
+			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($GLOBALS['ref_level'])), __FUNCTION__, __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";
+			//* DEBUG: */ OUTPUT_HTML(__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 />");
 
 			// No entry updated?
 			if (SQL_AFFECTEDROWS() < 1) {
 				// First ref in this level! :-)
 				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), __FUNCTION__, __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";
+				//* DEBUG: */ OUTPUT_HTML(__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 />");
 			} // END - if
 
 			// Update mediadata as well
@@ -1255,9 +1281,9 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 				);
 
 				// Load email template
-				$msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
+				$message = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
 
-				sendEmail($email, THANX_REFERRAL_ONE, $msg);
+				sendEmail($email, THANX_REFERRAL_ONE, $message);
 			} elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == 'direct') && (!defined('__POINTS_VALUE'))) {
 				// Direct payment shall be notified about
 				define('__POINTS_VALUE', $ref_points);
@@ -1269,17 +1295,17 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 				);
 
 				// Load message
-				$msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
+				$message = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
 
 				// And sent it away
-				sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
-				if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+				sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+				if (!REQUEST_ISSET_GET('mid')) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
 			}
 
 			// Maybe there's another ref?
 			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";
+				//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref},points={$points} - ADVANCE!<br />");
 				ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $send_notify, $ref, $locked);
 			} // END - if
 		} // END - if
@@ -1287,7 +1313,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
 
 	// Free result
 	SQL_FREERESULT($result_user);
-	//* DEBUG: */ print "</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />\n";
+	//* DEBUG: */ OUTPUT_HTML("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
 }
 
 // Wrapper function for ADD_POINTS_REFSYSTEM()
@@ -1299,40 +1325,40 @@ function ADD_POINTS_REFSYSTEM_DIRECT ($subject, $uid, $points) {
 function updateReferalCounter ($uid) {
 	// Make it sure referal level zero (member him-/herself) is at least selected
 	if (empty($GLOBALS['cache_array']['ref_level'][$uid])) $GLOBALS['cache_array']['ref_level'][$uid] = 1;
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$GLOBALS['cache_array']['ref_level'][$uid]}<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$GLOBALS['cache_array']['ref_level'][$uid]}<br />");
 
 	// Update counter
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
-	array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
+		array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __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";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS()."<br />");
 	if (SQL_AFFECTEDROWS() < 1) {
 		// First count!
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (userid, level, counter) VALUES (%s,%s,1)",
-		array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
+			array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />");
 	} // END - if
 
 	// Check for his referal
-	$result = SQL_QUERY_ESC("SELECT refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-	array(bigintval($uid)), __FUNCTION__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `refid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+		array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 	// Load refid
 	list($ref) = SQL_FETCHROW($result);
 
 	// Free memory
 	SQL_FREERESULT($result);
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref}<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},ref={$ref}<br />");
 
 	// When he has a referal...
 	if (($ref > 0) && ($ref != $uid)) {
 		// Move to next referal level and count his counter one up!
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />");
 		$GLOBALS['cache_array']['ref_level'][$uid]++; updateReferalCounter($ref);
 	} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION('cache') >= '0.1.2')) {
 		// Remove cache here
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />\n";
+		//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />");
 		rebuildCacheFiles('refsystem', 'refsystem');
 	}
 
@@ -1347,12 +1373,12 @@ function updateReferalCounter ($uid) {
 
 // Sends out mail to all administrators. This function is no longer obsolete
 // because we need it when there is no ext-admins installed
-function SEND_ADMIN_EMAILS ($subj, $msg) {
+function SEND_ADMIN_EMAILS ($subj, $message) {
 	// Load all admin email addresses
-	$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY("SELECT `email` FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Send the email out
-		sendEmail($content['email'], $subj, $msg);
+		sendEmail($content['email'], $subj, $message);
 	} // END - if
 
 	// Free result
@@ -1608,7 +1634,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 		list($points) = SQL_FETCHROW($result);
 
 		// Delete points entries as well
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE `userid`=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 
 		// Update mediadata as well
 		if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
@@ -1624,21 +1650,21 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 	SQL_FREERESULT($result);
 
 	// Delete category selections as well...
-	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)), __FUNCTION__, __LINE__);
 
 	// Remove from rallye if found
 	if (EXT_IS_ACTIVE('rallye')) {
-		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)), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Now a mail to the user and that's all...
-	$msg = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
-	sendEmail($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
+	$message = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
+	sendEmail($uid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
 
 	// Ok, delete the account!
-	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
+	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 }
 
 // Generates meta description for given module and 'what' value
@@ -1656,20 +1682,37 @@ function generateMetaDescriptionCode ($mod, $wht) {
 	unset($GLOBALS['ref_level']);
 }
 
-// Adds points to the jackpot
-function ADD_JACKPOT ($points) {
-	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
+function GET_JACKPOT_POINTS () {
+	// Default is zero
+	$jackpot = '0.00000';
+
+	// Read them
+	$result = SQL_QUERY("SELECT `points` FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE `ok`='ok' LIMIT 1", __FUNCTION__, __LINE__);
+
+	// Do we have an entry?
 	if (SQL_NUMROWS($result) == 0) {
-		// Create line
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok','%s')", array($points), __FUNCTION__, __LINE__);
+		// No, so create line
+		SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (`ok`, `points`) VALUES ('ok','0.00000')", __FUNCTION__, __LINE__);
 	} else {
-		// Free memory
-		SQL_FREERESULT($result);
+		// Read the line
+		list($jackpot) = SQL_FETCHROW($result);
+	}
+
+	// Free result
+	SQL_FREERESULT($result);
 
-		// Update points
-		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points+%s WHERE ok='ok' LIMIT 1",
+	// Return them
+	return $jackpot;
+}
+
+// Adds points to the jackpot
+function ADD_JACKPOT ($points) {
+	// Get jackpot points for dummy
+	$jackpot = GET_JACKPOT_POINTS();
+
+	// Update points
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET `points`=`points`+%s WHERE `ok`='ok' LIMIT 1",
 		array($points), __FUNCTION__, __LINE__);
-	}
 }
 
 // Subtracts points from the jackpot
@@ -1677,24 +1720,22 @@ function SUB_JACKPOT ($points) {
 	// First failed
 	$ret = '-1';
 
-	// Get current points
-	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result) == 0) {
-		// Create line
-		SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FUNCTION__, __LINE__);
-	} else {
-		// Read points
-		list($jackpot) = SQL_FETCHROW($result);
-		if ($jackpot >= $points) {
-			// Update points when there are enougth points in jackpot
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points-%s WHERE ok='ok' LIMIT 1",
+	// Get jackpot points for dummy
+	$jackpot = GET_JACKPOT_POINTS();
+
+	// Enougth points i jackpot?
+	if ($jackpot >= $points) {
+		// Update points when there are enougth points in jackpot
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET `points`=`points`-%s WHERE `ok`='ok' LIMIT 1",
 			array($points), __FUNCTION__, __LINE__);
-			$ret = $jackpot - $points;
-		} // END - if
-	}
+		$ret = $jackpot - $points;
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result);
+
+	// Return the result
+	return $ret;
 }
 
 // Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
@@ -1710,10 +1751,11 @@ function getWhatFromModule ($modCheck) {
 		return REQUEST_GET('what');
 	} // END - if
 
+	// Default is empty
 	$wht = '';
-	//* DEBUG: */ echo __LINE__.'!'.$modCheck."!<br />\n";
-	switch ($modCheck)
-	{
+
+	//* DEBUG: */ OUTPUT_HTML(__LINE__.'!'.$modCheck."!<br />");
+	switch ($modCheck) {
 		case 'admin':
 			$wht = 'overview';
 			break;
@@ -1727,7 +1769,7 @@ function getWhatFromModule ($modCheck) {
 		default:
 			$wht = '';
 			break;
-	}
+	} // END - switch
 
 	// Return what value
 	return $wht;
@@ -1736,10 +1778,11 @@ function getWhatFromModule ($modCheck) {
 // Subtract points from database and mediadata cache
 function SUB_POINTS ($subject, $uid, $points) {
 	// Add points to used points
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
-	array($points, bigintval($uid)), __FUNCTION__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1",
+		array($points, bigintval($uid)), __FUNCTION__, __LINE__);
 
 	// Insert booking record
+	// @TODO Rewrite this to a filter
 	if (EXT_IS_ACTIVE('booking')) {
 		// Add record
 		ADD_BOOKING_RECORD($subject, $uid, $points, 'sub');
@@ -1755,7 +1798,7 @@ function SUB_POINTS ($subject, $uid, $points) {
 // Update config entries
 function updateConfiguration ($entries, $values, $updateMode='') {
 	// Do not update config in CSS mode
-	if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
+	if ((getOutputMode() == '1') || (getOutputMode() == -1)) {
 		return;
 	} // END - if
 
@@ -1768,18 +1811,18 @@ function updateConfiguration ($entries, $values, $updateMode='') {
 			if (!empty($updateMode)) {
 				// Update entry
 				// @TODO Find a way for updating $_CONFIG here
-				$all .= sprintf("%s=%s%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
+				$all .= sprintf("`%s`=%s%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
 			} else {
 				// Check if string or number
 				if (($values[$idx] + 0) === $values[$idx]) {
 					// Number detected
-					$all .= sprintf("%s=%s,", $entry, (float)$values[$idx]);
+					$all .= sprintf("`%s`=%s,", $entry, (float)$values[$idx]);
 				} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
 					// Function UNIX_TIMESTAMP() detected
-					$all .= sprintf("%s=%s,", $entry, $values[$idx]);
+					$all .= sprintf("`%s`=%s,", $entry, $values[$idx]);
 				} else {
 					// String detected
-					$all .= sprintf("%s='%s',", $entry, SQL_ESCAPE($values[$idx]));
+					$all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx]));
 				}
 			}
 
@@ -1803,11 +1846,11 @@ function updateConfiguration ($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", __FUNCTION__, __LINE__);
+	SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE `config`=0 LIMIT 1", __FUNCTION__, __LINE__);
 
 	// Get affected rows
 	$affectedRows = SQL_AFFECTEDROWS();
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />\n";
+	//* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />");
 
 	// Rebuild cache
 	rebuildCacheFiles('config', 'config');
@@ -1833,9 +1876,12 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 // "Getter" for total available receivers
 function getTotalReceivers ($mode='normal') {
 	// Query database
-	$result_all = SQL_QUERY("SELECT userid
-FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
+	$result_all = SQL_QUERY("SELECT
+	`userid`
+FROM
+	`{!_MYSQL_PREFIX!}_user_data`
+WHERE
+	`status`='CONFIRMED' AND `receive_mails` > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
 	__FUNCTION__, __LINE__);
 
 	// Get num rows
@@ -1871,16 +1917,21 @@ function generateCategoryOptionsList ($mode) {
 			$CATS['name'][] = $content['cat'];
 
 			// Check which users are in this category
-			$result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
-			array(bigintval($content['id'])), __FUNCTION__, __LINE__);
+			$result_uids = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE `cat_id`=%s",
+				array(bigintval($content['id'])), __FUNCTION__, __LINE__);
 
 			// Start adding all
 			$uid_cnt = 0;
 			// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 			while (list($ucat) = SQL_FETCHROW($result_uids)) {
-				$result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
-				array(bigintval($ucat)), __FUNCTION__, __LINE__);
+				$result_ver = SQL_QUERY_ESC("SELECT
+	`userid`
+FROM
+	`{!_MYSQL_PREFIX!}_user_data`
+WHERE
+	`userid`=%s AND `status`='CONFIRMED' AND `receive_mails` > 0".PREPARE_SQL_HTML_HOLIDAY($mode)."
+LIMIT 1",
+					array(bigintval($ucat)), __FUNCTION__, __LINE__);
 
 				// Add user count
 				$uid_cnt += SQL_NUMROWS($result_ver);
@@ -1944,35 +1995,35 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 
 		// Add HTML mail
 		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)
+(`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(
-		$subject,
-		$text,
-		$receiverList,
-		$points,
-		$seconds,
-		$url,
-		$cat,
-		$target,
-		bigintval($receiver),
-		$HTML
+			$subject,
+			$text,
+			$receiverList,
+			$points,
+			$seconds,
+			$url,
+			$cat,
+			$target,
+			bigintval($receiver),
+			$HTML
 		), __FUNCTION__, __LINE__);
 	} else {
 		// Add regular mail
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
+(`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(
-		$subject,
-		$text,
-		$receiverList,
-		$points,
-		$seconds,
-		$url,
-		$cat,
-		$target,
-		bigintval($receiver),
+			$subject,
+			$text,
+			$receiverList,
+			$points,
+			$seconds,
+			$url,
+			$cat,
+			$target,
+			bigintval($receiver),
 		), __FUNCTION__, __LINE__);
 	}
 }
@@ -2054,11 +2105,18 @@ function getTimestampFromUserStats ($type, $data, $uid = 0) {
 	} // END - if
 
 	// Try to find the entry
-	$result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`inserted`) AS `stamp`
-FROM `{!_MYSQL_PREFIX!}_user_stats_data`
-WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
+	$result = SQL_QUERY_ESC("SELECT
+	UNIX_TIMESTAMP(`inserted`) AS stamp
+FROM
+	`{!_MYSQL_PREFIX!}_user_stats_data`
+WHERE
+	`userid`=%s AND `stats_type`='%s' AND `stats_data`='%s'
 LIMIT 1",
-	array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
+		array(
+			bigintval($uid),
+			$type,
+			$data
+		), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
 	if (SQL_NUMROWS($result) == 1) {
@@ -2085,16 +2143,16 @@ function insertUserStatsRecord ($uid, $type, $data) {
 	if ((!getTimestampFromUserStats($type, $data, $uid)) && (!is_array($data))) {
 		// Then insert it!
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
-		array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
+			array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
 	} elseif (is_array($data)) {
 		// Invalid data!
-		DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
+		DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
 	}
 }
 
 // "Getter" for array for user refs and points in given level
 function getUserReferalPoints ($uid, $level) {
-	//* DEBUG: */ print "----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n";
+	//* DEBUG: */ OUTPUT_HTML("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
 	// Default is no refs and no nickname
 	$add = '';
 	$refs = array();
@@ -2105,15 +2163,25 @@ function getUserReferalPoints ($uid, $level) {
 	} // END - if
 
 	// Get refs from database
-	$result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$add."
-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
-ON ur.refid=ud.userid
-WHERE ur.userid=%s AND ur.level=%s
+	$result = SQL_QUERY_ESC("SELECT
+	ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$add."
+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
+ON
+	ur.refid=ud.userid
+WHERE
+	ur.userid=%s AND ur.level=%s
 ORDER BY ur.refid ASC",
-	array(bigintval($uid), bigintval($level)), __FUNCTION__, __LINE__);
+		array(
+			bigintval($uid),
+			bigintval($level)
+		), __FUNCTION__, __LINE__);
 
 	// Are there some entries?
 	if (SQL_NUMROWS($result) > 0) {
@@ -2157,7 +2225,7 @@ ORDER BY ur.refid ASC",
 	SQL_FREERESULT($result);
 
 	// Return result
-	//* DEBUG: */ print "</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />\n";
+	//* DEBUG: */ OUTPUT_HTML("</li></ul>----------------------- <font color=\"#aa0000\">".__FUNCTION__." - EXIT</font> ------------------------<br />");
 	return $refs;
 }
 
@@ -2165,7 +2233,7 @@ ORDER BY ur.refid ASC",
 function reduceRecipientReceivedMails ($column, $id, $count) {
 	// Search for mail in database
 	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
-	array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
+		array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
 	// Are there entries?
 	if (SQL_NUMROWS($result) > 0) {
@@ -2178,7 +2246,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 
 		// Now update all user accounts
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
-		array(implode(',', $UIDs), count($UIDs)), __FUNCTION__, __LINE__);
+			array(implode(',', $UIDs), count($UIDs)), __FUNCTION__, __LINE__);
 	} // END - if
 
 	// Free result
@@ -2245,10 +2313,18 @@ function COUNT_SQLS () {
 // Checks wether the SQLs array is filled
 function IS_SQLS_VALID () {
 	return (
-	(IS_SQLS_INITIALIZED()) &&
-	(COUNT_SQLS() > 0)
+		(IS_SQLS_INITIALIZED())
+		&&
+		(COUNT_SQLS() > 0)
 	);
 }
 
+// Creates a new task
+function createNewTask($subject, $notes, $taskType, $userid = 0, $admin_id = 0, $strip = true) {
+	// Insert the task data into the database
+	SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
+		array($admin_id, $userid, $taskType, $subject, $notes), __FUNCTION__, __LINE__, true, $strip);
+}
+
 // [EOF]
 ?>