A lot code rewritten:

[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 85998ecb3c40d1f4af8917528f194daf672d9dcd..eb779a1f35ef80e60289bd3f1cc4dd6dad98b186 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,12 +54,12 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Edit menu entries
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
 
-       $cnt = '0'; $OUT = ''; $SW = 2;
+       $cnt = '0'; $OUT = '';
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
@@ -75,7 +76,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                        'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $DATA['action']),
                                        'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $DATA['what']),
                                        'menu'   => $DATA['title'],
-                                       'sw'     => $SW,
                                );
 
                                // Load row template
@@ -83,7 +83,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                        } else {
                                // Entry not found
                                $DATA = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
                                $OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
@@ -91,7 +90,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
                        // Free result and switch color
                        SQL_FREERESULT($result);
-                       $SW = 3 - $SW;
                } // END - if
        } // END - foreach
 
@@ -100,14 +98,13 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
        // Load template
        loadTemplate('admin_gmenu_edit_form', false, $content);
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
 
        $cnt = '0';
        $OUT = '';
-       $SW  = 2;
 
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
@@ -121,21 +118,18 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                        'cnt'  => $cnt,
                                        'menu' => $DATA['title'],
                                        'sel'  => $sel,
-                                       'sw'   => $SW,
                                );
                                $OUT .= loadTemplate('admin_gmenu_delete_row', true, $DATA);
                        } else {
                                // Entry not found?
                                $DATA = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
                                $OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
                        }
                        SQL_FREERESULT($result);
-                       $SW = 3 - $SW;
-               }
-       }
+               } // END - if
+       } // END - foreach
        $content['rows'] = $OUT;
        $content['cnt']  = $cnt;
 
@@ -153,7 +147,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                        array($menu, postRequestParameter('sel_action', $sel), postRequestParameter('sel_what', $sel), $sel),__FILE__, __LINE__);
                        } // END - foreach
-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                        break;
 
                case 'del': // Delete menu
@@ -162,7 +156,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
                                        array(bigintval($sel)), __FILE__, __LINE__);
                        } // END - foreach
-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                        break;
 
                case 'status': // Change access levels
@@ -174,12 +168,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                        array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
                        } // END - foreach
-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                        break;
 
                default: // Unexpected action
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                       loadTemplate('admin_menu_unknown_okay', false, postRequestParameter('ok'));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
                        break;
        } // END - switch
 } elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
@@ -188,7 +182,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
        $content['chk'] = countPostSelection();
 
        // Load template
-       $SW = 2; $cnt = '0'; $OUT = '';
+       $cnt = '0'; $OUT = '';
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
@@ -201,7 +195,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                        'cnt'     => $cnt,
                                        'menu'    => $data['title'],
                                        'sel'     => $sel,
-                                       'sw'      => $SW,
                                        'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
                                        'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
                                );
@@ -211,14 +204,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                        } else {
                                // Entry not found?
                                $data = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
                                $OUT .= loadTemplate('admin_menu_404_row', true, $data);
                        }
 
                        SQL_FREERESULT($result);
-                       $SW = 3 - $SW;
                } // END - if
        } // END - foreach
        $content['cnt']  = $cnt;
@@ -277,7 +268,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                $content['sub'] = $SUB;
 
                // Init variables
-               $SW = 2;
                $cnt = '0';
                $OUT = '';
 
@@ -301,7 +291,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
                        // Prepapre content
                        $row = array(
-                               'sw'     => $SW,
                                'id'     => $data['id'],
                                'action' => $data['action'],
                                'what'   => $data['what'],
@@ -312,7 +301,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
                        // Load row template
                        $OUT .= loadTemplate('admin_menu_overview_row', true, $row);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Add rows
@@ -325,7 +313,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                loadTemplate('admin_gmenu_edit', false, $content);
        } else {
                // Menu entries are missing... (???)
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        }
 }