More getModule() used, some SQL rewrites, constant __MODULE rewritten

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

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index da8684ad9164fc0183e74302a2313a07a665ffa5..4be4117ab8f7a8d662097376b9019c3b780ea582 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -53,11 +53,13 @@ if ((!REQUEST_ISSET_POST('title')) && (isFormSent())) {
 
 if (!isFormSent()) {
        // Create arrays
-       $menus = array(); $titles = array(); $below = array();
+       $menus  = array();
+       $titles = array();
+       $below  = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`",
-       __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `action`, `title`, `sort` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC",
+               __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
                // @TODO Cant this be rewritten?
@@ -77,7 +79,10 @@ if (!isFormSent()) {
 
                // 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) {
                                // Remove entries
@@ -143,47 +148,47 @@ if (!isFormSent()) {
        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] . ')';
-                                       }
-                               }
+                                       } // END - if
+                               } // END - foreach
                                $OUT .= "</option>\n";
-                       }
+                       } // END - foreach
                } else {
-                       $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+                       $OUT .= "      <option value=\"" . $m . "\">" . $titles[$key] . "</option>\n";
                }
        }
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', 'what', "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', 'action', "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', 'what'  , 'name'));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', 'action', 'menu'));
 
        // Display form
-       LOAD_TEMPLATE("admin_member_add");
+       LOAD_TEMPLATE('admin_member_add');
 } elseif (!IS_DEMO()) {
        // Insert new menu entry
-       if (REQUEST_ISSET_POST(('menu'))) {
+       if (REQUEST_ISSET_POST('menu')) {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
-               array(
-               REQUEST_POST('menu'),
-               REQUEST_POST('name'),
-               REQUEST_POST('title'),
-               REQUEST_POST('visible'),
-               REQUEST_POST('active'),
-               bigintval(REQUEST_POST('sort')),
-               ), __FILE__, __LINE__);
+                       array(
+                               REQUEST_POST('menu'),
+                               REQUEST_POST('name'),
+                               REQUEST_POST('title'),
+                               REQUEST_POST('visible'),
+                               REQUEST_POST('active'),
+                               bigintval(REQUEST_POST('sort')),
+                       ), __FILE__, __LINE__);
        } else {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
-               array(
-               REQUEST_POST('name'),
-               REQUEST_POST('title'),
-               REQUEST_POST('visible'),
-               REQUEST_POST('active'),
-               bigintval(REQUEST_POST('sort')),
-               ), __FILE__, __LINE__);
+                       array(
+                               REQUEST_POST('name'),
+                               REQUEST_POST('title'),
+                               REQUEST_POST('visible'),
+                               REQUEST_POST('active'),
+                               bigintval(REQUEST_POST('sort')),
+                       ), __FILE__, __LINE__);
        }
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {