X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid.php;h=eeea089cf86659620bc32e113a2fd5f48bda274d;hb=85960c24cfcdb68af183376a444474a5cb5eb80d;hp=5a176e4410fa06ab59ac4537a65f4656bf8cdf80;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/mailid.php b/mailid.php
index 5a176e4410..eeea089cf8 100644
--- a/mailid.php
+++ b/mailid.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -48,11 +48,11 @@ $GLOBALS['module'] = 'mailid';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 if (isInstalled()) {
 	// Is the extension active?
-	REDIRECT_ON_UNINSTALLED_EXTENSION('mailid');
+	redirectOnUninstalledExtension('mailid');
 
 	// Init
 	$url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -67,17 +67,17 @@ if (isInstalled()) {
 		// 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 = 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__);
 			$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 = 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__);
 			$type = 'bonusid'; $urlId = $url_bid;
 		} else {
 			// Problem: No ID entered
-			LOAD_URL('index.php');
+			redirectToUrl('index.php');
 		}
 
 		if (SQL_NUMROWS($result) == 1) {
@@ -89,35 +89,38 @@ if (isInstalled()) {
 
 			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",
+				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__);
-				break;
+					break;
 
-			case 'BONUS':
-				// Is the bonus extension active?
-				REDIRECT_ON_UNINSTALLED_EXTENSION('bonus');
+				case 'BONUS':
+					// Is the bonus extension active?
+					redirectOnUninstalledExtension('bonus');
 
-				// Bonus-Mails
-				$result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+					// Bonus-Mails
+					$result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
 					array($url_bid), __FILE__, __LINE__);
-				break;
+					break;
 			}
 
 			if (SQL_NUMROWS($result) == 1) {
 				// Load data
-				list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
+				list($pool, $URL, $title) = SQL_FETCHROW($result);
 
 				// Free result
 				SQL_FREERESULT($result);
 
 				// Compile extra title
-				$EXTRA_TITLE = COMPILE_CODE($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__);
+				array($url_uid), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result) == 1) {
 					list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
@@ -125,36 +128,36 @@ if (isInstalled()) {
 						// User has confirmed his account so we can procede...
 						switch ($ltype)
 						{
-						case 'NORMAL':
-							$result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+							case 'NORMAL':
+								$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);
-								$time      = GET_PAY_POINTS($pay, 'time');
-								$payment   = GET_PAY_POINTS($pay, 'payment');
-								$isValid   = true;
-							}
-
-							// Free memory
-							SQL_FREERESULT($result);
-							break;
-
-						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+								if (SQL_NUMROWS($result) == 1) {
+									list($pay) = SQL_FETCHROW($result);
+									$time      = getPaymentPoints($pay, 'time');
+									$payment   = getPaymentPoints($pay, 'payment');
+									$isValid   = true;
+								}
+
+								// Free memory
+								SQL_FREERESULT($result);
+								break;
+
+							case 'BONUS':
+								$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);
-								$payment = '0.00000';
-								$isValid = true;
-							}
-
-							// Free memory
-							SQL_FREERESULT($result);
-							break;
+								if (SQL_NUMROWS($result) == 1) {
+									list($points, $time) = SQL_FETCHROW($result);
+									$payment = '0.00000';
+									$isValid = true;
+								}
+
+								// Free memory
+								SQL_FREERESULT($result);
+								break;
 						}
 
 						// Add header
-						LOAD_INC_ONCE('inc/header.php');
+						loadIncludeOnce('inc/header.php');
 
 						// Was that mail a valid one?
 						if ($isValid === true) {
@@ -200,25 +203,25 @@ if (isInstalled()) {
 	if (!empty($msg)) {
 		switch (getConfig('mailid_error_redirect')) {
 			case 'INDEX': // Redirect to index page
-				LOAD_URL('modules.php?module=index&msg='.$msg.'&ext=mailid');
+				redirectToUrl('modules.php?module=index&msg='.$msg.'&ext=mailid');
 				break;
 
 			case 'REJECT': // Redirect to rejection page
-				LOAD_CONFIGURED_URL('reject_url');
+				redirectToConfiguredUrl('reject_url');
 				break;
 
 			default:
 				DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
-				LOAD_URL('modules.php?module=index&msg=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
+				redirectToUrl('modules.php?module=index&msg=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
 				break;
 		}
 	} else {
 		// Include footer
-		LOAD_INC_ONCE('inc/footer.php');
+		loadIncludeOnce('inc/footer.php');
 	}
 } else {
 	// You have to install first!
-	LOAD_URL('install.php');
+	redirectToUrl('install.php');
 }
 
 // Shutdown