X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=bcedacfb55a12d4007802a8ae7eb1eff28973c60;hp=43da016f1360ceaf0484d38b26e7c39c45ae0be1;hb=076e28c32b079b93b73a67b0c8710d65596b76a9;hpb=d997f1621c6e6e0427166bd96690e0825387dadd

diff --git a/surfbar.php b/surfbar.php
index 43da016f13..bcedacfb55 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -50,16 +50,19 @@ $msg = null;
 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 (!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);
+		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
 	}
 
+	// 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...
@@ -130,11 +133,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=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
@@ -170,7 +173,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 				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
@@ -195,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... ;-)
 ?>