All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 973d4e1b5d3933a8af868ff8d16278e9c9b29039..07d22fb273a4f31c1e175fcd13d128d1963a49af 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -47,17 +47,17 @@ $CSS = 0;
 $msg = null;
 
 // Load the required file(s)
-require("inc/config.php");
+require_once("inc/config.php");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Only logged in users may use this surfbar!
        if (!EXT_IS_ACTIVE("surfbar")) {
                // Surfbar deactivated
-               LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
+               LOAD_URL("modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
        } elseif (!IS_MEMBER()) {
                // Redirect
-               LOAD_URL(URL."/modules.php?module=index");
+               LOAD_URL("modules.php?module=index");
        }
 
        // Handle tasks on self-maintenance
@@ -67,7 +67,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
                // Reload-lock is full, surfbar stopped so...
                // Load header
-               require_once(PATH."inc/header.php");
+               LOAD_INC_ONCE("inc/header.php");
 
                // Load template
                if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
@@ -75,7 +75,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        LOAD_TEMPLATE("surfbar_frame_start");
 
                        // Load banner
-                       OUTPUT_HTML("<br />");
                        LOAD_TEMPLATE("surfbar_start_banner");
 
                        // This makes the footer appear again
@@ -88,12 +87,12 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        $content = array(
                                'points'   => TRANSLATE_COMMA($points),
                                'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-                               'reload'   => ($_CONFIG['surfbar_stats_reload'] * 1000),
-                               'c_total'  => TRANSLATE_COMMA($_CONFIG['surfbar_total_counter']),
-                               'c_today'  => TRANSLATE_COMMA($_CONFIG['surfbar_daily_counter']),
-                               'c_yester' => TRANSLATE_COMMA($_CONFIG['surfbar_yester_counter']),
-                               'c_week'   => TRANSLATE_COMMA($_CONFIG['surfbar_weekly_counter']),
-                               'c_month'  => TRANSLATE_COMMA($_CONFIG['surfbar_monthly_counter']),
+                               'reload'   => (getConfig('surfbar_stats_reload') * 1000),
+                               'c_total'  => TRANSLATE_COMMA(getConfig('surfbar_total_counter')),
+                               'c_today'  => TRANSLATE_COMMA(getConfig('surfbar_daily_counter')),
+                               'c_yester' => TRANSLATE_COMMA(getConfig('surfbar_yester_counter')),
+                               'c_week'   => TRANSLATE_COMMA(getConfig('surfbar_weekly_counter')),
+                               'c_month'  => TRANSLATE_COMMA(getConfig('surfbar_monthly_counter')),
                        );
 
                        // Load template for "stats" page
@@ -102,7 +101,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        // Prepare content
                        $content = array(
                                'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
-                               'reload'   => ($_CONFIG['surfbar_stats_reload'] * 1000)
+                               'reload'   => (getConfig('surfbar_stats_reload') * 1000)
                        );
 
                        // Load template for "stats" page
@@ -110,9 +109,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                } else {
                        // Prepare content
                        $content = array(
-                               'restart'   => $_CONFIG['surfbar_restart_time'],
-                               'start'     => str_repeat("X", strlen($_CONFIG['surfbar_restart_time'])),
-                               'autostart' => ($_CONFIG['surfbar_autostart'] == "Y") ? "true" : "false"
+                               'restart'   => getConfig('surfbar_restart_time'),
+                               'start'     => str_repeat("X", strlen(getConfig('surfbar_restart_time'))),
+                               'autostart' => (getConfig('surfbar_autostart') == "Y") ? "true" : "false"
                        );
 
                        // Load template for stopped surfbar
@@ -128,7 +127,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        SURFBAR_LOCKDOWN_ID($_GET['id']);
 
                        // Code is valid so pay points here
-                       SURFBAR_PAY_POINTS($_GET['id']);
+                       SURFBAR_PAY_POINTS();
 
                        // Check if reload is full
                        if (SURFBAR_CHECK_RELOAD_FULL()) {
@@ -163,7 +162,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        'salt'        => SURFBAR_GET_SALT(),
                                        'reward'      => TRANSLATE_COMMA(SURFBAR_GET_REWARD($nextId)),
                                        'url'         => SURFBAR_GET_URL($nextId),
-                                       'curr_reload' => SURFBAR_GET_USER_RELOAD_LOCK(),
+                                       'curr_reload' => SURFBAR_GET_USER_LOCKS(),
                                        'max_urls'    => SURFBAR_GET_TOTAL_URLS(),
                                        'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
                                        'xxx'         => str_repeat("X", strlen(SURFBAR_GET_RELOAD_TIME($nextId)))
@@ -184,7 +183,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                }
 
                // Load header
-               require_once(PATH."inc/header.php");
+               LOAD_INC_ONCE("inc/header.php");
 
                // Load that template
                //* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
@@ -192,9 +191,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Load footer
-       require_once(PATH."inc/footer.php");
+       LOAD_INC_ONCE("inc/footer.php");
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }