X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=33ee4cf417de3f1a16368994b5c5519318d48715;hp=ffad34755551de02776a3253de1ee5eefebed2c8;hb=8fc1c99d323e7599dd91071a5a772261b5d079a7;hpb=a6c65fe3bac46ab95bd9e49908c53cd6e3381ff8

diff --git a/mailid.php b/mailid.php
index ffad347555..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,46 +57,45 @@ 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;
+
 	// Maybe he wants to confirm an email?
 	if ($url_mid > 0) {
 		// Normal-Mails
-		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+		$result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
 			array($url_mid, $url_userid), __FILE__, __LINE__);
 		$type = 'mailid'; $urlId = $url_mid;
 	} elseif ($url_bid > 0) {
 		// Bonus-Mail
-		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+		$result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
 			array($url_bid, $url_userid), __FILE__, __LINE__);
 		$type = 'bonusid'; $urlId = $url_bid;
 	} else {
-		// Problem: No ID entered
-		redirectToUrl('index.php');
+		// Problem: No id entered
+		redirectToUrl('modules.php?module=index');
 	}
 
-	if (SQL_NUMROWS($result) == 1) {
+	if (SQL_NUMROWS($result_link) == 1) {
 		// Load the entry
-		list($ltype) = SQL_FETCHROW($result);
-
-		// Clean result
-		SQL_FREERESULT($result);
+		list($ltype) = SQL_FETCHROW($result_link);
 
 		// @TODO Rewrite this to a filter
-		switch ($ltype)
-		{
+		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",
+				// Is the stats id valid?
+				$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;
 
@@ -112,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,18 +123,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 			// Set it
 			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') {
+			// Is the user's id unlocked?
+			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);
@@ -149,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);
@@ -172,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
@@ -191,20 +190,20 @@ 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 {
-				SQL_FREERESULT($result);
 				$errorCode = getCode('USER_404');
 			}
 		} else {
-			SQL_FREERESULT($result);
 			$errorCode = getCode('STATS_404');
 		}
 	} else {
-		SQL_FREERESULT($result);
 		$errorCode = getCode('ALREADY_CONFIRMED');
 	}
+
+	// Free result
+	SQL_FREERESULT($result_link);
 } else {
 	// Nothing entered
 	$errorCode = getCode('ERROR_MAILID');
@@ -224,7 +223,7 @@ if (!empty($errorCode)) {
 				redirectToConfiguredUrl('reject_url');
 			} else {
 				// Redirect to index
-				redirectToUrl('index.php');
+				redirectToUrl('modules.php?module=index');
 			}
 			break;