X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admin_add.php;h=e3124ced44d38fe509c4c2ab9ae3f31fe70bd7cc;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=ce8ca70042340d0c968934be4f224ee5755cadcf;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index ce8ca70042..e3124ced44 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/27/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/27/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-admin_add.php                               *
@@ -14,11 +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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 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 *
@@ -37,37 +36,38 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu'))) || (!REQUEST_ISSET_POST(('descr')))) && (IS_FORM_SENT())) {
-	REQUEST_UNSET_POST('ok');
-}
+if ((isFormSent()) && ((!isPostRequestElementSet('title')) || (!isPostRequestElementSet('menu')) || (!isPostRequestElementSet('descr')))) {
+	unsetPostRequestElement('ok');
+} // END - if
 
-if (!IS_FORM_SENT())
-{
+if (!isFormSent()) {
 	// Create arrays
-	$menus = array(); $titles = array(); $below = array();
+	$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__);
-	if (SQL_NUMROWS($result) > 0) {
+	$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?
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Menu actions
-			$menus[] = $content['action'];
+			array_push($menus, $content['action']);
 
 			// Menu titles
-			$titles[] = $content['title'];
+			array_push($titles, $content['title']);
 
 			// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
-			$below[] = $content['sort'] + 1;
+			array_push($below, $content['sort'] + 1);
 		} // END - while
 
 		// Free memory
@@ -93,9 +93,9 @@ if (!IS_FORM_SENT())
 
 		// 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`",
+			$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_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Init arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
@@ -104,13 +104,13 @@ if (!IS_FORM_SENT())
 				// Read menu structure
 				while ($content = SQL_FETCHARRAY($result)) {
 					// Menu actions
-					$menus[$value_main][] = $content['what'];
+					array_push($menus[$value_main], $content['what']);
 
 					// Menu titles
-					$titles[$value_main][] = $content['title'];
+					array_push($titles[$value_main], $content['title']);
 
 					// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
-					$below[$value_main][] = $content['sort'] + 1;
+					array_push($below[$value_main], $content['sort'] + 1);
 				} // END - while
 
 				// Free memory
@@ -127,76 +127,69 @@ if (!IS_FORM_SENT())
 					} else {
 						$prev = $value;
 					}
-				}
+				} // END - foreach
 				$menus[$value_main] = $dmy;
 				$titles[$value_main] = $dmy2;
 				$below[$value_main] = $dmy3;
-			}
-		}
-	}
-	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"0\">".IS_FIRST_MENU."</option>\n";
-  	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)))
-					{
-						$OUT .= " (".$titles[$k].")";
-					}
-				}
-				$OUT .= "</option>\n";
-			}
-		}
-		 else
-		{
-			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+			} // END - if
+		} // END - foreach
+	} // END - if
+
+	$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) {
+				$OUT .= '      <option value="' . $m2 . '">' . $titles[$key][$key2];
+				foreach ($menus as $k => $v) {
+					if (($v == $key) && (!is_array($v))) {
+						$OUT .= ' (' . $titles[$k] . ')';
+					} // END - if
+				} // END - foreach
+				$OUT .= '</option>';
+			} // END - foreach
+		} else {
+			$OUT .= '      <option value="' . $m . '">' . $titles[$key] . '</option>';
 		}
 	}
-	$OUT .= "</select>";
+	$OUT .= '</select>';
 
-	define('__BELOW_SELECTION' , $OUT);
-	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('admin', "what", "name"));
-	define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('admin', "action", "menu"));
+	// Prepare selections for template
+	$content['below_selection']  = $OUT;
+	$content['what_selection']   = adminAddMenuSelectionBox('admin', 'what'  , 'name');
+	$content['action_selection'] = adminAddMenuSelectionBox('admin', 'action', 'menu');
 
 	// Display form
-	LOAD_TEMPLATE("admin_admin_add");
-} elseif (!IS_DEMO()) {
+	loadTemplate('admin_add_admin_menu', FALSE, $content);
+} elseif (!isDemoModeActive()) {
 	// Insert new menu entry
-	if (REQUEST_ISSET_POST(('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')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`, `what`, `title`, `descr`, `sort`) VALUES ('%s','%s','%s','%s','%s')",
 			array(
-				REQUEST_POST('menu'),
-				REQUEST_POST('name'),
-				REQUEST_POST('title'),
-				REQUEST_POST('descr'),
-				bigintval(REQUEST_POST('sort')),
+				postRequestElement('menu'),
+				postRequestElement('name'),
+				postRequestElement('title'),
+				postRequestElement('descr'),
+				bigintval(postRequestElement('sort')),
 			), __FILE__, __LINE__
 		);
-		CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('menu'), REQUEST_POST('name'));
 	} else {
 		// Add main menu
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
 			array(
-				REQUEST_POST('name'),
-				REQUEST_POST('title'),
-				REQUEST_POST('descr'),
-				bigintval(REQUEST_POST('sort')),
+				postRequestElement('name'),
+				postRequestElement('title'),
+				postRequestElement('descr'),
+				bigintval(postRequestElement('sort')),
 			), __FILE__, __LINE__
 		);
-		CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('name'));
 	}
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	displayMessage('{--SETTINGS_SAVED--}');
 } else {
 	// Is demo login!
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+	displayMessage('{--SETTINGS_NOT_SAVED--}');
 }
 
-//
+// [EOF]
 ?>