Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 6880b9195578d346f9ed0197c90032ba8a3dcc0d..8e063e7757b24ef4cb2bd0653bc21814ad6a9623 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -51,7 +51,7 @@ if (!isset($_POST['ok'])) {
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `"._MYSQL_PREFIX."_guest_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
                while (list($act, $title, $sort) = SQL_FETCHROW($result)) {
@@ -88,8 +88,8 @@ 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."_guest_menu
-WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+FROM `{!_MYSQL_PREFIX!}_guest_menu`
+WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
  array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0)
                        {
@@ -172,7 +172,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        // Insert new menu entry
        if (!empty($_POST['menu']))
        {
-               SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
  array(
        $_POST['menu'],
        $_POST['name'],
@@ -184,7 +184,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        }
         else
        {
-               SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
  array(
        $_POST['name'],
        $_POST['title'],
@@ -193,12 +193,12 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        $_POST['active'],
 ), __FILE__, __LINE__);
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 }
  else
 {
        // Demo mode!
-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //