Problem with one URL not in reload lock fixed

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index f2c47234eae731392fc33b08f36f6beb67442425..677c2c1c15de38fe7b3ef0aa436d2d2cc0926788 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -58,19 +58,22 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        } // END - if
 
        // Is there a check value?
-       if (SURFBAR_CHECK_RELOAD_FULL()) {
+       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && ($_GET['frame'] == "stop"))) {
                // Reload-lock is full, surfbar stopped so...
                // Load header
                require_once(PATH."inc/header.php");
 
                // Load template
-               if ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+               if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
                        // Load template for "start" page
                        LOAD_TEMPLATE("surfbar_frame_start");
 
                        // Load banner
                        OUTPUT_HTML("<br />");
                        LOAD_TEMPLATE("surfbar_start_banner");
+
+                       // This makes the footer appear again
+                       unset($_GET['frame']);
                } else {
                        // Prepare content
                        $content = array(
@@ -86,7 +89,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                SURFBAR_GET_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']))) {
+               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']);
 
@@ -96,11 +99,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=start");
+                               LOAD_URL("surfbar.php?frame=stop");
                        } // END - if
                } else {
-                       // Reload to start frame!
-                       LOAD_URL("surfbar.php?frame=start");
+                       // Reload to stop frame!
+                       LOAD_URL("surfbar.php?frame=stop");
                }
 
                // All done, so fix notice for footer.php
@@ -146,6 +149,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                require_once(PATH."inc/header.php");
 
                // Load that template
+               //* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
                LOAD_TEMPLATE($templateName, false, $content);
        }