mclemens
/
tsmmonitor2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented alternate submenu navigation for - hopefully - better overview.

This commit is contained in:
Frank Fegert 2009-05-24 13:20:15 +00:00
parent 79bade6748
commit ed9b42ff44
2 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
includes/tsmmonitor.php
View File

@ -47,8 +47,9 @@ class TSMMonitor {
var $max_pages; var $max_pages;
var $timetablestarttime; var $timetablestarttime;
var $submenu; var $menu;
var $adminmenu; var $adminmenu;
var $menuindent = 0;
var $message; var $message;
var $adodb; var $adodb;
@ -121,7 +122,7 @@ class TSMMonitor {
$_SESSION['timeshift'] = 0 ; $_SESSION['timeshift'] = 0 ;
} }
$this->submenu = $this->configarray["menuarray"][$this->GETVars['menu']]; $this->menu = $this->configarray["menuarray"];
$this->adminmenu = $this->configarray["adminmenuarray"]; $this->adminmenu = $this->configarray["adminmenuarray"];
//$query = $this->configarray["queryarray"][$this->GETVars['qq']]["tsmquery"]; //$query = $this->configarray["queryarray"][$this->GETVars['qq']]["tsmquery"];
$this->queryarray = $this->configarray["queryarray"]; $this->queryarray = $this->configarray["queryarray"];
@ -301,10 +302,13 @@ class TSMMonitor {
*/ */
function GetBetween($content,$start,$end) { function GetBetween($content,$start,$end) {
$r = explode($start, $content); $r = explode($start, $content);
if (isset($r[1])) { if (isset($r[1]) && $end != "") {
$r = explode($end, $r[1]); $r = explode($end, $r[1]);
return $r[0]; return $r[0];
} }
else {
return $r[1];
}
return ''; return '';
} }
@ -377,10 +381,16 @@ class TSMMonitor {
function getMenu($menu = '', $activelink = '', $type) { function getMenu($menu = '', $activelink = '', $type) {
if (!isset($menu)) { return ""; }; if (!isset($menu)) { return ""; };
$this->menuindent++;
for ($i=1;$i<$this->menuindent;$i++){
$indent .= "&nbsp;&nbsp;&nbsp;";
}
while(list($key, $val) = each($menu)) { while(list($key, $val) = each($menu)) {
$bCont = TRUE; $bCont = TRUE;
$q = $this->GetBetween($key,"q=","&m="); $q = $this->GetBetween($key,"q=","&m=");
$m = $this->GetBetween($key,"&m=","");
$okey = $key;
if ($this->configarray["queryarray"][$q]["notforlibclient"] == 1 && $this->configarray["serverlist"][$this->GETVars['server']]["libraryclient"] == 1) { if ($this->configarray["queryarray"][$q]["notforlibclient"] == 1 && $this->configarray["serverlist"][$this->GETVars['server']]["libraryclient"] == 1) {
$bCont = FALSE; $bCont = FALSE;
@ -391,23 +401,27 @@ class TSMMonitor {
$key .= "&s=".$this->GETVars['server']; $key .= "&s=".$this->GETVars['server'];
} }
if ($val == "Admin") { if ($val['label'] == "Admin") {
$key = "admin.php"; $key = "admin.php";
}else if ($val == "TSM Monitor") { }else if ($val['label'] == "TSM Monitor") {
$key = "index.php"; $key = "index.php";
} }
if ($val == "trennlinie") { if ($val['label'] == "trennlinie") {
$links .= "<br>\n"; $links .= "<br>\n";
} else if ($bCont) { } else if ($bCont) {
if (!stristr($key,$activelink)) { if (!stristr($key,$activelink)) {
$links .= "<a href=\"$key\">$val</a>\n"; $links .= "<a href=\"$key\">$indent".$val['label']."</a>\n";
} else { } else {
$links .= "<div class=\"aktuell\">$val</div>\n"; $links .= "<div class=\"aktuell\">$indent".$val['label']."</div>\n";
} }
} }
if ($this->GETVars['menu'] == $m) {
$links .= $this->getMenu($menu[$okey]['sub'], $activelink, $type);
}
} }
$this->menuindent--;
return $links; return $links;
} }
@ -1328,20 +1342,21 @@ class TSMMonitor {
$menuarray = array(); $menuarray = array();
$mainmenuarray = array(); $mainmenuarray = array();
$mainmenuarray["q=index&m=main"]['label'] = "Overview";
while (list ($key, $val) = each ($mainmenutablerows)) { while (list ($key, $val) = each ($mainmenutablerows)) {
$menuname = $val['name']; $menuname = $val['name'];
$menulabel = $val['label']; $menulabel = $val['label'];
$url = "q=overview&m=".$menuname; $url = "q=overview&m=".$menuname;
$mainmenuarray[$url] = $menulabel; $mainmenuarray[$url]['label'] = $menulabel;
} }
$menuarrayxml = $queryconfigarray["navigation"]["mainmenuitem"]; $menuarrayxml = $queryconfigarray["navigation"]["mainmenuitem"];
$mainmenuarrayxml = $menuarrayxml; $mainmenuarrayxml = $menuarrayxml;
$mainmenuarray["trennlinie"] = "trennlinie"; $mainmenuarray["trennlinie"]['label'] = "trennlinie";
$mainmenuarray["q=polldstat&m=main"] = "Polling Daemon Log"; $mainmenuarray["q=polldstat&m=main"]['label'] = "Polling Daemon Log";
$mainmenuarray["q=serverlist&m=main"] = "Change Server"; $mainmenuarray["q=serverlist&m=main"]['label'] = "Change Server";
if ($_SESSION["logindata"]["role"] == "admin") $mainmenuarray["admin"] = "Admin"; if ($_SESSION["logindata"]["role"] == "admin") $mainmenuarray["admin"]['label'] = "Admin";
$mainmenuarray["q=logout"] = "Logout"; $mainmenuarray["q=logout"]['label'] = "Logout";
$menuarray["main"] = $mainmenuarray; $menuarray["main"] = $mainmenuarray;
$query = "SELECT * from cfg_mainmenu"; $query = "SELECT * from cfg_mainmenu";
@ -1354,38 +1369,32 @@ class TSMMonitor {
$menuname = $val['name']; $menuname = $val['name'];
$menulabel = $val['label']; $menulabel = $val['label'];
$submenuarray = array(); $submenuarray = array();
$submenuarray[""] = "<---";
$query = "SELECT * from cfg_queries where parent='".$menuname."'"; $query = "SELECT * from cfg_queries where parent='".$menuname."'";
$querytablerows = $this->adodb->fetchArrayDB($query); $querytablerows = $this->adodb->fetchArrayDB($query);
while (list ($subkey, $submenuitem) = each ($querytablerows)) { while (list ($subkey, $submenuitem) = each ($querytablerows)) {
$submenuitem_name = $submenuitem['name']; $submenuitem_name = $submenuitem['name'];
$submenuitem_label = $submenuitem['label']; $submenuitem_label = $submenuitem['label'];
$url = "q=".$submenuitem_name."&m=".$menuname; $url = "q=".$submenuitem_name."&m=".$menuname;
$submenuarray[$url] = $submenuitem_label; $submenuarray[$url]['label'] = $submenuitem_label;
} }
$submenuarray["trennlinie"] = "trennlinie"; $menuarray['main']["q=overview&m=".$menuname]['sub'] = $submenuarray;
$submenuarray["q=polldstat&m=".$submenu['name']] = "Polling Daemon Log";
$submenuarray["q=serverlist&m=".$submenu['name']] = "Change Server";
if ($_SESSION["logindata"]["role"] == "admin") $submenuarray["admin"] = "Admin";
$submenuarray["q=logout"] = "Logout";
$menuarray[$menuname] = $submenuarray;
} }
$retArray["menuarray"] = $menuarray; $retArray["menuarray"] = $menuarray;
// Admin Backend Menu // Admin Backend Menu
$adminmenuarray = array(); $adminmenuarray = array();
$adminmenuarray["q=config&m=main"] = "General"; $adminmenuarray["q=config&m=main"]['label'] = "General";
$adminmenuarray["q=users&m=main"] = "Users"; $adminmenuarray["q=users&m=main"]['label'] = "Users";
$adminmenuarray["q=groups&m=main"] = "Groups"; $adminmenuarray["q=groups&m=main"]['label'] = "Groups";
$adminmenuarray["q=servers&m=main"] = "Servers"; $adminmenuarray["q=servers&m=main"]['label'] = "Servers";
$adminmenuarray["q=mainmenu&m=main"] = "Mainmenu"; $adminmenuarray["q=mainmenu&m=main"]['label'] = "Mainmenu";
$adminmenuarray["q=queries&m=main"] = "Queries"; $adminmenuarray["q=queries&m=main"]['label'] = "Queries";
$adminmenuarray["trennlinie"] = "trennlinie"; $adminmenuarray["trennlinie"]['label'] = "trennlinie";
$adminmenuarray["q=settings&m=main"] = "Settings"; $adminmenuarray["q=settings&m=main"]['label'] = "Settings";
$adminmenuarray["trennlinie2"] = "trennlinie"; $adminmenuarray["trennlinie2"]['label'] = "trennlinie";
$adminmenuarray["tsmmonitor"] = "TSM Monitor"; $adminmenuarray["tsmmonitor"]['label'] = "TSM Monitor";
$adminmenuarray["q=logout"] = "Logout"; $adminmenuarray["q=logout"]['label'] = "Logout";
$retArray["adminmenuarray"] = $adminmenuarray; $retArray["adminmenuarray"] = $adminmenuarray;
// Overview Boxes // Overview Boxes

2
index.php
View File

@ -62,7 +62,7 @@ include_once "includes/page_head.php";
<!-- Start left navigation menu --> <!-- Start left navigation menu -->
<td id="menue"> <td id="menue">
<div class="menuelinks"> <div class="menuelinks">
<?php echo $tsmmonitor->getMenu( $tsmmonitor->submenu, "index.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server'], "index" ); ?> <?php echo $tsmmonitor->getMenu( $tsmmonitor->menu['main'], "index.php?q=".$tsmmonitor->GETVars['qq']."&m=".$tsmmonitor->GETVars['menu']."&s=".$tsmmonitor->GETVars['server'], "index" ); ?>
</div> </div>
<br> <br>
<div class='menuelinks' id='datechooser'> <div class='menuelinks' id='datechooser'>