A lot code rewritten:
[mailer.git] / inc / modules / admin / what-guestedit.php
index 0185b03..eb779a1 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-guestedit.php                               *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Menue fuer die Gaeste editieren                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
-$AND = "what = ''"; $SUB = "";
-
-if (!empty($_GET['sub']))
-{
-       $AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
-       $SUB = SQL_ESCAPE($_GET['sub']);
-}
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
 
-// Get count of (maybe) selected menu points
-$chk = 0;
-if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
+if (isGetRequestParameterSet('sub')) {
+       $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+       $SUB = getRequestParameter('sub');
+} // END - if
 
 // List all menu points and make them editable
-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
-{
+if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Edit menu entries
-       define('__SUB_VALUE', $SUB);
-       define('__CHK_VALUE', $chk);
-
-       $cnt = 0; $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $sel=>$confirm)
-       {
-               if ($confirm == 1)
-               {
+       $content['sub'] = $SUB;
+       $content['chk'] = countPostSelection();
+
+       $cnt = '0'; $OUT = '';
+       foreach (postRequestParameter('sel') as $sel => $confirm) {
+               if ($confirm == 1) {
                        $cnt++;
-                       $query = SQL_QUERY_ESC("SELECT title, action, what FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($query) == 1)
-                       {
+                       $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__);
+                       if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
-                               list($menu, $act, $wht) = SQL_FETCHROW($query);
-                               SQL_FREERESULT($result);
+                               $DATA = SQL_FETCHARRAY($result);
+
+                               // Prepapre content
                                $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),
-                                       'menu'   => $menu,
-                                       'sw'     => $SW,
+                                       'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $DATA['action']),
+                                       'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $DATA['what']),
+                                       'menu'   => $DATA['title'],
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_gmenu_edit_row", true, $DATA);
-                       }
-                        else
-                       {
-                               // Entry not found?
-                               $content = array(
-                                       'sw'  => $SW,
+
+                               // Load row template
+                               $OUT .= loadTemplate('admin_gmenu_edit_row', true, $DATA);
+                       } else {
+                               // Entry not found
+                               $DATA = array(
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
                        }
-                       $SW = 3 - $SW;
-               }
-       }
-       define('__MENU_ROWS', $OUT);
-       define('__CNT_VALUE', $cnt);
+
+                       // Free result and switch color
+                       SQL_FREERESULT($result);
+               } // END - if
+       } // END - foreach
+
+       $content['rows'] = $OUT;
+       $content['cnt']  = $cnt;
 
        // Load template
-       LOAD_TEMPLATE("admin_gmenu_edit_form");
-}
- elseif ((isset($_POST['del'])) && (!IS_DEMO()))
-{
+       loadTemplate('admin_gmenu_edit_form', false, $content);
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
-       define('__SUB_VALUE', $SUB);
-       define('__CHK_VALUE', $chk);
-
-       $cnt = 0; $OUT = ""; $SW = 2;
-       foreach ($_POST['sel'] as $sel=>$confirm)
-       {
-               if ($confirm == 1)
-               {
+       $content['sub'] = $SUB;
+       $content['chk'] = countPostSelection();
+
+       $cnt = '0';
+       $OUT = '';
+
+       foreach (postRequestParameter('sel') as $sel => $confirm) {
+               if ($confirm == 1) {
                        $cnt++;
-                       $query = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($query) == 1)
-                       {
+                       $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                               array(bigintval($sel)), __FILE__, __LINE__);
+                       if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
-                               list($menu) = SQL_FETCHROW($query);
-                               SQL_FREERESULT($result);
+                               $DATA = SQL_FETCHARRAY($result);
                                $DATA = array(
                                        'cnt'  => $cnt,
-                                       'menu' => $menu,
+                                       'menu' => $DATA['title'],
                                        'sel'  => $sel,
-                                       'sw'   => $SW,
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_gmenu_delete_row", true, $DATA);
-                       }
-                        else
-                       {
+                               $OUT .= loadTemplate('admin_gmenu_delete_row', true, $DATA);
+                       } else {
                                // Entry not found?
-                               $content = array(
-                                       'sw'  => $SW,
+                               $DATA = array(
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
                        }
-                       $SW = 3 - $SW;
-               }
-       }
-       define('__MENU_ROWS', $OUT);
-       define('__CNT_VALUE', $cnt);
+                       SQL_FREERESULT($result);
+               } // END - if
+       } // END - foreach
+       $content['rows'] = $OUT;
+       $content['cnt']  = $cnt;
 
        // Load template
-       LOAD_TEMPLATE("admin_gmenu_delete");
-}
- elseif ((isset($_POST['ok'])) && (!IS_DEMO()))
-{
+       loadTemplate('admin_gmenu_delete', false, $content);
+} elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
-       switch ($_POST['ok'])
-       {
-       case "edit": // Edit menu
-               foreach ($_POST['sel'] as $sel=>$menu)
-               {
-                       // Secure selector
-                       $sel = bigintval($sel);
-
-                       // Update entry
-                       $query = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                        array($menu, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel], $sel),__FILE__, __LINE__);
-               }
-               LOAD_TEMPLATE("admin_data_saved");
-               break;
-
-       case "del": // Delete menu
-               foreach ($_POST['sel'] as $sel=>$menu)
-               {
-                       // Delete enty
-                       $query = 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_data_saved");
-               break;
-
-       case "status": // Change access levels
-               foreach ($_POST['sel'] as $sel=>$menu)
-               {
-                       // Secure selector
-                       $sel = bigintval($sel);
-
-                       // Update entry
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET visible='%s', locked='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                        array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
-               }
-               LOAD_TEMPLATE("admin_data_saved");
-               break;
+       switch (postRequestParameter('ok')) {
+               case 'edit': // Edit menu
+                       foreach (postRequestParameter('sel') as $sel => $menu) {
+                               // Secure selector
+                               $sel = bigintval($sel);
 
-       default: // Unexpected action
-               define('__OK_VALUE', $_POST['ok']);
-               LOAD_TEMPLATE("admin_menu_unknown_okay");
-               break;
-       }
-}
- elseif ((isset($_POST['status'])) && ($chk > 0) && (!IS_DEMO()))
-{
+                               // 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, postRequestParameter('sel_action', $sel), postRequestParameter('sel_what', $sel), $sel),__FILE__, __LINE__);
+                       } // END - foreach
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       break;
+
+               case 'del': // Delete menu
+                       foreach (postRequestParameter('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__);
+                       } // END - foreach
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       break;
+
+               case 'status': // Change access levels
+                       foreach (postRequestParameter('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",
+                                       array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+                       } // END - foreach
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       break;
+
+               default: // Unexpected action
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                       break;
+       } // END - switch
+} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Change status (visible / locked)
-       define('__SUB_VALUE', $SUB);
-       define('__CHK_VALUE', $chk);
+       $content['sub'] = $SUB;
+       $content['chk'] = countPostSelection();
 
        // Load template
-       $SW = 2; $cnt = 0; $OUT = "";
-       foreach ($_POST['sel'] as $sel=>$confirm)
-       {
-               if ($confirm == 1)
-               {
+       $cnt = '0'; $OUT = '';
+       foreach (postRequestParameter('sel') as $sel => $confirm) {
+               if ($confirm == 1) {
                        $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__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       $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__);
+                       if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
-                               list($menu, $vis, $locked) = SQL_FETCHROW($result);
-                               SQL_FREERESULT($result);
-                               $content = array(
+                               $data = SQL_FETCHARRAY($result);
+                               $data = array(
                                        'cnt'     => $cnt,
-                                       'menu'    => $menu,
+                                       'menu'    => $data['title'],
                                        'sel'     => $sel,
-                                       'sw'      => $SW,
-                                       'visible' => ADD_SELECTION("yn", $vis   , "visible", $sel),
-                                       'locked'  => ADD_SELECTION("yn", $locked, "locked" , $sel),
+                                       'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
+                                       'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
                                );
 
                                // Load template
-                               $OUT .= LOAD_TEMPLATE("admin_menu_status_row", true, $content);
-                       }
-                        else
-                       {
+                               $OUT .= loadTemplate('admin_menu_status_row', true, $data);
+                       } else {
                                // Entry not found?
-                               $content = array(
-                                       'sw'  => $SW,
+                               $data = array(
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $data);
                        }
-                       $SW = 3 - $SW;
-               }
-       }
-       define('__CNT_VALUE', $cnt);
-       define('__MENU_ROWS', $OUT);
+
+                       SQL_FREERESULT($result);
+               } // END - if
+       } // END - foreach
+       $content['cnt']  = $cnt;
+       $content['rows'] = $OUT;
 
        // Load template
-       LOAD_TEMPLATE("admin_gmenu_status");
-}
- else
-{
-       if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid'])))
-       {
-               // Get IDs
-               if (!empty($_GET['w']))
-               {
+       loadTemplate('admin_gmenu_status', false, $content);
+} else {
+       if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
+               // Get ids
+               if (isGetRequestParameterSet('w')) {
                        // Sub menus selected
-                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND sort='%s' LIMIT 1",
-                        array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+                               array(getRequestParameter('act'), bigintval(getRequestParameter('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($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+                               array(getRequestParameter('act'), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
-               }
-                else
-               {
+               } 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($_GET['tid'])), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+                               array(bigintval(getRequestParameter('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($_GET['fid'])), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+                               array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
 
-               if ((!empty($tid)) && (!empty($fid)))
-               {
+               if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
-                       $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
-                       $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
-               }
-       }
+                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                               array(bigintval(getRequestParameter('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(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
+               } // END - if
+       } // END - if
 
        // By default list menus
-       if (empty($SUB))
-       {
+       if (empty($SUB)) {
                // List only main menus
-               $query = SQL_QUERY("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
-       }
-        else
-       {
+               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+       } else {
                // List sub menus
-               $query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' ORDER BY sort ASC",
-                array($SUB), __FILE__, __LINE__);
+               $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__);
        }
 
        // Get number of menu entries
-       $max = SQL_NUMROWS($query);
-       if ($max > 0)
-       {
-               // Some entties does exist!
-               if (!empty($SUB))
-               {
-                       // Set sub value
-                       define('__SUB_VALUE', $SUB);
-               }
-                else
-               {
-                       // No sub menu selected
-                       define('__SUB_VALUE', "");
-               }
+       $max = SQL_NUMROWS($result);
+       if ($max > 0) {
+               // Set sub value
+               $content['sub'] = $SUB;
 
-               $SW = 2; $cnt = 0; $OUT = "";
-               while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($query))
-               {
+               // Init variables
+               $cnt = '0';
+               $OUT = '';
+
+               // Process all menu entries
+               while ($data = SQL_FETCHARRAY($result)) {
                        $cnt++;
-                       if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
-                       {
+                       if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
                                // Is highest position
-                               $NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
-                       }
-                        elseif ($cnt == $max)
-                       {
+                               $NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
+                       } elseif ($cnt == $max) {
                                // Is lowest position
-                               $NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
-                       }
-                        elseif ($sort > 0)
-                       {
+                               $NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>';
+                       } elseif ($data['sort'] > 0) {
                                // Anything else between highest and lowest
-                               $NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+                               $NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>/<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
                        }
-                       if (empty($act)) $act = "&nbsp;";
-                       if (empty($wht))   $wht   = "&nbsp;";
-                       if (empty($title))  $title  = "&nbsp;";
-                       $content = array(
-                               'sw'     => $SW,
-                               'id'     => $id,
-                               'action' => $act,
-                               'what'   => $wht,
-                               'title'  => $title,
+
+                       if (empty($data['action'])) $data['action'] = '&nbsp;';
+                       if (empty($data['what']))   $data['what']   = '&nbsp;';
+                       if (empty($data['title']))  $data['title']  = '&nbsp;';
+
+                       // Prepapre content
+                       $row = array(
+                               'id'     => $data['id'],
+                               'action' => $data['action'],
+                               'what'   => $data['what'],
+                               'title'  => $data['title'],
                                'navi'   => $NAVI,
-                               'mode'   => "guest"
+                               'mode'   => 'guest'
                        );
-                       $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
-                       $SW = 3 - $SW;
-               }
+
+                       // Load row template
+                       $OUT .= loadTemplate('admin_menu_overview_row', true, $row);
+               } // END - while
+
+               // Add rows
+               $content['rows'] = $OUT;
 
                // Free memory
-               SQL_FREERESULT($query);
-               define('__MENU_ROWS', $OUT);
+               SQL_FREERESULT($result);
 
                // Load template
-               LOAD_TEMPLATE("admin_gmenu_edit");
-       }
-        else
-       {
+               loadTemplate('admin_gmenu_edit', false, $content);
+       } else {
                // Menu entries are missing... (???)
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        }
 }
 
-//
+// [EOF]
 ?>