More network types and request parameters added, POST rerequest fixed

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index c8a8c9d00d56be3de44763f5a6770a4581f46060..35b10ffa3e83508cc1926c70c1d7c94c44c6b8fa 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -54,7 +54,7 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Is a frame active?
-if (isGetRequestElementSet('frame')) {
+if (isGetRequestParameterSet('frame')) {
        // Then we need to set header_sent to 0
        $GLOBALS['header_sent'] = '0';
 } // END - if
@@ -67,9 +67,9 @@ if (!isMember()) {
        // Should we display login window or redirect to main page?
        if ((getConfig('surfbar_guest_login_form') == 'Y') && (isExtensionActive('user'))) {
                // Is the form sent?
-               if ((isFormSent()) && (isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
+               if ((isFormSent()) && (isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password'))) {
                        // Do the login procedure
-                       $URL = doUserLogin(postRequestElement('id'), postRequestElement('password'), basename(__FILE__), basename(__FILE__) . '?code=');
+                       $URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'), basename(__FILE__), basename(__FILE__) . '?code=');
 
                        // And redirect to the URL
                        redirectToUrl($URL);
@@ -78,9 +78,9 @@ if (!isMember()) {
                        loadIncludeOnce('inc/header.php');
 
                        // Is there a 'code' provided?
-                       if (isGetRequestElementSet('code')) {
+                       if (isGetRequestParameterSet('code')) {
                                // Then generate an error message
-                               loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestElement('code')));
+                               loadTemplate('admin_settings_saved', false, getMessageFromErrorCode(getRequestParameter('code')));
                        } // END - if
 
                        // Display login form
@@ -94,7 +94,7 @@ if (!isMember()) {
                }
        } else {
                // Redirect
-               redirectToUrl('index.php');
+               redirectToUrl('modules.php?module=index');
        }
 } // END - if
 
@@ -105,13 +105,13 @@ SURFBAR_INIT();
 SURFBAR_HANDLE_SELF_MAINTENANCE();
 
 // Is there a check value?
-if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_array(getRequestElement('frame'), array('stop', 'stop', 'stats', 'textlinks'))))) {
+if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestParameterSet('frame')) && (in_array(getRequestParameter('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
        // Reload-lock is full, surfbar stopped so...
        // Load header
        loadIncludeOnce('inc/header.php');
 
        // Load template
-       if (((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stop')) || (!isGetRequestElementSet('frame'))) {
+       if (((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stop2')) || (!isGetRequestParameterSet('frame'))) {
                // Load template for "start" page
                loadTemplate('surfbar_frame_start');
 
@@ -119,8 +119,8 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
                loadTemplate('surfbar_start_banner');
 
                // This makes the footer appear again
-               unsetGetRequestElement('frame');
-       } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'stats')) {
+               unsetGetRequestParameter('frame');
+       } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'stats')) {
                // Get total points amount
                $points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
@@ -138,7 +138,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
 
                // Load template for "stats" page
                loadTemplate('surfbar_frame_stats', false, $content);
-       } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'textlinks')) {
+       } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'textlinks')) {
                // Prepare content
                $content = array(
                        'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -150,7 +150,6 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
        } else {
                // Prepare content
                $content = array(
-                       'restart'   => getConfig('surfbar_restart_time'),
                        'start'     => str_repeat('X', strlen(getConfig('surfbar_restart_time'))),
                        'autostart' => (getConfig('surfbar_autostart') == 'Y') ? 'true' : 'false'
                );
@@ -158,14 +157,14 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
                // Load template for stopped surfbar
                loadTemplate('surfbar_stopped', false, $content);
        }
-} elseif ((isGetRequestElementSet('check')) && (isGetRequestElementSet('id')) && (isGetRequestElementSet('salt'))) {
+} elseif ((isGetRequestParameterSet('check')) && (isGetRequestParameterSet('id')) && (isGetRequestParameterSet('salt'))) {
        // Dummy next id get
-       SURFBAR_DETERMINE_NEXT_ID(getRequestElement('id'));
+       SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('id'));
 
        // Check reload lock and validation code
-       if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestElement('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestElement('id'), getRequestElement('check'), getRequestElement('salt')))) {
+       if ((!SURFBAR_CHECK_RELOAD_LOCK(getRequestParameter('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(getRequestParameter('id'), getRequestParameter('check'), getRequestParameter('salt')))) {
                // Lock the URL (id) down
-               SURFBAR_LOCKDOWN_ID(getRequestElement('id'));
+               SURFBAR_LOCKDOWN_ID(getRequestParameter('id'));
 
                // Code is valid so pay points here
                SURFBAR_PAY_POINTS();
@@ -193,7 +192,7 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
        $isFrameset = true;
 
        // Frame "top" set?
-       if ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'top')) {
+       if ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'top')) {
                // Determine next id
                $nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -218,9 +217,9 @@ if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isGetRequestElementSet('frame')) && (in_a
                        // Load new URL
                        SURFBAR_RELOAD_TO_STOP_PAGE('stop');
                }
-       } elseif ((isGetRequestElementSet('frame')) && (getRequestElement('frame') == 'start')) {
+       } elseif ((isGetRequestParameterSet('frame')) && (getRequestParameter('frame') == 'start')) {
                // Starter frame found so let the footer display
-               unsetGetRequestElement('frame');
+               unsetGetRequestParameter('frame');
        }
 
        // Load header