A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

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

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 71fd7b841962af988757df6e5a486144a9158305..ce8ca70042340d0c968934be4f224ee5755cadcf 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -38,12 +38,12 @@
 
 // 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'))) || (!REQUEST_ISSET_POST(('descr')))) && (IS_FORM_SENT())) {
@@ -56,7 +56,7 @@ if (!IS_FORM_SENT())
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
                while ($content = SQL_FETCHARRAY($result)) {
@@ -75,21 +75,22 @@ if (!IS_FORM_SENT())
 
                // Remove double eintries
                // @TODO This can be somehow rewritten to a function
-               $prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
-               foreach ($menus as $key => $value)
-               {
-                       if ($value == $prev)
-                       {
+               $prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
+               foreach ($menus as $key => $value) {
+                       if ($value == $prev) {
                                unset($dmy[$key]);
                                unset($dmy2[$key]);
                                unset($dmy3[$key]);
-                       }
-                        else
-                       {
+                       } else {
                                $prev = $value;
                        }
-               }
-               $menus = $dmy; $titles = $dmy2; $below = $dmy3;
+               } // END - foreach
+
+               // Write dummys back to our array
+               $menus  = $dmy;  unset($dmy);
+               $titles = $dmy2; unset($dmy2);
+               $below  = $dmy3; unset($dmy3);
+
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
@@ -101,9 +102,9 @@ if (!IS_FORM_SENT())
                                $below[$value_main] = array();
 
                                // Read menu structure
-                               while ($content = SQL_FETCHROW($result)) {
+                               while ($content = SQL_FETCHARRAY($result)) {
                                        // Menu actions
-                                       $menus[$value_main][] = $content['action'];
+                                       $menus[$value_main][] = $content['what'];
 
                                        // Menu titles
                                        $titles[$value_main][] = $content['title'];
@@ -117,7 +118,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]);
@@ -160,8 +161,8 @@ if (!IS_FORM_SENT())
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("admin", "what", "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION("admin", "action", "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('admin', "what", "name"));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('admin', "action", "menu"));
 
        // Display form
        LOAD_TEMPLATE("admin_admin_add");
@@ -191,10 +192,10 @@ if (!IS_FORM_SENT())
                );
                CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('name'));
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
        // Is demo login!
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //