From 9c17c8be0eef94e9b0f62a9848d1dcd8a88d2130 Mon Sep 17 00:00:00 2001 From: hugetoad Date: Tue, 28 Sep 2004 17:58:11 +0000 Subject: Frontend improvements. git-svn-id: svn://svn.zabbix.com/trunk@1439 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/hosts.php | 108 +++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 61 deletions(-) (limited to 'frontends/php/hosts.php') diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php index 673c84f4..7bc2ca02 100644 --- a/frontends/php/hosts.php +++ b/frontends/php/hosts.php @@ -108,40 +108,33 @@ "; - echo "".S_ID.""; - echo "".S_NAME.""; - echo "".S_MEMBERS.""; - echo "".S_ACTIONS.""; - echo ""; + table_begin(); + table_header(array(S_ID,S_NAME,S_MEMBERS,S_ACTIONS)); $result=DBselect("select groupid,name from groups order by name"); $col=0; while($row=DBfetch($result)) { -// if(!check_right("User group","R",$row["usrgrpid"])) -// { -// continue; -// } - if($col++%2==0) { echo ""; } - else { echo ""; } - echo "".$row["groupid"].""; - echo "".$row["name"].""; - echo ""; + $members=array("hide"=>1,"value"=>""); $result1=DBselect("select distinct h.host from hosts h, hosts_groups hg where h.hostid=hg.hostid and hg.groupid=".$row["groupid"]." order by host"); for($i=0;$i"; - echo ""; - echo "".S_CHANGE.""; - echo ""; - echo ""; + $members["value"]=$members["value"]." "; + $actions="".S_CHANGE.""; + + table_row(array( + $row["groupid"], + $row["name"], + $members, + $actions + ),$col++); } if(DBnum_rows($result)==0) { @@ -149,7 +142,7 @@ echo "".S_NO_HOST_GROUPS_DEFINED.""; echo ""; } - echo ""; + table_end(); echo "
"; ?> @@ -195,16 +188,8 @@ "; - echo ""; - echo "".S_ID.""; - echo "".S_HOST.""; - echo "".S_IP.""; - echo "".S_PORT.""; - echo "".S_STATUS.""; - echo "".S_ACTIONS.""; - echo ""; - + table_begin(); + table_header(array(S_ID,S_HOST,S_IP,S_PORT,S_STATUS,S_ACTIONS)); if(isset($_GET["groupid"])) { @@ -223,75 +208,76 @@ { continue; } - if($col++%2==0) { echo ""; } - else { echo ""; } - - echo "".$row["hostid"].""; - echo "".$row["host"].""; + $host="".$row["host"].""; + if($row["useip"]==1) { - echo "".$row["ip"].""; + $ip=$row["ip"]; } else { - echo "-"; + $ip="-"; } - echo "".$row["port"].""; - echo ""; if(check_right("Host","U",$row["hostid"])) { if($row["status"] == 0) - echo "".S_MONITORED.""; + $status=array("value"=>"".S_MONITORED."","class"=>"off"); else if($row["status"] == 1) - echo "".S_NOT_MONITORED.""; + $status=array("value"=>"".S_NOT_MONITORED."","class"=>"on"); else if($row["status"] == 2) - echo "".S_UNREACHABLE.""; + $status=array("value"=>S_UNREACHABLE,"class"=>"unknown"); else if($row["status"] == 3) - echo "".S_TEMPLATE.""; + $status=array("value"=>S_TEMPLATE,"class"=>"unknown"); else if($row["status"] == HOST_STATUS_DELETED) - echo "".S_DELETED.""; + $status=array("value"=>S_DELETED,"class"=>"unknown"); else - echo S_UNKNOWN; + $status=S_UNKNOWN; } else { if($row["status"] == 0) - echo "".S_MONITORED.""; + $status=array("value"=>S_MONITORED,"class"=>"off"); else if($row["status"] == 1) - echo "".S_NOT_MONITORED.""; + $status=array("value"=>S_NOT_MONITORED,"class"=>"on"); else if($row["status"] == 2) - echo "".S_UNREACHABLE.""; + $status=array("value"=>S_UNREACHABLE,"class"=>"unknown"); else if($row["status"] == 3) - echo "".S_TEMPLATE.""; + $status=array("value"=>S_TEMPLATE,"class"=>"unknown"); else if($row["status"] == HOST_STATUS_DELETED) - echo "".S_DELETED.""; + $status=array("value"=>S_DELETED,"class"=>"unknown"); else - echo S_UNKNOWN; + $status=S_UNKNOWN; } - echo ""; if(check_right("Host","U",$row["hostid"])) { if($row["status"] != HOST_STATUS_DELETED) { if(isset($_GET["groupid"])) { - echo "".S_CHANGE.""; + $actions="".S_CHANGE.""; } else { - echo "".S_CHANGE.""; + $actions="".S_CHANGE.""; } } else { - echo " "; + $actions=" "; } } else { - echo "".S_CHANGE.""; + $actions=S_CHANGE; } - echo ""; + table_row(array( + $row["hostid"], + $host, + $ip, + $row["port"], + $status, + $actions + ),$col++); } if(DBnum_rows($result)==0) { @@ -299,7 +285,7 @@ echo "".S_NO_HOSTS_DEFINED.""; echo ""; } - echo ""; + table_end(); } ?> -- cgit