Fixes and cleanups

[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 61be3eca8ef407a730a3e8214325a240a0a6b997..e36e9ea5ba444fc9f65e51242f1f359b6ccdb830 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -15,12 +15,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,14 +39,14 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add desciption as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if ((!isPostRequestParameterSet('title')) && (isFormSent())) {
-       unsetPostRequestParameter('ok');
+if ((!isPostRequestElementSet('title')) && (isFormSent())) {
+       unsetPostRequestElement('ok');
 } // END - if
 
 if (!isFormSent()) {
@@ -58,7 +56,7 @@ if (!isFormSent()) {
        $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` ASC",
+       $result = SQL_QUERY("SELECT `action`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC",
                __FILE__, __LINE__);
        if (!SQL_HASZERONUMS($result)) {
                // Read menu structure
@@ -99,8 +97,8 @@ if (!isFormSent()) {
 
                // 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__);
+                       $result = SQL_QUERY_ESC("SELECT `what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort` ASC",
+                               array($value_main), __FILE__, __LINE__);
                        if (!SQL_HASZERONUMS($result)) {
                                // Initialize arrays
                                $menus[$value_main] = array();
@@ -143,24 +141,24 @@ if (!isFormSent()) {
                } // END - foreach
        } // END - if
 
-       $OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"\">{--IS_FIRST_MENU--}</option>\n";
+       $OUT = '<select class="form_select" name="sort" size="1">
+      <option value="">{--ADMIN_IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {
-                               $OUT .= "      <option value=\"" . $m2 . "\">" . $titles[$key][$key2];
+                               $OUT .= '<option value="' . $m2 . '">' . $titles[$key][$key2];
                                foreach ($menus as $k => $v) {
                                        if (($v == $key) && (!is_array($v))) {
-                                               $OUT .= " (" . $titles[$k] . ')';
+                                               $OUT .= ' (' . $titles[$k] . ')';
                                        } // END - if
                                } // END - foreach
-                               $OUT .= "</option>\n";
+                               $OUT .= '</option>';
                        } // END - foreach
                } else {
-                       $OUT .= "      <option value=\"" . $m . "\">" . $titles[$key] . "</option>\n";
+                       $OUT .= '<option value="' . $m . '">' . $titles[$key] . '</option>';
                }
        }
-       $OUT .= "</select>";
+       $OUT .= '</select>';
 
        // Prepare selection boxes for template
        $content['below_selection']  = $OUT;
@@ -168,33 +166,33 @@ if (!isFormSent()) {
        $content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
        // Display form
-       loadTemplate('admin_member_add', false, $content);
+       loadTemplate('admin_add_member_menu', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
-       if (isPostRequestParameterSet('menu')) {
+       if (isPostRequestElementSet('menu')) {
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
                        array(
-                               postRequestParameter('menu'),
-                               postRequestParameter('name'),
-                               postRequestParameter('title'),
-                               postRequestParameter('visible'),
-                               postRequestParameter('active'),
-                               bigintval(postRequestParameter('sort')),
+                               postRequestElement('menu'),
+                               postRequestElement('name'),
+                               postRequestElement('title'),
+                               postRequestElement('visible'),
+                               postRequestElement('active'),
+                               bigintval(postRequestElement('sort')),
                        ), __FILE__, __LINE__);
        } else {
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
                        array(
-                               postRequestParameter('name'),
-                               postRequestParameter('title'),
-                               postRequestParameter('visible'),
-                               postRequestParameter('active'),
-                               bigintval(postRequestParameter('sort')),
+                               postRequestElement('name'),
+                               postRequestElement('title'),
+                               postRequestElement('visible'),
+                               postRequestElement('active'),
+                               bigintval(postRequestElement('sort')),
                        ), __FILE__, __LINE__);
        }
-       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED');
+       displayMessage('{--SETTINGS_SAVED');
 } else {
        // Demo mode!
-       loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
+       displayMessage('{--SETTINGS_NOT_SAVED--}');
 }
 
 // [EOF]