X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admin_add.php;h=ddcfa970cbf0e8ab844493e0e0666e42d6687382;hb=3161d70d2c3a86649dd16a7909ec16f801f16e4e;hp=f205f3c17b4adcc904a9cdf1020600b8f9951305;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index f205f3c17b..ddcfa970cb 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -14,12 +14,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 *
@@ -43,11 +41,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if ((isFormSent()) && ((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet('descr')))) {
-	unsetPostRequestParameter('ok');
+if ((isFormSent()) && ((!isPostRequestElementSet('title')) || (!isPostRequestElementSet('menu')) || (!isPostRequestElementSet('descr')))) {
+	unsetPostRequestElement('ok');
 } // END - if
 
 if (!isFormSent()) {
@@ -55,7 +53,7 @@ if (!isFormSent()) {
 	$menus = array(); $titles = array(); $below = array();
 
 	// Get all available main menus
-	$result = SQL_QUERY("SELECT action, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT `action`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
@@ -93,8 +91,8 @@ if (!isFormSent()) {
 
 		// 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` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-			array($value_main), __FILE__, __LINE__);
+			$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` ASC",
+				array($value_main), __FILE__, __LINE__);
 			if (!SQL_HASZERONUMS($result)) {
 				// Init arrays
 				$menus[$value_main] = array();
@@ -127,16 +125,16 @@ if (!isFormSent()) {
 					} else {
 						$prev = $value;
 					}
-				}
+				} // END - foreach
 				$menus[$value_main] = $dmy;
 				$titles[$value_main] = $dmy2;
 				$below[$value_main] = $dmy3;
-			}
-		}
-	}
+			} // END - if
+		} // END - foreach
+	} // END - if
 
-	$OUT = '    <select class="admin_select" name="sort" size="1">
-      <option value="0">{--IS_FIRST_MENU--}</option>';
+	$OUT = '    <select class="form_select" name="sort" size="1">
+      <option value="0">{--ADMIN_IS_FIRST_MENU--}</option>';
 	foreach ($below as $key => $m) {
 		if (is_array($m)) {
 			foreach ($m as $key2 => $m2) {
@@ -147,7 +145,7 @@ if (!isFormSent()) {
 					} // END - if
 				} // END - foreach
 				$OUT .= '</option>';
-			}
+			} // END - foreach
 		} else {
 			$OUT .= '      <option value="' . $m . '">' . $titles[$key] . '</option>';
 		}
@@ -160,35 +158,35 @@ if (!isFormSent()) {
 	$content['action_selection'] = adminAddMenuSelectionBox('admin', 'action', 'menu');
 
 	// Display form
-	loadTemplate('admin_admin_add', false, $content);
+	loadTemplate('admin_add_admin_menu', false, $content);
 } elseif (!isDemoModeActive()) {
 	// Insert new menu entry
-	if (isPostRequestParameterSet('menu')) {
+	if (isPostRequestElementSet('menu')) {
 		// Add sub menu
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
 			array(
-				postRequestParameter('menu'),
-				postRequestParameter('name'),
-				postRequestParameter('title'),
-				postRequestParameter('descr'),
-				bigintval(postRequestParameter('sort')),
+				postRequestElement('menu'),
+				postRequestElement('name'),
+				postRequestElement('title'),
+				postRequestElement('descr'),
+				bigintval(postRequestElement('sort')),
 			), __FILE__, __LINE__
 		);
 	} else {
 		// Add main menu
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
 			array(
-				postRequestParameter('name'),
-				postRequestParameter('title'),
-				postRequestParameter('descr'),
-				bigintval(postRequestParameter('sort')),
+				postRequestElement('name'),
+				postRequestElement('title'),
+				postRequestElement('descr'),
+				bigintval(postRequestElement('sort')),
 			), __FILE__, __LINE__
 		);
 	}
-	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+	displayMessage('{--SETTINGS_SAVED--}');
 } else {
 	// Is demo login!
-	loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
+	displayMessage('{--SETTINGS_NOT_SAVED--}');
 }
 
 // [EOF]