X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=ae6191a043e05021fe8b47ddbc5d7d0f1266c32a;hb=c9b2e406d8e94ffcff8bac9d453e671f337552e4;hp=bcc4c3c16334030989c6cc12e64d9e7cb3085ba4;hpb=e6c65030461574197e7ff31f37da5cd0bfcb717c;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index bcc4c3c163..ae6191a043 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -177,10 +177,10 @@ function doAdminAction () {
 	// Load header, footer, render menu
 	$content['header'] = loadTemplate('admin_header' , true, $content);
 	$content['footer'] = loadTemplate('admin_footer' , true, $content);
-	$content['menu']   = addAdminMenu($action, $what, true);
+	$content['menu']   = addAdminMenu($action, $what);
 
-	// Tableset header
-	loadTemplate('admin_main_header', false, $content);
+	// Load main template
+	loadTemplate('admin_main', false, $content);
 
 	// Check if action/what pair is valid
 	$result_action = SQL_QUERY_ESC("SELECT
@@ -248,18 +248,20 @@ function isAdminAllowedAccessMenu ($action, $what = NULL) {
 }
 
 // Adds an admin menu
-function addAdminMenu ($action, $what, $return = false) {
+function addAdminMenu ($action, $what) {
 	// Init variables
 	$SUB = false;
 	$OUT = '';
 
 	// Menu descriptions
 	$GLOBALS['menu']['description'] = array();
-	$GLOBALS['menu']['title'] = array();
+	$GLOBALS['menu']['title']       = array();
 
 	// Build main menu
 	$result_main = SQL_QUERY("SELECT
-	`action`,`title`,`descr`
+	`action` AS `main_action`,
+	`title` AS `main_title`,
+	`descr` AS `main_descr`
 FROM
 	`{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -271,38 +273,39 @@ ORDER BY
 	// Do we have entries?
 	if (!SQL_HASZERONUMS($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
-		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
-		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
+
+		// Load all 'action' menus
+		while ($mainContent = SQL_FETCHARRAY($result_main)) {
 			// Filename
-			$inc = sprintf("inc/modules/admin/action-%s.php", $menu);
+			$inc = sprintf("inc/modules/admin/action-%s.php", $mainContent['main_action']);
 
 			// Is the file readable?
 			$readable = isIncludeReadable($inc);
 
 			// Is the current admin allowed to access this 'action' menu?
-			if (isAdminAllowedAccessMenu($menu)) {
+			if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
 				if ($SUB === false) {
 					// Insert compiled menu title and description
-					$GLOBALS['menu']['title'][$menu]      = $title;
-					$GLOBALS['menu']['description'][$menu] = $descr;
+					$GLOBALS['menu']['title'][$mainContent['main_action']]       = $mainContent['main_title'];
+					$GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
 				} // END - if
-				$OUT .= '<li class="admin_menu">
+				$OUT .= '<li class="admin_menu"' . addJavaScriptMenuContent('admin', $mainContent['main_action'], $action, $what) . '>
 <div class="nobr"><strong>&middot;</strong>&nbsp;';
 
 				if ($readable === true) {
-					if (($menu == $action) && (empty($what))) {
+					if (($mainContent['main_action'] == $action) && (empty($what))) {
 						$OUT .= '<strong>';
 					} else {
-						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
+						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $mainContent['main_action'] . '%}">';
 					}
 				} else {
-					$OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
+					$OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $mainContent['main_action'] . '%}">';
 				}
 
-				$OUT .= $title;
+				$OUT .= $mainContent['main_title'];
 
 				if ($readable === true) {
-					if (($menu == $action) && (empty($what))) {
+					if (($mainContent['main_action'] == $action) && (empty($what))) {
 						$OUT .= '</strong>';
 					} else {
 						$OUT .= '</a>]';
@@ -314,11 +317,32 @@ ORDER BY
 				$OUT .= '</div>
 </li>';
 
-				// Check for menu entries
-				$result_what = SQL_QUERY_ESC("SELECT
-	`what`,
-	`title`,
-	`descr`
+				// Add sub menu
+				$OUT .= addAdminSubMenu($mainContent, $action, $what);
+			} // END - if
+		} // END - while
+
+		// Close ul-tag
+		$OUT .= '</ul>';
+
+		// Free memory
+		SQL_FREERESULT($result_main);
+	} // END - if
+
+	// Return content
+	return $OUT;
+}
+
+// Add admin sub menu
+function addAdminSubMenu ($mainContent, $action, $what) {
+	// Init content
+	$OUT = '';
+
+	// Check for menu entries
+	$result_what = SQL_QUERY_ESC("SELECT
+	`what` AS `sub_what`,
+	`title` AS `sub_title`,
+	`descr` AS `sub_descr`
 FROM
 	`{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -328,78 +352,71 @@ WHERE
 ORDER BY
 	`sort` ASC,
 	`id` DESC",
-					array($menu), __FUNCTION__, __LINE__);
-
-				// Remember the count for later checks
-				setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
-
-				// Do we have entries?
-				if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
-					$GLOBALS['menu']['description'] = array();
-					$GLOBALS['menu']['title'] = array();
-					$SUB = true;
-					$OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
-					// @TODO Rewrite this to $content = SQL_FETCHARRAY()
-					while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
-						// Filename
-						$inc = sprintf("inc/modules/admin/what-%s.php", $what_sub);
-
-						// Is the file readable?
-						$readable = isIncludeReadable($inc);
-
-						// Is the current admin allowed to access this 'what' menu?
-						if (isAdminAllowedAccessMenu(null, $what_sub)) {
-							// Insert compiled title and description
-							$GLOBALS['menu']['title'][$what_sub]      = $title_what;
-							$GLOBALS['menu']['description'][$what_sub] = $desc_what;
-							$OUT .= '<li class="admin_menu">
+		array($mainContent['main_action']), __FUNCTION__, __LINE__);
+
+	// Remember the count for later checks
+	setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+
+	// Start li-tag for sub menu content
+	$OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
+
+	// Do we have entries?
+	if (ifAdminMenuHasEntries($mainContent['main_action'])) {
+		// Sub menu has been called
+		$SUB = true;
+		$OUT .= '<ul class="admin_menu_sub">';
+
+		// Load all entries
+		while ($subContent = SQL_FETCHARRAY($result_what)) {
+			// Filename
+			$inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+
+			// Is the file readable?
+			$readable = isIncludeReadable($inc);
+
+			// Is the current admin allowed to access this 'what' menu?
+			if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
+				// Insert compiled title and description
+				$GLOBALS['menu']['title'][$subContent['sub_what']]       = $subContent['sub_title'];
+				$GLOBALS['menu']['description'][$subContent['sub_what']] = $subContent['sub_descr'];
+				$OUT .= '<li class="admin_menu">
 <div class="nobr"><strong>--&gt;</strong>&nbsp;';
-							if ($readable === true) {
-								if ($what == $what_sub) {
-									$OUT .= '<strong>';
-								} else {
-									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
-								}
-							} else {
-								$OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
-							}
-
-							$OUT .= $title_what;
-
-							if ($readable === true) {
-								if ($what == $what_sub) {
-									$OUT .= '</strong>';
-								} else {
-									$OUT .= '</a>]';
-								}
-							} else {
-								$OUT .= '</span>';
-							}
-							$OUT .= '</div>
-</li>';
-						} // END - if
-					} // END - while
+				if ($readable === true) {
+					if ($what == $subContent['sub_what']) {
+						$OUT .= '<strong>';
+					} else {
+						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $subContent['sub_what'] . '%}">';
+					}
+				} else {
+					$OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $subContent['sub_what'] . '%}">';
+				}
+
+				$OUT .= $subContent['sub_title'];
 
-					// Free memory
-					SQL_FREERESULT($result_what);
-					$OUT .= '</ul>
+				if ($readable === true) {
+					if ($what == $subContent['sub_what']) {
+						$OUT .= '</strong>';
+					} else {
+						$OUT .= '</a>]';
+					}
+				} else {
+					$OUT .= '</span>';
+				}
+				$OUT .= '</div>
 </li>';
-				} // END - if
 			} // END - if
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result_main);
+		SQL_FREERESULT($result_what);
 		$OUT .= '</ul>';
 	} // END - if
 
-	// Is there a cache instance again?
-	// Return or output content?
-	if ($return === true) {
-		return $OUT;
-	} else {
-		outputHtml($OUT);
-	}
+	// Close li-tag
+	$OUT .= '</li>';
+
+	// Return content
+	return $OUT;
 }
 
 // Create an admin selection box form
@@ -415,7 +432,9 @@ function addAdminSelectionBox ($adminId = NULL, $special = '') {
 
 	// Query all entries
 	$result = SQL_QUERY('SELECT
-	`id`,`login`' . $ADD . '
+	`id`,
+	`login`
+	' . $ADD . '
 FROM
 	`{?_MYSQL_PREFIX?}_admins`
 ORDER BY
@@ -677,7 +696,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 		$title = $userid;
 	} elseif (!isValidUserId($userid)) {
 		// User id zero is invalid
-		return '<strong>' . makeNullToZero($userid) . '</strong>';
+		return '<strong>' . convertNullToZero($userid) . '</strong>';
 	}
 
 	if (($title == '0') && ($what == 'list_refs')) {
@@ -891,7 +910,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
 				if ($key == $userIdColumn[0]) {
 					// Add it again as raw id
 					//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-					$content[$userIdColumn[0]] = makeZeroToNull($value);
+					$content[$userIdColumn[0]] = convertZeroToNull($value);
 					$content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
 				} // END - if