X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-mem_add.php;h=14bde5ed57ce038da88f1b96dccbd967fd1978eb;hp=3cfdd7efe7004e4e49e4a5d0622c0feb3aa4a2f7;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 3cfdd7efe7..14bde5ed57 100644
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_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-mem_add.php                                 *
@@ -18,7 +18,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 *
@@ -38,28 +39,30 @@
  ************************************************************************/
 
 // 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();
 }
 
 // Add desciption 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'))) && (IS_FORM_SENT())) {
-	REQUEST_UNSET_POST('ok');
+if ((!isPostRequestParameterSet('title')) && (isFormSent())) {
+	unsetPostRequestParameter('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!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`",
+	$result = SQL_QUERY("SELECT `action`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC",
 		__FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Read menu structure
+		// @TODO Cant this be rewritten?
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Menu actions
 			$menus[] = $content['action'];
@@ -69,14 +72,17 @@ if (!IS_FORM_SENT()) {
 
 			// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
 			$below[] = $content['sort'] + 1;
-		}
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Remove double eintries
 		// @TODO This can be somehow rewritten to a function
-		$prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
+		$prev = '';
+		$dmy  = $menus;
+		$dmy2 = $titles;
+		$dmy3 = $below;
 		foreach ($menus as $key => $value) {
 			if ($value == $prev) {
 				// Remove entries
@@ -93,8 +99,8 @@ 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!}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
-				array($value_main), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
+			array($value_main), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) > 0) {
 				// Initialize arrays
 				$menus[$value_main] = array();
@@ -104,7 +110,7 @@ if (!IS_FORM_SENT()) {
 				// 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'];
@@ -142,52 +148,53 @@ if (!IS_FORM_SENT()) {
 	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] . ')';
+					} // END - if
+				} // END - foreach
 				$OUT .= "</option>\n";
-			}
+			} // END - foreach
 		} else {
-			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
+			$OUT .= "      <option value=\"" . $m . "\">" . $titles[$key] . "</option>\n";
 		}
 	}
 	$OUT .= "</select>";
 
-	define('__BELOW_SELECTION' , $OUT);
-	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', "what", "name"));
-	define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', "action", "menu"));
+	// Prepare selection boxes for template
+	$content['below_selection']  = $OUT;
+	$content['what_selection']   = adminAddMenuSelectionBox('member', 'what'  , 'name');
+	$content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
 	// Display form
-	LOAD_TEMPLATE("admin_member_add");
-} elseif (!IS_DEMO()) {
+	loadTemplate('admin_member_add', false, $content);
+} elseif (!isDemoModeActive()) {
 	// Insert new menu entry
-	if (REQUEST_ISSET_POST(('menu'))) {
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
+	if (isPostRequestParameterSet('menu')) {
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
 			array(
-				REQUEST_POST('menu'),
-				REQUEST_POST('name'),
-				REQUEST_POST('title'),
-				REQUEST_POST('visible'),
-				REQUEST_POST('active'),
-				bigintval(REQUEST_POST('sort')),
+				postRequestParameter('menu'),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+				bigintval(postRequestParameter('sort')),
 			), __FILE__, __LINE__);
 	} else {
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
 			array(
-				REQUEST_POST('name'),
-				REQUEST_POST('title'),
-				REQUEST_POST('visible'),
-				REQUEST_POST('active'),
-				bigintval(REQUEST_POST('sort')),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+				bigintval(postRequestParameter('sort')),
 			), __FILE__, __LINE__);
 	}
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
 	// Demo mode!
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //