X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid.php;h=7f684cef9b477d1afb5f2a58c44aca8a119bec7e;hb=794052dcd2f66a3e655c9e0d4865c23f44e79166;hp=b7447325826d6cec8971dd3ab737fb681676cd61;hpb=8d0af73ace3de78c3c2e5a0bba61cd88a07e587e;p=mailer.git

diff --git a/mailid.php b/mailid.php
index b744732582..7f684cef9b 100644
--- a/mailid.php
+++ b/mailid.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -58,31 +56,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                      2210
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+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 +97,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 +106,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,13 +125,13 @@ 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
 					if (!isAdmin()) {
 						// Is not admin, so update last activity
-						updateLastActivity($url_userid);
+						updateLastActivity($userId);
 					} // END - if
 
 					// User has confirmed his account so we can procede...
@@ -153,7 +153,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';
@@ -175,14 +175,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