X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e33b1b395e995c187edbccd29b2fbde77684f250;hb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;hp=1c9a5c64cfef11039c97297211784ee18d01b34d;hpb=9f6c30cc0e06098171d773d671292081ecee3d29;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 1c9a5c64cf..e33b1b395e 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/26/2003 *
- * ===============                              Last change: 11/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/26/2003 *
+ * ===================                          Last change: 11/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mysql-manager.php                                *
@@ -79,7 +79,7 @@ function getModuleTitle ($mod) {
 	if (empty($title)) {
 		// No name found
 		$title = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
-		if (SQL_NUMROWS($result) == 0) {
+		if (SQL_NUMROWS($result) == '0') {
 			// Add module to database
 			$dummy = checkModulePermissions($mod);
 		} // END - if
@@ -253,7 +253,7 @@ function checkModulePermissions ($mod = '') {
 
 			// Destroy cache here
 			// @TODO Rewrite this to a filter
-			if ((getOutputMode() == 0) || (getOutputMode() == -1)) rebuildCacheFile('modules', 'modules');
+			if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCacheFile('modules', 'modules');
 
 			// And reload data
 			unset($GLOBALS['module_status'][$mod]);
@@ -262,7 +262,7 @@ function checkModulePermissions ($mod = '') {
 			// Module not found we don't add it to the database
 			$ret = '404';
 		}
-	} elseif (($ret == 'cache_miss') && (getOutputMode() == 0)) {
+	} elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
 		// Rebuild the cache files
 		rebuildCacheFile('modules', 'modules');
 	} elseif ($found === false) {
@@ -348,7 +348,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
 
 	// Begin the navigation line
 	if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
-		$GLOBALS['nav_depth'] = 0;
+		$GLOBALS['nav_depth'] = '0';
 		$prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{?URL?}/modules.php?module=".getModule().$LINK_ADD."\">Home</a></strong>";
 	} else {
 		if ($return === false) $GLOBALS['nav_depth']++;
@@ -386,7 +386,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
 				//* DEBUG: */ print(__LINE__.'+'.$type."+<br />");
 				// Add closing div and br-tag
 				$OUT .= "</div><br />\n";
-				$GLOBALS['nav_depth'] = 0;
+				$GLOBALS['nav_depth'] = '0';
 
 				// Run the filter chain
 				$ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
@@ -411,7 +411,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
 // Adds a menu (mode = guest/member/admin/sponsor) to output
 function addMenu ($mode, $action, $what) {
 	// Init some variables
-	$main_cnt = 0;
+	$main_cnt = '0';
 	$AND = '';
 
 	// is the menu action valid?
@@ -451,7 +451,7 @@ function addMenu ($mode, $action, $what) {
 			// Do we have some entries?
 			if ($totalWhats > 0) {
 				// Init counter
-				$cnt = 0;
+				$cnt = '0';
 
 				// Load all sub menus
 				while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -580,9 +580,12 @@ function isMember () {
 	if (isset($GLOBALS['is_member'])) {
 		// Then return it
 		return $GLOBALS['is_member'];
-	} elseif (getUserId() == 0) {
+	} elseif (getMemberId() == '0') {
 		// No member
 		return false;
+	} else {
+		// Transfer userid=>current
+		setCurrentUserid(getMemberId());
 	}
 
 	// Init global user data array
@@ -592,9 +595,9 @@ function isMember () {
 	fixDeletedCookies(array('userid', 'u_hash'));
 
 	// Are cookies set?
-	if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
+	if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 		// Cookies are set with values, but are they valid?
-		if (fetchUserData(getUserId()) === true) {
+		if (fetchUserData(getMemberId()) === true) {
 			// Validate password by created the difference of it and the secret key
 			$valPass = generatePassString(getUserData('password'));
 
@@ -608,18 +611,16 @@ function isMember () {
 				$ret = true;
 			} else {
 				// Maybe got locked etc.
-				//* DEBUG: */ print(__LINE__."!!!<br />");
-				destroyUserSession();
+				logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status'));
+				destroyMemberSession();
 			}
 		} else {
 			// Cookie data is invalid!
-			//* DEBUG: */ print(__LINE__."***<br />");
-			destroyUserSession();
+			destroyMemberSession();
 		}
 	} else {
 		// Cookie data is invalid!
-		//* DEBUG: */ print(__LINE__."///<br />");
-		destroyUserSession();
+		destroyMemberSession();
 	}
 
 	// Cache status
@@ -631,24 +632,31 @@ function isMember () {
 
 // Fetch user data for given user id
 function fetchUserData ($userid, $column='userid') {
-	// Don't look for invalid userids...
-	if ($userid < 1) {
-		// Invalid, so abort here
-		debug_report_bug('User id ' . $userid . ' is invalid.');
-	} elseif (isset($GLOBALS['user_data'][$userid])) {
+	// If we should look for userid secure&set it here
+	if (substr($column, -2, 2) == 'id') {
+		// Secure userid
+		$userid = bigintval($userid);
+
+		// Set it here
+		setCurrentUserId($userid);
+
+		// Don't look for invalid userids...
+		if ($userid < 1) {
+			// Invalid, so abort here
+			debug_report_bug('User id ' . $userid . ' is invalid.');
+		} elseif (isUserDataValid()) {
+			// Use cache, so it is fine
+			return true;
+		}
+	} elseif (isUserDataValid()) {
 		// Use cache, so it is fine
 		return true;
 	}
 
+
 	// By default none was found
 	$found = false;
 
-	// Do we have userid/refid?
-	if (($column == 'userid') || ($column == 'refid')) {
-		// Then secure the id
-		$userid = bigintval($userid);
-	} // END - if
-
 	// Query for the user
 	$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
 		array($column, $userid), __FUNCTION__, __LINE__);
@@ -666,12 +674,12 @@ function fetchUserData ($userid, $column='userid') {
 		if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) {
 			// Backup the raw one and zero it
 			$GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure'];
-			$GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = 0;
+			$GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = '0';
 
 			// Is it not zero?
 			if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') {
 				// Seperate data/time
-				$array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure']);
+				$array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']);
 
 				// Seperate data and time again
 				$array['date'] = explode('-', $array[0]);
@@ -869,6 +877,8 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 
 	// Run SQL command
 	$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+
+	// Should we look for affected rows (only update) or found rows?
 	if ($updateEntry === true) {
 		// Check updated/affected rows
 		$ret = (SQL_AFFECTEDROWS() == 1);
@@ -891,7 +901,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
 // @TODO Lame description for this function
 function sendModeMails ($mod, $modes) {
 	// Load hash
-	if (fetchUserData(getUserId())) {
+	if (fetchUserData(getMemberId())) {
 		// Extract salt from cookie
 		$salt = substr(getSession('u_hash'), 0, -40);
 
@@ -902,7 +912,7 @@ function sendModeMails ($mod, $modes) {
 		if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
 			// Load user's data               0        1        2         3        4      5    6      7
 			$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND password='%s' LIMIT 1",
-				array(getUserId(), getUserData('password')), __FUNCTION__, __LINE__);
+				array(getMemberId(), getUserData('password')), __FUNCTION__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load the data
 				$content = SQL_FETCHARRAY($result, 0, false);
@@ -945,7 +955,7 @@ function sendModeMails ($mod, $modes) {
 						$content = merge_array($content, postRequestArray());
 
 						// Load template
-						$message = loadEmailTemplate('member_mydata_notify', $content, getUserId());
+						$message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
 
 						if (getConfig('admin_notify') == 'Y') {
 							// The admin needs to be notified about a profile change
@@ -992,7 +1002,7 @@ function sendModeMails ($mod, $modes) {
 	if (empty($content)) {
 		if ((!empty($sub_adm)) && (!empty($message_admin))) {
 			// Send admin mail
-			sendAdminNotification($sub_adm, $message_admin, $content, getUserId());
+			sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
 		} elseif (getConfig('admin_notify') == 'Y') {
 			// Cannot send mails to admin!
 			$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
@@ -1012,7 +1022,15 @@ function getModeAction ($mode, $what) {
 	$ret = '';
 
 	//* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=<br />");
-	if ((empty($what)) && ($mode != 'admin')) {
+	if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
+		// sql_patches is missing so choose depending on mode
+		if ($mode == 'admin') {
+			$what = 'overview';
+		} else {
+			$what = 'welcome';
+		}
+	} elseif ((empty($what)) && ($mode != 'admin')) {
+		// Use configured 'home'
 		$what = getConfig('index_home');
 	} // END - if
 
@@ -1070,7 +1088,7 @@ function getCategory ($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) {
@@ -1160,7 +1178,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 				array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
 
 			// Was it *not* found?
-			if (SQL_NUMROWS($result) == 0) {
+			if (SQL_NUMROWS($result) == '0') {
 				// So we add one!
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES ('%s','%s','%s')",
 					array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
@@ -1181,7 +1199,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
 
 // Calculate sum (default) or count records of given criteria
 function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
-	$ret = 0;
+	$ret = '0';
 	//* DEBUG: */ print($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'<br />');
 	if ((empty($search)) && ($search != '0')) {
 		// Count or sum whole table?
@@ -1218,16 +1236,17 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		$ret = '0.00000';
 	} elseif (''.$ret.'' == '') {
 		// Fix empty result
-		$ret = 0;
+		$ret = '0';
 	}
 
 	// Return value
+	//* DEBUG: */ print 'ret='.$ret.'<br />';
 	return $ret;
 }
 // Getter fro ref level percents
 function getReferalLevelPercents ($level) {
 	// Default is zero
-	$per = 0;
+	$per = '0';
 
 	// Do we have cache?
 	if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
@@ -1272,13 +1291,13 @@ function getReferalLevelPercents ($level) {
  * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = 0, $locked = false, $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
 	//* DEBUG: */ print("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
 	// Convert mode to lower-case
 	$add_mode = strtolower($add_mode);
 
-	// When $userid = 0 add points to jackpot
-	if (($userid == 0) && (isExtensionActive('jackpot'))) {
+	// When $userid = '0' add points to jackpot
+	if (($userid == '0') && (isExtensionActive('jackpot'))) {
 		// Add points to jackpot
 		addPointsToJackpot($points);
 		return;
@@ -1303,7 +1322,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 	if (!isset($GLOBALS['ref_level'])) {
 		// Initialialize referal system
 		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Referal system initialized!<br />");
-		$GLOBALS['ref_level'] = 0;
+		$GLOBALS['ref_level'] = '0';
 	} else {
 		// Increase referal level
 		$GLOBALS['ref_level']++;
@@ -1365,8 +1384,8 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				// Load email template
 				$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
-				sendEmail(getUserData('email'), THANX_REFERRAL_ONE, $message);
-			} elseif (($sendNotify) && (getUserData('refid') == 0) && ($locked === false) && ($add_mode == 'direct')) {
+				sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message);
+			} elseif (($sendNotify) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
 				// Prepare content
 				$content = array(
 					'text'   => getMessage('REASON_DIRECT_PAYMENT'),
@@ -1413,7 +1432,7 @@ function updateReferalCounter ($userid) {
 	} // END - if
 
 	// Init referal id
-	$ref = 0;
+	$ref = '0';
 
 	// Check for his referal
 	if (fetchUserData($userid)) {
@@ -1427,8 +1446,9 @@ function updateReferalCounter ($userid) {
 	if (($ref > 0) && ($ref != $userid)) {
 		// Move to next referal level and count his counter one up!
 		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - ADVANCE!<br />");
-		$GLOBALS['cache_array']['ref_level'][$userid]++; updateReferalCounter($ref);
-	} elseif ((($ref == $userid) || ($ref == 0)) && (getExtensionVersion('cache') >= '0.1.2')) {
+		$GLOBALS['cache_array']['ref_level'][$userid]++;
+		updateReferalCounter($ref);
+	} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
 		// Remove cache here
 		//* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ref={$ref} - CACHE!<br />");
 		rebuildCacheFile('refsystem', 'refsystem');
@@ -1632,22 +1652,29 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 	$ret = '';
 	if ($table == '/ARRAY/') {
 		// Selection from array
-		if (is_array($id) && is_array($name) && count($id) == count($name)) {
+		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>';
 			} // END - foreach
-		} // END - if
+		} else {
+			// Problem in request
+			debug_report_bug('Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name));
+		}
 	} else {
 		// Data from database
-		$SPEC = ', '.$id;
+		$SPEC = ', `' . $id . '`';
 		if (!empty($special)) $SPEC = ', ' . $special;
-		$ORDER = $name.$SPEC;
+		$ORDER = $name . $SPEC;
 		if ($table == 'country') $ORDER = $special;
-		$result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY %s",
-		array($id, $ORDER, $table, $name), __FUNCTION__, __LINE__);
+
+		// Query the database
+		$result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY %s",
+			array($id, $ORDER, $table, $name), __FUNCTION__, __LINE__);
+
+		// Do we have rows?
 		if (SQL_NUMROWS($result) > 0) {
 			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
 			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
@@ -1673,7 +1700,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 // Activate exchange
 function FILTER_ACTIVATE_EXCHANGE () {
 	// Is the extension 'user' there?
-	if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == 0)) {
+	if ((!isExtensionActive('user')) || (getConfig('activate_xchange') == '0')) {
 		// Silently abort here
 		return false;
 	} // END - if
@@ -1701,7 +1728,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
 
 // Deletes a user account with given reason
 function deleteUserAccount ($userid, $reason) {
-	$points = 0;
+	$points = '0';
 	$result = SQL_QUERY_ESC("SELECT
 	(SUM(p.points) - d.used_points) AS points
 FROM
@@ -1721,7 +1748,7 @@ WHERE
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 		// Update mediadata as well
-		if (getExtensionVersion('mediadata') >= '0.0.4') {
+		if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
 			// Update database
 			updateMediadataEntry(array('total_points'), 'sub', $points);
 		} // END - if
@@ -1857,7 +1884,10 @@ function generateCategoryOptionsList ($mode) {
 	);
 
 	// Get categories
-	$result = SQL_QUERY("SELECT id, cat FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+		__FUNCTION__, __LINE__);
+
+	// Do we have entries?
 	if (SQL_NUMROWS($result) > 0) {
 		// ... and begin loading stuff
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -1870,7 +1900,7 @@ function generateCategoryOptionsList ($mode) {
 				array(bigintval($content['id'])), __FUNCTION__, __LINE__);
 
 			// Start adding all
-			$userid_cnt = 0;
+			$userid_cnt = '0';
 			// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 			while (list($ucat) = SQL_FETCHROW($result_userids)) {
 				$result_ver = SQL_QUERY_ESC("SELECT
@@ -1878,7 +1908,9 @@ function generateCategoryOptionsList ($mode) {
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`userid`=%s AND `status`='CONFIRMED' AND `receive_mails` > 0".runFilterChain('exclude_users', $mode)."
+	`userid`=%s AND
+	`status`='CONFIRMED' AND
+	`receive_mails` > 0".runFilterChain('exclude_users', $mode)."
 LIMIT 1",
 					array(bigintval($ucat)), __FUNCTION__, __LINE__);
 
@@ -1929,7 +1961,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
 	$target = countSelection(explode(';', $receiverList));
 
 	// Receiver is zero?
-	if ($receiver == 0) {
+	if ($receiver == '0') {
 		// Then auto-fix it
 		$receiver = $target;
 	} // END - if
@@ -1990,7 +2022,7 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 	$receiver = bigintval($receiver);
 
 	// Is the receiver zero and mode set?
-	if (($receiver == 0) && (!empty($mode))) {
+	if (($receiver == '0') && (!empty($mode))) {
 		// Auto-fix receiver maximum
 		$receiver = getTotalReceivers($mode);
 	} // END - if
@@ -2042,13 +2074,13 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
 }
 
 // Get timestamp for given stats type and data
-function getTimestampFromUserStats ($type, $data, $userid = 0) {
+function getTimestampFromUserStats ($type, $data, $userid = '0') {
 	// Default timestamp is zero
-	$stamp = 0;
+	$stamp = '0';
 
 	// User id set?
-	if ((isUserIdSet()) && ($userid == 0)) {
-		$userid = getUserId();
+	if ((isMemberIdSet()) && ($userid == '0')) {
+		$userid = getMemberId();
 	} // END - if
 
 	// Is the extension installed and updated?
@@ -2147,7 +2179,7 @@ ORDER BY ur.refid ASC",
 			$row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
 
 			// Init clickrate with zero
-			$row['clickrate'] = 0;
+			$row['clickrate'] = '0';
 
 			// Is at least one mail received?
 			if ($row['emails_received'] > 0) {
@@ -2207,10 +2239,22 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 }
 
 // Creates a new task
-function createNewTask ($subject, $notes, $taskType, $userid = 0, $adminId = 0, $strip = true) {
+function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '0', $strip = true) {
 	// Insert the task data into the database
 	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
-		array($adminId, $userid, $taskType, $subject, smartAddSlashes($notes)), __FUNCTION__, __LINE__, true, $strip);
+		array($adminId, $userid, $taskType, $subject, escapeQuotes($notes)), __FUNCTION__, __LINE__, true, $strip);
+}
+
+// Updates last module / online time
+// @TODO Fix inconsistency between last_module and getWhat()
+function updateLastActivity($userid) {
+	// Run the update query
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
+		array(
+			getWhat(),
+			detectRemoteAddr(),
+			bigintval($userid)
+		), __FUNCTION__, __LINE__);
 }
 
 // [EOF]