Some rewrites, TODOs handled:

[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 bb072f5b99283fecd2796120bf931333fade6bff..a9ceac643ff5db55742ab3750be738801c974e06 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Einen neuen Gastmenuepunkt einfuegen             *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,27 +38,28 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu')))) && (IS_FORM_SENT())) {
+if (((!REQUEST_ISSET_POST('title')) || (!REQUEST_ISSET_POST(('menu')))) && (isFormSent())) {
        // Abort adding the menu entry
        REQUEST_UNSET_POST('ok');
-}
+} // END - if
 
-if (!IS_FORM_SENT()) {
+if (!isFormSent()) {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
+               // @TODO Cant this be rewritten?
                while ($content = SQL_FETCHARRAY($result)) {
                        // Menu actions
                        $menus[] = $content['action'];
@@ -68,14 +69,14 @@ if (!IS_FORM_SENT()) {
 
                        // Below this menu point should the new be added so we simply increase the sort value by 1 :-)
                        $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;
+               $prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
                foreach ($menus as $key => $value) {
                        if ($value == $prev) {
                                unset($dmy[$key]);
@@ -96,7 +97,7 @@ if (!IS_FORM_SENT()) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort
 FROM `{!_MYSQL_PREFIX!}_guest_menu`
 WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-                               array($value_main), __FILE__, __LINE__);
+                       array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0) {
                                // Initialize arrays
                                $menus[$value_main] = array();
@@ -120,7 +121,7 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 
                                // Remove double eintries
                                // @TODO This can be somehow rewritten to a function
-                               $prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
+                               $prev = ''; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
                                foreach ($menus[$value_main] as $key => $value) {
                                        if ($value == $prev) {
                                                unset($dmy[$key]);
@@ -141,18 +142,13 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 
        $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)
-                       {
+       foreach ($below as $key => $m) {
+               if (is_array($m)) {
+                       foreach ($m as $key2 => $m2) {
                                $OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
-                               foreach ($menus as $k => $v)
-                               {
-                                       if (($v == $key) && (!is_array($v)))
-                                       {
-                                               $OUT .= " (".$titles[$k].")";
+                               foreach ($menus as $k => $v) {
+                                       if (($v == $key) && (!is_array($v))) {
+                                               $OUT .= " (" . $titles[$k] . ')';
                                        }
                                }
                                $OUT .= "</option>\n";
@@ -164,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");
@@ -173,28 +169,28 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
        // Insert new menu entry
        if (REQUEST_ISSET_POST(('menu'))) {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
- array(
-       REQUEST_POST('menu'),
-       REQUEST_POST('name'),
-       REQUEST_POST('title'),
-       bigintval(REQUEST_POST('sort')),
-       REQUEST_POST('visible'),
-       REQUEST_POST('active'),
-), __FILE__, __LINE__);
+               array(
+               REQUEST_POST('menu'),
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               bigintval(REQUEST_POST('sort')),
+               REQUEST_POST('visible'),
+               REQUEST_POST('active'),
+               ), __FILE__, __LINE__);
        } else {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
- array(
-       REQUEST_POST('name'),
-       REQUEST_POST('title'),
-       bigintval(REQUEST_POST('sort')),
-       REQUEST_POST('visible'),
-       REQUEST_POST('active'),
-), __FILE__, __LINE__);
+               array(
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               bigintval(REQUEST_POST('sort')),
+               REQUEST_POST('visible'),
+               REQUEST_POST('active'),
+               ), __FILE__, __LINE__);
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
        // Demo mode!
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //