X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=4d459eb739824f5b9738dab36f318b619642cb61;hb=67f53c107d5b68f6e735407b98803fc83e12d7b4;hp=009ebdce982388c412d93e8e0abd6699e585ea6d;hpb=01f61fde8c4a4e040dc089ccb274441859487e1d;p=mailer.git

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 009ebdce98..4d459eb739 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -55,7 +56,7 @@ if (!isFormSent()) {
 	$menus = array(); $titles = array(); $below = array();
 
 	// Get all available main menus
-	$result = SQL_QUERY("SELECT
+	$result_menu = SQL_QUERY("SELECT
 	`action`, `title`, `sort`
 FROM
 	`{?_MYSQL_PREFIX?}_guest_menu`
@@ -63,10 +64,10 @@ WHERE
 	(`what`='' OR `what` IS NULL)
 ORDER BY
 	`sort` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result_menu)) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = SQL_FETCHARRAY($result_menu)) {
 			// Menu actions
 			$menus[] = $content['action'];
 
@@ -77,9 +78,6 @@ ORDER BY
 			$below[] = $content['sort'] + 1;
 		} // END - while
 
-		// Free memory
-		SQL_FREERESULT($result);
-
 		// Remove double eintries
 		// @TODO This can be somehow rewritten to a function
 		$prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
@@ -111,7 +109,7 @@ WHERE
 	`what` IS NOT NULL
 ORDER BY `sort` ASC",
 				array($value_main), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Initialize arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
@@ -127,10 +125,7 @@ ORDER BY `sort` ASC",
 
 					// 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
@@ -143,34 +138,40 @@ ORDER BY `sort` ASC",
 					} 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>';
 
 	// Prepare selections for template
 	$content['below_selection']  = $OUT;
@@ -178,7 +179,7 @@ ORDER BY `sort` ASC",
 	$content['action_selection'] = adminAddMenuSelectionBox('guest', 'action', 'menu');
 
 	// Display form
-	loadTemplate('admin_guest_add', false, $content);
+	loadTemplate('admin_add_guest_menu', false, $content);
 } elseif (!isDemoModeActive()) {
 	// Insert new menu entry
 	if (isPostRequestParameterSet('menu')) {
@@ -201,10 +202,10 @@ ORDER BY `sort` ASC",
 				postRequestParameter('active'),
 			), __FILE__, __LINE__);
 	}
-	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 } else {
 	// Demo mode!
-	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
 }
 
 // [EOF]