From 231faf1162a0aac6feb4e30b18da7bd14bb8de11 Mon Sep 17 00:00:00 2001 From: hugetoad Date: Tue, 25 May 2004 07:40:51 +0000 Subject: - added support for real delta. item.delta=2. (Alexei) - new selection for triggers.php (Alexei) - new selection for items.php (Alexei) - removed helpdesk.php (Alexei) - fixed check of permissions for screenedit.php (Alexei) - new selection for graphs in charts.php (Alexei) - new selection of maps in maps.php (Alexei) - new selection of group and host for latest.php (Alexei) - added support for macro {IPADDRESS} (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@1348 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/items.php | 158 ++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 100 deletions(-) (limited to 'frontends/php/items.php') diff --git a/frontends/php/items.php b/frontends/php/items.php index fb75794b..c8abe129 100644 --- a/frontends/php/items.php +++ b/frontends/php/items.php @@ -132,75 +132,60 @@ echo S_CONFIGURATION_OF_ITEMS_BIG;; show_table_v_delimiter(); -// echo ""; +// Start of new code + echo "
"; - if(isset($HTTP_GET_VARS["groupid"])) + if(isset($HTTP_GET_VARS["groupid"])&&($HTTP_GET_VARS["groupid"]==0)) { -// echo "all "; - echo "".S_ALL." "; - } - else - { - echo "[".S_ALL."] "; + unset($HTTP_GET_VARS["groupid"]); } - $result=DBselect("select groupid,name from groups order by name"); + echo S_GROUP." "; + echo ""; + + echo " ".S_HOST." "; + echo ""; + + echo "
"; +// end of new code + show_table_header_end(); $lasthost=""; @@ -240,8 +225,9 @@ echo ""; } $lasthost=$row["host"]; - if($col++%2 == 1) { echo ""; } - else { echo ""; } + iif_echo($col++%2 == 1, + "", + ""); echo " ".$row["itemid"].""; // echo "".$row["itemid"].""; @@ -281,56 +267,28 @@ echo ""; -# if(isset($HTTP_GET_VARS["hostid"])) -# { - switch($row["status"]) - { - case 0: - echo "".S_ACTIVE.""; - break; - case 1: - echo "".S_NOT_ACTIVE.""; - break; -# case 2: -# echo "Trapper"; -# break; - case 3: - echo "".S_NOT_SUPPORTED.""; - break; - default: - echo S_UNKNOWN; - } -# } -# else -# { -# switch($row["status"]) -# { -# case 0: -# echo "Active"; -# break; -# case 1: -# echo "Not active"; -# break; -# case 2: -# echo "Trapper"; -# break; -# case 3: -# echo "Not supported"; -# break; -# default: -# echo "$status Unknown"; -# } -# } - echo ""; - - if(check_right("Item","U",$row["itemid"])) - { - echo "".S_CHANGE.""; - } - else + switch($row["status"]) { - echo "".S_CHANGE.""; + case 0: + echo "".S_ACTIVE.""; + break; + case 1: + echo "".S_NOT_ACTIVE.""; + break; +# case 2: +# echo "Trapper"; +# break; + case 3: + echo "".S_NOT_SUPPORTED.""; + break; + default: + echo S_UNKNOWN; } + echo ""; + + iif_echo(check_right("Item","U",$row["itemid"]), + "".S_CHANGE."", + "".S_CHANGE.""); echo ""; } echo ""; -- cgit