Fix for SQL with ref_depth=NULL

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index ed53114ca8ef37a3cc5373dfe5d6e24b1076c9b5..8ad2c2af012473fd73719298e06bc00aa866b8fb 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -68,10 +68,10 @@ if (!isMember()) {
                // Is the form sent?
                if ((isFormSent()) && (isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password'))) {
                        // Do the login procedure
-                       $URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+                       $url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
                        // And redirect to the URL
-                       redirectToUrl($URL);
+                       redirectToUrl($url);
                } else {
                        // Load header
                        loadIncludeOnce('inc/header.php');
@@ -79,7 +79,7 @@ if (!isMember()) {
                        // Is there a 'code' provided?
                        if (isGetRequestParameterSet('code')) {
                                // Then generate an error message
-                               loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestParameter('code')));
+                               displayMessage(getMessageFromErrorCode(getRequestParameter('code')));
                        } // END - if
 
                        // Display login form
@@ -163,6 +163,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
                        // Then load waiting page
                        SURFBAR_RELOAD_TO_STOP_PAGE();
                } // END - if
+
+               // Load header to avoid a bug
+               loadIncludeOnce('inc/header.php');
        } else {
                // Reload to stop frame!
                SURFBAR_RELOAD_TO_STOP_PAGE();
@@ -174,16 +177,11 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
        // Prepare content
        $content = '';
 
-       // Determine template name
-       $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
-
-       // Load header in frameset mode is the default
-       $isFrameset = true;
-
        // Frame "top" set?
        if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
                // Determine next id
                $nextId = SURFBAR_DETERMINE_NEXT_ID();
+               //* DEBUG: */ die('nextId='.$nextId);
 
                // Is there a valid id?
                if ($nextId > 0) {
@@ -207,6 +205,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in
        // Load header
        loadIncludeOnce('inc/header.php');
 
+       // Determine template name
+       $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
+
        // Load that template
        //* DEBUG: */ die('templateName=' . $templateName . '<br /><strong>content</strong>=<pre>' . print_r($content, true) . '</pre>');
        loadTemplate($templateName, false, $content);