More misc fixes and rewrites (sorry, lame description)

[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 155609cbdea603f2062ffead846fa3c39e27bd7d..4be4117ab8f7a8d662097376b9019c3b780ea582 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -39,27 +39,30 @@
 
 // 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 desciption 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'))) && (IS_FORM_SENT())) {
+if ((!REQUEST_ISSET_POST('title')) && (isFormSent())) {
        REQUEST_UNSET_POST('ok');
 } // END - if
 
-if (!IS_FORM_SENT()) {
+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`",
+       $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?
                while ($content = SQL_FETCHARRAY($result)) {
                        // Menu actions
                        $menus[] = $content['action'];
@@ -69,14 +72,17 @@ 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 - if
 
                // 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) {
                                // Remove entries
@@ -94,7 +100,7 @@ if (!IS_FORM_SENT()) {
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
-                               array($value_main), __FILE__, __LINE__);
+                       array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0) {
                                // Initialize arrays
                                $menus[$value_main] = array();
@@ -118,7 +124,7 @@ if (!IS_FORM_SENT()) {
 
                                // 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]);
@@ -142,29 +148,29 @@ if (!IS_FORM_SENT()) {
        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] . ')';
+                                       } // 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'),
@@ -184,10 +190,10 @@ if (!IS_FORM_SENT()) {
                                bigintval(REQUEST_POST('sort')),
                        ), __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'));
 }
 
 //