X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_other.php;h=d3df62edf920823a30d3c4763d9e9f11345efbc1;hb=f13b0c89b6dce2dc31ef3c58f0e2ad4821d7bee8;hp=ad5dc9e0c32973fb7e90487406b2373d80b962b7;hpb=e87430f959a8b240d516ef830e6494165bc933b2;p=mailer.git

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index ad5dc9e0c3..d3df62edf9 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {
@@ -42,7 +42,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Stop saving data if one input field is !isset
 if (isset($_POST['ok'])) {
@@ -56,7 +56,7 @@ if (isset($_POST['ok'])) {
 	}
 
 	// Online-Timeout shall be > 0 or your database will crow and crow and crow...
-	if (!isset($_POST['online_timeout']))         { unset($_POST['ok']); }
+	if (!isset($_POST['online_timeout']))        { unset($_POST['ok']); }
 
 	// Chedck other timestamps (which can be zero!)
 	if (!isset($_POST['profile_lock']))          { unset($_POST['ok']); }
@@ -66,8 +66,6 @@ if (isset($_POST['ok'])) {
 
 	// Check other settings
 	if (!isset($_POST['max_send']))              { unset($_POST['ok']); }
-	if (!isset($_POST['max_tlength']))           { unset($_POST['ok']); }
-	if (!isset($_POST['unconfirmed']))           { unset($_POST['ok']); }
 	if (!isset($_POST['code_length']))           { unset($_POST['ok']); }
 	if (!isset($_POST['reject_url']))            { unset($_POST['ok']); }
 }
@@ -92,91 +90,99 @@ if (isset($_POST['ok'])) {
 		define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($_CONFIG['resend_profile_update'] , "resend_profile_update", "MWD"));
 	} else {
 		// Normal input boxes
-		define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['online_timeout']."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-		define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-		define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-		define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$_CONFIG['profile_update']."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
+		define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['online_timeout']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+		define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+		define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+		define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$_CONFIG['profile_update']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
 	}
 
-	if ($_CONFIG['order_multi_page'] == 'N') {
-		define('_CFG_ORDER_MULTI_N', ' checked');
+	if ($_CONFIG['order_multi_page'] == "N") {
+		define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
 		define('_CFG_ORDER_MULTI_Y', "");
 	} else {
 		define('_CFG_ORDER_MULTI_N', "");
-		define('_CFG_ORDER_MULTI_Y', ' checked');
+		define('_CFG_ORDER_MULTI_Y', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['autosend_active'] == 'N') {
-		define('_CFG_AUTOSEND_ACTIVE_N', ' checked');
+	if ($_CONFIG['autosend_active'] == "N") {
+		define('_CFG_AUTOSEND_ACTIVE_N', " checked=\"checked\"");
 		define('_CFG_AUTOSEND_ACTIVE_Y', "");
 	} else {
 		define('_CFG_AUTOSEND_ACTIVE_N', "");
-		define('_CFG_AUTOSEND_ACTIVE_Y', ' checked');
+		define('_CFG_AUTOSEND_ACTIVE_Y', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['send_prof_update'] == 'N') {
-		define('_CFG_SEND_UPDATE_N', ' checked');
+	if ($_CONFIG['send_prof_update'] == "N") {
+		define('_CFG_SEND_UPDATE_N', " checked=\"checked\"");
 		define('_CFG_SEND_UPDATE_Y', "");
 	} else {
 		define('_CFG_SEND_UPDATE_N', "");
-		define('_CFG_SEND_UPDATE_Y', ' checked');
+		define('_CFG_SEND_UPDATE_Y', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['admin_notify'] == 'N') {
-		define('_CFG_ADMIN_NOTIFY_N', ' checked');
+	if ($_CONFIG['admin_notify'] == "N") {
+		define('_CFG_ADMIN_NOTIFY_N', " checked=\"checked\"");
 		define('_CFG_ADMIN_NOTIFY_Y', "");
 	} else {
 		define('_CFG_ADMIN_NOTIFY_N', "");
-		define('_CFG_ADMIN_NOTIFY_Y', ' checked');
+		define('_CFG_ADMIN_NOTIFY_Y', " checked=\"checked\"");
 	}
 
 	if ($_CONFIG['css_php'] == "DIRECT") {
-		define('_CFG_CSS_PHP_DIRECT', ' checked');
+		define('_CFG_CSS_PHP_DIRECT', " checked=\"checked\"");
 		define('_CFG_CSS_PHP_FILE', "");
 	} else {
 		define('_CFG_CSS_PHP_DIRECT', "");
-		define('_CFG_CSS_PHP_FILE', ' checked');
+		define('_CFG_CSS_PHP_FILE', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['guest_menu'] == 'Y') {
-		define('_CFG_GUEST_MENU_ACTIVE', ' checked');
+	if ($_CONFIG['guest_menu'] == "Y") {
+		define('_CFG_GUEST_MENU_ACTIVE', " checked=\"checked\"");
 		define('_CFG_GUEST_MENU_INACTIVE', "");
 	} else {
 		define('_CFG_GUEST_MENU_ACTIVE', "");
-		define('_CFG_GUEST_MENU_INACTIVE', ' checked');
+		define('_CFG_GUEST_MENU_INACTIVE', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['member_menu'] == 'Y') {
-		define('_CFG_MEMBER_MENU_ACTIVE', ' checked');
+	if ($_CONFIG['member_menu'] == "Y") {
+		define('_CFG_MEMBER_MENU_ACTIVE', " checked=\"checked\"");
 		define('_CFG_MEMBER_MENU_INACTIVE', "");
 	} else {
 		define('_CFG_MEMBER_MENU_ACTIVE', "");
-		define('_CFG_MEMBER_MENU_INACTIVE', ' checked');
+		define('_CFG_MEMBER_MENU_INACTIVE', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['youre_here'] == 'Y') {
-		define('_CFG_YOURE_HERE_ACTIVE', ' checked');
+	if ($_CONFIG['youre_here'] == "Y") {
+		define('_CFG_YOURE_HERE_ACTIVE', " checked=\"checked\"");
 		define('_CFG_YOURE_HERE_INACTIVE', "");
 	} else {
 		define('_CFG_YOURE_HERE_ACTIVE', "");
-		define('_CFG_YOURE_HERE_INACTIVE', ' checked');
+		define('_CFG_YOURE_HERE_INACTIVE', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['show_timings'] == 'Y') {
-		define('_CFG_SHOW_TIMINGS_Y', ' checked');
+	if ($_CONFIG['show_timings'] == "Y") {
+		define('_CFG_SHOW_TIMINGS_Y', " checked=\"checked\"");
 		define('_CFG_SHOW_TIMINGS_N', "");
 	} else {
 		define('_CFG_SHOW_TIMINGS_Y', "");
-		define('_CFG_SHOW_TIMINGS_N', ' checked');
+		define('_CFG_SHOW_TIMINGS_N', " checked=\"checked\"");
 	}
 
-	if ($_CONFIG['mailid_error_redirect'] == 'index') {
-		define('_CFG_MAILID_REDIRECT_INDEX', ' checked');
+	if ($_CONFIG['show_points_unconfirmed'] == "Y") {
+		define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', " checked=\"checked\"");
+		define('_CFG_SHOW_POINTS_UNCONFIRMED_N', "");
+	} else {
+		define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', "");
+		define('_CFG_SHOW_POINTS_UNCONFIRMED_N', " checked=\"checked\"");
+	}
+
+	if ($_CONFIG['mailid_error_redirect'] == 'INDEX') {
+		define('_CFG_MAILID_REDIRECT_INDEX', " checked=\"checked\"");
 		define('_CFG_MAILID_REDIRECT_REJECT', "");
 	} else {
 		define('_CFG_MAILID_REDIRECT_INDEX', "");
-		define('_CFG_MAILID_REDIRECT_REJECT', ' checked');
+		define('_CFG_MAILID_REDIRECT_REJECT', " checked=\"checked\"");
 	}
 
 	for ($i = 0; $i <= 5; $i++) {