From 0369c36aaab5af6ed44da1e13a53baef285f79b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 12 Sep 2008 16:51:08 +0000
Subject: [PATCH] Reset rewritten, SQL fixed, zeros are now numeric

---
 .gitattributes                              |   1 +
 beg.php                                     |   2 +-
 doubler.php                                 |   2 +-
 inc/autopurge.php                           |   8 +-
 inc/check-reset.php                         |  56 +++++++
 inc/databases.php                           |   2 +-
 inc/db/lib-mysql3.php                       |   4 +-
 inc/doubler_send.php                        |   6 +-
 inc/functions.php                           | 157 +++++++++-----------
 inc/gen_mediadata.php                       |  10 +-
 inc/libs/admins_functions.php               |   4 +-
 inc/libs/autopurge_functions.php            |   2 +-
 inc/libs/bonus_functions.php                |   4 +-
 inc/libs/cache_functions.php                |   2 +-
 inc/libs/doubler_functions.php              |   6 +-
 inc/libs/rallye_functions.php               |  10 +-
 inc/libs/sponsor_functions.php              |   2 +-
 inc/libs/surfbar_functions.php              |   4 +-
 inc/libs/task_functions.php                 |   2 +-
 inc/libs/user_functions.php                 |   4 +-
 inc/modules/admin/what-admins_mails.php     |   2 +-
 inc/modules/admin/what-del_transfer.php     |   2 +-
 inc/modules/admin/what-email_details.php    |   2 +-
 inc/modules/admin/what-extensions.php       |   8 +-
 inc/modules/admin/what-list_payouts.php     |  18 +--
 inc/modules/admin/what-list_rallyes.php     |   6 +-
 inc/modules/admin/what-list_sponsor.php     |   2 +-
 inc/modules/admin/what-list_transfer.php    |   2 +-
 inc/modules/admin/what-list_unconfirmed.php |   2 +-
 inc/modules/admin/what-send_bonus.php       |   2 +-
 inc/modules/admin/what-theme_check.php      |   2 +-
 inc/modules/admin/what-updates.php          |   2 +-
 inc/modules/guest/what-login.php            |   6 +-
 inc/modules/guest/what-mediadata.php        |  48 +++---
 inc/modules/member/what-order.php           |   6 +-
 inc/modules/member/what-payout.php          |   2 +-
 inc/modules/member/what-points.php          |   6 +-
 inc/modules/member/what-transfer.php        |   4 +-
 inc/modules/member/what-unconfirmed.php     |   2 +-
 inc/mysql-connect.php                       |  22 +--
 inc/mysql-manager.php                       |  88 +++++------
 inc/patch-system.php                        |   2 +-
 inc/pool-update.php                         |   4 +-
 inc/reset/reset_daily.php                   |   3 +-
 inc/session.php                             |   1 +
 mailid_top.php                              |   4 +-
 ref.php                                     |   2 +-
 47 files changed, 278 insertions(+), 260 deletions(-)
 create mode 100644 inc/check-reset.php

diff --git a/.gitattributes b/.gitattributes
index ee112d0aa8..98ad788718 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -79,6 +79,7 @@ inc/.htaccess -text
 inc/.secret/.htaccess -text
 inc/autopurge.php -text
 inc/cache/.htaccess -text
+inc/check-reset.php -text
 inc/config.php -text
 inc/databases.php -text
 inc/db/.htaccess -text
diff --git a/beg.php b/beg.php
index a7e4e82aef..d207d5cf54 100644
--- a/beg.php
+++ b/beg.php
@@ -103,7 +103,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 				define('__BEG_POINTS', TRANSLATE_COMMA($points));
 			} else {
 				// Other status
-				$uid = "0";
+				$uid = 0;
 			}
 		}
 
diff --git a/doubler.php b/doubler.php
index 53ee068260..eab1a6d533 100644
--- a/doubler.php
+++ b/doubler.php
@@ -42,7 +42,7 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 // Set module
 $GLOBALS['module'] = "doubler";
 $GLOBALS['refid'] = 0;
-$CSS = "0";
+$CSS = 0;
 
 // Load the required file(s)
 require ("inc/config.php");
diff --git a/inc/autopurge.php b/inc/autopurge.php
index 6873a1542a..a0896be2c3 100644
--- a/inc/autopurge.php
+++ b/inc/autopurge.php
@@ -51,7 +51,7 @@ if (($_CONFIG['auto_purge_active'] == "Y") && ($_CONFIG['auto_purge'] > 0))
 	}
 
 	// Init variables
-	$admin_points = "0";
+	$admin_points = 0;
 
 	// Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
 	$result = SQL_QUERY_ESC("SELECT s.id, s.userid, s.pool_id, t.price
@@ -63,7 +63,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 	if (SQL_NUMROWS($result) > 0)
 	{
 		// Start deleting procedure
-		$uid = "0"; $points = "0";
+		$uid = 0; $points = 0;
 		while(list($mid, $sender, $pool, $price) = SQL_FETCHROW($result))
 		{
 			// Check if confirmation links are purged or not
@@ -79,7 +79,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 				{
 					// Directly add points back to senders account
 					AUTOPURGE_ADD_POINTS($uid, $points);
-					$points = "0";
+					$points = 0;
 				}
 				// Add points
 				$uid = $sender; $points += $price; $admin_points += $price;
@@ -110,7 +110,7 @@ WHERE s.timestamp_ordered <= %s ORDER BY s.userid",
 		if (SQL_NUMROWS($result) > 0)
 		{
 			// Start deleting procedure
-			$points = "0";
+			$points = 0;
 			while (list($bid, $price) = SQL_FETCHROW($result))
 			{
 				// Check if confirmation links are purged or not
diff --git a/inc/check-reset.php b/inc/check-reset.php
new file mode 100644
index 0000000000..7596a8d6d4
--- /dev/null
+++ b/inc/check-reset.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 09/12/2008 *
+ * ===============                              Last change: 09/12/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : check-reset.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : Checks for if reset shall be executed            *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Prueft ob Reset laufen soll                      *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	require($INC);
+}
+
+// 01    2                            2        2         3321    1                         2                     21    1                        2                    21    1                        2                  21    1      2                 21    1         10
+if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) {
+	// Do daily things in external PHP file but only when script is completely setup
+	// Daily reset was run!
+	define('__DAILY_RESET', true);
+
+	// Add more includes
+	$INC_POOL = RESET_ADD_INCLUDES();
+
+	// Run the full reset scripts
+	foreach ($INC_POOL as $incFile) {
+		require_once($incFile);
+	} // END - foreach
+} // END - if
+
+//
+?>
diff --git a/inc/databases.php b/inc/databases.php
index 28f1bb9154..a5f1522c60 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "308");
+define('CURR_SVN_REVISION', "309");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index dbc6571506..f09301c9b4 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -105,10 +105,10 @@ function SQL_NUMROWS($result) {
 		$lines = @mysql_num_rows($result);
 
 		// Is the result empty? Then we have an error!
-		if (empty($lines)) $lines = "0";
+		if (empty($lines)) $lines = 0;
 	} else {
 		// No resource given, no lines found!
-		$lines = "0";
+		$lines = 0;
 	}
 	return $lines;
 }
diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 71685ced4e..1fe8475e0f 100644
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -38,7 +38,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 }
 
 // Initialize variables
-$jackpot = "0"; $user = "0";
+$jackpot = 0; $user = 0;
 
 // Get total points of the doubler itself
 $DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
@@ -51,7 +51,7 @@ if ($DOUBLER_POINTS == 0) {
 unset($_GET['DOUBLER_UID']);
 unset($_POST['DOUBLER_UID']);
 set_session('DOUBLER_UID', "");
-if (empty($DOUBLER_UID)) $DOUBLER_UID = "0";
+if (empty($DOUBLER_UID)) $DOUBLER_UID = 0;
 
 // Check for doubles which we can pay out
 $min = bigintval($_CONFIG['doubler_min'] * 2);
@@ -103,7 +103,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
 			 else
 			{
 				// No referral points found
-				$ref = "0";
+				$ref = 0;
 			}
 
 			// Exclude webmaster from doubling...
diff --git a/inc/functions.php b/inc/functions.php
index 6484f86506..8b416e865c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -597,7 +597,7 @@ function FRAMETESTER($URL) {
 }
 //
 function SELECTION_COUNT($array) {
-	$ret = "0";
+	$ret = 0;
 	if (is_array($array)) {
 		foreach ($array as $key => $sel) {
 			if (!empty($sel)) $ret++;
@@ -1090,7 +1090,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++)
 		{
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
@@ -1099,7 +1099,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 	case "month": // Month
 		foreach ($MONTH_DESCR as $month => $descr)
 		{
-			$OUT .= "      <OPTION value=\"".$month."\"";
+			$OUT .= "<OPTION value=\"".$month."\"";
 			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$descr."</OPTION>\n";
 		}
@@ -1114,7 +1114,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 		{
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1124,17 +1124,17 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 			// Current year minus 1
 			for ($idx = 2003; $idx <= ($YEAR + 1); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
+				$OUT .= "<OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
 			}
 		}
 		 else
 		{
 			// Get current year and subtract 16 (for erotic content)
-			$OUT .= "      <OPTION value=\"1929\">&lt;1930</OPTION>\n";
+			$OUT .= "<OPTION value=\"1929\">&lt;1930</OPTION>\n";
 			$YEAR = date('Y', time()) - 16;
 			for ($idx = 1930; $idx <= $YEAR; $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1143,30 +1143,27 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 
 	case "sec":
 	case "min":
-		for ($idx = 0; $idx < 60; $idx+=5)
-		{
+		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "hour":
-		for ($idx = 0; $idx < 24; $idx++)
-		{
+		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "yn":
-		$OUT .= "      <OPTION value=\"Y\"";
+		$OUT .= "<OPTION value=\"Y\"";
 		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".YES."</OPTION>
-			<OPTION value=\"N\"";
+		$OUT .= ">".YES."</OPTION>\n<OPTION value=\"N\"";
 		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
@@ -1302,17 +1299,20 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	// Remove image from memory
 	imagedestroy($image);
 }
-function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false)
-{
+// Create selection box or array of splitted timestamp
+function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
 	// Calculate 15-seconds timestamp (15-seconds-steps shall be fine ;) )
 	$timestamp = round($timestamp / 15) * 15;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
 	$M1 = date("m", time());
 	$M2 = date("m", (time() + $timestamp));
+
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = ONE_DAY;
+
 	// First of all years...
 	$Y = abs(floor($timestamp / (31536000 + $SWITCH)));
 	// Next months...
@@ -1327,11 +1327,11 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 	$m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 60 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
 	// And at last seconds...
 	$s = abs(floor($timestamp - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+
 	//
 	// Now we convert them in seconds...
 	//
-	if ($return_array)
-	{
+	if ($return_array) {
 		// Just put all data in an array for later use
 		$OUT = array(
 			'YEARS'   => $Y,
@@ -1342,61 +1342,57 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 			'MINUTES' => $m,
 			'SECONDS' => $s
 		);
-	}
-	 else
-	{
+	} else {
 		// Generate table
 		$OUT  = "<DIV align=\"".$align."\">\n";
 		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._YEARS."</STRONG></TD>\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MONTHS."</STRONG></TD>\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._WEEKS."</STRONG></TD>\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._DAYS."</STRONG></TD>\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._HOURS."</STRONG></TD>\n";
 		}
-		if (ereg("m", $display) || (empty($display)))
-		{
+
+		if (ereg("m", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MINUTES."</STRONG></TD>\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		if (ereg("s", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
 		}
+
 		$OUT .= "</TR>\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 10; $idx++)
-			{
+			for ($idx = 0; $idx <= 10; $idx++) {
 				$OUT .= "    <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $Y) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\">\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			// Generate month selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
@@ -1406,89 +1402,72 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\">\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			// Generate week selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 4; $idx++)
-			{
+			for ($idx = 0; $idx <= 4; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $W) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\">\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			// Generate day selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 31; $idx++)
-			{
+			for ($idx = 0; $idx <= 31; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $D) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			// Generate hour selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 23; $idx++)
-			{
+			for ($idx = 0; $idx <= 23; $idx++) 	{
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $h) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
 		}
-		if (ereg("m", $display) || (empty($display)))
-		{
+
+		if (ereg("m", $display) || (empty($display))) {
 			// Generate minute selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 59; $idx++)
-			{
+			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $m) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		if (ereg("s", $display) || (empty($display))) {
 			// Generate second selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 45; $idx+=15)
-			{
+			for ($idx = 0; $idx <= 45; $idx += 15) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $s) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
 		}
 		$OUT .= "</TR>\n";
@@ -1500,7 +1479,8 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 }
 //
 function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
-	$ret = "0";
+	$ret = 0;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
@@ -2365,7 +2345,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix) {
 }
 // Load more reset scripts
 function RESET_ADD_INCLUDES () {
-	global $_CONFIG, $INC_POOL;
+	global $_CONFIG;
 
 	// Is the reset set or old sql_patches?
 	if ((!isBooleanConstantAndTrue('__DAILY_RESET')) || (GET_EXT_VERSION("sql_patches") < "0.4.5")) {
@@ -2374,7 +2354,7 @@ function RESET_ADD_INCLUDES () {
 	} // END - if
 
 	// Get more daily reset scripts
-	$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_"));
+	$INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_");
 
 	// Create current week mark
 	$currWeek = date("W", time());
@@ -2399,6 +2379,9 @@ function RESET_ADD_INCLUDES () {
 		// Update config
 		UPDATE_CONFIG("last_month", $currMonth);
 	} // END - if
+
+	// Return array
+	return $INC_POOL;
 }
 // Handle extra values
 function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index 07d1e7a7e9..07a0b4f44c 100644
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -42,8 +42,8 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 $result_media = SQL_QUERY("SELECT SUM(max_rec) AS max_rec, SUM(clicks) AS clicks
 FROM "._MYSQL_PREFIX."_user_stats", __FILE__, __LINE__);
 list($nsent, $nclicks) = SQL_FETCHROW($result_media);
-if (empty($nsent))   $nsent   = "0";
-if (empty($nclicks)) $nclicks = "0";
+if (empty($nsent))   $nsent   = 0;
+if (empty($nclicks)) $nclicks = 0;
 
 // Free memory
 SQL_FREERESULT($result_media);
@@ -63,13 +63,13 @@ if (EXT_IS_ACTIVE("bonus"))
 	$result_media = SQL_QUERY("SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks
 FROM "._MYSQL_PREFIX."_bonus", __FILE__, __LINE__);
 	list($bsent, $bclicks) = SQL_FETCHROW($result_media);
-	if (empty($bsent))   $bsent   = "0";
-	if (empty($bclicks)) $bclicks = "0";
+	if (empty($bsent))   $bsent   = 0;
+	if (empty($bclicks)) $bclicks = 0;
 }
  else
 {
 	// Not found!
-	$bsent = "0"; $bclicks = "0";
+	$bsent = 0; $bclicks = 0;
 }
 
 // Load (maybe) missing file
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 55cebce7d9..8e254a61e5 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -178,7 +178,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
 	global $cacheInstance;
 
 	// Begin the update
-	$cacheInstance_UPDATE = "0";
+	$cacheInstance_UPDATE = 0;
 	foreach ($POST['login'] as $id => $login) {
 		// Secure ID number
 		$id = bigintval($id);
@@ -362,7 +362,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 // Remove the given accounts
 function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 	// Begin removal
-	$cacheInstance_UPDATE = "0";
+	$cacheInstance_UPDATE = 0;
 	foreach ($POST['sel'] as $id => $del) {
 		// Secure ID number
 		$id = bigintval($id);
diff --git a/inc/libs/autopurge_functions.php b/inc/libs/autopurge_functions.php
index 62073918fc..1b20a242ea 100644
--- a/inc/libs/autopurge_functions.php
+++ b/inc/libs/autopurge_functions.php
@@ -61,7 +61,7 @@ function AUTOPURGE_ADD_POINTS($uid, $points)
 	{
 		// ... to jackpot account
 		ADD_JACKPOT($points);
-		if (empty($jackpot)) $jackpot = "0";
+		if (empty($jackpot)) $jackpot = 0;
 		$jackpot += $points;
 	}
 	 else
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 9fa4477f44..366606a243 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -52,13 +52,13 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type)
 	case "bonusid":
 		$result = SQL_QUERY_ESC("SELECT clicks FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
 		 array($mid), __FILE__, __LINE__);
-		$bonus = $mid; $mail = "0";
+		$bonus = $mid; $mail = 0;
 		break;
 
 	case "mailid" :
 		$result = SQL_QUERY_ESC("SELECT clicks FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
 		 array($mid), __FILE__, __LINE__);
-		$bonus = "0"; $mail = $mid;
+		$bonus = 0; $mail = $mid;
 		break;
 	}
 
diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index e0c3fec20c..1394c129b3 100644
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -103,7 +103,7 @@ class mxchange_cache
 			$ctime = filectime($inc);
 		} else {
 			// No, it doesn't. Zero date/time
-			$ctime = "0";
+			$ctime = 0;
 		}
 
 		// Remember change date/time in class
diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 85ad9e6872..7137020b47 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -41,8 +41,8 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 function DOUBLER_GENERATE_TABLE($uid="0", $done='N', $ref='N', $sort="ASC")
 {
 	global $_CONFIG;
-	if (empty($cnt)) $cnt = "0";
-	$ADD = ""; $DT_MODE = "0";
+	if (empty($cnt)) $cnt = 0;
+	$ADD = ""; $DT_MODE = 0;
 	if ($uid > 0)
 	{
 		// Load entries only from a single user
@@ -128,7 +128,7 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT()
 {
 	global $_CONFIG;
 	// Initialize variables
-	$points = "0";
+	$points = 0;
 
 	if ($_CONFIG['doubler_own'] == "Y")
 	{
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index d6aaef96f8..b7cb9d0635 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -94,7 +94,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 
 		// Get refs by userid
 		$cnt = RALLYE_GET_REFCOUNT($uid);
-		if (empty($cnt)) $cnt = "0"; // Added prevent some unknown troubles... :-?
+		if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-?
 
 		// Check if line is already included...
 		$result_ref = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s AND userid=%s LIMIT 1",
@@ -230,7 +230,7 @@ LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout'], $since), __FILE__, __LI
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
-		if (empty($refpoints)) $refpoints = "0";
+		if (empty($refpoints)) $refpoints = 0;
 
 		// And subtract start refs
 		$cnt -= $refs;
@@ -316,7 +316,7 @@ VALUES ('%s', '%s', '0')",
 			$DATA['now_t'] = MAKE_DATETIME(time(), "2");
 			$DATA['title'] = $title;
 			$DATA['id']    = $id;  // ID for the rallye details link
-			$DATA['ref']   = "0";
+			$DATA['ref']   = 0;
 
 			// Load prices
 			$prices = RALLYE_ADD_PRICES($id);
@@ -551,7 +551,7 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
-		if (empty($refpoints)) $refpoints = "0";
+		if (empty($refpoints)) $refpoints = 0;
 
 		// Store calculated new refs to array
 		$users['uid'][]     = $uid;
@@ -798,7 +798,7 @@ WHERE s.userid=%s AND s.level=0", array(bigintval($uid)), __FILE__, __LINE__);
 		SQL_FREERESULT($result_ref);
 		if (empty($cnt))
 		{
-			$cnt = "0";
+			$cnt = 0;
 		}
 		 else
 		{
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index c9ce82d799..fdf4eb9f43 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -153,7 +153,7 @@ function SPONSOR_HANDLE_SPONSOR(&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_ST
 	if ($SAVE)
 	{
 		// Default is no force even when a guest want to abuse this force switch
-		if ((empty($POST['force'])) || (!IS_ADMIN())) $POST['force'] = "0";
+		if ((empty($POST['force'])) || (!IS_ADMIN())) $POST['force'] = 0;
 
 		// SQL and message string is empty by default
 		$SQL = ""; $MSG = "";
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 8d238b5e44..8b491c650a 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -225,7 +225,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 	$uid = bigintval($urlData['uid']);
 
 	// Is the id set?
-	if (empty($uid)) $uid = "0";
+	if (empty($uid)) $uid = 0;
 
 	// Just run the insert query for now
 	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid, url, reward, costs, status) VALUES('%s', '%s', %s, %s, '%s')",
@@ -884,7 +884,7 @@ LIMIT 1",
 		if ((!isset($SURFBAR_CACHE['last_surfed'])) || (is_null($SURFBAR_CACHE['last_surfed']))) {
 			// Fix it here
 			//DEBUG_LOG(__FUNCTION__.":last_surfed - FIXED!");
-			$SURFBAR_CACHE['last_surfed'] = "0";
+			$SURFBAR_CACHE['last_surfed'] = 0;
 		} // END - if
 
 		// Get base/fixed reward and costs
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index d5b79dc22d..94fb9b9c7d 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -572,7 +572,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 			if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE;
 			$content['row_link'] = "<A href=\"".URL."/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</A>";
 		} else {
-			$content['row_link'] = "0";
+			$content['row_link'] = 0;
 		}
 
 		// Switch color
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index b297144340..9c42fb28a2 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 function alpha($sortby, $colspan, $return=false)
 {
 	global $_CONFIG;
-	if (empty($_GET['offset'])) $_GET['offset'] = "0";
+	if (empty($_GET['offset'])) $_GET['offset'] = 0;
 	$ADD = "&amp;page=".$_GET['page']."&amp;offset=".$_GET['offset'];
 	if (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
 
@@ -91,7 +91,7 @@ function alpha($sortby, $colspan, $return=false)
 function SortLinks($letter, $sortby, $colspan, $return=false)
 {
 	$OUT = "";
-	if (empty($_GET['offset'])) $_GET['offset'] = "0";
+	if (empty($_GET['offset'])) $_GET['offset'] = 0;
 	$ADD = "&amp;page=".$_GET['page']."&amp;offset=".$_GET['offset'];
 	if (!empty($_GET['mode'])) $ADD .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
 
diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 620c42338a..08c14b722d 100644
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -54,7 +54,7 @@ if (isset($_POST['edit']))
 			// First of all load data from DB
 			$result = SQL_QUERY_ESC("SELECT admin_id, id FROM "._MYSQL_PREFIX."_admins_mails WHERE mail_template='%s' ORDER BY id",
 			 array($template), __FILE__, __LINE__);
-			$OUT = ""; $aid = "0"; $aid2 = "0";
+			$OUT = ""; $aid = 0; $aid2 = 0;
 			while (list($aid, $id) = SQL_FETCHROW($result))
 			{
 				$OUT .= "<SELECT name=\"admin_id[".$id."]\" size=\"1\" class=\"admin_select\">
diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index 7a3b3c2238..0f1b92788e 100644
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -60,7 +60,7 @@ if (isset($_POST['del']))
 
 // We only need outgoing transfers
 $result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY trans_id", __FILE__, __LINE__);
-$total = "0";
+$total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
 	// Output rows
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 4cfcb50a70..afe6ac4543 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -154,7 +154,7 @@ if (SQL_NUMROWS($result_list) > 0)
 		 elseif ($unconfirmed < 0)
 		{
 			// Sometimes rarely displayed minus values will be "fixed" to zero
-			$unconfirmed = "0";
+			$unconfirmed = 0;
 		}
 
 		// List mail
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index c33b616d40..ce0379f0c2 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -44,7 +44,7 @@ global $cacheInstance, $cacheArray, $cacheMode;
 
 // Normally we want the overview of all registered extensions
 $do = "overview";
-$SEL = "0";
+$SEL = 0;
 if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
 
 if (!empty($_GET['reg_ext'])) {
@@ -72,7 +72,7 @@ if (!empty($_GET['reg_ext'])) {
 	// Change settings like CSS file load
 	if (isset($_POST['modify'])) {
 		// Change entries
-		$cacheInstance_UPDATE = "0";
+		$cacheInstance_UPDATE = 0;
 		foreach ($_POST['sel'] as $id => $sel) {
 			// Secure ID
 			$id = bigintval($id);
@@ -197,7 +197,7 @@ if (!empty($_GET['reg_ext'])) {
 	$do = "delete";
 } elseif ((isset($_POST['remove'])) && ($SEL > 0) && (!IS_DEMO())) {
 	// Remove extensions from DB (you have to delete all files manually!)
-	$cacheInstance_UPDATE = "0";
+	$cacheInstance_UPDATE = 0;
 	foreach ($_POST['sel'] as $id => $active) {
 		// Secure ID number
 		$id = bigintval($id);
@@ -297,7 +297,7 @@ case "register": // Register new extension
 		SQL_FREERESULT($result);
 
 		// Disable cache update by default
-		$cacheInstance_UPDATE = "0";
+		$cacheInstance_UPDATE = 0;
 		if (!empty($subj)) {
 			// Extract extension's name from subject...
 			$ext_name = trim(substr($subj, 1, strpos($subj, ":") - 1));
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index a4d1dc66bc..5a6df80094 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -49,28 +49,22 @@ if (!empty($_GET['pid']))
 	SQL_FREERESULT($result);
 
 	// Obtain some data
-	if (empty($_GET['task']) && (!empty($uid)) && ($uid > 0))
-	{
+	if (empty($_GET['task']) && (!empty($uid)) && ($uid > 0)) {
 		// Get task ID from database
 		$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE userid=%s AND task_type='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",
 		 array(bigintval($uid)), __FILE__, __LINE__);
 		list($task) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		if (empty($task)) $task = "0";
-
-	}
-	 elseif ((empty($uid)) || ($uid == "0"))
-	{
+		if (empty($task)) $task = 0;
+	} elseif ((empty($uid)) || ($uid == "0")) {
 		// Cannot obtain member ID!
 		LOAD_TEMPLATE("admin_settings_saved", false, PAYOUT_FAILED_OBTAIN_USERID);
-	}
-	 else
-	{
+	} else {
 		// Get task ID from URL
 		$task = $_GET['task'];
 	}
-	if ((!empty($task)) && (!empty($uid)) && ($uid > 0))
-	{
+
+	if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
 		// Load user's data
 		$result = SQL_QUERY_ESC("SELECT email, sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 		 array(bigintval($uid)), __FILE__, __LINE__);
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 7ef34bd302..4438870eee 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -341,7 +341,7 @@ ORDER BY start_time DESC",
 				// Rallye is active so do not edit it!
 				$content['select'] = "<STRONG class=\"big\">".$id."</STRONG>";
 				$content['active_title'] = RALLYE_DEACTIVATE_NOW;
-				$content['active'] = "0";
+				$content['active'] = 0;
 				break;
 
 			case 'N':
@@ -355,7 +355,7 @@ ORDER BY start_time DESC",
 			{
 			case 'Y':
 				$content['notify_title'] = RALLYE_STOP_NOTIFY_NOW;
-				$content['notify'] = "0";
+				$content['notify'] = 0;
 				break;
 
 			case 'N':
@@ -369,7 +369,7 @@ ORDER BY start_time DESC",
 			{
 			case 'Y':
 				$content['auto_title'] = RALLYE_STOP_AUTO_ADD_NOW;
-				$content['auto'] = "0";
+				$content['auto'] = 0;
 				break;
 
 			case 'N':
diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 9135b5b2cd..498444a912 100644
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -61,7 +61,7 @@ WHERE id='%s' LIMIT 1",
 		 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 		list($orders) = SQL_FETCHROW($result_orders);
 		SQL_FREERESULT($result_orders);
-		if (empty($orders)) $orders = "0";
+		if (empty($orders)) $orders = 0;
 
 		// Prepare all data for the template
 		//  Sponsor's ID
diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index 4a4a926b89..64b6474750 100644
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", basename(__FILE__));
 
 // We only need outgoing transfers
 $result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY trans_id", __FILE__, __LINE__);
-$total = "0";
+$total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
 	// Output rows
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 1c763694f5..7fe2287fa0 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -96,7 +96,7 @@ if ($listed)
 
 		// Transfer data to constants for the template
 		if (($stats_id > 0) && ($ID == "-1")) $ID = $stats_id;
-		if ($col == "bonus_id") $sender = "0";
+		if ($col == "bonus_id") $sender = 0;
 		define('__LIST_UNCON_SENDER' , $sender);
 		define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
 		define('__LIST_UNCON_TEXT'   , COMPILE_CODE($text));
diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 345a7bdaf7..799d606969 100644
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -169,7 +169,7 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s',
 			$CATS['name'][] = $cat;
 			$result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s",
 			 array(bigintval($id)), __FILE__, __LINE__);
-			$uid_cnt = "0";
+			$uid_cnt = 0;
 			while (list($ucat) = SQL_FETCHROW($result_uids))
 			{
 				$result_ver = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data
diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index e266ccb632..b3368dd779 100644
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -44,7 +44,7 @@ global $cacheInstance, $cacheArray, $cacheMode;
 
 // Normally we want the overview of all registered theme_check
 $mode = "overview";
-$SEL = "0";
+$SEL = 0;
 
 // Get response from our server
 $response = GET_URL("check-themes.php");
diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index aacab36091..4bf1d60f1d 100644
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -85,7 +85,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 
 		if (($response[3] != "[EOF]") && ($ONLINE['version'] == FULL_VERSION)) {
 			// We have found new patches (newer than FULL_VERSION)
-			$max = str_replace("\n", "", $response[sizeof($response) - 2]); $TOTAL_SIZE = "0";
+			$max = str_replace("\n", "", $response[sizeof($response) - 2]); $TOTAL_SIZE = 0;
 
 			// Maximum of available pacthes extracted (above). Now we can get all informations
 			for ($idx = 0; $idx < $max; $idx++) {
diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 3aeef30560..ecf3887652 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -64,11 +64,11 @@ if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')))
 	}
 } elseif (!empty($_POST['new_pass'])) {
 	// New password requested
-	$UID = "0";
+	$UID = 0;
 	if (!empty($_POST['id'])) $UID = $_POST['id'];
 } else {
 	// Not logged in
-	$UID = "0"; $hash = "";
+	$UID = 0; $hash = "";
 }
 
 $URL = ""; $ADD = "";
@@ -229,7 +229,7 @@ if (IS_MEMBER()) {
 	if (!empty($_POST['email'])) $_POST['email'] = str_replace("{DOT}", '.', $_POST['email']);
 
 	// Set ID number when left empty
-	if (empty($_POST['id'])) $_POST['id'] = "0";
+	if (empty($_POST['id'])) $_POST['id'] = 0;
 
 	// Probe userid/nickname
 	$probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['id'])."") != $_POST['id']));
diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 5d7439a7a5..e73614e2f4 100644
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -101,28 +101,28 @@ define('rec', $dummy);
 SQL_FREERESULT($result_rec);
 
 // Initial lots of variables
-$bmails = "0"; $sent = "0"; $max = "0"; $rec = "0"; $clicks = "0";
+$bmails = 0; $sent = 0; $max = 0; $rec = 0; $clicks = 0;
 
 // Mail orders (only current)
 $nmails = MEDIA_GET_ENTRY("normal_orders");
-if (empty($nmails)) $nmails = "0";
+if (empty($nmails)) $nmails = 0;
 
 // Mails sent so far
 $clicks = MEDIA_GET_ENTRY("normal_clicks");
 $sent   = MEDIA_GET_ENTRY("normal_send");
-if (empty($sent))   $sent   = "0";
-if (empty($clicks)) $clicks = "0";
+if (empty($sent))   $sent   = 0;
+if (empty($clicks)) $clicks = 0;
 
 // Bonus mails
 if (EXT_IS_ACTIVE("bonus")) {
 	$bmails = MEDIA_GET_ENTRY("bonus_orders");
-	if (empty($bmails)) $bmails = "0";
+	if (empty($bmails)) $bmails = 0;
 
 	// Count bonus mails clicks / sent mails
 	$dmy  = MEDIA_GET_ENTRY("bonus_clicks");
 	$dmy2 = MEDIA_GET_ENTRY("bonus_send");
-	if (empty($dmy))  $dmy  = "0";
-	if (empty($dmy2)) $dmy2 = "0";
+	if (empty($dmy))  $dmy  = 0;
+	if (empty($dmy2)) $dmy2 = 0;
 	$sent += $dmy2; $clicks += $dmy;
 }
 
@@ -140,7 +140,7 @@ define('_clr', TRANSLATE_COMMA($clr)."%");
 $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
 list($jackpot) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
-if (empty($jackpot)) $jackpot = "0";
+if (empty($jackpot)) $jackpot = 0;
 define('jackpot', TRANSLATE_COMMA($jackpot));
 
 // Total referral link clicks, total logins
@@ -152,9 +152,9 @@ SQL_FREERESULT($result);
 // Get total points
 $points = MEDIA_GET_ENTRY("total_points");
 
-if (empty($points)) $points = "0";
-if (empty($ref))    $ref    = "0";
-if (empty($logins)) $logins = "0";
+if (empty($points)) $points = 0;
+if (empty($ref))    $ref    = 0;
+if (empty($logins)) $logins = 0;
 
 define('__TOTAL_POINTS'   , TRANSLATE_COMMA($points));
 define('__TOTAL_REFCLICKS', $ref);
@@ -168,9 +168,9 @@ $result = SQL_QUERY("SELECT SUM(counter), SUM(clicks) FROM "._MYSQL_PREFIX."_ref
 list($views, $clicks) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
-if (empty($total))  $total  = "0";
-if (empty($views))  $views  = "0";
-if (empty($clicks)) $clicks = "0";
+if (empty($total))  $total  = 0;
+if (empty($views))  $views  = 0;
+if (empty($clicks)) $clicks = 0;
 
 define('__REF_TOTAL' , $total);
 define('__REF_VIEWS' , $views);
@@ -191,7 +191,7 @@ if (EXT_IS_ACTIVE("beg")) {
 	$result = SQL_QUERY("SELECT SUM(beg_clicks) FROM "._MYSQL_PREFIX."_user_data WHERE beg_clicks>0", __FILE__, __LINE__);
 	list($extra) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
-	if (empty($extra)) $extra = "0";
+	if (empty($extra)) $extra = 0;
 	$content = array(
 		'lang'  => MEDIA_BEG_CLICKS,
 		'value' => $extra
@@ -209,10 +209,10 @@ if (EXT_IS_ACTIVE("doubler")) {
 	list($count2, $points2) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
-	if (empty($count1))  $count1  = "0";
-	if (empty($count2))  $count2  = "0";
-	if (empty($points1)) $points1 = "0";
-	if (empty($points2)) $points2 = "0";
+	if (empty($count1))  $count1  = 0;
+	if (empty($count2))  $count2  = 0;
+	if (empty($points1)) $points1 = 0;
+	if (empty($points2)) $points2 = 0;
 
 	// Add header
 	$OUT_SPECIAL .= LOAD_TEMPLATE("mediadata_extra_hrow", true, MEDIA_DOUBLER_HEADER);
@@ -251,7 +251,7 @@ ON h.userid=d.userid
 WHERE d.holiday_active='Y'",
  __FILE__, __LINE__);
 	list($holiday) = SQL_FETCHROW($result);
-	if (empty($holiday)) $holiday = "0";
+	if (empty($holiday)) $holiday = 0;
 	$content = array(
 		'lang'  => MEDIA_HOLIDAY_COUNT,
 		'value' => $holiday
@@ -268,8 +268,8 @@ LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON t.userid=d.userid",
  __FILE__, __LINE__);
 	list($count_in, $points_in) = SQL_FETCHROW($result);
-	if (empty($count_in))  $count_in  = "0";
-	if (empty($points_in)) $points_in = "0";
+	if (empty($count_in))  $count_in  = 0;
+	if (empty($points_in)) $points_in = 0;
 
 	$result = SQL_QUERY("SELECT DISTINCT COUNT(t.id), SUM(t.points)
 FROM "._MYSQL_PREFIX."_user_transfers_out AS t
@@ -277,8 +277,8 @@ LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON t.userid=d.userid",
  __FILE__, __LINE__);
 	list($count_out, $points_out) = SQL_FETCHROW($result);
-	if (empty($count_out))  $count_out  = "0";
-	if (empty($points_out)) $points_out = "0";
+	if (empty($count_out))  $count_out  = 0;
+	if (empty($points_out)) $points_out = 0;
 
 	// Add header
 	$OUT_SPECIAL .= LOAD_TEMPLATE("mediadata_extra_hrow", true, MEDIA_TRANSFER_HEADER);
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index b4c2f9a8cb..ccbc0821a5 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -104,7 +104,7 @@ $HTML_EXT = EXT_IS_ACTIVE("html_mail");
 $result_p = SQL_QUERY_ESC("SELECT SUM(points) FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 
-$TOTAL = "0";
+$TOTAL = 0;
 if (SQL_NUMROWS($result_p) > 0)
 {
 	// Load points
@@ -137,7 +137,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 	$result = SQL_QUERY_ESC("SELECT id, data_type FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND url='%s' AND timestamp > %s LIMIT 1",
 	 array($GLOBALS['userid'], $_POST['url'], bigintval(time() - $_CONFIG['url_tlock'])), __FILE__, __LINE__);
 
-	$type = "TEMP"; $id = "0";
+	$type = "TEMP"; $id = 0;
 	if (SQL_NUMROWS($result) == 1)
 	{
 		list($id, $type) = SQL_FETCHROW($result);
@@ -485,7 +485,7 @@ array(
 				$result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
 				 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
-				$uid_cnt = "0";
+				$uid_cnt = 0;
 				while (list($ucat) = SQL_FETCHROW($result_uids))
 				{
 					// Check for holiday system
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 1a828cdb9c..1983bb7171 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 ADD_DESCR("member", basename(__FILE__));
 
 $result_depths = SQL_QUERY("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
-$TPTS = "0";
+$TPTS = 0;
 while (list($lvl, $per) = SQL_FETCHROW($result_depths))
 {
 	// Load referral points
diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 87f17ee8ed..129fb40263 100644
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -54,12 +54,12 @@ if (GET_EXT_VERSION("bonus") >= "0.4.4") $depths += 4;
 define('__ROWS_VALUE', ($depths*2+15));
 
 // Init some vars...
-$TPTS = "0"; $TREF = "0"; $TLOCK = "0"; $OUT = "";
+$TPTS = 0; $TREF = 0; $TLOCK = 0; $OUT = "";
 
 // Load ref levels
 while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
 	// Initialize ref-count
-	$REFS = "0";
+	$REFS = 0;
 
 	// Load referral points
 	$result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s AND ref_depth=%s LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
@@ -79,7 +79,7 @@ while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
 		SQL_FREERESULT($result_refs);
 		$TREF += $REFS;
 	} else {
-		$REFS = "0";
+		$REFS = 0;
 	}
 
 	// Transfer data to array for template
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 0e9c148ae8..eac91e3a0b 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -362,7 +362,7 @@ case "list_out": // List only outgoing transactions
 	}
 
 	// Run the SQL command
-	$total = "0";
+	$total = 0;
 	$result = SQL_QUERY_ESC($SQL, array($GLOBALS['userid']), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0)
 	{
@@ -456,7 +456,7 @@ array($GLOBALS['userid'], $_CONFIG['transfer_max']), __FILE__, __LINE__);
 	// Free memory
 	SQL_FREERESULT($result);
 
-	$total = "0";
+	$total = 0;
 	if (SQL_NUMROWS($result) > 0)
 	{
 		// Output rows
diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 114276f7ab..4e22502eaf 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -57,7 +57,7 @@ if (EXT_IS_ACTIVE("bonus")) {
 if (SQL_NUMROWS($result) > 0)
 {
 	// Please confirm these mails!
-	$sum = "0"; $SW = 2; $OUT = "";
+	$sum = 0; $SW = 2; $OUT = "";
 	while (list($id, $id2, $type) = SQL_FETCHROW($result))
 	{
 		// Load data from stats table...
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 59921655d4..1f2fefc671 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -124,23 +124,7 @@ LIMIT 1", __FILE__, __LINE__);
 					require_once(PATH."inc/theme-manager.php");
 
 					// Run daily reset
-					// 01    2                            2        2         3321    1                         2                     21    1                        2                    21    1                        2                  21    1      2                 21    1         10
-					if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) {
-						// Do daily things in external PHP file but only when script is completely setup
-						$INC_POOL = array();
-						$INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
-
-						// Daily reset was run!
-						define('__DAILY_RESET', true);
-
-						// Add more includes
-						RESET_ADD_INCLUDES();
-
-						// Run the full reset scripts
-						foreach ($INC_POOL as $incFile) {
-							require_once($incFile);
-						} // END - foreach
-					} // END - if
+					require_once(PATH."inc/check-reset.php");
 
 					// Load admin include file if he is admin
 					if (IS_ADMIN()) {
@@ -163,7 +147,7 @@ LIMIT 1", __FILE__, __LINE__);
 					UPDATE_LOGIN_DATA();
 
 					// Update online list
-					UPDATE_ONLINE_LIST(get_session('PHPSESSID'), $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
+					UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
 
 					// Load theme name
 					$currTheme = GET_CURR_THEME();
@@ -182,7 +166,7 @@ LIMIT 1", __FILE__, __LINE__);
 							// Anything else like begging link
 							$GLOBALS['what'] = "";
 						}
-					}
+					} // END - if
 
 					// Update sending pool
 					if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 8ddbea29c9..e1df712762 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -245,7 +245,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
 		$AND = "";
 	}
 	if ((!isset($DEPTH)) && (!$return)) {
-		$DEPTH = "0";
+		$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>";
 	} else {
 		if (!$return) $DEPTH++;
@@ -1004,7 +1004,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
 //
 function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false)
 {
-	$ret = "0";
+	$ret = 0;
 	if ($onlyRows) {
 		// Count rows
 		$result = SQL_QUERY_ESC("SELECT COUNT(%s) FROM "._MYSQL_PREFIX."_%s WHERE %s='%s'",
@@ -1021,7 +1021,7 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid",
 	SQL_FREERESULT($result);
 	if (empty($ret)) {
 		if (($lookFor == "counter") || ($lookFor == "id")) {
-			$ret = "0";
+			$ret = 0;
 		} else {
 			$ret = "0.00000";
 		}
@@ -1057,7 +1057,7 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 	// Count up referral depth
 	if (empty($DEPTH)) {
 		// Initialialize referral system
-		$DEPTH = "0";
+		$DEPTH = 0;
 	} else {
 		// Increase referral level
 		$DEPTH++;
@@ -1156,8 +1156,9 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 function UPDATE_REF_COUNTER($uid)
 {
 	global $REF_LVL, $cacheInstance;
+
 	// Make it sure referral level zero (member him-/herself) is at least selected
-	if (empty($REF_LVL)) $REF_LVL = "0";
+	if (empty($REF_LVL)) $REF_LVL = 0;
 
 	// Update counter
 	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
@@ -1191,45 +1192,50 @@ function UPDATE_REF_COUNTER($uid)
 		if ($cacheInstance->cache_file("refsystem", true)) $cacheInstance->cache_destroy();
 	}
 }
-//
-function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht)
-{
+// Updates/extends the online list
+function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) {
 	global $_CONFIG;
 
 	// Do not update online list when extension is deactivated
 	if (!EXT_IS_ACTIVE("online", true)) return;
 
+	// Empty session?
+	if (empty($SID)) {
+		// This is invalid here!
+		print "Invalid session. Backtrace:<pre>";
+		debug_print_backtrace();
+		die("</pre>");
+	} // END - if
+
 	// Initialize variables
-	$uid = "0"; $rid = "0"; $MEM = "N"; $ADMIN = "N";
-	if (!empty($GLOBALS['userid']))
-	{
-		// Update member status only when userid is valid
-		if (($GLOBALS['userid'] > 0) && (IS_MEMBER()))
-		{
-			// Is valid user
-			$uid = $GLOBALS['userid'];
-			$MEM = "Y";
-		}
-	}
-	if (IS_ADMIN())
-	{
+	$uid = 0; $rid = 0; $MEM = "N"; $ADMIN = "N";
+
+	// Valid userid?
+	if ((!empty($GLOBALS['userid'])) && ($GLOBALS['userid'] > 0) && (IS_MEMBER())) {
+		// Is valid user
+		$uid = bigintval($GLOBALS['userid']);
+		$MEM = "Y";
+	} // END - if
+
+	if (IS_ADMIN()) {
 		// Is administrator
 		$ADMIN = "Y";
-	}
+	} // END - if
+
 	if (isSessionVariableSet('refid')) {
 		// Check cookie
-		if (get_session('refid') > 0) $rid = $GLOBALS['refid'];
-	}
+		if (get_session('refid') > 0) $rid = bigintval($GLOBALS['refid']);
+	} // END - if
 
-	// Now Read data
+	// Now search for the user
 	$result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_online
 WHERE sid='%s' LIMIT 1",
  array($SID), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) == 1)
-	{
-		SQL_FREERESULT($result);
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET
+	// Entry found?
+	if (SQL_NUMROWS($result) == 1) {
+		// Then update it
+		SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET
 module='%s',
 action='%s',
 what='%s',
@@ -1239,24 +1245,18 @@ is_member='%s',
 is_admin='%s',
 timestamp=UNIX_TIMESTAMP()
 WHERE sid='%s' LIMIT 1",
- array(
-	$mod,
-	$act,
-	$wht,
-	bigintval($uid),
-	bigintval($rid),
-	$MEM,
-	$ADMIN,
-	$SID
-), __FILE__, __LINE__);
-	}
-	 else
-	{
+			array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID), __FILE__, __LINE__
+		);
+	} else {
 		// No entry does exists so we simply add it!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')",
-		 array($mod, $act, $wht, bigintval($uid), bigintval($rid), $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')",
+			array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__
+		);
 	}
 
+	// Free result
+	SQL_FREERESULT($result);
+
 	// Purge old entries
 	$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
 	 array($_CONFIG['online_timeout']), __FILE__, __LINE__);
diff --git a/inc/patch-system.php b/inc/patch-system.php
index 19659950bf..9eb7c43df2 100644
--- a/inc/patch-system.php
+++ b/inc/patch-system.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Check for patch level differences between databases and current hard-coded
 if (CURR_SVN_REVISION > $_CONFIG['patch_level']) {
 	// Update database and CONFIG array
-	UPDATE_CONFIG(array("patch_level", "path_ctime"), array(CURR_SVN_REVISION, "UNIX_TIMESTAMP()"));
+	UPDATE_CONFIG(array("patch_level", "patch_ctime"), array(CURR_SVN_REVISION, "UNIX_TIMESTAMP()"));
 	$_CONFIG['patch_level'] = CURR_SVN_REVISION;
 	$_CONFIG['patch_ctime'] = time();
 } // END - if
diff --git a/inc/pool-update.php b/inc/pool-update.php
index 592ef3b5fc..fad28479f8 100644
--- a/inc/pool-update.php
+++ b/inc/pool-update.php
@@ -54,7 +54,7 @@ if ($HTML_EXT)
 }
 
 // Reset variables
-$cnt = "0"; $cnt2 = "0"; $LAST_SENT_ID = "0"; $cnt_back = array("0"); $points_BACK = array("0");
+$cnt = 0; $cnt2 = 0; $LAST_SENT_ID = 0; $cnt_back = array("0"); $points_BACK = array("0");
 if (SQL_NUMROWS($result_main) > 0)
 {
 	while ($DATA = SQL_FETCHROW($result_main))
@@ -208,7 +208,7 @@ if (SQL_NUMROWS($result_main) > 0)
 						$result_user = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_stats SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",
 						 array(bigintval($DATA[0])), __FILE__, __LINE__);
 
-						$LAST_SENT_ID = $DATA[0]; $cnt = "0";
+						$LAST_SENT_ID = $DATA[0]; $cnt = 0;
 						$cnt2 += $cnt;
 
 						// Update mediadata if version is 0.0.4 or higher
diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index d18d2fbd62..b8adac194a 100644
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
diff --git a/inc/session.php b/inc/session.php
index 7710e9bf65..b3c4dfbd55 100644
--- a/inc/session.php
+++ b/inc/session.php
@@ -47,6 +47,7 @@ if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
 
 // Start the session
 @session_start();
+global $PHPSESSID;
 $PHPSESSID = @session_id();
 
 // Store language code in cookie
diff --git a/mailid_top.php b/mailid_top.php
index 1ac56046dc..6810f06aa3 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -39,7 +39,7 @@ global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 
 // Tell everyone we are in this module
-$GLOBALS['module'] = "mailid";  $CSS = "0";
+$GLOBALS['module'] = "mailid";  $CSS = 0;
 
 // Load the required file(s)
 require ("inc/config.php");
@@ -53,7 +53,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	}
 
 	// Secure all data
-	$url_uid = "0"; $url_bid = "0"; $url_mid = "0"; $code = "0"; $mode = "";
+	$url_uid = 0; $url_bid = 0; $url_mid = 0; $code = 0; $mode = "";
 	if (!empty($_GET['uid']))     $url_uid = bigintval($_GET['uid']);
 	if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
 	if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
diff --git a/ref.php b/ref.php
index d733f53f89..dbbff4b257 100644
--- a/ref.php
+++ b/ref.php
@@ -73,7 +73,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		} // END - if
 
 		// Also edit this 0 !
-		if (empty($ref)) $ref = "0";
+		if (empty($ref)) $ref = 0;
 
 		// We have an refid here. So we simply add it
 		$URL .= bigintval($ref);
-- 
2.39.5