Functions renamed to new naming convetion, TODOs.txt updated

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 6736b927c2bc4dc7cd14f5c1e1a0452066ce9361..6d70c83dda3a4617c2d6bdbe4ff3529decc0bfba 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -52,12 +52,12 @@ $GLOBALS['output_mode'] = 0;
 $msg = null;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the script installed?
 if (isInstalled()) {
        // Only logged in users may use this surfbar!
-       REDIRECT_ON_UNINSTALLED_EXTENSION('surfbar');
+       redirectOnUninstalledExtension('surfbar');
 
        // No member?
        if (!IS_MEMBER()) {
@@ -70,13 +70,13 @@ if (isInstalled()) {
        SURFBAR_HANDLE_SELF_MAINTENANCE();
 
        // Is there a check value?
-       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET(('frame'))) && (in_array(REQUEST_GET('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
+       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET('frame')) && (in_array(REQUEST_GET('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
                // Reload-lock is full, surfbar stopped so...
                // Load header
                loadIncludeOnce('inc/header.php');
 
                // Load template
-               if (((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'stop')) || (!REQUEST_ISSET_GET(('frame')))) {
+               if (((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stop')) || (!REQUEST_ISSET_GET('frame'))) {
                        // Load template for "start" page
                        LOAD_TEMPLATE('surfbar_frame_start');
 
@@ -84,8 +84,8 @@ if (isInstalled()) {
                        LOAD_TEMPLATE('surfbar_start_banner');
 
                        // This makes the footer appear again
-                       REQUEST_UNSET_GET(('frame'));
-               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'stats')) {
+                       REQUEST_UNSET_GET('frame');
+               } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'stats')) {
                        // Get total points amount
                        $points = GET_TOTAL_DATA(getUserId(), 'user_points', 'points') - GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');
 
@@ -103,7 +103,7 @@ if (isInstalled()) {
 
                        // Load template for "stats" page
                        LOAD_TEMPLATE('surfbar_frame_stats', false, $content);
-               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'textlinks')) {
+               } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'textlinks')) {
                        // Prepare content
                        $content = array(
                                'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -118,10 +118,10 @@ if (isInstalled()) {
                                'restart'   => getConfig('surfbar_restart_time'),
                                'start'     => str_repeat('X', strlen(getConfig('surfbar_restart_time'))),
                                'autostart' => (getConfig('surfbar_autostart') == 'Y') ? 'true' : 'false'
-                       );
+                               );
 
-                       // Load template for stopped surfbar
-                       LOAD_TEMPLATE('surfbar_stopped', false, $content);
+                               // Load template for stopped surfbar
+                               LOAD_TEMPLATE('surfbar_stopped', false, $content);
                }
        } elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET(('salt')))) {
                // Dummy next id get
@@ -155,7 +155,7 @@ if (isInstalled()) {
                $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
 
                // Frame "top" set?
-               if ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'top')) {
+               if ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'top')) {
                        // Determine next id
                        $nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -180,9 +180,9 @@ if (isInstalled()) {
                                // Load new URL
                                SURFBAR_RELOAD_TO_STOP_PAGE('stop2');
                        }
-               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == 'start')) {
+               } elseif ((REQUEST_ISSET_GET('frame')) && (REQUEST_GET('frame') == 'start')) {
                        // Starter frame found so let the footer display
-                       REQUEST_UNSET_GET(('frame'));
+                       REQUEST_UNSET_GET('frame');
                } else {
                        // Load header in frameset mode
                        $isFrameset = true;