X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_other.php;h=54226ccbc5fdc82e3feec1a2206417243ddd2e4e;hp=6b5db674fc9e8fc851fa678a1a00163bfa91d932;hb=d291cfb1e3ed4d182df758dd302ed9b391d258a0;hpb=77cdaff2afb97ed32985ced906a3a95ee078c2ef

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 6b5db674fc..54226ccbc5 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Grund Einstellungen                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,157 +37,81 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!EXT_IS_ACTIVE("other")) {
-	// Missing extension!
-	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "other");
-	return;
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
+
+if (!isExtensionActive('other')) {
+	// Missing extension!
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('other'));
+	return;
+} // END - if
 
 // Stop saving data if one input field is !isset
-if (isset($_POST['ok'])) {
+if (isFormSent()) {
 	// 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);
+	setRequestPostElement('online_timeout'       , createTimestampFromSelections('ip_timeout'           , postRequestArray()));
+	setRequestPostElement('url_tlock'            , createTimestampFromSelections('url_tlock'            , postRequestArray()));
+	setRequestPostElement('profile_lock'         , createTimestampFromSelections('profile_lock'         , postRequestArray()));
+	setRequestPostElement('profile_update'       , createTimestampFromSelections('profile_update'       , postRequestArray()));
+	setRequestPostElement('resend_profile_update', createTimestampFromSelections('resend_profile_update', postRequestArray()));
 
 	// Online-Timeout shall be > 0 or your database will crow and crow and crow...
-	if (!isset($_POST['online_timeout']))        { unset($_POST['ok']); }
+	if (!isPostRequestElementSet('online_timeout'))        { unsetPostRequestElement('ok'); }
 
 	// Chedck other timestamps (which can be zero!)
-	if (!isset($_POST['profile_lock']))          { unset($_POST['ok']); }
-	if (!isset($_POST['url_tlock']))             { unset($_POST['ok']); }
-	if (!isset($_POST['profile_update']))        { unset($_POST['ok']); }
-	if (!isset($_POST['resend_profile_update'])) { unset($_POST['ok']); }
+	if (!isPostRequestElementSet('profile_lock'))          { unsetPostRequestElement('ok'); }
+	if (!isPostRequestElementSet('url_tlock'))             { unsetPostRequestElement('ok'); }
+	if (!isPostRequestElementSet('profile_update'))        { unsetPostRequestElement('ok'); }
+	if (!isPostRequestElementSet('resend_profile_update')) { unsetPostRequestElement('ok'); }
 
 	// Check other settings
-	if (!isset($_POST['max_send']))              { unset($_POST['ok']); }
-	if (!isset($_POST['code_length']))           { unset($_POST['ok']); }
-	if (!isset($_POST['reject_url']))            { unset($_POST['ok']); }
+	if (!isPostRequestElementSet('max_send'))              { unsetPostRequestElement('ok'); }
+	if (!isPostRequestElementSet('code_length'))           { unsetPostRequestElement('ok'); }
+	if (!isPostRequestElementSet('reject_url'))            { unsetPostRequestElement('ok'); }
 }
 
-if (isset($_POST['ok'])) {
+if (isFormSent()) {
 	// Update stamps directly
-	ADMIN_SAVE_SETTINGS($_POST);
+	adminSaveSettingsFromPostData();
 } else {
-	// Transfer config data into constants for the template (DO NOT set $_CONFIG as global in LOAD_TEMPLATE!!!)
-	define('_CFG_CODE_LENGTH', getConfig('code_length'));
-	define('_CFG_ACT_SYSTEM' , getConfig('activate_xchange'));
-	define('_CFG_MAX_SEND'   , getConfig('max_send'));
-	define('_CFG_REJECT_URL' , getConfig('reject_url'));
-	define('_CFG_MIN_AGE'    , getConfig('min_age'));
-
 	// 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') != "Y") {
-		define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
-		define('_CFG_ORDER_MULTI_Y', "");
-	} else {
-		define('_CFG_ORDER_MULTI_N', "");
-		define('_CFG_ORDER_MULTI_Y', " checked=\"checked\"");
-	}
-
-	if (getConfig('autosend_active') != "Y") {
-		define('_CFG_AUTOSEND_ACTIVE_N', " checked=\"checked\"");
-		define('_CFG_AUTOSEND_ACTIVE_Y', "");
-	} else {
-		define('_CFG_AUTOSEND_ACTIVE_N', "");
-		define('_CFG_AUTOSEND_ACTIVE_Y', " checked=\"checked\"");
-	}
-
-	if (getConfig('send_prof_update') != "Y") {
-		define('_CFG_SEND_UPDATE_N', " checked=\"checked\"");
-		define('_CFG_SEND_UPDATE_Y', "");
-	} else {
-		define('_CFG_SEND_UPDATE_N', "");
-		define('_CFG_SEND_UPDATE_Y', " checked=\"checked\"");
-	}
-
-	if (getConfig('admin_notify') != "Y") {
-		define('_CFG_ADMIN_NOTIFY_N', " checked=\"checked\"");
-		define('_CFG_ADMIN_NOTIFY_Y', "");
-	} else {
-		define('_CFG_ADMIN_NOTIFY_N', "");
-		define('_CFG_ADMIN_NOTIFY_Y', " checked=\"checked\"");
-	}
-
-	if (getConfig('css_php') == "DIRECT") {
-		define('_CFG_CSS_PHP_DIRECT', " checked=\"checked\"");
-		define('_CFG_CSS_PHP_FILE', "");
-	} else {
-		define('_CFG_CSS_PHP_DIRECT', "");
-		define('_CFG_CSS_PHP_FILE', " checked=\"checked\"");
-	}
-
-	if (getConfig('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=\"checked\"");
-	}
-
-	if (getConfig('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=\"checked\"");
-	}
-
-	if (getConfig('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=\"checked\"");
-	}
-
-	if (getConfig('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=\"checked\"");
-	}
-
-	if (getConfig('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 (getConfig('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=\"checked\"");
-	}
+	$content['online_timeout']   = createTimeSelections(getConfig('online_timeout'), 'ip_timeout'           , 'ms');
+	$content['url_tlock']        = createTimeSelections(getConfig('url_tlock')     , 'url_tlock'            , 'WDh');
+	$content['profile_lock']     = createTimeSelections(getConfig('profile_lock')  , 'profile_lock'         , 'WDh');
+	$content['profile_update']   = createTimeSelections(getConfig('profile_update'), 'profile_update'       , 'YM');
+	$content['profile_reupdate'] = createTimeSelections(getConfig('resend_profile_update') , 'resend_profile_update', 'MWD');
+
+	// Prepare more Y/N selections
+	foreach(array('show_points_unconfirmed','show_timings','youre_here','member_menu','guest_menu','order_multi_page','autosend_active','send_prof_update','admin_notify','display_debug_sqls') as $entry) {
+		$content[$entry . '_y'] = '';
+		$content[$entry . '_n'] = '';
+		$content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
+	} // END - foreach
+
+	// Prepare more
+	foreach (array('css_php_direct','css_php_file','css_php_inline','mailid_error_redirect_index','mailid_error_redirect_reject') as $entry) {
+		$content[$entry] = '';
+	} // END - foreach
+
+	// Set selections
+	foreach (array('css_php','mailid_error_redirect') as $entry) {
+		$content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
+	} // END - foreach
 
 	for ($i = 0; $i <= 5; $i++) {
-		$eval = "define('_COMMA_DEF_".$i."', \"\");";
-		if (getConfig('max_comma') == $i) $eval = "define('_COMMA_DEF_".$i."', ' selected=\"selected\"');";
-		eval($eval);
-	}
+		$content['comma_def_' . $i] = '';
+	} // END - for
+
+	// Set selection
+	$content['comma_def_' . getConfig('max_comma')] = ' selected="selected"';
 
 	// Load template
-	LOAD_TEMPLATE("admin_config_other");
+	loadTemplate('admin_config_other', false, $content);
 }
 
-//
+// [EOF]
 ?>