X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid_top.php;h=5273f72e9ca9e5c5f98e2c8c125401ef0842b6ee;hp=9a6c54cc648eed1f1d77c439864d6377b0d984ef;hb=5071030af40e69ca4284642f44758964e18f5be8;hpb=d480b3a8bc2a5c4654067c732228490e448a6c8a

diff --git a/mailid_top.php b/mailid_top.php
index 9a6c54cc64..5273f72e9c 100644
--- a/mailid_top.php
+++ b/mailid_top.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'] = 0;
 
 // 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');
 
 	// Secure all data
 	$url_uid = 0; $url_bid = 0; $url_mid = 0; $code = 0; $mode = '';
@@ -65,16 +65,16 @@ if (isInstalled()) {
 	// 01        1        12            2    2            21    1                   22     10
 	if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
 		// No image? Then output header
-		if ($mode != 'img') LOAD_INC_ONCE('inc/header.php');
+		if ($mode != 'img') loadIncludeOnce('inc/header.php');
 
 		// Maybe he wants to confirm an email?
 		if ($url_mid > 0) {
-			$result = SQL_QUERY_ESC("SELECT id, 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 id, 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) {
-			$result = SQL_QUERY_ESC("SELECT id, 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 id, 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;
 		}
 
@@ -84,15 +84,15 @@ if (isInstalled()) {
 			SQL_FREERESULT($result);
 			switch ($ltype)
 			{
-			case 'NORMAL':
-				$result_mailid = SQL_QUERY_ESC("SELECT pool_id, userid, id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+				case 'NORMAL':
+					$result_mailid = SQL_QUERY_ESC("SELECT pool_id, userid, id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `id`=%s LIMIT 1",
 					array($url_mid), __FILE__, __LINE__);
-				break;
+					break;
 
-			case 'BONUS':
-				$result_mailid = SQL_QUERY_ESC("SELECT id, id, is_notify FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+				case 'BONUS':
+					$result_mailid = SQL_QUERY_ESC("SELECT id, id, is_notify FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
 					array($url_bid), __FILE__, __LINE__);
-				break;
+					break;
 			}
 
 			// Entry found?
@@ -111,7 +111,7 @@ if (isInstalled()) {
 
 				// Is the user's ID unlocked?
 				$result = SQL_QUERY_ESC("SELECT status, gender, surname, family, ref_payout 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) {
 					// Load data
 					list($status, $gender, $sname, $fname, $ref_pay) = SQL_FETCHROW($result);
@@ -122,40 +122,40 @@ if (isInstalled()) {
 					if ($status == 'CONFIRMED') {
 						// Update last activity
 						SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_online=UNIX_TIMESTAMP(), `last_module`='mailid_top' WHERE userid=%s LIMIT 1",
-							array($url_uid), __FILE__, __LINE__);
+						array($url_uid), __FILE__, __LINE__);
 
 						// 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__);
 
-							// Entry found?
-							if (SQL_NUMROWS($result) == 1) {
-								list($pay) = SQL_FETCHROW($result);
-								$time      = GET_PAY_POINTS($pay, 'time');
-								$payment   = GET_PAY_POINTS($pay, 'payment');
-								$isValid   = true;
-							} // END - if
+								// Entry found?
+								if (SQL_NUMROWS($result) == 1) {
+									list($pay) = SQL_FETCHROW($result);
+									$time      = getPaymentPoints($pay, 'time');
+									$payment   = getPaymentPoints($pay, 'payment');
+									$isValid   = true;
+								} // END - if
 
-							// Free memory...
-							SQL_FREERESULT($result);
-							break;
+								// Free memory...
+								SQL_FREERESULT($result);
+								break;
 
-						case 'BONUS':
-							$result = SQL_QUERY_ESC("SELECT time, points FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+							case 'BONUS':
+								$result = SQL_QUERY_ESC("SELECT time, points FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
 								array(bigintval($pool)), __FILE__, __LINE__);
 
-							// Entry found?
-							if (SQL_NUMROWS($result) == 1) {
-								list($time, $payment) = SQL_FETCHROW($result);
-								$isValid = true;
-							}
+								// Entry found?
+								if (SQL_NUMROWS($result) == 1) {
+									list($time, $payment) = SQL_FETCHROW($result);
+									$isValid = true;
+								}
 
-							// Free memory...
-							SQL_FREERESULT($result);
-							break;
+								// Free memory...
+								SQL_FREERESULT($result);
+								break;
 						}
 
 						// Is this entry valid?
@@ -168,163 +168,163 @@ if (isInstalled()) {
 								} // END - if
 
 								switch ($mode) {
-								case 'add':
-									// Init stats data
-									$stats_data = 0;
-
-									// Count clicks
-									switch ($ltype)
-									{
-									case 'NORMAL':
-										SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",
-											array($url_mid), __FILE__, __LINE__);
-
-										// Update mediadata as well
-										if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
-											// Update database
-											MEDIA_UPDATE_ENTRY(array('total_clicks', 'normal_clicks'), 'add', 1);
+									case 'add':
+										// Init stats data
+										$stats_data = 0;
+
+										// Count clicks
+										switch ($ltype)
+										{
+											case 'NORMAL':
+												SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET clicks=clicks + 1 WHERE `id`=%s LIMIT 1",
+												array($url_mid), __FILE__, __LINE__);
+
+												// Update mediadata as well
+												if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
+													// Update database
+													MEDIA_UPDATE_ENTRY(array('total_clicks', 'normal_clicks'), 'add', 1);
+												}
+												$stats_data = $url_mid;
+												break;
+
+											case 'BONUS':
+												SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET clicks=clicks + 1 WHERE `id`=%s LIMIT 1",
+												array($url_bid), __FILE__, __LINE__);
+
+												// Update mediadata as well
+												if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
+													// Update database
+													MEDIA_UPDATE_ENTRY(array('total_clicks', 'bonus_clicks'), 'add', 1);
+												}
+												$stats_data = $url_bid;
+												break;
 										}
-										$stats_data = $url_mid;
-										break;
-
-									case 'BONUS':
-										SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",
-											array($url_bid), __FILE__, __LINE__);
-
-										// Update mediadata as well
-										if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
-											// Update database
-											MEDIA_UPDATE_ENTRY(array('total_clicks', 'bonus_clicks'), 'add', 1);
-										}
-										$stats_data = $url_bid;
-										break;
-									}
 
-									// Export data into constants for the template
-									define('_POINTS_VALUE'   , TRANSLATE_COMMA($payment));
-									define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
+										// Export data into constants for the template
+										define('_POINTS_VALUE'   , translateComma($payment));
+										define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
 
-									// Only when user extension = v0.1.2: Update mails-confirmed counter
-									// @TODO Rewrite these blocks to filter
-									if (GET_EXT_VERSION('user') >= '0.1.2') {
-										// Update counter
-										SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE userid=%s LIMIT 1",
+										// Only when user extension = v0.1.2: Update mails-confirmed counter
+										// @TODO Rewrite these blocks to filter
+										if (GET_EXT_VERSION('user') >= '0.1.2') {
+											// Update counter
+											SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE userid=%s LIMIT 1",
 											array($url_uid), __FILE__, __LINE__);
 
-										// Update random confirmed as well?
-										if (GET_EXT_VERSION('user') >= '0.3.4') {
-											// Update second counter
-											SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE userid=%s LIMIT 1",
+											// Update random confirmed as well?
+											if (GET_EXT_VERSION('user') >= '0.3.4') {
+												// Update second counter
+												SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE userid=%s LIMIT 1",
 												array($url_uid), __FILE__, __LINE__);
+											} // END - if
 										} // END - if
-									} // END - if
-
-									// Insert stats record
-									USER_STATS_INSERT_RECORD($url_uid, $type, $stats_data);
-
-									// Right code entered?
-									if (bigintval(REQUEST_POST('gfx_check')) == $img_code) {
-										// Add points over referal system is the default
-										$locked = false;
-										$template = 'mailid_points_done';
-
-										// Right code entered add points and remove entry
-										if (($ref_pay > 0) && (getConfig('allow_direct_pay') != 'Y')) {
-											// Don't add points over the referal system
-											$locked = true;
-											$template = 'mailid_points_locked';
-										} // END - if
 
-										// Count down ref_payout value
-										SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=ref_payout-1 WHERE userid=%s AND ref_payout > 0 LIMIT 1",
+										// Insert stats record
+										insertUserStatsRecord($url_uid, $type, $stats_data);
+
+										// Right code entered?
+										if (bigintval(REQUEST_POST('gfx_check')) == $img_code) {
+											// Add points over referal system is the default
+											$locked = false;
+											$template = 'mailid_points_done';
+
+											// Right code entered add points and remove entry
+											if (($ref_pay > 0) && (getConfig('allow_direct_pay') != 'Y')) {
+												// Don't add points over the referal system
+												$locked = true;
+												$template = 'mailid_points_locked';
+											} // END - if
+
+											// Count down ref_payout value
+											SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=ref_payout-1 WHERE userid=%s AND ref_payout > 0 LIMIT 1",
 											array($url_uid), __FILE__, __LINE__);
 
-										// Add points
-										unset($GLOBALS['ref_level']);
-										ADD_POINTS_REFSYSTEM('mailid_okay', $url_uid, $payment, false, '0', $locked);
-
-										// Shall I add bonus points for "turbo clickers" ?
-										if (GET_EXT_VERSION('bonus') >= '0.2.2') {
-											// Is an active-rallye running and this is not a notification mail?
-											if ((getConfig('bonus_active') == 'Y') && ($notify == 'N')) {
-												// Shall I exclude the webmaster's own userid from the active-rallye?
-												if ((((getConfig('bonus_uid') == $url_uid) && (getConfig('bonus_include_own') == 'Y')) || (getConfig('bonus_uid') != $url_uid)) && (getConfig('def_refid') != $url_uid)) {
-													// Add points and remember ranking are done in this function....
-													BONUS_ADD_TURBO_POINTS($urlId, $url_uid, $type);
-
-													// Set template to mailid_points_done2 which contains a link to the ranking list
-													$template = 'mailid_points_done2';
-													if ($locked) $template = 'mailid_points_locked2';
-													define('_UID_VALUE' , $url_uid);
-													define('_TYPE_VALUE', $type);
-													define('_DATA_VALUE', TRANSLATE_COMMA($urlId));
+											// Add points
+											unset($GLOBALS['ref_level']);
+											ADD_POINTS_REFSYSTEM('mailid_okay', $url_uid, $payment, false, '0', $locked);
+
+											// Shall I add bonus points for "turbo clickers" ?
+											if (GET_EXT_VERSION('bonus') >= '0.2.2') {
+												// Is an active-rallye running and this is not a notification mail?
+												if ((getConfig('bonus_active') == 'Y') && ($notify == 'N')) {
+													// Shall I exclude the webmaster's own userid from the active-rallye?
+													if ((((getConfig('bonus_uid') == $url_uid) && (getConfig('bonus_include_own') == 'Y')) || (getConfig('bonus_uid') != $url_uid)) && (getConfig('def_refid') != $url_uid)) {
+														// Add points and remember ranking are done in this function....
+														BONUS_ADD_TURBO_POINTS($urlId, $url_uid, $type);
+
+														// Set template to mailid_points_done2 which contains a link to the ranking list
+														$template = 'mailid_points_done2';
+														if ($locked) $template = 'mailid_points_locked2';
+														define('_UID_VALUE' , $url_uid);
+														define('_TYPE_VALUE', $type);
+														define('_DATA_VALUE', translateComma($urlId));
+													} // END - if
 												} // END - if
 											} // END - if
-										} // END - if
 
-										// Load total points
-										define('__TOTAL_POINTS', TRANSLATE_COMMA(
+											// Load total points
+											define('__TOTAL_POINTS', translateComma(
 											GET_TOTAL_DATA($url_uid, 'user_points', 'points') -
 											GET_TOTAL_DATA($url_uid, 'user_data', 'used_points'))
-										);
+											);
 
-										// Load template
-										LOAD_TEMPLATE($template);
-									} else {
-										// Wrong image code! So add points to sender's account
-										unset($GLOBALS['ref_level']);
-										ADD_POINTS_REFSYSTEM('mailid_payback', $sender, $payment, false, 0, false, 'direct');
+											// Load template
+											LOAD_TEMPLATE($template);
+										} else {
+											// Wrong image code! So add points to sender's account
+											unset($GLOBALS['ref_level']);
+											ADD_POINTS_REFSYSTEM_DIRECT('mailid_payback', $sender, $payment);
 
-										// Load template
-										LOAD_TEMPLATE('mailid_points_failed');
-									}
+											// Load template
+											LOAD_TEMPLATE('mailid_points_failed');
+										}
 
-									// Remove link from table
-									SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE id=%s LIMIT 1",
+										// Remove link from table
+										SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `id`=%s LIMIT 1",
 										array(bigintval($lid)), __FILE__, __LINE__);
-									break;
-
-								case 'img':
-									GENERATE_IMAGE($img_code);
-									break;
+										break;
 
-								case 'confirm':
-									if ($code > 0) {
-										// Export data into constants for the template
-										define('_CODE_VALUE', $code);
-										define('_UID_VALUE' , $url_uid );
-										define('_TYPE_VALUE', $type);
-										define('_DATA_VALUE', $urlId);
-										define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
-										if (getConfig('code_length') > 0) {
-											// Generate Code
-											define('_IMAGE_CODE', IMG_CODE($code, $type, $urlId, $url_uid));
-											$templ = 'mailid_enter_code';
-										} else {
-											// Disabled code
-											define('__GFX_CODE', $img_code);
-											$templ = 'mailid_confirm_buttom';
-										}
+											case 'img':
+												GENERATE_IMAGE($img_code);
+												break;
 
-										// Load template
-										LOAD_TEMPLATE($templ);
-									}
-									break;
-
-								case '':
-									// Ok, all data is valid and loaded. Finally let's output the timer... :-)
-									// Export data into constants for the template
-									define('_TIME_VALUE', $time);
-									define('_TIM2_VALUE', strlen($time));
-									define('_UID_VALUE' , $url_uid );
-									define('_TYPE_VALUE', $type);
-									define('_DATA_VALUE', $urlId);
-									define('_RAND_VALUE', mt_rand(0, 99999));
-									define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
-
-									// Load template
-									LOAD_TEMPLATE('mailid_timer');
-									break;
+											case 'confirm':
+												if ($code > 0) {
+													// Export data into constants for the template
+													define('_CODE_VALUE', $code);
+													define('_UID_VALUE' , $url_uid );
+													define('_TYPE_VALUE', $type);
+													define('_DATA_VALUE', $urlId);
+													define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
+													if (getConfig('code_length') > 0) {
+														// Generate Code
+														define('_IMAGE_CODE', generateCaptchaCode($code, $type, $urlId, $url_uid));
+														$templ = 'mailid_enter_code';
+													} else {
+														// Disabled code
+														define('__GFX_CODE', $img_code);
+														$templ = 'mailid_confirm_buttom';
+													}
+
+													// Load template
+													LOAD_TEMPLATE($templ);
+												}
+												break;
+
+											case '':
+												// Ok, all data is valid and loaded. Finally let's output the timer... :-)
+												// Export data into constants for the template
+												define('_TIME_VALUE', $time);
+												define('_TIM2_VALUE', strlen($time));
+												define('_UID_VALUE' , $url_uid );
+												define('_TYPE_VALUE', $type);
+												define('_DATA_VALUE', $urlId);
+												define('_RAND_VALUE', mt_rand(0, 99999));
+												define('_TEMPLATE_BANNER', LOAD_TEMPLATE('mailid_banner', true));
+
+												// Load template
+												LOAD_TEMPLATE('mailid_timer');
+												break;
 								} // END - switch
 							} else {
 								LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (6)</div>");
@@ -351,12 +351,12 @@ if (isInstalled()) {
 		// Insert footer if no image
 		if ($mode != 'img') {
 			// Write footer
-			LOAD_INC_ONCE('inc/footer.php');
+			loadIncludeOnce('inc/footer.php');
 		} // END - if
 	}
 } elseif ($mode != 'img') {
 	// You have to install first!
-	LOAD_URL('install.php');
+	redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)