X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid.php;h=b7d50bf0b4c0c6fa23916fea16f0917480952b39;hb=992a3780f0517a61d548bbcaa5b538cb3822815a;hp=06acf208cad76b145324cd45ff910610bf197afa;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 06acf208ca..b7d50bf0b4 100644
--- a/mailid.php
+++ b/mailid.php
@@ -59,16 +59,16 @@ redirectOnUninstalledExtension('mailid');
 
 // Init
 $url_userid = '0';
-$url_bid = '0';
-$url_mid = '0';
+$url_bid    = '0';
+$url_mid    = '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'));
 
-// 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($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
 	// Init result
 	$result_link = false;
 
@@ -77,12 +77,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 		// 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;
+		$type = 'mailid';
+		$urlId = $url_mid;
 	} elseif ($url_bid > 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;
+		$type = 'bonusid';
+		$urlId = $url_bid;
 	} else {
 		// Problem: No id entered
 		redirectToUrl('modules.php?module=index');
@@ -110,7 +112,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 				break;
 
 			default: // Invalid mail type
-				debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+				debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 				break;
 		} // END - switch
 
@@ -129,7 +131,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 				// 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($url_userid);
+					} // END - if
 
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
@@ -162,7 +167,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 							break;
 
 						default: // Invalid mail type
-							debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+							debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 							break;
 					}
 
@@ -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,
 								'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');