X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid_top.php;h=b68409ad3aa8d94ee8a02eb931e4a9edd8f08487;hp=cf0ec430c2162794333a642b0241cdcb3bc7e759;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=84317e249885eb03a99f2946acf285ff27d506ac

diff --git a/mailid_top.php b/mailid_top.php
index cf0ec430c2..b68409ad3a 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -35,29 +35,30 @@
 require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
 
 // Tell everyone we are in this module
-$GLOBALS['module'] = "mailid";  $CSS = 0;
+$GLOBALS['module'] = "mailid"; 
+$GLOBALS['output_mode'] = 0;
 
 // Load the required file(s)
 require("inc/config.php");
 
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
 	// Is the extension active
 	if (!EXT_IS_ACTIVE("mailid", true)) {
 		// Is not activated/installed yet!
-		addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+		addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mailid");
 	} // END - if
 
 	// Secure all data
 	$url_uid = 0; $url_bid = 0; $url_mid = 0; $code = 0; $mode = "";
-	if (!empty($_GET['uid']))     $url_uid = bigintval($_GET['uid']);
-	if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
-	if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
-	if (!empty($_GET['code']))    $code    = bigintval($_GET['code']);
-	if (!empty($_GET['mode']))    $mode    = $_GET['mode'];
+	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 (REQUEST_ISSET_GET(('code')))    $code    = bigintval(REQUEST_GET('code'));
+	if (REQUEST_ISSET_GET(('mode')))    $mode    = REQUEST_GET('mode');
 
 	// 01        1        12            2    2            21    1                   22     10
 	if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
@@ -161,7 +162,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 							if (($time > 0) && ($payment > 0)) {
 								if (!empty($code)) {
 									// Generate code
-									$img_code = GEN_RANDOM_CODE(getConfig('code_length'), $code, $url_uid, $DATA);
+									$img_code = generateRandomCodde(getConfig('code_length'), $code, $url_uid, $DATA);
 								} // END - if
 
 								switch ($mode) {
@@ -202,6 +203,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 									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",
@@ -219,13 +221,13 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 									USER_STATS_INSERT_RECORD($url_uid, $type, $stats_data);
 
 									// Right code entered?
-									if (bigintval($_POST['gfx_check']) == $img_code) {
+									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') == "N")) {
+										if (($ref_pay > 0) && (getConfig('allow_direct_pay') != "Y")) {
 											// Don't add points over the referal system
 											$locked = true;
 											$template = "mailid_points_locked";
@@ -285,22 +287,18 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 									break;
 
 								case "confirm":
-									if ($code > 0)
-									{
+									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', $DATA);
 										define('_TEMPLATE_BANNER', LOAD_TEMPLATE("mailid_banner", true));
-										if (getConfig('code_length') > 0)
-										{
+										if (getConfig('code_length') > 0) {
 											// Generate Code
 											define('_IMAGE_CODE', IMG_CODE($code, $type, $DATA, $url_uid));
 											$templ = "mailid_enter_code";
-										}
-										 else
-										{
+										} else {
 											// Disabled code
 											define('__GFX_CODE', $img_code);
 											$templ = "mailid_confirm_buttom";
@@ -325,24 +323,27 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 									// 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>");
 							}
-							 else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</div>");
+						} else {
+							LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (5)</div>");
 						}
-						 else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</div>");
+					} else {
+						LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (4)</div>");
 					}
-					 else LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</div>");
 				} else {
 					SQL_FREERESULT($result);
-					LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</div>");
+					LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (3)</div>");
 				}
 			} else {
 				SQL_FREERESULT($result);
-				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</div>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (2)</div>");
 			}
 		} else {
 			SQL_FREERESULT($result);
-			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</div>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--MAIL_ALREADY_CONFIRMED--} (1)</div>");
 		}
 
 		// Insert footer if no image