X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=c45aff14d3c416916ca344929ee2515edd0e5230;hp=a640ea603a2eae2c289d4214633073f917358e5d;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=43ef1d67a04c351e4432515b53c04fd70f8dc760

diff --git a/surfbar.php b/surfbar.php
index a640ea603a..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("modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
-	} elseif (!IS_MEMBER()) {
+	REDIRECT_ON_UNINSTALLED_EXTENSION("surfbar");
+
+	// No member?
+	if (!IS_MEMBER()) {
 		// Redirect
+		// @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']))) {
@@ -183,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>");
@@ -191,7 +192,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 	}
 
 	// Load footer
-	require_once(PATH."inc/footer.php");
+	LOAD_INC_ONCE("inc/footer.php");
 } else {
 	// You have to install first!
 	LOAD_URL("install.php");