X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=690443a957d13157c76ff07265784469db85c9af;hp=f2c47234eae731392fc33b08f36f6beb67442425;hb=700bc24c3ab00d51273e93cdc816e177bac34aa5;hpb=c3ea029c279923888cebf39020fe152c4540fbe8

diff --git a/surfbar.php b/surfbar.php
index f2c47234ea..690443a957 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -55,27 +55,52 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	if (!IS_LOGGED_IN()) {
 		// Redirect
 		LOAD_URL(URL."/modules.php?module=index");
-	} // END - if
+	} elseif (!EXT_IS_ACTIVE("surfbar")) {
+		// Surfbar deactivated
+		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM);
+	}
 
 	// Is there a check value?
-	if (SURFBAR_CHECK_RELOAD_FULL()) {
+	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats"))))) {
 		// Reload-lock is full, surfbar stopped so...
 		// Load header
 		require_once(PATH."inc/header.php");
 
 		// Load template
-		if ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+		if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
 			// Load template for "start" page
 			LOAD_TEMPLATE("surfbar_frame_start");
 
 			// Load banner
 			OUTPUT_HTML("<br />");
 			LOAD_TEMPLATE("surfbar_start_banner");
+
+			// This makes the footer appear again
+			unset($_GET['frame']);
+		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "stats")) {
+			// Get total points amount
+			$points = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
+
+			// Prepare content
+			$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_yester_counter']),
+				'c_yester' => TRANSLATE_COMMA($_CONFIG['surfbar_daily_counter']),
+				'c_week'   => TRANSLATE_COMMA($_CONFIG['surfbar_weekly_counter']),
+				'c_month'  => TRANSLATE_COMMA($_CONFIG['surfbar_monthly_counter']),
+			);
+
+			// Load template for "stats" page
+			LOAD_TEMPLATE("surfbar_frame_stats", false, $content);
 		} else {
 			// Prepare content
 			$content = array(
-				'restart' => $_CONFIG['surfbar_restart_time'],
-				'start'   => str_repeat("X", strlen($_CONFIG['surfbar_restart_time']))
+				'restart'   => $_CONFIG['surfbar_restart_time'],
+				'start'     => str_repeat("X", strlen($_CONFIG['surfbar_restart_time'])),
+				'autostart' => ($_CONFIG['surfbar_autostart'] == "Y") ? "true" : "false"
 			);
 
 			// Load template for stopped surfbar
@@ -86,7 +111,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		SURFBAR_GET_NEXT_ID($_GET['id']);
 
 		// Check reload lock and validation code
-		if ((SURFBAR_CHECK_RELOAD_LOCK($_GET['id'])) && (SURFBAR_CHECK_VALIDATION_CODE($_GET['id'], $_GET['check'], $_GET['salt']))) {
+		if ((!SURFBAR_CHECK_RELOAD_LOCK($_GET['id'])) && (SURFBAR_CHECK_VALIDATION_CODE($_GET['id'], $_GET['check'], $_GET['salt']))) {
 			// Lock the URL (id) down
 			SURFBAR_LOCKDOWN_ID($_GET['id']);
 
@@ -96,11 +121,11 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 			// Check if reload is full
 			if (SURFBAR_CHECK_RELOAD_FULL()) {
 				// Then load waiting page
-				LOAD_URL("surfbar.php?frame=start");
+				LOAD_URL("surfbar.php?frame=stop");
 			} // END - if
 		} else {
-			// Reload to start frame!
-			LOAD_URL("surfbar.php?frame=start");
+			// Reload to stop frame!
+			LOAD_URL("surfbar.php?frame=stop");
 		}
 
 		// All done, so fix notice for footer.php
@@ -129,14 +154,17 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 					'curr_reload' => SURFBAR_GET_USER_RELOAD_LOCK(),
 					'max_urls'    => SURFBAR_GET_TOTAL_URLS(),
 					'reload'      => SURFBAR_GET_RELOAD_TIME($nextId)
-			);
+				);
 
-				// Update salt (double-call lock!)
-				SURFBAR_UPDATE_SALT();
+				// Update salt (double-call lock!) and statistics
+				SURFBAR_UPDATE_SALT_STATS();
 			} else {
-				// Change template name
-				$templateName = "surfbar_stopped";
+				// Load new URL
+				LOAD_URL("surfbar.php?frame=stop2");
 			}
+		} elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+			// Starter frame found so let the footer display
+			unset($_GET['frame']);
 		} else {
 			// Load header in frameset mode
 			$isFrameset = true;
@@ -146,6 +174,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		require_once(PATH."inc/header.php");
 
 		// Load that template
+		//* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
 		LOAD_TEMPLATE($templateName, false, $content);
 	}