X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-admin_add.php;h=8363be5858472902e24ebbff903702efd8028267;hb=ad16f516e254e67b221dd72d518821e9a0853610;hp=aa2fa702f232062bf4dc8eb12a43a3dda4408666;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index aa2fa702f2..8363be5858 100644
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,13 +38,13 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // 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 (((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet(('descr')))) && (isFormSent())) {
+if ((isFormSent()) && ((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet('descr')))) {
 	unsetPostRequestParameter('ok');
 } // END - if
 
@@ -55,8 +53,8 @@ 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__);
-	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)) {
@@ -93,9 +91,9 @@ 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__);
-			if (SQL_NUMROWS($result) > 0) {
+			$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();
 				$titles[$value_main] = array();
@@ -127,33 +125,32 @@ if (!isFormSent()) {
 					} 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";
+			} // 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];
+				$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";
+						$OUT .= ' (' . $titles[$k] . ')';
+					} // END - if
+				} // END - foreach
+				$OUT .= '</option>';
+			} // END - foreach
+		} else {
+			$OUT .= '      <option value="' . $m . '">' . $titles[$key] . '</option>';
 		}
 	}
-	$OUT .= "</select>";
+	$OUT .= '</select>';
 
 	// Prepare selections for template
 	$content['below_selection']  = $OUT;
@@ -161,7 +158,7 @@ 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')) {
@@ -186,10 +183,10 @@ if (!isFormSent()) {
 			), __FILE__, __LINE__
 		);
 	}
-	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	displayMessage('{--SETTINGS_SAVED--}');
 } else {
 	// Is demo login!
-	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+	displayMessage('{--SETTINGS_NOT_SAVED--}');
 }
 
 // [EOF]