X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=surfbar.php;h=a640ea603a2eae2c289d4214633073f917358e5d;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hp=93510abffa06ab1e94dddec7f5675b5992cd5684;hpb=b56eadb18a023f4d2d712e8936b4dc1ad31fd580;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index 93510abffa..a640ea603a 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -47,19 +47,22 @@ $CSS = 0;
 $msg = null;
 
 // Load the required file(s)
-require ("inc/config.php");
+require("inc/config.php");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// Only logged in users may use this surfbar!
-	if (!IS_MEMBER()) {
-		// Redirect
-		LOAD_URL(URL."/modules.php?module=index");
-	} elseif (!EXT_IS_ACTIVE("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("modules.php?module=index");
 	}
 
+	// Handle tasks on self-maintenance
+	SURFBAR_HANDLE_SELF_MAINTENANCE();
+
 	// Is there a check value?
 	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
 		// Reload-lock is full, surfbar stopped so...
@@ -72,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
@@ -85,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
@@ -99,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
@@ -107,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
@@ -125,16 +127,16 @@ 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()) {
 				// Then load waiting page
-				LOAD_URL("surfbar.php?frame=stop");
+				SURFBAR_RELOAD_TO_STOP_PAGE();
 			} // END - if
 		} else {
 			// Reload to stop frame!
-			LOAD_URL("surfbar.php?frame=stop");
+			SURFBAR_RELOAD_TO_STOP_PAGE();
 		}
 
 		// All done, so fix notice for footer.php
@@ -160,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)))
@@ -170,7 +172,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 				SURFBAR_UPDATE_SALT_STATS();
 			} else {
 				// Load new URL
-				LOAD_URL("surfbar.php?frame=stop2");
+				SURFBAR_RELOAD_TO_STOP_PAGE("stop2");
 			}
 		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
 			// Starter frame found so let the footer display
@@ -191,7 +193,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// Load footer
 	require_once(PATH."inc/footer.php");
 } else {
-	// You have to configure first!
+	// You have to install first!
 	LOAD_URL("install.php");
 }