Several rewrites/renames, fixes for installation. Resolves #104

[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..52e768a92ae45cc97318d96b8dd8136e4de77de6 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -41,17 +41,17 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((empty($_POST['title'])) || (empty($_POST['menu']))) && (isset($_POST['ok']))) {
+if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu')))) && (IS_FORM_SENT())) {
        // Abort adding the menu entry
-       unset($_POST['ok']);
+       REQUEST_UNSET_POST('ok');
 }
 
-if (!isset($_POST['ok'])) {
+if (!IS_FORM_SENT()) {
        // Create arrays
        $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)
                        {
@@ -152,9 +152,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
                                }
                                $OUT .= "</option>\n";
                        }
-               }
-                else
-               {
+               } else {
                        $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
                }
        }
@@ -166,39 +164,32 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 
        // Display form
        LOAD_TEMPLATE("admin_guest_add");
-}
- elseif (!IS_DEMO())
-{
+} elseif (!IS_DEMO()) {
        // 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')",
+       if (REQUEST_ISSET_POST(('menu'))) {
+               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'],
-       $_POST['title'],
-       bigintval($_POST['sort']),
-       $_POST['visible'],
-       $_POST['active'],
+       REQUEST_POST('menu'),
+       REQUEST_POST('name'),
+       REQUEST_POST('title'),
+       bigintval(REQUEST_POST('sort')),
+       REQUEST_POST('visible'),
+       REQUEST_POST('active'),
 ), __FILE__, __LINE__);
-       }
-        else
-       {
-               SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
+       } else {
+               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'],
-       bigintval($_POST['sort']),
-       $_POST['visible'],
-       $_POST['active'],
+       REQUEST_POST('name'),
+       REQUEST_POST('title'),
+       bigintval(REQUEST_POST('sort')),
+       REQUEST_POST('visible'),
+       REQUEST_POST('active'),
 ), __FILE__, __LINE__);
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
-}
- else
-{
+       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'));
 }
 
 //