Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 0e543a4f7e902bf9d2233c2acc8d30152b3875ee..c075449cb7f81de4b1eeb1be5a5bc84c1f12c12a 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -42,23 +42,19 @@ 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'])) && (isset($_POST['ok'])))
-{
+if ((empty($_POST['title'])) && (isset($_POST['ok']))) {
        unset($_POST['ok']);
 }
 
-if (!isset($_POST['ok']))
-{
+if (!isset($_POST['ok'])) {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_member_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))
-               {
+               while (list($act, $title, $sort) = SQL_FETCHROW($result)) {
                        // Menu actions
                        $menus[] = $act;
 
@@ -74,36 +70,32 @@ if (!isset($_POST['ok']))
 
                // Remove double eintries
                $prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
-               foreach ($menus as $key => $value)
-               {
-                       if ($value == $prev)
-                       {
+               foreach ($menus as $key => $value) {
+                       if ($value == $prev) {
                                // Remove entries
                                unset($dmy[$key]);
                                unset($dmy2[$key]);
                                unset($dmy3[$key]);
-                       }
-                        else
-                       {
+                       } else {
                                $prev = $value;
                        }
                }
+
+               // Prepare variables
                $menus = $dmy; $titles = $dmy2; $below = $dmy3;
+
                // Load sub menus :)
-               foreach ($menus as $key_main => $value_main)
-               {
-                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND what != '' ORDER BY sort",
-                        array($value_main), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) > 0)
-                       {
+               foreach ($menus as $key_main => $value_main) {
+                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND `what` != '' ORDER BY `sort`",
+                               array($value_main), __FILE__, __LINE__);
+                       if (SQL_NUMROWS($result) > 0) {
                                // Initialize arrays
                                $menus[$value_main] = array();
                                $titles[$value_main] = array();
                                $below[$value_main] = array();
 
                                // Read menu structure
-                               while (list($act, $title, $sort) = SQL_FETCHROW($result))
-                               {
+                               while (list($act, $title, $sort) = SQL_FETCHROW($result)) {
                                        // Menu actions
                                        $menus[$value_main][] = $act;
 
@@ -119,16 +111,12 @@ if (!isset($_POST['ok']))
 
                                // Remove double eintries
                                $prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
-                               foreach ($menus[$value_main] as $key => $value)
-                               {
-                                       if ($value == $prev)
-                                       {
+                               foreach ($menus[$value_main] as $key => $value) {
+                                       if ($value == $prev) {
                                                unset($dmy[$key]);
                                                unset($dmy2[$key]);
                                                unset($dmy3[$key]);
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                $prev = $value;
                                        }
                                }
@@ -139,25 +127,18 @@ if (!isset($_POST['ok']))
 
        $OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
       <option value=\"\">".IS_FIRST_MENU."</option>";
-       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)))
-                                       {
+                               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";
                }
        }
@@ -169,13 +150,11 @@ if (!isset($_POST['ok']))
 
        // Display form
        LOAD_TEMPLATE("admin_member_add");
-}
- elseif (!IS_DEMO())
-{
+} elseif (!IS_DEMO()) {
        // Insert new menu entry
        if (!empty($_POST['menu']))
        {
-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
  array(
        $_POST['menu'],
        $_POST['name'],
@@ -184,10 +163,8 @@ if (!isset($_POST['ok']))
        $_POST['active'],
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
-       }
-        else
-       {
-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+       } else {
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
  array(
        $_POST['name'],
        $_POST['title'],
@@ -196,12 +173,10 @@ if (!isset($_POST['ok']))
        bigintval($_POST['sort']),
 ), __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'));
 }
 
 //