X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=surfbar.php;h=c45aff14d3c416916ca344929ee2515edd0e5230;hb=d52156d35605388b7554c31d08bc29f0bb167079;hp=68b6d387077b37f7b493fc662cce3bd9027f64aa;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git

diff --git a/surfbar.php b/surfbar.php
index 68b6d38707..c45aff14d3 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action, $startTime, $SURFBAR_CACHE;
@@ -52,13 +52,14 @@ require("inc/config.php");
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
 	// Only logged in users may use this surfbar!
-	if (!EXT_IS_ACTIVE("surfbar")) {
-		// Surfbar deactivated
-		LOAD_URL(URL."/modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
-	} elseif (!IS_MEMBER()) {
+	REDIRECT_ON_UNINSTALLED_EXTENSION("surfbar");
+
+	// No member?
+	if (!IS_MEMBER()) {
 		// Redirect
-		LOAD_URL(URL."/modules.php?module=index");
-	}
+		// @TODO Display quick login form here or redirect as configured
+		LOAD_URL("modules.php?module=index");
+	} // END - if
 
 	// Handle tasks on self-maintenance
 	SURFBAR_HANDLE_SELF_MAINTENANCE();
@@ -67,7 +68,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
 		// Reload-lock is full, surfbar stopped so...
 		// Load header
-		require_once(PATH."inc/header.php");
+		LOAD_INC_ONCE("inc/header.php");
 
 		// Load template
 		if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
@@ -75,7 +76,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
@@ -184,7 +184,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 		}
 
 		// Load header
-		require_once(PATH."inc/header.php");
+		LOAD_INC_ONCE("inc/header.php");
 
 		// Load that template
 		//* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
@@ -192,9 +192,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	}
 
 	// Load footer
-	require_once(PATH."inc/footer.php");
+	LOAD_INC_ONCE("inc/footer.php");
 } else {
-	// You have to configure first!
+	// You have to install first!
 	LOAD_URL("install.php");
 }