X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid.php;h=1c4762dab2a2906ee91ebfb2d81a48fb135be41d;hb=9bc2a494fae1a98f0873a6f3bd8c878b09124b9f;hp=5415fc5fc2062cc8beac2382dcc442678c9fd5e3;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 5415fc5fc2..1c4762dab2 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)) && (getTotalFatalErrors() == '0')) {
+// 01           1        12            2    2            21    1                      2210
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
 	// Init result
 	$result_link = false;
 
@@ -110,7 +110,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 				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 +129,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 				// 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 +165,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 							break;
 
 						default: // Invalid mail type
-							debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+							debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 							break;
 					}
 
@@ -179,7 +182,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 								'userid'  => $url_userid,
 								'type'    => $type,
 								'data'    => $urlId,
-								'url'     => generateDerefererUrl($URL)
+								'url'     => $URL
 							);
 
 							// Load template
@@ -211,29 +214,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 }
 
 // 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');