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

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

diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php
index e903b6265c9256c745b15ca78be40491210537d7..43019d2966e15c1a288d0621e73fee4995e1ca8d 100644 (file)
--- a/inc/modules/admin/what-config_holiday.php
+++ b/inc/modules/admin/what-config_holiday.php
@@ -32,34 +32,34 @@
  ************************************************************************/
 
 // 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);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
+if (IS_FORM_SENT())
 {
        // Save settings
-       ADMIN_SAVE_SETTINGS($_POST);
+       ADMIN_SAVE_SETTINGS_POST();
 }
  else
 {
        // Prepare constants for the template
-       define('__MAX_VALUE', $CONFIG['holiday_max']);
-       define('__LOCKED'   , CREATE_TIME_SELECTIONS($CONFIG['holiday_lock']  , "holiday_lock"  , "WDh"));
-       switch ($CONFIG['holiday_mode'])
-       {
+       define('__MAX_VALUE', getConfig('holiday_max'));
+       define('__LOCKED'   , CREATE_TIME_SELECTIONS(getConfig('holiday_lock')  , "holiday_lock"  , "WDh"));
+
+       switch (getConfig('holiday_mode')) {
        case "RESET":
-               define('__RESET_DEFAULT' , " checked");
+               define('__RESET_DEFAULT' , " checked=\"checked\"");
                define('__DIRECT_DEFAULT', "");
                break;
 
        case "DIRECT":
                define('__RESET_DEFAULT' , "");
-               define('__DIRECT_DEFAULT', " checked");
+               define('__DIRECT_DEFAULT', " checked=\"checked\"");
                break;
        }