From f4959808757ef018273ffe82e6f9fa2267a39f4e Mon Sep 17 00:00:00 2001 From: hugetoad Date: Fri, 20 Jun 2003 10:33:47 +0000 Subject: - added basic support for simple graphs in screens (Alexei) - added table screens_graphs (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@835 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/screenedit.php | 157 +++++++++++++++++++++++++++++++++---------- 1 file changed, 123 insertions(+), 34 deletions(-) (limited to 'frontends/php/screenedit.php') diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php index 7038680e..e042418c 100644 --- a/frontends/php/screenedit.php +++ b/frontends/php/screenedit.php @@ -28,7 +28,14 @@ { delete_screen_item($HTTP_GET_VARS["screenitemid"]); } - $result=add_screen_item($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]); + if($HTTP_GET_VARS["resource"]==0) + { + $result=add_screen_graph($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["itemid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]); + } + if($HTTP_GET_VARS["resource"]==1) + { + $result=add_screen_item($HTTP_GET_VARS["screenid"],$HTTP_GET_VARS["x"],$HTTP_GET_VARS["y"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]); + } show_messages($result,"Item added","Cannot add item"); } if($HTTP_GET_VARS["register"]=="delete") @@ -42,6 +49,7 @@ $result=update_screen_item($HTTP_GET_VARS["screenitemid"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]); show_messages($result,"Item updated","Cannot update item"); } + unset($HTTP_GET_VARS["register"]); } ?> @@ -50,7 +58,7 @@ $screenid=$HTTP_GET_VARS["screenid"]; $result=DBselect("select name,cols,rows from screens where screenid=$screenid"); $row=DBfetch($result); - show_table_header($row["name"]); + show_table_header("".$row["name"].""); echo ""; echo ""; + + { + $screenitemid=0; + $screengraphid=0; + $graphid=0; + $sysmapid=0; + $itemid=0; + $width=500; + $height=100; + $resource=@iif(isset($HTTP_GET_VARS["resource"]),$HTTP_GET_VARS["resource"],0); + } + $iresult=DBSelect("select * from screens_items where screenid=$screenid and x=$c and y=$r"); if(DBnum_rows($iresult)>0) { + $resource=1; $irow=DBfetch($iresult); $screenitemid=$irow["screenitemid"]; $graphid=$irow["graphid"]; $width=$irow["width"]; $height=$irow["height"]; + $found=1; } - else - { - $screenitemid=0; - $graphid=0; - $width=500; - $height=100; - } - if(isset($HTTP_GET_VARS["register"])&&($HTTP_GET_VARS["register"]=="edit")&&($HTTP_GET_VARS["x"]==$c)&&($HTTP_GET_VARS["y"]==$r)) + $iresult=DBSelect("select * from screens_graphs where screenid=$screenid and x=$c and y=$r"); + if(DBnum_rows($iresult)>0) + { + $resource=0; + $irow=DBfetch($iresult); + $screengraphid=$irow["screengraphid"]; + $itemid=$irow["itemid"]; + $width=$irow["width"]; + $height=$irow["height"]; + } + + if(isset($HTTP_GET_VARS["x"])&&($HTTP_GET_VARS["x"]==$c)&&($HTTP_GET_VARS["y"]==$r)) { show_table2_header_begin(); echo "Screen item configuration"; - show_table2_v_delimiter(); + echo ""; echo ""; echo ""; echo ""; + echo ""; - echo "Graph name"; + show_table2_v_delimiter(); + echo "Resource"; show_table2_h_delimiter(); + echo ""; - if($graphid!=0) + if($resource == 0) + { + show_table2_v_delimiter(); + echo "Graph name"; + show_table2_h_delimiter(); + $result=DBselect("select h.host,i.description,i.itemid from hosts h,items i where h.hostid=i.hostid and h.status in (0,2) and i.status=0 order by h.host,i.description"); + echo ""; + } + else { - $result=DBselect("select name from graphs where graphid=$graphid"); - if($result) $name=DBget_field($result,0,0); - else $name="(none)"; + echo ""; } - else $name="(none)"; - - $result=DBselect("select graphid,name from graphs"); - echo ""; + echo "