Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[mailer.git] / inc / modules / admin / what-guestedit.php

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 64ee46891adf94a714adc01c078e9187c66a55b0..f36e508510c936d84cd318db4211ccd95181a7ab 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -71,7 +71,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                                // Entry found so we load the stuff...
@@ -87,7 +87,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                                );
                                $OUT .= LOAD_TEMPLATE("admin_gmenu_edit_row", true, $DATA);
                        }
-                        else
+                       else
                        {
                                // Entry not found?
                                $content = array(
@@ -114,7 +114,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval($sel)), __FILE__, __LINE__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu) = SQL_FETCHROW($result);
@@ -142,48 +142,48 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
 
        // Load template
        LOAD_TEMPLATE("admin_gmenu_delete");
-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+} elseif ((isFormSent()) && (!IS_DEMO())) {
        // An action is done...
        switch (REQUEST_POST('ok'))
        {
-       case 'edit': // Edit menu
-               foreach (REQUEST_POST('sel') as $sel => $menu) {
-                       // Secure selector
-                       $sel = bigintval($sel);
+               case 'edit': // Edit menu
+                       foreach (REQUEST_POST('sel') as $sel => $menu) {
+                               // Secure selector
+                               $sel = bigintval($sel);
 
-                       // Update entry
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                               // Update entry
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
                                array($menu, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel), $sel),__FILE__, __LINE__);
-               }
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
-               break;
+                       }
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       break;
 
-       case 'del': // Delete menu
-               foreach (REQUEST_POST('sel') as $sel => $menu) {
-                       // Delete enty
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+               case 'del': // Delete menu
+                       foreach (REQUEST_POST('sel') as $sel => $menu) {
+                               // Delete enty
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
                                array(bigintval($sel)), __FILE__, __LINE__);
-               }
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
-               break;
+                       }
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       break;
 
-       case 'status': // Change access levels
-               foreach (REQUEST_POST('sel') as $sel => $menu) {
-                       // Secure selector
-                       $sel = bigintval($sel);
+               case 'status': // Change access levels
+                       foreach (REQUEST_POST('sel') as $sel => $menu) {
+                               // Secure selector
+                               $sel = bigintval($sel);
 
-                       // Update entry
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                               // Update entry
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
                                array(REQUEST_POST('visible', $sel), REQUEST_POST('locked', $sel), $sel), __FILE__, __LINE__);
-               }
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
-               break;
+                       }
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       break;
 
-       default: // Unexpected action
-               define('__OK_VALUE', REQUEST_POST('ok'));
-               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
-               LOAD_TEMPLATE("admin_menu_unknown_okay");
-               break;
+               default: // Unexpected action
+                       define('__OK_VALUE', REQUEST_POST('ok'));
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
+                       LOAD_TEMPLATE("admin_menu_unknown_okay");
+                       break;
        }
 } elseif ((REQUEST_ISSET_POST(('status'))) && ($chk > 0) && (!IS_DEMO())) {
        // Change status (visible / locked)
@@ -198,7 +198,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                                // Entry found so we load the stuff...
@@ -216,7 +216,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                                // Load template
                                $OUT .= LOAD_TEMPLATE("admin_menu_status_row", true, $content);
                        }
-                        else
+                       else
                        {
                                // Entry not found?
                                $content = array(
@@ -239,21 +239,21 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                if (REQUEST_ISSET_GET(('w'))) {
                        // Sub menus selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                        array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+                       array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                        array(REQUEST_GET('act'), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+                       array(REQUEST_GET('act'), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                        array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                        array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
@@ -261,9 +261,9 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
                } // END - if
        } // END - if
 
@@ -274,7 +274,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
        } else {
                // List sub menus
                $result = SQL_QUERY_ESC("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
-                       array($SUB), __FILE__, __LINE__);
+               array($SUB), __FILE__, __LINE__);
        }
 
        // Get number of menu entries
@@ -315,9 +315,9 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
                                'title'  => $content['title'],
                                'navi'   => $NAVI,
                                'mode'   => 'guest'
-                       );
-                       $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
-                       $SW = 3 - $SW;
+                               );
+                               $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
+                               $SW = 3 - $SW;
                }
 
                // Free memory