X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid.php;h=289ac310cd4a701d728f6993b57a358078e3b5fa;hb=8c46238f94898e46f98e775855e10f9d96ee6628;hp=1c4762dab2a2906ee91ebfb2d81a48fb135be41d;hpb=7e17864b7d07fb5123b1b1d68f83db28ea5394ef;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 1c4762dab2..289ac310cd 100644
--- a/mailid.php
+++ b/mailid.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,48 +39,57 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);
 
 // Tell everyone we are in this module
-$GLOBALS['module'] = 'mailid';
-$GLOBALS['output_mode'] = -1;
+$GLOBALS['__module']      = 'mailid';
+$GLOBALS['__output_mode'] = '0';
 $errorCode = '';
 
+// This is a frameset module
+$GLOBALS['frameset_mode'] = TRUE;
+
+// Disable copyright footer which would break the frameset
+$GLOBALS['__copyright_enabled'] = 'N';
+
 // Load the required file(s)
 require('inc/config-global.php');
 
-// Set content type
+// Set content type and HTTP status
 setContentType('text/html');
+setHttpStatus('404 Not Found');
 
 // Is the extension active?
 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 (isGetRequestElementSet('userid'))  $userId  = bigintval(getRequestElement('userid'));
+if (isGetRequestElementSet('mailid'))  $mailId  = bigintval(getRequestElement('mailid'));
+if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('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;
+	$result_link = FALSE;
 
 	// Maybe he wants to confirm an email?
-	if ($url_mid > 0) {
-		// Normal-Mails
+	if ($mailId > 0) {
+		// Member mail
 		$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
+			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 +104,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':
@@ -105,18 +112,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 				redirectOnUninstalledExtension('bonus');
 
 				// Bonus-Mails
-				$result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-					array($url_bid), __FILE__, __LINE__);
+				$result = SQL_QUERY_ESC("SELECT `id` AS `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+					array($bonusId), __FILE__, __LINE__);
 				break;
 
 			default: // Invalid mail type
-				debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
+				reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 				break;
 		} // END - switch
 
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
-			list($pool, $URL, $title) = SQL_FETCHROW($result);
+			list($pool, $url, $title) = SQL_FETCHROW($result);
 
 			// Free result
 			SQL_FREERESULT($result);
@@ -125,13 +132,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()) {
+					if ((!isAdmin()) || (isDebugModeEnabled())) {
 						// Is not admin, so update last activity
-						updateLastActivity($url_userid);
+						updateLastActivity($userId);
 					} // END - if
 
 					// User has confirmed his account so we can procede...
@@ -142,9 +149,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 								array(bigintval($pool)), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($pay) = SQL_FETCHROW($result);
-								$time      = getPaymentPoints($pay, 'time');
-								$payment   = getPaymentPoints($pay, 'payment');
-								$isValid   = true;
+								$time      = getPaymentData($pay, 'time');
+								$payment   = getPaymentData($pay, 'payment');
+								$isValid   = TRUE;
 							} // END - if
 
 							// Free memory
@@ -153,11 +160,11 @@ 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';
-								$isValid = true;
+								$isValid = TRUE;
 							} // END - if
 
 							// Free memory
@@ -165,28 +172,35 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 							break;
 
 						default: // Invalid mail type
-							debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
+							reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
 							break;
-					}
+					} // END - switch
 
 					// Add header
 					loadIncludeOnce('inc/header.php');
 
 					// Was that mail a valid one?
-					if ($isValid === true) {
+					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))) {
+							// Set HTTP status to okay
+							setHttpStatus('200 OK');
+
 							// Export data into constants for the template
 							$content = array(
-								'userid'  => $url_userid,
+								'userid'  => $userId,
 								'type'    => $type,
 								'data'    => $urlId,
-								'url'     => $URL
+								'url'     => $url
 							);
 
 							// Load template
-							loadTemplate('mailid_frames', false, $content);
+							loadTemplate('mailid_frames', FALSE, $content);
 						} else {
 							$errorCode = getCode('DATA_INVALID');
 						}
@@ -194,7 +208,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 						$errorCode = getCode('POSSIBLE_INVALID');
 					}
 				} else {
-					$errorCode = getCode('ACCOUNT_' . getUserData('status'));
+					$errorCode = getCode('ACCOUNT_' . strtoupper(getUserData('status')));
 				}
 			} else {
 				$errorCode = getCode('USER_404');