else-block removed

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 306b92190cc011d885a0b4dd523a5d05ff7028e6..2da2cea3a24d336961e972f62e249739ed61c2d0 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -47,7 +47,6 @@ $GLOBALS['module'] = 'surfbar';
 $GLOBALS['refid']  = 0;
 $GLOBALS['output_mode'] = 0;
 $GLOBALS['header_sent'] = 3;
-$msg = null;
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -134,7 +133,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
                // Load template for stopped surfbar
                LOAD_TEMPLATE('surfbar_stopped', false, $content);
        }
-} elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET(('salt')))) {
+} elseif ((REQUEST_ISSET_GET('check')) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET('salt'))) {
        // Dummy next id get
        SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
 
@@ -165,6 +164,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
        // Determine template name
        $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
 
+       // Load header in frameset mode is the default
+       $isFrameset = true;
+
        // Frame "top" set?
        if ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
                // Determine next id
@@ -194,9 +196,6 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(
        } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
                // Starter frame found so let the footer display
                REQUEST_UNSET_GET('frame');
-       } else {
-               // Load header in frameset mode
-               $isFrameset = true;
        }
 
        // Load header