X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=surfbar.php;h=80e96057aa6887a3cea03f72000d4218f1d01497;hb=59bd8a9805c51c895a92cc12825f4cbdfd792597;hp=cb78c0a8c479d4b7398bdcfa86d1e088651418bc;hpb=dfc8488124d3e208253e583a87e8306487b21cd3;p=mailer.git
diff --git a/surfbar.php b/surfbar.php
index cb78c0a8c4..80e96057aa 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -32,7 +32,7 @@
************************************************************************/
// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
// Init "action" and "what"
global $what, $action, $startTime, $SURFBAR_CACHE;
@@ -43,7 +43,7 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
// Set module
$GLOBALS['module'] = "surfbar";
$GLOBALS['refid'] = 0;
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
$msg = null;
// Load the required file(s)
@@ -52,13 +52,14 @@ require("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");
- } elseif (!IS_MEMBER()) {
+ REDIRECT_ON_UNINSTALLED_EXTENSION("surfbar");
+
+ // No member?
+ if (!IS_MEMBER()) {
// Redirect
- LOAD_URL(URL."/modules.php?module=index");
- }
+ // @TODO Display quick login form here or redirect as configured
+ LOAD_URL("modules.php?module=index");
+ } // END - if
// Handle tasks on self-maintenance
SURFBAR_HANDLE_SELF_MAINTENANCE();
@@ -67,7 +68,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 +76,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
LOAD_TEMPLATE("surfbar_frame_start");
// Load banner
- OUTPUT_HTML("
");
LOAD_TEMPLATE("surfbar_start_banner");
// This makes the footer appear again
@@ -88,12 +88,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 +102,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 +110,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 +128,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()) {
@@ -141,7 +141,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
}
// All done, so fix notice for footer.php
- $footer = 1;
+ $GLOBALS['footer_sent'] = 1;
} else {
// Prepare content
$content = "";
@@ -184,7 +184,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}
\ncontent=
".print_r($content, true).""); @@ -192,9 +192,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"); }