X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=4d459eb739824f5b9738dab36f318b619642cb61;hb=22f132c8d6314f76c69dff58ec0dac21f5ca3bf2;hp=650e4ed6677ec9916dc60a1276d8df187d864f9b;hpb=3afdce4fe00b4af570122ce7b8158ced44aec7d3;p=mailer.git

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 650e4ed667..4d459eb739 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-guest_add.php                               *
@@ -17,7 +17,8 @@
  * 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,29 +38,36 @@
  ************************************************************************/
 
 // 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')))) && (isFormSent())) {
+if (((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu'))) && (isFormSent())) {
 	// Abort adding the menu entry
-	REQUEST_UNSET_POST('ok');
-}
+	unsetPostRequestParameter('ok');
+} // END - if
 
 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!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	$result_menu = SQL_QUERY("SELECT
+	`action`, `title`, `sort`
+FROM
+	`{?_MYSQL_PREFIX?}_guest_menu`
+WHERE
+	(`what`='' OR `what` IS NULL)
+ORDER BY
+	`sort` ASC", __FILE__, __LINE__);
+	if (!SQL_HASZERONUMS($result_menu)) {
 		// Read menu structure
-		while ($content = SQL_FETCHARRAY($result)) {
+		// @TODO Cant this be rewritten?
+		while ($content = SQL_FETCHARRAY($result_menu)) {
 			// Menu actions
 			$menus[] = $content['action'];
 
@@ -68,10 +76,7 @@ if (!isFormSent()) {
 
 			// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
 			$below[] = $content['sort'] + 1;
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
+		} // END - while
 
 		// Remove double eintries
 		// @TODO This can be somehow rewritten to a function
@@ -93,11 +98,18 @@ if (!isFormSent()) {
 
 		// Load sub menus :)
 		foreach ($menus as $key_main => $value_main) {
-			$result = SQL_QUERY_ESC("SELECT what, title, sort
-FROM `{!_MYSQL_PREFIX!}_guest_menu`
-WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-			array($value_main), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0) {
+			// Query for sub menus
+			$result = SQL_QUERY_ESC("SELECT
+	`what`, `title`, `sort`
+FROM
+	`{?_MYSQL_PREFIX?}_guest_menu`
+WHERE
+	`action`='%s' AND
+	`what` != '' AND
+	`what` IS NOT NULL
+ORDER BY `sort` ASC",
+				array($value_main), __FILE__, __LINE__);
+			if (!SQL_HASZERONUMS($result)) {
 				// Initialize arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
@@ -106,17 +118,14 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 				// Read menu structure
 				while ($content = SQL_FETCHARRAY($result)) {
 					// Menu actions
-					$menus[$value_main][] = $content['action'];
+					$menus[$value_main][] = $content['what'];
 
 					// Menu titles
 					$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;
-				}
-
-				// Free memory
-				SQL_FREERESULT($result);
+				} // END - while
 
 				// Remove double eintries
 				// @TODO This can be somehow rewritten to a function
@@ -129,68 +138,75 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 					} else {
 						$prev = $value;
 					}
-				}
+				} // END - foreach
 
 				// Transfer dummy array
 				$menus[$value_main] = $dmy;
 				$titles[$value_main] = $dmy2;
 				$below[$value_main] = $dmy3;
-			}
-		}
-	}
+			} // END - if
+
+			// Free memory
+			SQL_FREERESULT($result);
+		} // END - foreach
+	} // END - if
+
+	// Free memory
+	SQL_FREERESULT($result_menu);
 
-	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"0\">".IS_FIRST_MENU."</option>";
+	$OUT = '<select class="admin_select" name="sort" size="1">
+      <option value="0">{--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] . ')';
 					}
 				}
-				$OUT .= "</option>\n";
+				$OUT .= '</option>';
 			}
 		} else {
-			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+			$OUT .= '<option value="' . $m . '">' . $titles[$key] . '</option>';
 		}
 	}
-	$OUT .= "</select>";
+	$OUT .= '</select>';
 
-	define('__BELOW_SELECTION' , $OUT);
-	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('guest', "what", "name"));
-	define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('guest', "action", "menu"));
+	// Prepare selections for template
+	$content['below_selection']  = $OUT;
+	$content['what_selection']   = adminAddMenuSelectionBox('guest', 'what'  , 'name');
+	$content['action_selection'] = adminAddMenuSelectionBox('guest', 'action', 'menu');
 
 	// Display form
-	LOAD_TEMPLATE("admin_guest_add");
-} elseif (!IS_DEMO()) {
+	loadTemplate('admin_add_guest_menu', false, $content);
+} elseif (!isDemoModeActive()) {
 	// Insert new menu entry
-	if (REQUEST_ISSET_POST(('menu'))) {
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
-		array(
-		REQUEST_POST('menu'),
-		REQUEST_POST('name'),
-		REQUEST_POST('title'),
-		bigintval(REQUEST_POST('sort')),
-		REQUEST_POST('visible'),
-		REQUEST_POST('active'),
-		), __FILE__, __LINE__);
+	if (isPostRequestParameterSet('menu')) {
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+			array(
+				postRequestParameter('menu'),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				bigintval(postRequestParameter('sort')),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+			), __FILE__, __LINE__);
 	} else {
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
-		array(
-		REQUEST_POST('name'),
-		REQUEST_POST('title'),
-		bigintval(REQUEST_POST('sort')),
-		REQUEST_POST('visible'),
-		REQUEST_POST('active'),
-		), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `title`, `sort`, `visible`, `locked`) VALUES ('%s','%s','%s','%s','%s')",
+			array(
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				bigintval(postRequestParameter('sort')),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+			), __FILE__, __LINE__);
 	}
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 } else {
 	// Demo mode!
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
 }
 
-//
+// [EOF]
 ?>