X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_other.php;h=d73a2f793d380cc048eadb8dff9d775100251cb7;hb=ab92fb7241d00636b0eb940f147449758820cba1;hp=5d3b3b19a465495c239ef469e8ea56c2775ab545;hpb=ac04130f9ccbaba51d7d7992d8a10c38db776eee;p=mailer.git

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 5d3b3b19a4..d73a2f793d 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -46,14 +46,12 @@ ADD_DESCR("admin", __FILE__);
 
 // Stop saving data if one input field is !isset
 if (isset($_POST['ok'])) {
-	if (function_exists('CREATE_TIME_SELECTIONS')) {
-		// Calculate stamps and set calculated stamps
-		$_POST['online_timeout']        = CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout"           , $_POST);
-		$_POST['url_tlock']             = CREATE_TIMESTAMP_FROM_SELECTIONS("url_tlock"            , $_POST);
-		$_POST['profile_lock']          = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_lock"         , $_POST);
-		$_POST['profile_update']        = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_update"       , $_POST);
-		$_POST['resend_profile_update'] = CREATE_TIMESTAMP_FROM_SELECTIONS("resend_profile_update", $_POST);
-	}
+	// Calculate stamps and set calculated stamps
+	$_POST['online_timeout']        = CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout"           , $_POST);
+	$_POST['url_tlock']             = CREATE_TIMESTAMP_FROM_SELECTIONS("url_tlock"            , $_POST);
+	$_POST['profile_lock']          = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_lock"         , $_POST);
+	$_POST['profile_update']        = CREATE_TIMESTAMP_FROM_SELECTIONS("profile_update"       , $_POST);
+	$_POST['resend_profile_update'] = CREATE_TIMESTAMP_FROM_SELECTIONS("resend_profile_update", $_POST);
 
 	// Online-Timeout shall be > 0 or your database will crow and crow and crow...
 	if (!isset($_POST['online_timeout']))        { unset($_POST['ok']); }
@@ -81,24 +79,14 @@ if (isset($_POST['ok'])) {
 	define('_CFG_REJECT_URL' , getConfig('reject_url'));
 	define('_CFG_MIN_AGE'    , getConfig('min_age'));
 
-	// Is there the pro-version function avaiable to create selection boxes instead of input boxes?
-	if (function_exists('CREATE_TIME_SELECTIONS')) {
-		// Only pro versions: time selection boxes
-		define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS(getConfig('online_timeout'), "ip_timeout"           , "ms"));
-		define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS(getConfig('url_tlock')     , "url_tlock"            , "WDh"));
-		define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS(getConfig('profile_lock')  , "profile_lock"         , "WDh"));
-		define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS(getConfig('profile_update'), "profile_update"       , "YM"));
-		define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('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=\"".getConfig('online_timeout')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-		define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('url_tlock')     ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-		define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('profile_lock')  ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-		define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".getConfig('profile_update')."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-		define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('resend_profile_update') ."\"> <div class=\"tiny\">("._SECONDS.")</div>");
-	}
+	// Time selection boxes
+	define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS(getConfig('online_timeout'), "ip_timeout"           , "ms"));
+	define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS(getConfig('url_tlock')     , "url_tlock"            , "WDh"));
+	define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS(getConfig('profile_lock')  , "profile_lock"         , "WDh"));
+	define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS(getConfig('profile_update'), "profile_update"       , "YM"));
+	define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('resend_profile_update') , "resend_profile_update", "MWD"));
 
-	if (getConfig('order_multi_page') == "N") {
+	if (getConfig('order_multi_page') != "Y") {
 		define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
 		define('_CFG_ORDER_MULTI_Y', "");
 	} else {
@@ -106,7 +94,7 @@ if (isset($_POST['ok'])) {
 		define('_CFG_ORDER_MULTI_Y', " checked=\"checked\"");
 	}
 
-	if (getConfig('autosend_active') == "N") {
+	if (getConfig('autosend_active') != "Y") {
 		define('_CFG_AUTOSEND_ACTIVE_N', " checked=\"checked\"");
 		define('_CFG_AUTOSEND_ACTIVE_Y', "");
 	} else {
@@ -114,7 +102,7 @@ if (isset($_POST['ok'])) {
 		define('_CFG_AUTOSEND_ACTIVE_Y', " checked=\"checked\"");
 	}
 
-	if (getConfig('send_prof_update') == "N") {
+	if (getConfig('send_prof_update') != "Y") {
 		define('_CFG_SEND_UPDATE_N', " checked=\"checked\"");
 		define('_CFG_SEND_UPDATE_Y', "");
 	} else {
@@ -122,7 +110,7 @@ if (isset($_POST['ok'])) {
 		define('_CFG_SEND_UPDATE_Y', " checked=\"checked\"");
 	}
 
-	if (getConfig('admin_notify') == "N") {
+	if (getConfig('admin_notify') != "Y") {
 		define('_CFG_ADMIN_NOTIFY_N', " checked=\"checked\"");
 		define('_CFG_ADMIN_NOTIFY_Y', "");
 	} else {