X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=33ee4cf417de3f1a16368994b5c5519318d48715;hp=81778853ab2c3ca209b01b62fe0a46dbcf9ed24b;hb=1a9c4d5736b58e8d1da657ba2ff3da9f0777300c;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb

diff --git a/mailid.php b/mailid.php
index 81778853ab..33ee4cf417 100644
--- a/mailid.php
+++ b/mailid.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/14/2003 *
- * ===============                              Last change: 11/25/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/14/2003 *
+ * ===================                          Last change: 11/25/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mailid.php                                       *
@@ -57,17 +57,17 @@ setContentType('text/html');
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$url_userid = 0;
-$url_bid = 0;
-$url_mid = 0;
+$url_userid = '0';
+$url_bid = '0';
+$url_mid = '0';
 
 // Secure all data
-if (isGetRequestElementSet('userid'))  $url_userid = bigintval(getRequestElement('userid'));
-if (isGetRequestElementSet('mailid'))  $url_mid    = bigintval(getRequestElement('mailid'));
-if (isGetRequestElementSet('bonusid')) $url_bid    = bigintval(getRequestElement('bonusid'));
+if (isGetRequestParameterSet('userid'))  $url_userid = bigintval(getRequestParameter('userid'));
+if (isGetRequestParameterSet('mailid'))  $url_mid    = bigintval(getRequestParameter('mailid'));
+if (isGetRequestParameterSet('bonusid')) $url_bid    = bigintval(getRequestParameter('bonusid'));
 
 // 01           1        12            2    2            21    1                   22     10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == '0')) {
 	// Init result
 	$result_link = false;
 
@@ -84,7 +84,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 		$type = 'bonusid'; $urlId = $url_bid;
 	} else {
 		// Problem: No id entered
-		redirectToUrl('index.php');
+		redirectToUrl('modules.php?module=index');
 	}
 
 	if (SQL_NUMROWS($result_link) == 1) {
@@ -95,7 +95,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 		switch ($ltype) {
 			case 'NORMAL':
 				// Is the stats id valid?
-				$result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($url_mid), __FILE__, __LINE__);
 				break;
 
@@ -111,7 +111,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 			default: // Invalid mail type
 				debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
 				break;
-		}
+		} // END - switch
 
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
@@ -124,17 +124,17 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 			setExtraTitle($title);
 
 			// Is the user's id unlocked?
-			$result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-				array($url_userid), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
-				list($status, $gender, $surname, $family) = SQL_FETCHROW($result);
-				SQL_FREERESULT($result);
-				if ($status == 'CONFIRMED') {
+			if (fetchUserData($url_userid)) {
+				// Status must be CONFIRMED
+				if (getUserData('status') == 'CONFIRMED') {
+					// Update last activity if not admin
+					updateLastActivity($url_userid);
+
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
 					switch ($ltype) {
 						case 'NORMAL':
-							$result = SQL_QUERY_ESC("SELECT payment_id FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT `payment_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
 								array(bigintval($pool)), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($pay) = SQL_FETCHROW($result);
@@ -148,13 +148,13 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 							break;
 
 						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT points, time FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT `points`, `time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array($url_bid), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($points, $time) = SQL_FETCHROW($result);
 								$payment = '0.00000';
 								$isValid = true;
-							}
+							} // END - if
 
 							// Free memory
 							SQL_FREERESULT($result);
@@ -171,14 +171,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 					// Was that mail a valid one?
 					if ($isValid === true) {
 						// If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
-						if (($time == 0) && ($payment > 0)) { $URL = getConfig('URL'); $time = 1; }
+						if (($time == '0') && ($payment > 0)) { $URL = getConfig('URL'); $time = 1; }
 						if (($time > 0) && (($payment > 0) || ($points > 0))) {
 							// Export data into constants for the template
 							$content = array(
 								'userid'  => $url_userid,
-								'type' => $type,
-								'data' => $urlId,
-								'url'  => generateDerefererUrl($URL)
+								'type'    => $type,
+								'data'    => $urlId,
+								'url'     => generateDerefererUrl($URL)
 							);
 
 							// Load template
@@ -190,7 +190,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 						$errorCode = getCode('POSSIBLE_INVALID');
 					}
 				} else {
-					$errorCode = getCode('ACCOUNT_' . $status);
+					$errorCode = getCode('ACCOUNT_' . getUserData('status'));
 				}
 			} else {
 				$errorCode = getCode('USER_404');
@@ -223,7 +223,7 @@ if (!empty($errorCode)) {
 				redirectToConfiguredUrl('reject_url');
 			} else {
 				// Redirect to index
-				redirectToUrl('index.php');
+				redirectToUrl('modules.php?module=index');
 			}
 			break;