A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / modules / admin / what-config_register2.php

diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php
index bcf85c5381d74cbc06b735547e62a7681c1bdbd7..3356d97c9fdbb19150058f90f88a1e05d6f6b930 100644 (file)
--- a/inc/modules/admin/what-config_register2.php
+++ b/inc/modules/admin/what-config_register2.php
@@ -32,40 +32,33 @@
  ************************************************************************/
 
 // 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);
 }
 
-global $link;
-
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-if (isset($_POST['ok']))
-{
+if (IS_FORM_SENT()) {
        // Calculate timestamp from selections...
-       $_POST['ip_timeout'] = CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout", $_POST);
-       $_POST['least_cats'] = round($_POST['least_cats']);
+       REQUEST_SET_POST('ip_timeout', CREATE_TIMESTAMP_FROM_SELECTIONS("ip_timeout", REQUEST_POST_ARRAY()));
+       REQUEST_SET_POST('least_cats', round(REQUEST_POST('least_cats')));
 
        // Save settings
-       ADMIN_SAVE_SETTINGS($_POST);
-}
- else
-{
+       ADMIN_SAVE_SETTINGS_POST();
+} else {
        // Remember stuff in constants
-       define('LEAST_CATS_VALUE'   , round($_CONFIG['least_cats']));
-       define('__CFG_SHOW_REFID'   , ADD_SELECTION("yn", $_CONFIG['display_refid']   , "display_refid"));
-       define('__TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS($_CONFIG['ip_timeout']   , "ip_timeout", "Dhm"));
-       define('__CFG_DBL_EMAIL'    , ADD_SELECTION("yn", $_CONFIG['check_double_email']       , "check_double_email"));
-       define('__CFG_DBL_PASS'     , ADD_SELECTION("yn", $_CONFIG['check_double_pass']        , "check_double_pass"));
-       define('__CFG_CAT_DEFAULT'  , ADD_SELECTION("yn", $_CONFIG['register_default'], "register_default"));
+       define('LEAST_CATS_VALUE'   , round(getConfig('least_cats')));
+       define('__CFG_SHOW_REFID'   , ADD_SELECTION("yn", getConfig('display_refid')   , "display_refid"));
+       define('__TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS(getConfig('ip_timeout')   , "ip_timeout", "Dhm"));
+       define('__CFG_DBL_EMAIL'    , ADD_SELECTION("yn", getConfig('check_double_email')       , "check_double_email"));
+       define('__CFG_DBL_PASS'     , ADD_SELECTION("yn", getConfig('check_double_pass')        , "check_double_pass"));
+       define('__CFG_CAT_DEFAULT'  , ADD_SELECTION("yn", getConfig('register_default'), "register_default"));
 
        // Load normal template
        LOAD_TEMPLATE("admin_config_register2");
 }
-CLOSE_TABLE();
+
 //
 ?>