X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=6a028dee56048c23c5c919c1fa13e959bf2aeada;hp=79e308753b2878e4dc8770fc1d55520bb6eead6b;hb=903f539b5aac6171fdfee9ad252565531e8dd4e2;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52

diff --git a/mailid.php b/mailid.php
index 79e308753b..6a028dee56 100644
--- a/mailid.php
+++ b/mailid.php
@@ -58,31 +58,33 @@ setContentType('text/html');
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$url_userid = '0';
-$url_bid = '0';
-$url_mid = '0';
+$userId = '0';
+$bonusId    = '0';
+$mailId    = '0';
 
 // Secure all data
-if (isGetRequestParameterSet('userid'))  $url_userid = bigintval(getRequestParameter('userid'));
-if (isGetRequestParameterSet('mailid'))  $url_mid    = bigintval(getRequestParameter('mailid'));
-if (isGetRequestParameterSet('bonusid')) $url_bid    = bigintval(getRequestParameter('bonusid'));
+if (isGetRequestParameterSet('userid'))  $userId  = bigintval(getRequestParameter('userid'));
+if (isGetRequestParameterSet('mailid'))  $mailId  = bigintval(getRequestParameter('mailid'));
+if (isGetRequestParameterSet('bonusid')) $bonusId = bigintval(getRequestParameter('bonusid'));
 
-// 01           1        12            2    2            21    1                   22     10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+// 01           1        12            2    2            21    1                      2210
+if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
 	// Init result
 	$result_link = false;
 
 	// Maybe he wants to confirm an email?
-	if ($url_mid > 0) {
+	if ($mailId > 0) {
 		// Normal-Mails
 		$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) {
+			array($mailId, $userId), __FILE__, __LINE__);
+		$type = 'mailid';
+		$urlId = $mailId;
+	} elseif ($bonusId > 0) {
 		// Bonus-Mail
 		$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;
+			array($bonusId, $userId), __FILE__, __LINE__);
+		$type = 'bonusid';
+		$urlId = $bonusId;
 	} else {
 		// Problem: No id entered
 		redirectToUrl('modules.php?module=index');
@@ -97,7 +99,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 			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",
-					array($url_mid), __FILE__, __LINE__);
+					array($mailId), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
@@ -106,7 +108,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
 				// Bonus-Mails
 				$result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-					array($url_bid), __FILE__, __LINE__);
+					array($bonusId), __FILE__, __LINE__);
 				break;
 
 			default: // Invalid mail type
@@ -125,11 +127,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 			setExtraTitle($title);
 
 			// Is the user's id unlocked?
-			if (fetchUserData($url_userid)) {
+			if (fetchUserData($userId)) {
 				// Status must be CONFIRMED
 				if (getUserData('status') == 'CONFIRMED') {
 					// Update last activity if not admin
-					updateLastActivity($url_userid);
+					if (!isAdmin()) {
+						// Is not admin, so update last activity
+						updateLastActivity($userId);
+					} // END - if
 
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
@@ -150,7 +155,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
 						case 'BONUS':
 							$result = SQL_QUERY_ESC("SELECT `points`, `time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-								array($url_bid), __FILE__, __LINE__);
+								array($bonusId), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($points, $time) = SQL_FETCHROW($result);
 								$payment = '0.00000';
@@ -172,14 +177,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 					// 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 = getUrl();
+							$time = 1; 
+						} // END - if
+
 						if (($time > 0) && (($payment > 0) || ($points > 0))) {
 							// Export data into constants for the template
 							$content = array(
-								'userid'  => $url_userid,
+								'userid'  => $userId,
 								'type'    => $type,
 								'data'    => $urlId,
-								'url'     => generateDerefererUrl($URL)
+								'url'     => $URL
 							);
 
 							// Load template
@@ -211,29 +220,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 }
 
 // Error code is set?
-if (!empty($errorCode)) {
-	// @TODO Rewrite this to a dynamic include or so
-	switch (getConfig('mailid_error_redirect')) {
-		case 'INDEX': // Redirect to index page
-			redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=mailid');
-			break;
-
-		case 'REJECT': // Redirect to rejection page
-			if (isExtensionActive('other')) {
-				// Redirect to configured URL
-				redirectToConfiguredUrl('reject_url');
-			} else {
-				// Redirect to index
-				redirectToUrl('modules.php?module=index');
-			}
-			break;
-
-		default:
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
-			redirectToUrl('modules.php?module=index&code=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
-			break;
-	} // END - switch
-} // END - if
+handleMailIdErrorCode($errorCode);
 
 // Include footer
 loadIncludeOnce('inc/footer.php');