- added deletion from favorites on deleting items,graphs,screens,maps.. (Artem)

 - changes resources for favorites (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5579 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 10 insertions, 12 deletions

diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 554887ae..265d3614 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -301,13 +301,11 @@
 		return	$result;
 	}
 
-	function	get_graph_by_graphid($graphid)
-	{
+	function	get_graph_by_graphid($graphid){
 
 		$result=DBselect("SELECT * FROM graphs WHERE graphid=$graphid");
 		$row=DBfetch($result);
-		if($row)
-		{
+		if($row){
 			return	$row;
 		}
 		error("No graph with graphid=[$graphid]");
@@ -626,14 +624,12 @@
          * Comments: !!! Don't forget sync code with C !!!
          *
          */
-	function	delete_graph($graphid)
-	{
+	function	delete_graph($graphid){
 		$graph = get_graph_by_graphid($graphid);
 
 		$host_list = array();
 		$db_hosts = get_hosts_by_graphid($graphid);
-		while($db_host = DBfetch($db_hosts))
-		{
+		while($db_host = DBfetch($db_hosts)){
 			$host_list[] = '"'.$db_host['host'].'"';
 		}
 
@@ -648,13 +644,15 @@
 		DBexecute('delete from screens_items where resourceid='.$graphid.' and resourcetype='.SCREEN_RESOURCE_GRAPH);
 
 		/* delete graph */
-		if ( ($result = DBexecute('DELETE FROM graphs_items WHERE graphid='.$graphid)) )
-		if ( ($result = DBexecute('DELETE FROM graphs WHERE graphid='.$graphid)) )
-		{	
+		$result = DBexecute('DELETE FROM graphs_items WHERE graphid='.$graphid);
+		$result &= DBexecute('DELETE FROM graphs WHERE graphid='.$graphid);
+		$result &= rm4favorites('web.favorite.graphids',$graphid,ZBX_FAVORITES_ALL,'graphid');
+		
+		if($result){
 			info('Graph "'.$graph['name'].'" deleted from hosts '.implode(',',$host_list));
 		}
 
-		return $result;
+	return $result;
 	}
 
         /*