Code cleanup:

- Initialization of 'action' and 'what' is no longer needed in all root scripts
- Some more double-quotes converted to single-quotes
- Minor cleanups

diff --git a/admin.php b/admin.php
index 8de27a1209fb645c7707a5c780f3210fb9fda803..410750546d207d7e17bcbf61f11ad16af14b7ac2 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'admin';
 $GLOBALS['output_mode'] = -1;

diff --git a/agb.php b/agb.php
index 8d5e13d97c3ae0a32c4b245b032c5311df5a1326..19947b5efa804cc9ea0ce819634e81eafd71c774 100644 (file)
--- a/agb.php
+++ b/agb.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'agb';
 $GLOBALS['output_mode'] = -1;

diff --git a/beg.php b/beg.php
index 3de49a3a9b251cefbecc9cd68393089d5934cafc..cdfbfc70bee97abf92f19f249a23d17557972998 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -39,10 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set module
 $GLOBALS['module'] = 'beg';

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 003c93fbd186e359dbf95f9e477f5d7720b250ff..d1284aec6bbb346b8446aec0c216e2d84ff0b359 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -39,9 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Set module
 $GLOBALS['module'] = 'birthday_confirm';

diff --git a/click.php b/click.php
index ac9d1b6199b32c5d41bf7ded8bf971ee7975ca47..6a17401d260c7e996f0b183573dc1dfbe29a1e92 100644 (file)
--- a/click.php
+++ b/click.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'click';
 $GLOBALS['output_mode'] = -1;

diff --git a/confirm.php b/confirm.php
index c53046e3479d79585135d893736014776d6d34a4..41ca856c24b9ff39ca39642aa10aa373794194dd 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module to confirm
 $GLOBALS['module'] = 'confirm';
 $GLOBALS['output_mode'] = -1;

diff --git a/css.php b/css.php
index 45ad87d9543b2230d700e8ee62fa50a856965471..4a9c8ed36f5c0a7774cb2c44ba2612fb04985957 100644 (file)
--- a/css.php
+++ b/css.php
@@ -42,10 +42,6 @@ require('inc/libs/security_functions.php');
 // Footer is disabled in CSS mode
 $GLOBALS['footer_sent'] = '-1';
 
-// Init variables
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // This is a CSS file loader!
 $GLOBALS['output_mode'] = '1';
 $GLOBALS['module'] = 'css';

diff --git a/debug.php b/debug.php
index ef780e47402242b70dc7bfb29cfa2405d3cae77d..8dfc9d42c3907b98c78bb9face4d506a3abc46ea 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module and fake "CSS mode"
 $GLOBALS['module'] = 'debug';
 $GLOBALS['output_mode'] = -1;

diff --git a/doubler.php b/doubler.php
index bb9201f1791e33b509aaa70a2c604333f21c6e38..a521ad470903a35cc3c474e34223036fdf5d376f 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -39,10 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set module
 $GLOBALS['module'] = 'doubler';

diff --git a/img.php b/img.php
index 444b1b96f590f6842bda1cdeb13d77e7d99e03de..adaa3e271e668cc8069d874cff7f418a7f181411 100644 (file)
--- a/img.php
+++ b/img.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'img';
 $GLOBALS['output_mode'] = -1;

diff --git a/inc/filters.php b/inc/filters.php
index 83438eab3ecbb3587dc0b9307c2ce7ac5d5d6c78..6d92d6a654f5e97f0e997f881818876cb2f3304e 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -330,7 +330,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 
        // Handle failed logins here if not in guest
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):type={$data['type']},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$data['access_level']}<br />\n";
-       if ((($data['type'] == "what") || ($data['type'] == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) {
+       if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) {
                // Handle failure
                $content['content'] .= HANDLE_LOGIN_FAILTURES($data['access_level']);
        } // END - if
@@ -475,7 +475,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
                        $GLOBALS['last']['module'] = $mod; $GLOBALS['last']['online'] = $onl;
                } // END - if
 
-               // "what" not set?
+               // 'what' not set?
                if (empty($GLOBALS['what'])) {
                        // Fix it to default
                        $GLOBALS['what'] = "welcome";

diff --git a/inc/functions.php b/inc/functions.php
index 2900e464e0dbc84d93f865afc4f9271aa72fa271..9589c5e15cb849b91656a23e10d8f899f1ac6255 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -929,11 +929,11 @@ function redirectToUrl ($URL) {
                clearOutputBuffer();
        } // END - if
 
-       // Secure the URL against bad things such als HTML insertions and so on...
-       $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
-
        // Simple probe for bots/spiders from search engines
        if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
+               // Secure the URL against bad things such als HTML insertions and so on...
+               $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
+
                // Output new location link as anchor
                OUTPUT_HTML('<a href="' . $URL . '"' . $rel . '>' . $URL . '</a>');
        } elseif (!headers_sent()) {

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index b78e6ba25384a7a760bedd7b7e95df3efdfd371b..9a9eab41e00d956cafb98c7eedcea76a581cfb1e 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -518,7 +518,7 @@ function ADD_MEMBER_SELECTION_BOX ($def='0', $add_all=false, $return=false, $non
 // Create a menu selection box for given menu system
 function ADMIN_MENU_SELECTION ($mode, $default = '', $defid = '') {
        $wht = "`what` != ''";
-       if ($mode == "action") $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
+       if ($mode == 'action') $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
        array($mode), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 34a57b82f0deee652cd822957b383def5ce69592..d99ec7e6784cba4f56c7a6132519071cf947a289 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -157,8 +157,8 @@ if (!isFormSent())
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('admin', "what", "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('admin', "action", "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('admin', 'what', "name"));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('admin', 'action', "menu"));
 
        // Display form
        LOAD_TEMPLATE("admin_admin_add");

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index f5743113d5bb30a99e885bb65a90cacafb7d7466..6db7d6964761b7e2f9fedfb265cbd6d430b54091 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -47,11 +47,10 @@ ADD_DESCR('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
-if (REQUEST_ISSET_GET('sub'))
-{
+if (REQUEST_ISSET_GET('sub')) {
        $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
        $SUB = REQUEST_GET('sub');
-}
+} // END - if
 
 // Get count of (maybe) selected menu points
 $chk = 0;
@@ -60,67 +59,59 @@ if (REQUEST_ISSET_POST('sel')) $chk = countPostSelection();
 // List all menu points and make them editable
 if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        // Edit menu entries
+       // @TODO Kill all constants in this file
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $cnt = 0; $SW = 2;
-       foreach (REQUEST_POST('sel') as $sel => $confirm)
-       {
-               if ($confirm == 1)
-               {
+       foreach (REQUEST_POST('sel') as $sel => $confirm) {
+               if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
                                // Prepare data for the row template
                                $content = array(
-                                       'action' => ADMIN_MAKE_MENU_SELECTION('admin', "action", "sel_action[".$sel."]", $act),
-                                       'what'   => ADMIN_MAKE_MENU_SELECTION('admin', "what", "sel_what[".$sel."]", $wht),
+                                       'action' => ADMIN_MAKE_MENU_SELECTION('admin', 'action', 'sel_action[' . $sel . ']', $act),
+                                       'what'   => ADMIN_MAKE_MENU_SELECTION('admin', 'what', 'sel_what[' . $sel . ']', $wht),
                                        'sw'     => $SW,
                                        'sel'    => $sel,
                                        'menu'   => $menu,
                                        'descr'  => $descr,
                                        'cnt'    => $cnt,
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_amenu_edit_row", true, $content);
-                       }
-                       else
-                       {
+                               $OUT .= LOAD_TEMPLATE('admin_amenu_edit_row', true, $content);
+                       } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
                        }
                        $SW = 3 - $SW;
-               }
-       }
+               } // END - if
+       } // END - foreach
+
        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);
 
        // Load template
-       LOAD_TEMPLATE("admin_amenu_edit_form");
-}
-elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
-{
+       LOAD_TEMPLATE('admin_amenu_edit_form');
+} elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO())) {
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        // Del menu entries with or without confirmation
        $SW = 2; $cnt = 0; $OUT = '';
-       foreach (REQUEST_POST('sel') as $sel => $confirm)
-       {
-               if ($confirm == 1)
-               {
+       foreach (REQUEST_POST('sel') as $sel => $confirm) {
+               if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
@@ -132,16 +123,14 @@ elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
                                        'sel'  => $sel,
                                        'sw'   => $SW
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_amenu_delete_row", true, $content);
-                       }
-                       else
-                       {
+                               $OUT .= LOAD_TEMPLATE('admin_amenu_delete_row', true, $content);
+                       } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
                        }
                        $SW = 3 - $SW;
                }
@@ -150,11 +139,10 @@ elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
        define('__CNT_VALUE', $cnt);
 
        // Load template
-       LOAD_TEMPLATE("admin_amenu_delete");
+       LOAD_TEMPLATE('admin_amenu_delete');
 } elseif ((isFormSent()) && (!IS_DEMO())) {
        // An action is done...
-       switch (REQUEST_POST('ok'))
-       {
+       switch (REQUEST_POST('ok')) {
                case 'edit': // Edit menu
                        foreach (REQUEST_POST('sel') as $sel => $menu) {
                                // Secure ID

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index a9ceac643ff5db55742ab3750be738801c974e06..871cd7039df0036b2175a765f6c9057f78010fd1 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -160,8 +160,8 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('guest', "what", "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('guest', "action", "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('guest', 'what', "name"));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('guest', 'action', "menu"));
 
        // Display form
        LOAD_TEMPLATE("admin_guest_add");

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index f36e508510c936d84cd318db4211ccd95181a7ab..96ec6ce28531e0dae35eb26a1f7c6aeb36d39b4b 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -80,8 +80,8 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                                $DATA = array(
                                        'cnt'    => $cnt,
                                        'sel'    => $sel,
-                                       'action' => ADMIN_MAKE_MENU_SELECTION('guest', "action", "sel_action[".$sel."]", $act),
-                                       'what'   => ADMIN_MAKE_MENU_SELECTION('guest', "what", "sel_what[".$sel."]", $wht),
+                                       'action' => ADMIN_MAKE_MENU_SELECTION('guest', 'action', 'sel_action[' . $sel . ']', $act),
+                                       'what'   => ADMIN_MAKE_MENU_SELECTION('guest', 'what', 'sel_what[' . $sel . ']', $wht),
                                        'menu'   => $menu,
                                        'sw'     => $SW,
                                );

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 5004189a9e7b979ae2312366b749fe2b27e0062e..da8684ad9164fc0183e74302a2313a07a665ffa5 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -158,8 +158,8 @@ if (!isFormSent()) {
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', "what", "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', "action", "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', 'what', "name"));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', 'action', "menu"));
 
        // Display form
        LOAD_TEMPLATE("admin_member_add");

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index a9d1e0dae4c5b09ca223145a7d92dbdaeed1938a..40173a3b410a63c6ec1d32622190238f735bcea3 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -78,7 +78,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                                        'menu'   => $menu,
                                        'sw'     => $SW,
                                        'act'    => ADMIN_MAKE_MENU_SELECTION('member', "act", "sel_act[".$sel."]", $act),
-                                       'what'   => ADMIN_MAKE_MENU_SELECTION('member', "what", "sel_what[".$sel."]", $wht),
+                                       'what'   => ADMIN_MAKE_MENU_SELECTION('member', 'what', 'sel_what[' . $sel . ']', $wht),
                                );
                                // Load template
                                $OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2d5d26fa9af300d84339cf283937fcf42e9b7e2e..9fc243f21403d3acd2326267c07def46c4101a92 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -85,7 +85,7 @@ function getModuleTitle ($mod) {
 
 // "Getter" for module description
 function getModuleDescription ($mode, $wht, $column = 'what') {
-       // Fix empty "what"
+       // Fix empty 'what'
        if (empty($wht)) {
                $wht = "welcome";
                if (getConfig('index_home') != '') $wht = getConfig('index_home');
@@ -268,7 +268,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
        // First we have to do some analysis...
        if (substr($file, 0, 7) == "action-") {
                // This is an action file!
-               $type = "action";
+               $type = 'action';
                $search = substr($file, 7);
                switch ($ACC_LVL) {
                        case 'admin':
@@ -284,7 +284,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
                $AND = " AND (`what`='' OR `what` IS NULL)";
        } elseif (substr($file, 0, 5) == "what-") {
                // This is an admin what file!
-               $type = "what";
+               $type = 'what';
                $search = substr($file, 5);
                $AND = '';
                switch ($ACC_LVL) {
@@ -304,7 +304,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
                $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'";
        } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
                // Sponsor / engine menu
-               $type     = "what";
+               $type     = 'what';
                $search   = $file;
                $modCheck = $GLOBALS['module'];
                $AND      = '';
@@ -352,7 +352,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
 
                        // Can we close the you-are-here navigation?
                        //* DEBUG: */ echo __LINE__."*".$type.'/'.$GLOBALS['what']."*<br />\n";
-                       if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
+                       if (($type == 'what') || (($type == 'action') && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
                                //* DEBUG: */ echo __LINE__.'+'.$type."+<br />\n";
                                // Add closing div and br-tag
                                $OUT .= "</div><br />\n";

diff --git a/index.php b/index.php
index 4079b95efebf998a938c36615ce5cec0f3b11966..e13c8536ac0a912c6ce8b2efa008e3dc7a012a37 100644 (file)
--- a/index.php
+++ b/index.php
@@ -40,9 +40,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Set module
 $GLOBALS['module'] = 'index';

diff --git a/install.php b/install.php
index 75638936e493b07f504ba0211c230a9ee6957e33..9e28d9c2aab4ddc765940dada10044a2e5f79460 100644 (file)
--- a/install.php
+++ b/install.php
@@ -49,13 +49,12 @@
 // Load security system
 require('inc/libs/security_functions.php');
 
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
+
 // Tell every module / include file we are installing
 $GLOBALS['mxchange_installing'] = true;
 
-// Init "action" and "what"
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
-
 // Set CSS variable for "normal mode"
 $GLOBALS['output_mode'] = 0;
 

diff --git a/js.php b/js.php
index b666aac864617cfc44d52b9ccfb0d5a8ad205200..2868eb1291e7bcdfa41465aa5f26ab32c045b352 100644 (file)
--- a/js.php
+++ b/js.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
-
 // This is a fake-CSS file loader, more a JavaScript loader...
 // This is in one way good and in one not. The whole reset part will be
 // by-passed even in this "faked" CSS mode. The bad news is that this makes all

diff --git a/lead-confirm.php b/lead-confirm.php
index 38b94017abcadec30aba8477298ed19afde95a9a..fc693eea44b6b9ae96ddb0b5561657439874d5c4 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -39,10 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set module
 $GLOBALS['module'] = 'lead-confirm';

diff --git a/login.php b/login.php
index 9a63243365fe0fbd260230b91ce8296407331c66..89cf5207b06639199eb37b482a6cf850591a7c54 100644 (file)
--- a/login.php
+++ b/login.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'login';
 

diff --git a/mailid.php b/mailid.php
index 6321d30a30f208b0ca20af360b64f38fe675c1ca..58b41d6b753ae75a14c756354e94259b67a4bc34 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -39,9 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Tell everyone we are in this module
 $GLOBALS['module'] = 'mailid';

diff --git a/mailid_top.php b/mailid_top.php
index b757543e895966cb5cb6d31724f7d2ce0b489ca4..e7eccc98c6071766b9835b3c6590d684a36bea31 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -39,9 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Tell everyone we are in this module
 $GLOBALS['module'] = 'mailid';

diff --git a/modules.php b/modules.php
index 71a861f0cd1b0be15ef48d4a2cfc81bd0f39ef7d..d77af8437d879930b40659aec4d142a805309426 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -42,11 +42,11 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
+
+// Init output mode and module
 $GLOBALS['output_mode'] = 0;
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
 $GLOBALS['module'] = '';
 
 // Needed include files

diff --git a/ref.php b/ref.php
index 527d4e9ffc59a7dd6f313dfcbb533b9bde24cce1..4a2129716d065158336bda6c623067d5abfadca2 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'ref';
 $GLOBALS['output_mode'] = -1;

diff --git a/show_bonus.php b/show_bonus.php
index 5daf345ce89efd1b7874aa4431ec8681adc3645b..130f7147c3fcfeeaf3301cc8adee3a2224f3afc9 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -39,10 +39,8 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init start time
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set this because we have no module in URI
 $GLOBALS['module'] = 'show_bonus';

diff --git a/sponsor_confirm.php b/sponsor_confirm.php
index 6fc90cdcffc9d7a6123e58879f492e0c3afa7e01..69d458077d5ce06a62b3b3901aa6bacbb2f607fc 100644 (file)
--- a/sponsor_confirm.php
+++ b/sponsor_confirm.php
@@ -38,10 +38,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'sponsor_confirm';
 

diff --git a/sponsor_ref.php b/sponsor_ref.php
index 9c1920254f093a762879e0801d4abf406957f02f..2a46697143bf4818ae81c1b04b172d3723350576 100644 (file)
--- a/sponsor_ref.php
+++ b/sponsor_ref.php
@@ -38,10 +38,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'sponsor_ref';
 

diff --git a/surfbar.php b/surfbar.php
index d119e1bd83ba59198cb06078d7fddaec8ff2a9fe..f6092ad36a3d29eb08fb748ab62be17f01a169ee 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -39,11 +39,9 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
+// Init surfbar cache and start time
 $GLOBALS['cache_array']['surfbar'] = array();
 $GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
 
 // Set module
 $GLOBALS['module'] = 'surfbar';

diff --git a/view.php b/view.php
index 536b8257ac37c45783416bacb603071f742b7d9d..90441e0055b84f68ea79ea83b82e5c157be301ca 100644 (file)
--- a/view.php
+++ b/view.php
@@ -39,10 +39,6 @@
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module
 $GLOBALS['module'] = 'view';
 $GLOBALS['output_mode'] = -1;