X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=dcd0208ad0247cb47df77dee388cbd3e6d08ace6;hp=dfc023c0554aa816cc4a5a4fb3b2121f859048e8;hb=3925d2168d4740ced8ea4e510a525ed4743c8f4f;hpb=66b91ce490ab549425619c95fc12086e126d541b

diff --git a/mailid.php b/mailid.php
index dfc023c055..dcd0208ad0 100644
--- a/mailid.php
+++ b/mailid.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,43 +50,44 @@ $errorCode = '';
 // Load the required file(s)
 require('inc/config-global.php');
 
-if (!isInstalled()) {
-	// You have to install first!
-	redirectToUrl('install.php');
-} // END - if
+// Set content type
+setContentType('text/html');
 
 // Is the extension active?
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$url_uid = 0;
+$url_userid = 0;
 $url_bid = 0;
 $url_mid = 0;
 
 // Secure all data
-if (REQUEST_ISSET_GET('uid'))     $url_uid = bigintval(REQUEST_GET('uid'));
-if (REQUEST_ISSET_GET('mailid'))  $url_mid = bigintval(REQUEST_GET('mailid'));
-if (REQUEST_ISSET_GET('bonusid')) $url_bid = bigintval(REQUEST_GET('bonusid'));
+if (isGetRequestElementSet('userid'))  $url_userid = bigintval(getRequestElement('userid'));
+if (isGetRequestElementSet('mailid'))  $url_mid    = bigintval(getRequestElement('mailid'));
+if (isGetRequestElementSet('bonusid')) $url_bid    = bigintval(getRequestElement('bonusid'));
+
+// 01           1        12            2    2            21    1                   22     10
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
+	// Init result
+	$result_link = false;
 
-// 01        1        12            3    32           21    1                   22     10
-if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
 	// Maybe he wants to confirm an email?
 	if ($url_mid > 0) {
 		// Normal-Mails
-		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
-			array($url_mid, $url_uid), __FILE__, __LINE__);
+		$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
-		$result = SQL_QUERY_ESC("SELECT `link_type` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
-			array($url_bid, $url_uid), __FILE__, __LINE__);
+		$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;
 	} else {
 		// Problem: No ID entered
 		redirectToUrl('index.php');
 	}
 
-	if (SQL_NUMROWS($result) == 1) {
+	if (SQL_NUMROWS($result_link) == 1) {
 		// Load the entry
 		list($ltype) = SQL_FETCHROW($result);
 
@@ -94,12 +95,11 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 		SQL_FREERESULT($result);
 
 		// @TODO Rewrite this to a filter
-		switch ($ltype)
-		{
+		switch ($ltype) {
 			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__);
+				$result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+					array($url_mid), __FILE__, __LINE__);
 				break;
 
 			case 'BONUS':
@@ -107,8 +107,8 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 				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, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+					array($url_bid), __FILE__, __LINE__);
 				break;
 
 			default: // Invalid mail type
@@ -123,25 +123,21 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 			// Free result
 			SQL_FREERESULT($result);
 
-			// Compile extra title
-			$title = COMPILE_CODE($title);
-
 			// Set it
 			setExtraTitle($title);
 
 			// Is the user's ID unlocked?
-			$result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`,` family` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
-				array($url_uid), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+				array($url_userid), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
-				list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
+				list($status, $gender, $surname, $family) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 				if ($status == 'CONFIRMED') {
 					// User has confirmed his account so we can procede...
 					// @TODO Rewrite this to a filter
-					switch ($ltype)
-					{
+					switch ($ltype) {
 						case 'NORMAL':
-							$result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT payment_id FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
 								array(bigintval($pool)), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($pay) = SQL_FETCHROW($result);
@@ -155,7 +151,7 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 							break;
 
 						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
+							$result = SQL_QUERY_ESC("SELECT points, time FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array($url_bid), __FILE__, __LINE__);
 							if (SQL_NUMROWS($result) == 1) {
 								list($points, $time) = SQL_FETCHROW($result);
@@ -178,18 +174,18 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 					// 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 = getConfig('URL'); $time = 1; }
 						if (($time > 0) && (($payment > 0) || ($points > 0))) {
 							// Export data into constants for the template
 							$content = array(
-								'uid'  => $url_uid,
+								'userid'  => $url_userid,
 								'type' => $type,
 								'data' => $urlId,
-								'url'  => DEREFERER($URL)
+								'url'  => generateDerefererUrl($URL)
 							);
 
 							// Load template
-							LOAD_TEMPLATE('mailid_frames');
+							loadTemplate('mailid_frames', false, $content);
 						} else {
 							$errorCode = getCode('DATA_INVALID');
 						}
@@ -197,7 +193,7 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 						$errorCode = getCode('POSSIBLE_INVALID');
 					}
 				} else {
-					$errorCode = getCode('ACCOUNT_LOCKED');
+					$errorCode = getCode('ACCOUNT_' . $status);
 				}
 			} else {
 				SQL_FREERESULT($result);
@@ -218,25 +214,31 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
 
 // Error code is set?
 if (!empty($errorCode)) {
-	// @TODO Rewrite this to a filter
+	// @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&msg=' . $errorCode . '&ext=mailid');
+			redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=mailid');
 			break;
 
 		case 'REJECT': // Redirect to rejection page
-			redirectToConfiguredUrl('reject_url');
+			if (isExtensionActive('other')) {
+				// Redirect to configured URL
+				redirectToConfiguredUrl('reject_url');
+			} else {
+				// Redirect to index
+				redirectToUrl('index.php');
+			}
 			break;
 
 		default:
-			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
-			redirectToUrl('modules.php?module=index&msg=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
+			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;
-	}
-} else {
-	// Include footer
-	loadIncludeOnce('inc/footer.php');
-}
+	} // END - switch
+} // END - if
+
+// Include footer
+loadIncludeOnce('inc/footer.php');
 
 // [EOF]
 ?>