X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_other.php;h=d6bca2db091f8db0c22bee6df6aca071a76d3303;hb=49248176a5638be80b148ef55d0dc8c334522bf3;hp=ba171a2831a69db9dc4e41f75ff67211c19aa9c6;hpb=fb2e318a47ed99236c9fa63ab94e0c91e805c649;p=mailer.git
diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index ba171a2831..d6bca2db09 100644
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* 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 *
* For more information visit: http://www.mxchange.org *
@@ -33,162 +38,150 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
-} elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {
+} elseif (!EXT_IS_ACTIVE('other')) {
// Missing extension!
- ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "other"));
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('other'));
return;
}
// Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+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);
- }
+if (isFormSent()) {
+ // Calculate stamps and set calculated stamps
+ REQUEST_POST('online_timeout') = createTimestampFromSelections('ip_timeout' , REQUEST_POST_ARRAY());
+ REQUEST_POST('url_tlock') = createTimestampFromSelections('url_tlock' , REQUEST_POST_ARRAY());
+ REQUEST_POST('profile_lock') = createTimestampFromSelections('profile_lock' , REQUEST_POST_ARRAY());
+ REQUEST_POST('profile_update') = createTimestampFromSelections('profile_update' , REQUEST_POST_ARRAY());
+ REQUEST_SET_POST('resend_profile_update', createTimestampFromSelections('resend_profile_update', REQUEST_POST_ARRAY()));
// Online-Timeout shall be > 0 or your database will crow and crow and crow...
- if (!isset($_POST['online_timeout'])) { unset($_POST['ok']); }
+ if (!REQUEST_ISSET_POST(('online_timeout'))) { REQUEST_UNSET_POST('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 (!REQUEST_ISSET_POST(('profile_lock'))) { REQUEST_UNSET_POST('ok'); }
+ if (!REQUEST_ISSET_POST(('url_tlock'))) { REQUEST_UNSET_POST('ok'); }
+ if (!REQUEST_ISSET_POST(('profile_update'))) { REQUEST_UNSET_POST('ok'); }
+ if (!REQUEST_ISSET_POST(('resend_profile_update'))) { REQUEST_UNSET_POST('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 (!REQUEST_ISSET_POST(('max_send'))) { REQUEST_UNSET_POST('ok'); }
+ if (!REQUEST_ISSET_POST(('code_length'))) { REQUEST_UNSET_POST('ok'); }
+ if (!REQUEST_ISSET_POST(('reject_url'))) { REQUEST_UNSET_POST('ok'); }
}
-if (isset($_POST['ok'])) {
+if (isFormSent()) {
// Update stamps directly
- ADMIN_SAVE_SETTINGS($_POST);
+ ADMIN_SAVE_SETTINGS_POST();
} else {
- // Transfer config data into constants for the template (DO NOT set $_CONFIG as global in LOAD_TEMPLATE!!!)
- define('_CFG_CODE_LENGTH' , $_CONFIG['code_length']);
- define('_CFG_ACT_SYSTEM' , $_CONFIG['activate_xchange']);
- define('_CFG_MAX_SEND' , $_CONFIG['max_send']);
- define('_CFG_REJECT_URL' , $_CONFIG['reject_url']);
- define('_CFG_MIN_AGE' , $_CONFIG['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($_CONFIG['online_timeout'], "ip_timeout" , "ms"));
- define('_CFG_URL_TLOCK' , CREATE_TIME_SELECTIONS($_CONFIG['url_tlock'] , "url_tlock" , "WDh"));
- define('_CFG_PROFILE_LOCK' , CREATE_TIME_SELECTIONS($_CONFIG['profile_lock'] , "profile_lock" , "WDh"));
- define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS($_CONFIG['profile_update'], "profile_update" , "YM"));
- define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($_CONFIG['resend_profile_update'] , "resend_profile_update", "MWD"));
- } else {
- // Normal input boxes
- define('_CFG_ONLINE_TIMEOUT', " ("._SECONDS.")");
- define('_CFG_URL_TLOCK' , " ("._SECONDS.")");
- define('_CFG_PROFILE_LOCK' , " ("._SECONDS.")");
- define('_CFG_PROFILE_UPDATE', " ("._SECONDS.")");
- define('_CFG_PROF_REUPDATE' , " ("._SECONDS.")");
- }
-
- if ($_CONFIG['order_multi_page'] == "N") {
- define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
- define('_CFG_ORDER_MULTI_Y', "");
+ // Transfer config data into constants for the 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', createTimeSelections(getConfig('online_timeout'), 'ip_timeout' , 'ms'));
+ define('_CFG_URL_TLOCK' , createTimeSelections(getConfig('url_tlock') , 'url_tlock' , 'WDh'));
+ define('_CFG_PROFILE_LOCK' , createTimeSelections(getConfig('profile_lock') , 'profile_lock' , 'WDh'));
+ define('_CFG_PROFILE_UPDATE', createTimeSelections(getConfig('profile_update'), 'profile_update' , 'YM'));
+ define('_CFG_PROF_REUPDATE' , createTimeSelections(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\"");
+ define('_CFG_ORDER_MULTI_N', '');
+ define('_CFG_ORDER_MULTI_Y', ' checked="checked"');
}
- if ($_CONFIG['autosend_active'] == "N") {
- define('_CFG_AUTOSEND_ACTIVE_N', " checked=\"checked\"");
- define('_CFG_AUTOSEND_ACTIVE_Y', "");
+ 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\"");
+ define('_CFG_AUTOSEND_ACTIVE_N', '');
+ define('_CFG_AUTOSEND_ACTIVE_Y', ' checked="checked"');
}
- if ($_CONFIG['send_prof_update'] == "N") {
- define('_CFG_SEND_UPDATE_N', " checked=\"checked\"");
- define('_CFG_SEND_UPDATE_Y', "");
+ 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\"");
+ define('_CFG_SEND_UPDATE_N', '');
+ define('_CFG_SEND_UPDATE_Y', ' checked="checked"');
}
- if ($_CONFIG['admin_notify'] == "N") {
- define('_CFG_ADMIN_NOTIFY_N', " checked=\"checked\"");
- define('_CFG_ADMIN_NOTIFY_Y', "");
+ 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\"");
+ define('_CFG_ADMIN_NOTIFY_N', '');
+ define('_CFG_ADMIN_NOTIFY_Y', ' checked="checked"');
}
- if ($_CONFIG['css_php'] == "DIRECT") {
- define('_CFG_CSS_PHP_DIRECT', " checked=\"checked\"");
- define('_CFG_CSS_PHP_FILE', "");
+ 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\"");
+ define('_CFG_CSS_PHP_DIRECT', '');
+ define('_CFG_CSS_PHP_FILE', ' checked="checked"');
}
- if ($_CONFIG['guest_menu'] == "Y") {
- define('_CFG_GUEST_MENU_ACTIVE', " checked=\"checked\"");
- define('_CFG_GUEST_MENU_INACTIVE', "");
+ 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\"");
+ define('_CFG_GUEST_MENU_ACTIVE', '');
+ define('_CFG_GUEST_MENU_INACTIVE', ' checked="checked"');
}
- if ($_CONFIG['member_menu'] == "Y") {
- define('_CFG_MEMBER_MENU_ACTIVE', " checked=\"checked\"");
- define('_CFG_MEMBER_MENU_INACTIVE', "");
+ 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\"");
+ define('_CFG_MEMBER_MENU_ACTIVE', '');
+ define('_CFG_MEMBER_MENU_INACTIVE', ' checked="checked"');
}
- if ($_CONFIG['youre_here'] == "Y") {
- define('_CFG_YOURE_HERE_ACTIVE', " checked=\"checked\"");
- define('_CFG_YOURE_HERE_INACTIVE', "");
+ 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\"");
+ define('_CFG_YOURE_HERE_ACTIVE', '');
+ define('_CFG_YOURE_HERE_INACTIVE', ' checked="checked"');
}
- if ($_CONFIG['show_timings'] == "Y") {
- define('_CFG_SHOW_TIMINGS_Y', " checked=\"checked\"");
- define('_CFG_SHOW_TIMINGS_N', "");
+ 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\"");
+ define('_CFG_SHOW_TIMINGS_Y', '');
+ define('_CFG_SHOW_TIMINGS_N', ' checked="checked"');
}
- if ($_CONFIG['show_points_unconfirmed'] == "Y") {
- define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', " checked=\"checked\"");
- define('_CFG_SHOW_POINTS_UNCONFIRMED_N', "");
+ 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\"");
+ 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', "");
+ 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\"");
+ define('_CFG_MAILID_REDIRECT_INDEX', '');
+ define('_CFG_MAILID_REDIRECT_REJECT', ' checked="checked"');
}
for ($i = 0; $i <= 5; $i++) {
$eval = "define('_COMMA_DEF_".$i."', \"\");";
- if ($_CONFIG['max_comma'] == $i) $eval = "define('_COMMA_DEF_".$i."', \" selected\");";
+ if (getConfig('max_comma') == $i) $eval = "define('_COMMA_DEF_".$i."', ' selected=\"selected\"');";
eval($eval);
}