X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=9cc8187bb4bda5eb9d2ef3c446fb1219b3103402;hp=e17d81953bd51379dddf82c06a10cf454ac7da2b;hb=f9cc6f432459393d1c3a220e5270705d341a350e;hpb=a79fc75a2304a53e5418b25607ccabbecad929c6

diff --git a/surfbar.php b/surfbar.php
index e17d81953b..9cc8187bb4 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 (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// Only logged in users may use this surfbar!
-	if (!IS_LOGGED_IN()) {
+	if (!EXT_IS_ACTIVE("surfbar")) {
+		// Surfbar deactivated
+		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
+	} elseif (!IS_MEMBER()) {
 		// Redirect
 		LOAD_URL(URL."/modules.php?module=index");
-	} elseif (!EXT_IS_ACTIVE("surfbar")) {
-		// Surfbar deactivated
-		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM);
 	}
 
+	// 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...
@@ -117,7 +120,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		}
 	} elseif ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) {
 		// Dummy next id get
-		SURFBAR_GET_NEXT_ID($_GET['id']);
+		SURFBAR_DETERMINE_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']))) {
@@ -125,16 +128,16 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 			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
@@ -149,7 +152,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 		// Frame "top" set?
 		if ((isset($_GET['frame'])) && ($_GET['frame'] == "top")) {
 			// Determine next id
-			$nextId = SURFBAR_GET_NEXT_ID();
+			$nextId = SURFBAR_DETERMINE_NEXT_ID();
 
 			// Is there a valid id?
 			if ($nextId > 0) {
@@ -160,16 +163,17 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 					'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)
+					'reload'      => SURFBAR_GET_RELOAD_TIME($nextId),
+					'xxx'         => str_repeat("X", strlen(SURFBAR_GET_RELOAD_TIME($nextId)))
 				);
 
 				// Update salt (double-call lock!) and statistics
 				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
@@ -194,8 +198,5 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 	LOAD_URL("install.php");
 }
 
-// Close any open database connection here
-SQL_CLOSE($link, __FILE__, __LINE__);
-
 // Really all done here... ;-)
 ?>