X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e4ef99b7002818d881166f91de7c301e61aa6422;hb=b2fff4de774cc58dfae0b8dd2a291af28f254833;hp=6a8a9e43f238e4eaa33ad9acfe43fa395c624d6a;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 6a8a9e43f2..e4ef99b700 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -353,7 +353,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 }
 
 //
-function ADD_MENU ($MODE, $act, $wht) {
+function ADD_MENU ($mode, $act, $wht) {
 	// Init some variables
 	$main_cnt = 0;
 	$AND = '';
@@ -361,7 +361,7 @@ function ADD_MENU ($MODE, $act, $wht) {
 	$sub_what = '';
 
 	// is the menu action valid?
-	if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) {
+	if (!VALIDATE_MENU_ACTION($mode, $act, $wht, true)) {
 		return getCode('MENU_NOT_VALID');
 	} // END - if
 
@@ -372,10 +372,10 @@ function ADD_MENU ($MODE, $act, $wht) {
 
 	// 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__);
+		array($mode), __FUNCTION__, __LINE__);
 	//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
 	if (SQL_NUMROWS($result_main) > 0) {
-		OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");
+		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";
@@ -384,11 +384,11 @@ function ADD_MENU ($MODE, $act, $wht) {
 			$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__);
+				array($mode, $content['action']), __FUNCTION__, __LINE__);
 
 			// Get number of rows
 			$ctl = SQL_NUMROWS($result_sub);
@@ -408,7 +408,7 @@ function ADD_MENU ($MODE, $act, $wht) {
 
 					// Full file name for checking menu
 					//* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!<br />\n";
-					$INC = sprintf("inc/modules/%s/what-%s.php", $MODE, $content['sub_what']);
+					$INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
 					if (INCLUDE_READABLE($INC)) {
 						if ((!empty($wht)) && (($wht == $content['sub_what']))) {
 							$OUT = "<strong>";
@@ -444,20 +444,20 @@ 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;
-				$INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $content['action']);
+				$INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
 				if (FILE_READABLE($INC_BLOCK)) {
 					// Load include file
 					if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("<tr>
 
-  <td class=\"".$MODE."_menu_whats\">");
+  <td class=\"".$mode."_menu_whats\">");
 					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
 					LOAD_INC($INC_BLOCK);
 					//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
@@ -469,7 +469,7 @@ function ADD_MENU ($MODE, $act, $wht) {
 			$main_cnt++;
 			//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*<br />\n";
 			if (SQL_NUMROWS($result_main) > $main_cnt) {
-				OUTPUT_HTML("<tr><td class=\"".$MODE."_menu_seperator\"></td></tr>");
+				OUTPUT_HTML("<tr><td class=\"".$mode."_menu_seperator\"></td></tr>");
 			} // END - if
 		}
 
@@ -543,11 +543,11 @@ function IS_ADMIN ($admin="") {
 }
 
 // Generates a list of "max receiveable emails per day"
-function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
+function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) {
 	$OUT = '';
 	$result = false;
 
-	switch ($MODE) {
+	switch ($mode) {
 		case 'guest':
 			// Guests (in the registration form) are not allowed to select 0 mails per day.
 			$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value",
@@ -561,7 +561,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
 			break;
 
 		default: // Invalid!
-			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $MODE));
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode));
 			break;
 	}
 
@@ -570,7 +570,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= "      <option value=\"".$content['value']."\"";
-			if (REQUEST_POST('max_mails') == $content['value']) $OUT .= " selected=\"selected\"";
+			if (REQUEST_POST('max_mails') == $content['value']) $OUT .= ' selected="selected"';
 			$OUT .= ">".$content['value']." {--PER_DAY--}";
 			if (!empty($content['comment'])) $OUT .= " (".$content['comment'].")";
 			$OUT .= "</option>\n";
@@ -578,7 +578,7 @@ function ADD_MAX_RECEIVE_LIST ($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?");
@@ -679,14 +679,14 @@ function IS_MEMBER () {
 }
 
 // Validate the given menu action
-function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
+function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) {
 	// Is the cache entry there and we shall not update?
-	if ((isset($GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht])) && ($UPDATE === false)) {
+	if ((isset($GLOBALS['cache_array']['action_valid'][$mode][$act][$wht])) && ($UPDATE === false)) {
 		// Count cache hit
 		incrementConfigEntry('cache_hits');
 
 		// Then use this cache
-		return $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht];
+		return $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht];
 	} // END - if
 
 	// By default nothing is valid
@@ -694,21 +694,21 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
 
 	// Look in all menus or only unlocked
 	$add = '';
-	if ((!IS_ADMIN()) && ($MODE != 'admin')) $add = " AND `locked`='N'";
+	if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'";
 
-	//* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
-	if (($MODE != 'admin') && ($UPDATE === true)) {
+	//* DEBUG: */ echo __LINE__.":".$mode."/".$act."/".$wht."*<br />\n";
+	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);
+			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);
+			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);
+			array($mode, $act), __FUNCTION__, __LINE__, false);
 	}
 
 	// Run SQL command
@@ -725,14 +725,14 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
 	SQL_FREERESULT($result);
 
 	// Set cache entry
-	$GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht] = $ret;
+	$GLOBALS['cache_array']['action_valid'][$mode][$act][$wht] = $ret;
 
 	// Return result
 	return $ret;
 }
 
 //
-function GET_MOD_DESCR($MODE, $wht, $column="what") {
+function GET_MOD_DESCR($mode, $wht, $column="what") {
 	// Fix empty "what"
 	if (empty($wht)) {
 		$wht = "welcome";
@@ -744,7 +744,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what") {
 
 	// Look for title
 	$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
-		array($MODE, $column, $wht), __FUNCTION__, __LINE__);
+		array($mode, $column, $wht), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
@@ -890,17 +890,17 @@ function countModuleHit($mod) {
 }
 
 // Get action value from mode (admin/guest/member) and what-value
-function GET_ACTION ($MODE, &$wht) {
+function GET_ACTION ($mode, &$wht) {
 	// Init status
 	$ret = '';
 
-	//* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=<br />";
-	if ((empty($wht)) && ($MODE != 'admin')) {
+	//* DEBUG: */ echo __LINE__."=".$mode."/".$wht."/".$GLOBALS['action']."=<br />";
+	if ((empty($wht)) && ($mode != 'admin')) {
 		$wht = "welcome";
 		if (getConfig('index_home') != "") $wht = getConfig('index_home');
 	} // END - if
 
-	if ($MODE == 'admin') {
+	if ($mode == 'admin') {
 		// Action value for admin area
 		if (REQUEST_ISSET_GET('action')) {
 			// Use from request!
@@ -919,11 +919,11 @@ function GET_ACTION ($MODE, &$wht) {
 	//* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
 
 	// Does the module have a menu?
-	if (MODULE_HAS_MENU($MODE)) {
+	if (MODULE_HAS_MENU($mode)) {
 		// Rewriting modules to menu
-		switch ($MODE) {
-			case 'index': $MODE = 'guest';  break;
-			case "login": $MODE = 'member'; break;
+		switch ($mode) {
+			case 'index': $mode = 'guest';  break;
+			case "login": $mode = 'member'; break;
 		} // END - switch
 
 		// Guest and member menu is "main" as the default
@@ -931,7 +931,7 @@ function GET_ACTION ($MODE, &$wht) {
 
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
-			array($MODE, $wht), __FUNCTION__, __LINE__);
+			array($mode, $wht), __FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load action value and pray that this one is the right you want... ;-)
 			list($ret) = SQL_FETCHROW($result);
@@ -939,12 +939,12 @@ function GET_ACTION ($MODE, &$wht) {
 
 		// Free memory
 		SQL_FREERESULT($result);
-	} elseif ((GET_EXT_VERSION('sql_patches') == "") && ($MODE != 'admin')) {
+	} elseif ((GET_EXT_VERSION('sql_patches') == "") && ($mode != 'admin')) {
 		// No sql_patches installed, but maybe we need to register an admin?
 		if (isAdminRegistered()) {
 			// Redirect
 			// @TODO Why does this lead into an endless loop but we still need it???
-			// @TODO Commented out LOAD_URL("admin.php");
+			// @TODO Commented out LOAD_URL('admin.php');
 		} // END - if
 	}
 
@@ -958,7 +958,7 @@ function GET_CATEGORY ($cid) {
 	$ret = getMessage('_CATEGORY_404');
 
 	// Is the category id set?
-	if ($cid == "0") {
+	if ($cid == '0') {
 		// No category
 		$ret = getMessage('_CATEGORY_NONE');
 	} elseif ($cid > 0) {
@@ -994,7 +994,7 @@ function GET_PAYMENT ($pid, $full=false) {
 		} else {
 			// Return title and price
 			list($t, $p) = SQL_FETCHROW($result);
-			$ret = $t." / ".TRANSLATE_COMMA($p)." {!POINTS!}";
+			$ret = $t.' / '.TRANSLATE_COMMA($p).' {!POINTS!}';
 		}
 	}
 
@@ -1006,8 +1006,8 @@ function GET_PAYMENT ($pid, $full=false) {
 }
 
 // Get (basicly) the price of given payment id
-function GET_PAY_POINTS ($pid, $lookFor = "price") {
-	$ret = "-1";
+function GET_PAY_POINTS ($pid, $lookFor = 'price') {
+	$ret = '-1';
 	$result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
 		array($lookFor, $pid), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
@@ -1019,9 +1019,9 @@ function GET_PAY_POINTS ($pid, $lookFor = "price") {
 }
 
 // Remove a receiver's ID from $receivers and add a link for him to confirm
-function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
+function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus=false) {
 	// Default is not removed
-	$ret = "failed";
+	$ret = 'failed';
 
 	// Is the userid valid?
 	if ($uid > 0) {
@@ -1031,8 +1031,8 @@ function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id="", $bonu
 		// Is there already a line for this user available?
 		if ($stats_id > 0) {
 			// Only when we got a real stats ID continue searching for the entry
-			$type = "NORMAL"; $rowName = "stats_id";
-			if ($bonus) { $type = "BONUS"; $rowName = 'bonus_id'; }
+			$type = 'NORMAL'; $rowName = 'stats_id';
+			if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
 
 			// 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",
@@ -1043,10 +1043,10 @@ function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id="", $bonu
 				// 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__);
-				$ret = "done";
+				$ret = 'done';
 			} else {
 				// Already found
-				$ret = "already";
+				$ret = 'already';
 			}
 
 			// Free memory
@@ -1059,10 +1059,10 @@ function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id="", $bonu
 }
 
 // Calculate sum (default) or count records of given criteria
-function GET_TOTAL_DATA ($search, $tableName, $lookFor = "id", $whereStatement = 'userid', $countRows = false, $add = "") {
+function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
 	$ret = 0;
-	//* DEBUG: */ echo $search."/".$tableName."/".$lookFor."/".$whereStatement."/".$add."<br />\n";
-	if ((empty($search)) && ($search != "0")) {
+	//* DEBUG: */ echo $search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />\n';
+	if ((empty($search)) && ($search != '0')) {
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
@@ -1092,18 +1092,18 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor = "id", $whereStatement =
 	SQL_FREERESULT($result);
 
 	// Fix empty values
-	if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != 'userid')) {
+	if ((empty($ret)) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
 		// Float number
-		$ret = "0.00000";
-	} elseif ("".$ret."" == "") {
+		$ret = '0.00000';
+	} elseif (''.$ret.'' == '') {
 		// Fix empty result
-		$ret = "0";
+		$ret = '0';
 	}
 
 	// Return value
 	return $ret;
 }
-// "Getter fro ref level percents
+// Getter fro ref level percents
 function GET_REF_LEVEL_PERCENTS ($level) {
 	// Default is zero
 	$per = 0;
@@ -1150,7 +1150,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
  * add_mode    = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct"
  *               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") {
+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 $DATA;
 
@@ -1158,7 +1158,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 	$add_mode = strtolower($add_mode);
 
 	// When $uid = 0 add points to jackpot
-	if ($uid == "0") {
+	if ($uid == '0') {
 		// Add points to jackpot
 		ADD_JACKPOT($points);
 		return;
@@ -1182,10 +1182,10 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 	}
 
 	// Default is 'normal' points
-	$data = "points";
+	$data = 'points';
 
 	// Which points, locked or normal?
-	if ($locked) $data = "locked_points";
+	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",
@@ -1244,7 +1244,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 				);
 
 				// Load email template
-				$msg = LOAD_EMAIL_TEMPLATE("confirm-referal", $content, bigintval($uid));
+				$msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
 
 				SEND_EMAIL($email, THANX_REFERRAL_ONE, $msg);
 			} elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == "direct") && (!defined('__POINTS_VALUE'))) {
@@ -1258,7 +1258,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 				);
 
 				// Load message
-				$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid);
+				$msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
 
 				// And sent it away
 				SEND_EMAIL($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
@@ -1266,7 +1266,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 			}
 
 			// Maybe there's another ref?
-			if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == "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";
 				ADD_POINTS_REFSYSTEM(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $send_notify, $ref, $locked);
@@ -1316,7 +1316,7 @@ function UPDATE_REF_COUNTER ($uid) {
 	} 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";
-		rebuildCacheFiles("refsystem", "refsystem");
+		rebuildCacheFiles('refsystem', 'refsystem');
 	}
 
 	// "Walk" back here
@@ -1347,7 +1347,7 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
 // Get ID number from administrator's login name
 function GET_ADMIN_ID ($login) {
 	// By default no admin is found
-	$ret = "-1";
+	$ret = '-1';
 
 	// Check cache
 	if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
@@ -1385,7 +1385,7 @@ function GET_CURRENT_ADMIN_ID () {
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH ($aid) {
 	// By default an invalid hash is returned
-	$ret = "-1";
+	$ret = '-1';
 
 	if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
 		// Check cache
@@ -1403,7 +1403,7 @@ function GET_ADMIN_HASH ($aid) {
 
 			// Set cache
 			$GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
-		}
+		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -1413,7 +1413,7 @@ function GET_ADMIN_HASH ($aid) {
 //
 function GET_ADMIN_LOGIN ($aid) {
 	// By default a non-existent login is returned (other functions react on this!)
-	$ret = "***";
+	$ret = '***';
 
 	if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
 		// Get cache
@@ -1441,7 +1441,7 @@ function GET_ADMIN_LOGIN ($aid) {
 // Get email address of admin id
 function GET_ADMIN_EMAIL ($aid) {
 	// By default an invalid emails is returned
-	$ret = "***";
+	$ret = '***';
 
 	if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
 		// Get cache
@@ -1471,12 +1471,12 @@ function GET_ADMIN_EMAIL ($aid) {
 // Get default ACL  of admin id
 function GET_ADMIN_DEFAULT_ACL ($aid) {
 	// By default an invalid ACL value is returned
-	$ret = "***";
+	$ret = '***';
 
 	// Is sql_patches there and was it found in cache?
 	if (!EXT_IS_ACTIVE('sql_patches')) {
 		// Not found, which is bad, so we need to allow all
-		$ret =  "allow";
+		$ret =  'allow';
 	} elseif (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
 		// Use cache
 		$ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
@@ -1503,22 +1503,22 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
 	return $ret;
 }
 //
-function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where="") {
+function ADD_OPTION_LINES ($table, $id, $name, $default='', $special='', $where='') {
 	$ret = '';
-	if ($table == "/ARRAY/") {
+	if ($table == '/ARRAY/') {
 		// Selection from array
 		if (is_array($id) && is_array($name) && count($id) == count($name)) {
 			// Both are arrays
 			foreach ($id as $idx => $value) {
-				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
-				$ret .= ">".$name[$idx]."</option>\n";
+				$ret .= '<option value="' . $value . '"';
+				if ($default == $value) $ret .= ' selected="selected"';
+				$ret .= '>' . $name[$idx] . '</option>';
 			} // END - foreach
 		} // END - if
 	} else {
 		// Data from database
-		$SPEC = ", ".$id;
-		if (!empty($special)) $SPEC = ", ".$special;
+		$SPEC = ', '.$id;
+		if (!empty($special)) $SPEC = ', '.$special;
 		$ORDER = $name.$SPEC;
 		if ($table == 'country') $ORDER = $special;
 		$result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM `{!_MYSQL_PREFIX!}_%s` ".$where." ORDER BY %s",
@@ -1528,17 +1528,17 @@ function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where=
 			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
 				if (empty($special)) $add = '';
-				$ret .= "<option value=\"".$value."\"";
-				if ($default == $value) $ret .= " selected=\"selected\"";
-				if (!empty($add)) $add = " (".$add.")";
-				$ret .= ">".$title.$add."</option>\n";
+				$ret .= '<option value="' . $value . '"';
+				if ($default == $value) $ret .= ' selected="selected"';
+				if (!empty($add)) $add = ' ('.$add.')';
+				$ret .= '>' . $title . $add . '</option>';
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// No data found
-			$ret = "<option value=\"x\">{--SELECT_NONE--}</option>\n";
+			$ret = '<option value="x">{--SELECT_NONE--}</option>';
 		}
 	}
 
@@ -1554,13 +1554,13 @@ function activateExchange () {
 	} // END - if
 
 	// Check total amount of users
-	$totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", 'userid', "status", true, " AND max_mails > 0");
+	$totalUsers = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
 
 	if ($totalUsers >= getConfig('activate_xchange')) {
 		// Activate System
 		SET_SQLS(array(
 			"UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
-			"UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2",
+			"UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what='order' OR `what`='unconfirmed' LIMIT 2",
 			"UPDATE `{!_MYSQL_PREFIX!}_config` SET activate_xchange='0' WHERE config=0 LIMIT 1"
 		));
 
@@ -1568,13 +1568,14 @@ function activateExchange () {
 		runFilterChain('run_sqls');
 
 		// Rebuild caches
-		rebuildCacheFiles("config", "config");
-		rebuildCacheFiles("modreg", "modreg");
+		// @TODO Rewrite this to a filter
+		rebuildCacheFiles('config', 'config');
+		rebuildCacheFiles('modreg', 'modreg');
 	} // END - if
 }
+
 //
-function DELETE_USER_ACCOUNT($uid, $reason)
-{
+function DELETE_USER_ACCOUNT ($uid, $reason) {
 	$points = 0;
 	$result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
 FROM `{!_MYSQL_PREFIX!}_user_points` AS p
@@ -1620,12 +1621,12 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
 //
 function META_DESCRIPTION ($mod, $wht) {
 	// Exclude admin and member's area
-	if (($mod != 'admin') && ($mod != "login")) {
+	if (($mod != 'admin') && ($mod != 'login')) {
 		// Construct dynamic description
-		$DESCR = "{!MAIN_TITLE!} ".trim(getConfig('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."\" />");
+		OUTPUT_HTML('<meta name="description" content="' . $DESCR . '" />');
 	} // END - if
 
 	// Remove depth
@@ -1649,7 +1650,7 @@ function ADD_JACKPOT($points) {
 //
 function SUB_JACKPOT($points) {
 	// First failed
-	$ret = "-1";
+	$ret = '-1';
 
 	// Get current points
 	$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
@@ -1670,7 +1671,8 @@ function SUB_JACKPOT($points) {
 	// Free memory
 	SQL_FREERESULT($result);
 }
-//
+
+// Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
 function IS_DEMO () {
 	return ((EXT_IS_ACTIVE('demo')) && (get_session('admin_login') == 'demo'));
 }
@@ -1688,13 +1690,13 @@ function GET_WHAT ($modCheck) {
 	switch ($modCheck)
 	{
 	case 'admin':
-		$wht = "overview";
+		$wht = 'overview';
 		break;
 
-	case "login":
+	case 'login':
 	case 'index':
-		$wht = "welcome";
-		if (($modCheck == 'index') && (getConfig('index_home') != "")) $wht = getConfig('index_home');
+		$wht = 'welcome';
+		if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
 		break;
 
 	default:
@@ -1726,9 +1728,9 @@ function SUB_POINTS ($subject, $uid, $points) {
 }
 
 // Update config entries
-function UPDATE_CONFIG ($entries, $values, $updateMode="") {
+function UPDATE_CONFIG ($entries, $values, $updateMode='') {
 	// Do not update config in CSS mode
-	if (($GLOBALS['output_mode'] == "1") || ($GLOBALS['output_mode'] == -1)) {
+	if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
 		return;
 	} // END - if
 
@@ -1747,7 +1749,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 				if (($values[$idx] + 0) === $values[$idx]) {
 					// Number detected
 					$all .= sprintf("%s=%s,", $entry, (float)$values[$idx]);
-				} elseif ($values[$idx] == "UNIX_TIMESTAMP()") {
+				} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
 					// Function UNIX_TIMESTAMP() detected
 					$all .= sprintf("%s=%s,", $entry, $values[$idx]);
 				} else {
@@ -1783,7 +1785,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />\n";
 
 	// Rebuild cache
-	rebuildCacheFiles("config", "config");
+	rebuildCacheFiles('config', 'config');
 }
 
 // Prepares an SQL statement part for HTML mail and/or holiday depency
@@ -1792,10 +1794,10 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 	$MORE = '';
 
 	// HTML mail?
-	if ($mode == 'html') $MORE = " AND html='Y'";
+	if ($mode == 'html') $MORE = " AND `html`='Y'";
 	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
 		// Add something for the holiday extension
-		$MORE .= " AND holiday_active='N'";
+		$MORE .= " AND `holiday_active`='N'";
 	} // END - if
 
 	// Return result
@@ -1875,11 +1877,11 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML
 		$OUT = '';
 		foreach ($CATS['id'] as $key => $value) {
 			if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."...";
-			$OUT .= "      <option value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." {--USER_IN_CAT--})</option>\n";
+			$OUT .= '      <option value="' . $value . '">' . $CATS['name'][$key] . ' (' . $CATS['uids'][$key] . ' {--USER_IN_CAT--})</option>';
 		} // END - foreach
 	} else {
 		// No cateogries are defined yet
-		$OUT = "<option class=\"member_failed\">{!MEMBER_NO_CATS!}</option>\n";
+		$OUT = '<option class="member_failed">{!MEMBER_NO_CATS!}</option>';
 	}
 
 	// Return HTML code
@@ -1909,10 +1911,10 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco
 	// HTML extension active?
 	if (EXT_IS_ACTIVE('html_mail')) {
 		// No HTML by default
-		$HTML = "N";
+		$HTML = 'N';
 
 		// HTML mode?
-		if ($mode == 'html') $HTML = "Y";
+		if ($mode == 'html') $HTML = 'Y';
 
 		// Add HTML mail
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus`
@@ -1977,12 +1979,12 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 	// Exclude users in holiday?
 	if (GET_EXT_VERSION('holiday') >= '0.1.3') {
 		// Add something for the holiday extension
-		$CAT_WHERE .= " AND d.holiday_active='N'";
+		$CAT_WHERE .= " AND d.`holiday_active`='N'";
 	} // END - if
 
 	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",
+		$result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
 			array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
 	} else {
 		// Include all
@@ -2073,7 +2075,7 @@ function GET_USER_REF_POINTS ($uid, $level) {
 
 	// Do we have nickname extension installed?
 	if (EXT_IS_ACTIVE('nickname')) {
-		$add = ", ud.nickname";
+		$add = ', ud.nickname';
 	} // END - if
 
 	// Get refs from database
@@ -2092,10 +2094,10 @@ ORDER BY ur.refid ASC",
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Get total points of this user
-			$row['points'] = GET_TOTAL_DATA($row['refid'], "user_points", "points") - GET_TOTAL_DATA($row['refid'], "user_data", "used_points");
+			$row['points'] = GET_TOTAL_DATA($row['refid'], 'user_points', 'points') - GET_TOTAL_DATA($row['refid'], 'user_data', 'used_points');
 
 			// Get unconfirmed mails
-			$row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], "user_links", "id", 'userid', true);
+			$row['unconfirmed']  = GET_TOTAL_DATA($row['refid'], 'user_links', 'id', 'userid', true);
 
 			// Init clickrate with zero
 			$row['clickrate'] = 0;