New method generateExtensionInactiveMessage() introduced

[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 9b9479cc6696cf115b6e31d88fa0b1b076b355b9..18a9dcfdeeb81cc4ac94964359ca10cf7a652ce9 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -38,19 +38,19 @@
 
 // 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())) {
+if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu'))) || (!REQUEST_ISSET_POST(('descr')))) && (isFormSent())) {
        REQUEST_UNSET_POST('ok');
 }
 
-if (!IS_FORM_SENT())
+if (!isFormSent())
 {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
@@ -75,25 +75,26 @@ 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`",
-                               array($value_main), __FILE__, __LINE__);
+                       array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0) {
                                // Init arrays
                                $menus[$value_main] = array();
@@ -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]);
@@ -135,24 +136,19 @@ if (!IS_FORM_SENT())
        }
        $OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
       <option value=\"0\">".IS_FIRST_MENU."</option>\n";
-       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";
                        }
                }
-                else
+               else
                {
                        $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
                }
@@ -160,8 +156,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");
@@ -170,31 +166,31 @@ if (!IS_FORM_SENT())
        if (REQUEST_ISSET_POST(('menu'))) {
                // Add sub menu
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
-                       array(
-                               REQUEST_POST('menu'),
-                               REQUEST_POST('name'),
-                               REQUEST_POST('title'),
-                               REQUEST_POST('descr'),
-                               bigintval(REQUEST_POST('sort')),
-                       ), __FILE__, __LINE__
+               array(
+               REQUEST_POST('menu'),
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               REQUEST_POST('descr'),
+               bigintval(REQUEST_POST('sort')),
+               ), __FILE__, __LINE__
                );
-               CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('menu'), REQUEST_POST('name'));
+               cachePurgeAdminMenu(0, REQUEST_POST('menu'), REQUEST_POST('name'));
        } else {
                // Add main menu
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
-                       array(
-                               REQUEST_POST('name'),
-                               REQUEST_POST('title'),
-                               REQUEST_POST('descr'),
-                               bigintval(REQUEST_POST('sort')),
-                       ), __FILE__, __LINE__
+               array(
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               REQUEST_POST('descr'),
+               bigintval(REQUEST_POST('sort')),
+               ), __FILE__, __LINE__
                );
-               CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('name'));
+               cachePurgeAdminMenu(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'));
 }
 
 //