Extension 'yoomedia' now alpha status, some rewrites

[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 7907f4c4e2b86c98453a843a2ceb984ca276b91b..b93cf05a0a80cb031ec943b304c883ad3c957581 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -32,17 +32,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((empty($_POST['title'])) || (empty($_POST['menu'])) || (empty($_POST['descr']))) && (isset($_POST['ok'])))
-{
+if (((empty($_POST['title'])) || (empty($_POST['menu'])) || (empty($_POST['descr']))) && (isset($_POST['ok']))) {
        unset($_POST['ok']);
 }
 
@@ -90,7 +89,7 @@ if (!isset($_POST['ok']))
                // 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 != '' ORDER BY sort",
+                       $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__);
                        if (SQL_NUMROWS($result) > 0)
                        {
@@ -171,8 +170,8 @@ if (!isset($_POST['ok']))
        if (!empty($_POST['menu']))
        {
                // Add sub menu
-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort)
-VALUES('%s', '%s', '%s', '%s', '%s')",
+               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`)
+VALUES('%s','%s','%s','%s','%s')",
  array(
        $_POST['menu'],
        $_POST['name'],
@@ -180,18 +179,20 @@ VALUES('%s', '%s', '%s', '%s', '%s')",
        addslashes($_POST['descr']),
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
+               CACHE_PURGE_ADMIN_MENU(0, $_POST['menu'], $_POST['name']);
        }
         else
        {
                // Add main menu
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, title, descr, sort)
-VALUES('%s', '%s', '%s', '%s')",
+VALUES('%s','%s','%s','%s')",
  array(
        $_POST['name'],
        $_POST['title'],
        addslashes($_POST['descr']),
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
+               CACHE_PURGE_ADMIN_MENU(0, $_POST['name']);
        }
        LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
 }