Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index d481f6a761f0885fa835f17cd57fbbcddd8ebbc6..dcbea253335443bd671b2b1d4bcf93786e6278a7 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -52,23 +52,23 @@ if (isset($_POST['ok'])) {
 } else {
        // Prepare content
        $content = array(
-               'surfbar_static_reward'   => TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']),
-               'surfbar_static_costs'    => TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']),
-               'surfbar_static_time'     => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_static_time']   , "surfbar_static_time"   , "ms"),
-               'surfbar_static_lock'     => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_static_lock']   , "surfbar_static_lock"   , "hm"),
-               'surfbar_restart_time'    => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_restart_time']  , "surfbar_restart_time"  , "ms"),
-               'surfbar_dynamic_percent' => TRANSLATE_COMMA($_CONFIG['surfbar_dynamic_percent']),
-               'surfbar_max_order'       => $_CONFIG['surfbar_max_order'],
-               'surfbar_stats_reload'    => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_stats_reload']  , "surfbar_stats_reload"  , "ms"),
-               'surfbar_purge_deleted'   => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_purge_deleted'] , "surfbar_purge_deleted" , "WDh"),
-               'surfbar_purge_migrated'  => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_purge_migrated'], "surfbar_purge_migrated", "WDh"),
-               'surfbar_pause_url'       => $_CONFIG['surfbar_pause_url'],
-               'surfbar_warn_low_points' => $_CONFIG['surfbar_warn_low_points'],
-               'surfbar_low_interval'    => CREATE_TIME_SELECTIONS($_CONFIG['surfbar_low_interval']  , "surfbar_low_interval"  , "WDh"),
+               'surfbar_static_reward'   => TRANSLATE_COMMA(getConfig('surfbar_static_reward')),
+               'surfbar_static_costs'    => TRANSLATE_COMMA(getConfig('surfbar_static_costs')),
+               'surfbar_static_time'     => CREATE_TIME_SELECTIONS(getConfig('surfbar_static_time')   , "surfbar_static_time"   , "ms" , "left"),
+               'surfbar_static_lock'     => CREATE_TIME_SELECTIONS(getConfig('surfbar_static_lock')   , "surfbar_static_lock"   , "hm" , "left"),
+               'surfbar_restart_time'    => CREATE_TIME_SELECTIONS(getConfig('surfbar_restart_time')  , "surfbar_restart_time"  , "ms" , "left"),
+               'surfbar_dynamic_percent' => TRANSLATE_COMMA(getConfig('surfbar_dynamic_percent')),
+               'surfbar_max_order'       => getConfig('surfbar_max_order'),
+               'surfbar_stats_reload'    => CREATE_TIME_SELECTIONS(getConfig('surfbar_stats_reload')  , "surfbar_stats_reload"  , "ms" , "left"),
+               'surfbar_purge_deleted'   => CREATE_TIME_SELECTIONS(getConfig('surfbar_purge_deleted') , "surfbar_purge_deleted" , "WDh", "left"),
+               'surfbar_purge_migrated'  => CREATE_TIME_SELECTIONS(getConfig('surfbar_purge_migrated'), "surfbar_purge_migrated", "WDh", "left"),
+               'surfbar_pause_url'       => getConfig('surfbar_pause_url'),
+               'surfbar_warn_low_points' => getConfig('surfbar_warn_low_points'),
+               'surfbar_low_interval'    => CREATE_TIME_SELECTIONS(getConfig('surfbar_low_interval')  , "surfbar_low_interval"  , "WDh", "left"),
        );
 
        // Prepare payment model for template
-       if ($_CONFIG['surfbar_pay_model'] == "STATIC") {
+       if (getConfig('surfbar_pay_model') == "STATIC") {
                // Static model
                define('__CONFIG_SURFBAR_PAY_MODEL_STATIC' , " checked=\"checked\"");
                define('__CONFIG_SURFBAR_PAY_MODEL_DYNAMIC', "");
@@ -79,7 +79,7 @@ if (isset($_POST['ok'])) {
        }
 
        // Prepare auto-sart
-       if ($_CONFIG['surfbar_autostart'] == "Y") {
+       if (getConfig('surfbar_autostart') == "Y") {
                // Yes selected
                define('__CONFIG_SURFBAR_AUTOSTART_Y', " checked=\"checked\"");
                define('__CONFIG_SURFBAR_AUTOSTART_N', "");
@@ -90,7 +90,7 @@ if (isset($_POST['ok'])) {
        }
 
        // Prepare notify limits
-       if ($_CONFIG['surfbar_notify_limits'] == "Y") {
+       if (getConfig('surfbar_notify_limits') == "Y") {
                // Yes selected
                define('__CONFIG_SURFBAR_NOTIFY_LIMITS_Y', " checked=\"checked\"");
                define('__CONFIG_SURFBAR_NOTIFY_LIMITS_N', "");
@@ -100,8 +100,19 @@ if (isset($_POST['ok'])) {
                define('__CONFIG_SURFBAR_NOTIFY_LIMITS_N', " checked=\"checked\"");
        }
 
+       // Prepare notify admin about unlocked emails
+       if (getConfig('surfbar_notify_admin_unlock') == "Y") {
+               // Yes selected
+               define('__CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK_Y', " checked=\"checked\"");
+               define('__CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK_N', "");
+       } else {
+               // No selected
+               define('__CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK_Y', "");
+               define('__CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK_N', " checked=\"checked\"");
+       }
+
        // Prepare order migration
-       if ($_CONFIG['surfbar_migrate_order'] == "Y") {
+       if (getConfig('surfbar_migrate_order') == "Y") {
                // Yes selected
                define('__CONFIG_SURFBAR_MIGRATE_ORDER_Y', " checked=\"checked\"");
                define('__CONFIG_SURFBAR_MIGRATE_ORDER_N', "");
@@ -112,7 +123,7 @@ if (isset($_POST['ok'])) {
        }
 
        // Pause URL mode
-       if ($_CONFIG['surfbar_pause_mode'] == "INTERNAL") {
+       if (getConfig('surfbar_pause_mode') == "INTERNAL") {
                // Internal pause page
                define('__CONFIG_SURFBAR_PAUSE_MODE_INTERNAL', " checked=\"checked\"");
                define('__CONFIG_SURFBAR_PAUSE_MODE_EXTERNAL', "");
@@ -123,7 +134,7 @@ if (isset($_POST['ok'])) {
        }
 
        // Notification mode
-       if ($_CONFIG['surfbar_notification_mode'] == "INSTANT") {
+       if (getConfig('surfbar_notification_mode') == "INSTANT") {
                // Instant notification
                define('__CONFIG_SURFBAR_NOTIFICATION_MODE_INSTANT', " selected=\"selected\"");
                define('__CONFIG_SURFBAR_NOTIFICATION_MODE_RESET'  , "");