X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=d2f943308d0dfe495eaeb5b11ab45b8b8b5887dd;hp=3bfe6552794ce3ba8d39242a91c887bb570e4c85;hb=105acbe19037f756a0902e990836133bcd993d13;hpb=fb54237bf1d0c0a7435ad4322a4ac40f3bd72eba

diff --git a/surfbar.php b/surfbar.php
index 3bfe655279..d2f943308d 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -35,8 +35,8 @@
 require_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action, $startTime, $SURFBAR_DATA;
-$SURFBAR_DATA = array();
+global $what, $action, $startTime, $SURFBAR_CACHE;
+$SURFBAR_CACHE = array();
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 
@@ -58,28 +58,37 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	} // END - if
 
 	// Is there a check value?
-	if ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) {
+	if (SURFBAR_CHECK_RELOAD_FULL()) {
+		// Reload-lock is full, surfbar stopped so...
+		// Load header
+		require_once(PATH."inc/header.php");
+
+		// Load template
+		LOAD_TEMPLATE("surfbar_stopped");
+	} elseif ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) {
 		// Dummy next id get
 		SURFBAR_GET_NEXT_ID($_GET['id']);
 
-		// Check validation code
-		if (SURFBAR_CHECK_VALIDATION_CODE($_GET['id'], $_GET['check'], $_GET['salt'])) {
+		// Check reload lock and validation code
+		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']);
 
 			// Code is valid so pay points here
 			SURFBAR_PAY_POINTS($_GET['id']);
-		} // END - if
 
-		// Set footer (fixes notice)
-		$footer = 1;
-	} elseif (SURFBAR_CHECK_RELOAD_FULL()) {
-		// Reload-lock is full, surfbar stopped so...
-		// Load header
-		require_once(PATH."inc/header.php");
+			// Check if reload is full
+			if (SURFBAR_CHECK_RELOAD_FULL()) {
+				// Then load waiting page
+				LOAD_URL("surfbar.php?frame=start");
+			} // END - if
+		} else {
+			// Reload to start frame!
+			LOAD_URL("surfbar.php?frame=start");
+		}
 
-		// Load template
-		LOAD_TEMPLATE("surfbar_stopped");
+		// All done, so fix notice for footer.php
+		$footer = 1;
 	} else {
 		// Prepare content
 		$content = "";
@@ -98,7 +107,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 				$content = array(
 					'id'          => $nextId,
 					'check'       => SURFBAR_GENERATE_VALIDATION_CODE($nextId),
-					'salt'        => $SURFBAR_DATA['salt'],
+					'salt'        => SURFBAR_GET_SALT(),
 					'reward'      => TRANSLATE_COMMA(SURFBAR_GET_REWARD($nextId)),
 					'url'         => SURFBAR_GET_URL($nextId),
 					'curr_reload' => SURFBAR_GET_USER_RELOAD_LOCK(),