X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-memedit.php;h=a778d5be46b03bc83dbbe15173f81b09fdea6fd9;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=cac4ef6629906941c10af067648fdb7ce889650b;hpb=66b91ce490ab549425619c95fc12086e126d541b;p=mailer.git

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index cac4ef6629..a778d5be46 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 05/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 05/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-memedit.php                                 *
@@ -14,10 +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 - 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,79 +36,73 @@
  ************************************************************************/
 
 // 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__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
 
-if (REQUEST_ISSET_GET('sub')) {
-	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
-	$SUB = REQUEST_GET('sub');
+if (isGetRequestParameterSet('sub')) {
+	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+	$SUB = getRequestParameter('sub');
 } // END - if
 
-// Get count of (maybe) selected menu points
-$chk = 0;
-if (REQUEST_ISSET_POST('sel')) $chk = countPostSelection();
-
 // List all menu points and make them editable
-if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
-	define('__SUB_VALUE', $SUB);
-	define('__CHK_VALUE', $chk);
-	$SW = 2; $cnt = 0; $OUT = '';
-	foreach (REQUEST_POST('sel') as $sel => $confirm) {
+	$content['sub'] = $SUB;
+	$content['chk'] = countPostSelection();
+	$cnt = '0'; $OUT = '';
+	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT `title`, `action`, `what` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `title`, `action`, `what` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
-				list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
-				$content = array(
+				$data = SQL_FETCHARRAY($result);
+				$data = array(
 					'cnt'    => $cnt,
 					'sel'    => $sel,
-					'menu'   => $menu,
-					'sw'     => $SW,
-					'act'    => ADMIN_MAKE_MENU_SELECTION('member', 'act' , 'sel_act[' . $sel . ']', $act),
-					'what'   => ADMIN_MAKE_MENU_SELECTION('member', 'what', 'sel_what[' . $sel . ']', $wht),
+					'menu'   => $data['title'],
+					'act'    => adminAddMenuSelectionBox('member', 'act' , 'sel_act['  . $sel . ']', $data['action']),
+					'what'   => adminAddMenuSelectionBox('member', 'what', 'sel_what[' . $sel . ']', $data['what']),
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_mmenu_edit_row', true, $content);
+				$OUT .= loadTemplate('admin_edit_member_menu_row', true, $data);
 			} else {
 				// Entry not found?
-				$content = array(
-					'sw'  => $SW,
+				$data = array(
 					'sel' => $sel
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $data);
 			}
 			SQL_FREERESULT($result);
-			$SW = 3 - $SW;
-		}
-	}
-	define('__MENU_ROWS', $OUT);
-	define('__CNT_VALUE', $cnt);
+		} // END - if
+	} // END - foreach
+
+	// Add row content and current counter
+	$content['rows'] = $OUT;
+	$content['cnt'] = $cnt;
 
 	// Load template
-	LOAD_TEMPLATE('admin_mmenu_edit');
-} elseif ((REQUEST_ISSET_POST('del')) && ($chk > 0) && (!IS_DEMO())) {
+	loadTemplate('admin_edit_member_menu', false, $content);
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Del menu entries with or without confirmation
-	define('__SUB_VALUE', $SUB);
-	define('__CHK_VALUE', $chk);
-	$SW = 2; $cnt = 0; $OUT = '';
-	foreach (REQUEST_POST('sel') as $sel => $confirm) {
+	$content['sub'] = $SUB;
+	$content['chk'] = countPostSelection();
+	$cnt = '0'; $OUT = '';
+	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT `title` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
@@ -121,190 +114,187 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_mmenu_delete_row', true, $content);
+				$OUT .= loadTemplate('admin_delete_member_menu_row', true, $content);
 			} else {
 				// Entry not found?
 				$content = array(
-					'sw'  => $SW,
 					'sel' => $sel
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $content);
 			}
 			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
-	define('__MENU_ROWS', $OUT);
-	define('__CNT_VALUE', $cnt);
+	$content['rows'] = $OUT;
+	$content['cnt'] = $cnt;
 
 	// Load template
-	LOAD_TEMPLATE('admin_mmenu_delete');
-} elseif ((REQUEST_ISSET_POST('status')) && ($chk > 0) && (!IS_DEMO())) {
+	loadTemplate('admin_delete_member_menu', false, $content);
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change status (visible / locked)
-	define('__SUB_VALUE', $SUB);
-	define('__CHK_VALUE', $chk);
-	$SW = 2; $cnt = 0; $OUT = '';
-	foreach (REQUEST_POST('sel') as $sel => $confirm) {
+	$content['sub'] = $SUB;
+	$content['chk'] = countPostSelection();
+	$cnt = '0'; $OUT = '';
+	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `title`, `visible`, `locked` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
-				list($menu, $vis, $locked) = SQL_FETCHROW($result);
-				SQL_FREERESULT($result);
-				$content = array(
+				$data = SQL_FETCHARRAY($result);
+				$data = array(
 					'cnt'     => $cnt,
-					'menu'    => $menu,
+					'menu'    => $data['title'],
 					'sel'     => $sel,
-					'sw'      => $SW,
-					'visible' => ADD_SELECTION('yn', $vis   , 'visible', $sel),
-					'locked'  => ADD_SELECTION('yn', $locked, 'locked' , $sel),
+					'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
+					'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_menu_status_row', true, $content);
+				$OUT .= loadTemplate('admin_menu_status_row', true, $data);
 			} else {
 				// Entry not found?
-				$content = array(
-					'sw'  => $SW,
+				$data = array(
 					'sel' => $sel
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $data);
 			}
-			$SW = 3 - $SW;
+			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
-	define('__MENU_ROWS', $OUT);
-	define('__CNT_VALUE', $cnt);
+	$content['rows'] = $OUT;
+	$content['cnt'] = $cnt;
 
 	// Load template
-	LOAD_TEMPLATE('admin_mmenu_status');
-} elseif ((isFormSent()) && (!IS_DEMO())) {
+	loadTemplate('admin_member_menu_status', false, $content);
+} elseif ((isFormSent()) && (!isDemoModeActive())) {
 	// An act is done...
-	foreach (REQUEST_POST('sel') as $sel => $menu) {
+	foreach (postRequestParameter('sel') as $sel => $menu) {
 		$AND = "(`what` = '' OR `what` IS NULL)";
+
 		$sel = bigintval($sel);
-		if (!empty($SUB)) $AND = "`action`='".$SUB."'";
-		switch (REQUEST_POST('ok')) {
+
+		if (!empty($SUB)) $AND = "`action`='" . $SUB . "'";
+
+		switch (postRequestParameter('ok')) {
 			case 'edit': // Edit menu
-				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-					array($menu, REQUEST_POST('sel_act', $sel), REQUEST_POST('sel_what', $sel), $sel), __FILE__, __LINE__);
+				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+					array($menu, postRequestParameter('sel_act', $sel), postRequestParameter('sel_what', $sel), $sel), __FILE__, __LINE__);
 				break;
 
-			case 'del': // Delete menu
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+			case 'delete': // Delete menu
+				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array($sel), __FILE__, __LINE__);
 				break;
 
 			case 'status': // Change status of menus
-				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-					array(REQUEST_POST('visible', $sel), REQUEST_POST('locked', $sel), $sel), __FILE__, __LINE__);
+				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+					array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+				break;
+
+			default: // Unexpected action
+				logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+				loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
 				break;
 		} // END - switch
-		break;
 	} // END - foreach
 
 	// Load template
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 } else {
-	if ((REQUEST_ISSET_GET('act')) && (REQUEST_ISSET_GET('tid')) && (REQUEST_ISSET_GET('fid'))) {
+	if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
 		// Init
 		$tid = ''; $fid = '';
 
-		// Get IDs
-		if (REQUEST_ISSET_GET('w')) {
+		// Get ids
+		if (isGetRequestParameterSet('w')) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-				array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('act')), bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-				array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('act')), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		} else {
 			// Main menu selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-				array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-				array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 		}
 
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-				array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-				array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('tid')), bigintval($fid)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+				array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
 		} // END - -fi
-	}
+	} // END - if
 
 	if (!empty($SUB)) {
 		// Edit sub menus
-		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
 	} else {
 		// Edit main menus
-		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	}
 
-	// Get total menu entries
-	$max = SQL_NUMROWS($result);
-
 	// Some are there?
-	if ($max > 0) {
+	if (SQL_NUMROWS($result) > 0) {
 		// Set sub value
-		// @TODO Rewrite this constant
-		define('__SUB_VALUE', $SUB);
+		$content['sub'] = $SUB;
 
-		$SW = 2; $cnt = 0; $OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		$cnt = '0'; $OUT = '';
+		while ($data = SQL_FETCHARRAY($result)) {
 			// Init navigation
-			$content['navi'] = '';
+			$data['navi'] = '';
 			$cnt++;
-			if (($content['sort'] == 0) || (($content['sort'] == 1) && (!empty($SUB)))) {
+			if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
 				// Is highest position
-				$content['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']+1)."&amp;fid=".$content['sort']."\">{--LOWER--}</a>";
-			} elseif ($cnt == $max) {
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
+			} elseif ($cnt == SQL_NUMROWS($result)) {
 				// Is lowest position
-				$content['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']-1)."&amp;fid=".$content['sort']."\">{--HIGHER--}</a>";
-			} elseif ($content['sort'] > 0) {
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>';
+			} elseif ($data['sort'] > 0) {
 				// Anything else between highest and lowest
-				$content['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']-1)."&amp;fid=".$content['sort']."\">{--HIGHER--}</a>/<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']+1)."&amp;fid=".$content['sort']."\">{--LOWER--}</a>";
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>/<a href="{%url=modules.php?module=admin&amp;what=memedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
 			}
 
 			// Fix empty values for Firefox
-			if (empty($content['action'])) $content['action'] = '&nbsp;';
-			if (empty($content['what']))   $content['what']   = '&nbsp;';
-			if (empty($content['title']))  $content['title']  = '&nbsp;';
+			if (empty($data['action'])) $data['action'] = '&nbsp;';
+			if (empty($data['what']))   $data['what']   = '&nbsp;';
+			if (empty($data['title']))  $data['title']  = '&nbsp;';
 
 			// Add more entries
-			$content['sw']   = $SW;
-			$content['mode'] = 'mem';
+			$data['mode'] = 'mem';
 
 			// Load row template and switch color
-			$OUT .= LOAD_TEMPLATE('admin_menu_overview_row', true, $content);
-			$SW = 3 - $SW;
-		}
+			$OUT .= loadTemplate('admin_menu_overview_row', true, $data);
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
-		// @TODO Rewrite this constant
-		define('__MENU_ROWS', $OUT);
+		// Remember rows in array
+		$content['rows'] = $OUT;
 
 		// Load main template
-		LOAD_TEMPLATE('admin_mmenu_overview');
+		loadTemplate('admin_member_menu_overview', false, $content);
 	} else {
 		// Menu entries are missing... (???)
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
 	}
 }
 
-//
+// [EOF]
 ?>