Generic function accepts eights (!) but optional parameter $callback, ext-network...

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

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index d86210f5319ef5c7f1b4e9442c7f5405f596f993..4d459eb739824f5b9738dab36f318b619642cb61 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -56,7 +56,7 @@ if (!isFormSent()) {
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT
+       $result_menu = SQL_QUERY("SELECT
        `action`, `title`, `sort`
 FROM
        `{?_MYSQL_PREFIX?}_guest_menu`
@@ -64,10 +64,10 @@ WHERE
        (`what`='' OR `what` IS NULL)
 ORDER BY
        `sort` ASC", __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
+       if (!SQL_HASZERONUMS($result_menu)) {
                // Read menu structure
                // @TODO Cant this be rewritten?
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = SQL_FETCHARRAY($result_menu)) {
                        // Menu actions
                        $menus[] = $content['action'];
 
@@ -78,9 +78,6 @@ ORDER BY
                        $below[] = $content['sort'] + 1;
                } // END - while
 
-               // Free memory
-               SQL_FREERESULT($result);
-
                // Remove double eintries
                // @TODO This can be somehow rewritten to a function
                $prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
@@ -128,10 +125,7 @@ ORDER BY `sort` ASC",
 
                                        // Below this menu point should the new be added so we simply increase the sort value by 1 :-)
                                        $below[$value_main][] = $content['sort'] + 1;
-                               }
-
-                               // Free memory
-                               SQL_FREERESULT($result);
+                               } // END - while
 
                                // Remove double eintries
                                // @TODO This can be somehow rewritten to a function
@@ -144,34 +138,40 @@ ORDER BY `sort` ASC",
                                        } else {
                                                $prev = $value;
                                        }
-                               }
+                               } // END - foreach
 
                                // Transfer dummy array
                                $menus[$value_main] = $dmy;
                                $titles[$value_main] = $dmy2;
                                $below[$value_main] = $dmy3;
-                       }
-               }
-       }
+                       } // END - if
+
+                       // Free memory
+                       SQL_FREERESULT($result);
+               } // END - foreach
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result_menu);
 
-       $OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"0\">{--IS_FIRST_MENU--}</option>";
+       $OUT = '<select class="admin_select" name="sort" size="1">
+      <option value="0">{--IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {
-                               $OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
+                               $OUT .= '<option value="' . $m2 . '">' . $titles[$key][$key2];
                                foreach ($menus as $k => $v) {
                                        if (($v == $key) && (!is_array($v))) {
-                                               $OUT .= " (" . $titles[$k] . ')';
+                                               $OUT .= ' (' . $titles[$k] . ')';
                                        }
                                }
-                               $OUT .= "</option>\n";
+                               $OUT .= '</option>';
                        }
                } else {
-                       $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+                       $OUT .= '<option value="' . $m . '">' . $titles[$key] . '</option>';
                }
        }
-       $OUT .= "</select>";
+       $OUT .= '</select>';
 
        // Prepare selections for template
        $content['below_selection']  = $OUT;
@@ -179,7 +179,7 @@ ORDER BY `sort` ASC",
        $content['action_selection'] = adminAddMenuSelectionBox('guest', 'action', 'menu');
 
        // Display form
-       loadTemplate('admin_guest_add', false, $content);
+       loadTemplate('admin_add_guest_menu', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {