X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admin_add.php;h=8e582deab7d0b1ba1a0ddedf8da46b86a807bec2;hp=02a6a934763ec44ec034fd9af9b9a512f0d581b9;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hpb=508228c85fba8448d00865b1639cb8cd7a69e457

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 02a6a93476..8e582deab7 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                               *
@@ -10,14 +10,13 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Menueeintraege zum Admin-Bereich einfuegen  *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,28 +36,27 @@
  ************************************************************************/
 
 // 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__);
+addMenuDescription('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()) && ((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet('descr')))) {
+	unsetPostRequestParameter('ok');
+} // END - if
 
-if (!IS_FORM_SENT())
-{
+if (!isFormSent()) {
 	// Create arrays
 	$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'];
@@ -75,35 +73,36 @@ if (!IS_FORM_SENT())
 
 		// Remove double eintries
 		// @TODO This can be somehow rewritten to a function
-		$prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
-		foreach ($menus as $key => $value)
-		{
-			if ($value == $prev)
-			{
+		$prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
+		foreach ($menus as $key => $value) {
+			if ($value == $prev) {
 				unset($dmy[$key]);
 				unset($dmy2[$key]);
 				unset($dmy3[$key]);
-			}
-			 else
-			{
+			} else {
 				$prev = $value;
 			}
-		}
-		$menus = $dmy; $titles = $dmy2; $below = $dmy3;
+		} // END - foreach
+
+		// Write dummys back to our array
+		$menus  = $dmy;  unset($dmy);
+		$titles = $dmy2; unset($dmy2);
+		$below  = $dmy3; unset($dmy3);
+
 		// 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();
 				$below[$value_main] = array();
 
 				// Read menu structure
-				while ($content = SQL_FETCHROW($result)) {
+				while ($content = SQL_FETCHARRAY($result)) {
 					// Menu actions
-					$menus[$value_main][] = $content['action'];
+					$menus[$value_main][] = $content['what'];
 
 					// Menu titles
 					$titles[$value_main][] = $content['title'];
@@ -117,7 +116,7 @@ if (!IS_FORM_SENT())
 
 				// Remove double eintries
 				// @TODO This can be somehow rewritten to a function
-				$prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
+				$prev = ''; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
 				foreach ($menus[$value_main] as $key => $value) {
 					if ($value == $prev) {
 						unset($dmy[$key]);
@@ -133,69 +132,62 @@ if (!IS_FORM_SENT())
 			}
 		}
 	}
-	$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";
+
+	$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>';
 			}
-		}
-		 else
-		{
-			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+		} 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 (isPostRequestParameterSet('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')),
+				postRequestParameter('menu'),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				postRequestParameter('descr'),
+				bigintval(postRequestParameter('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')),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				postRequestParameter('descr'),
+				bigintval(postRequestParameter('sort')),
 			), __FILE__, __LINE__
 		);
-		CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('name'));
 	}
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 } else {
 	// Is demo login!
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
 }
 
-//
+// [EOF]
 ?>