X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_other.php;h=80cba1720e43e94d0c34b1e77b61e7fb9e5183d5;hb=095f5ab59b539834d2c67e5d409d01820e10d8be;hp=55496f34db5f348b93102e3476f906fb181f04b6;hpb=76b1b077bda73310c536f658d3a9bb5e12232f39;p=mailer.git

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 55496f34db..80cba1720e 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -14,11 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,75 +41,51 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('other')) {
-	// Missing extension!
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('other'));
-	return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
 
 // Stop saving data if one input field is !isset
-if (isFormSent()) {
+if (isFormSent('save_config')) {
 	// Calculate stamps and set calculated stamps
-	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()));
+	setPostRequestElement('online_timeout'       , createEpocheTimeFromSelections('online_timeout'       , postRequestArray()));
+	setPostRequestElement('url_tlock'            , createEpocheTimeFromSelections('url_tlock'            , postRequestArray()));
 
 	// Online-Timeout shall be > 0 or your database will crow and crow and crow...
 	if (!isPostRequestElementSet('online_timeout'))        { unsetPostRequestElement('ok'); }
 
 	// Chedck other timestamps (which can be zero!)
-	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 (!isPostRequestElementSet('max_send'))              { unsetPostRequestElement('ok'); }
 	if (!isPostRequestElementSet('code_length'))           { unsetPostRequestElement('ok'); }
 	if (!isPostRequestElementSet('reject_url'))            { unsetPostRequestElement('ok'); }
-}
+} // END - if
 
-if (isFormSent()) {
+if (isFormSent('save_config')) {
 	// Update stamps directly
 	adminSaveSettingsFromPostData();
 } else {
 	// Time selection boxes
-	$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
+	$content['online_timeout']   = createConfigurationTimeSelections('online_timeout'       , 'ms');
+	$content['url_tlock']        = createConfigurationTimeSelections('url_tlock'            , 'WDh');
 
 	// 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++) {
-		$content['comma_def_' . $i] = '';
+		$content['max_comma_' . $i] = '';
 	} // END - for
 
+	// Set selections
+	$content = merge_array($content, getCheckedConfig(array('css_php', 'mailid_error_redirect')));
+
 	// Set selection
-	$content['comma_def_' . getConfig('max_comma')] = ' selected="selected"';
+	$content = merge_array($content, getSelectedConfig(array('max_comma')));
 
 	// Load template
-	loadTemplate('admin_config_other', false, $content);
+	loadTemplate('admin_config_other', FALSE, $content);
 }
 
 // [EOF]