Several minor rewrites, getter GET_JACKPOT_POINTS() added

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 306b92190cc011d885a0b4dd523a5d05ff7028e6..ec7ce0e6f1242262fe5c278d9d7ba5d1b1b33d05 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');
@@ -69,9 +68,32 @@ redirectOnUninstalledExtension('surfbar');
 
 // No member?
 if (!IS_MEMBER()) {
-       // Redirect
-       // @TODO Display quick login form here or redirect as configured
-       redirectToUrl('modules.php?module=index');
+       // Should we display login window or redirect to main page?
+       if ((getConfig('surfbar_guest_login_form') == 'Y') && (EXT_IS_ACTIVE('user'))) {
+               // Is the form sent?
+               if ((isFormSent()) && (REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST('password'))) {
+                       // Do the login procedure
+                       $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'), basename(__FILE__));
+
+                       // And redirect to the URL
+                       redirectToUrl($URL);
+               } else {
+                       // Load header
+                       loadIncludeOnce('inc/header.php');
+
+                       // Display login form
+                       LOAD_TEMPLATE('surfbar_login_form');
+
+                       // Allow footer here
+                       $GLOBALS['header_sent'] = 2;
+
+                       // Load footer
+                       loadIncludeOnce('inc/footer.php');
+               }
+       } else {
+               // Redirect
+               redirectToUrl('index.php');
+       }
 } // END - if
 
 // Initialize the surfbar
@@ -134,7 +156,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 +187,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 +219,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