- 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

7 files changed, 32 insertions, 24 deletions

diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 8017b383..53cec68c 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -34,7 +34,7 @@ function make_favorite_graphs($available_hosts=false){
 	$fav_graphs = get4favorites('web.favorite.graphids');
 	
 	foreach($fav_graphs['id'] as $key => $resourceid){
-		if('simple_graph' == $fav_graphs['resource'][$key]){
+		if('itemid' == $fav_graphs['resource'][$key]){
 			if(!$item = get_item_by_itemid($resourceid)) continue;
 	
 			$host = get_host_by_itemid($resourceid);
@@ -85,7 +85,7 @@ function make_favorite_screens(){
 	
 	$fav_screens = get4favorites('web.favorite.screenids');
 	foreach($fav_screens['id'] as $key => $resourceid){
-		if('slides' == $fav_screens['resource'][$key]){
+		if('slideid' == $fav_screens['resource'][$key]){
 			if(!$slide = get_slideshow_by_slideshowid($resourceid)) continue;
 
 			$link = new CLink($slide['name'],'screens.php?config=1&elementid='.$resourceid);
@@ -890,7 +890,7 @@ function make_graph_submenu(){
 			
 	$fav_graphs = get4favorites('web.favorite.graphids');
 	foreach($fav_graphs['id'] as $key => $resourceid){
-		if('simple_graph' == $fav_graphs['resource'][$key]){
+		if('itemid' == $fav_graphs['resource'][$key]){
 			if(!$item = get_item_by_itemid($resourceid)) continue;
 	
 			$host = get_host_by_itemid($resourceid);
@@ -898,7 +898,7 @@ function make_graph_submenu(){
 			
 			$graphids[] = array( 
 							'name'	=>	$host['host'].':'.$item['description'],
-							'favobj'=>	'simple_graph',
+							'favobj'=>	'itemid',
 							'favid'	=>	$resourceid,
 							'action'=>	'remove'
 						);
@@ -911,7 +911,7 @@ function make_graph_submenu(){
 	
 			$graphids[] = array( 
 							'name'	=>	$ghost['host'].':'.$graph['name'],
-							'favobj'=>	'graphs',
+							'favobj'=>	'graphid',
 							'favid'	=>	$resourceid,
 							'action'=>	'remove'
 						);
@@ -951,7 +951,7 @@ function make_sysmap_submenu(){
 
 		$sysmapids[] = array( 
 							'name'	=>	$sysmap['name'],
-							'favobj'=>	'sysmaps',
+							'favobj'=>	'sysmapid',
 							'favid'	=>	$resourceid,
 							'action'=>	'remove'
 						);
@@ -1005,7 +1005,7 @@ function make_screen_submenu(){
 		
 			$screenids[] = array( 
 								'name'	=>	$slide['name'],
-								'favobj'=>	'slides',
+								'favobj'=>	'slideid',
 								'favid'	=>	$resourceid,
 								'action'=>	'remove'
 							);
@@ -1016,7 +1016,7 @@ function make_screen_submenu(){
 		
 			$screenids[] = array( 
 								'name'	=>	$screen['name'],
-								'favobj'=>	'screens',
+								'favobj'=>	'screenid',
 								'favid'	=>	$resourceid,
 								'action'=>	'remove'
 							);
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index ac018e72..9eeb3d03 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -504,6 +504,8 @@ if((ini_get('mbstring.func_overload') > 5)){
 	define('ZBX_USER_ONLINE_TIME',600);		// 10min
 	define('ZBX_GUEST_USER','guest');
 	define('ZBX_DEFAULT_CSS','default.css');
+	
+	define('ZBX_FAVORITES_ALL', -1);
 
 /* Define if your logs are in non-standard format */
 /*	define('ZBX_LOG_ENCODING_DEFAULT', 'Shift_JIS');*/
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;
 	}
 
         /*
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 85901a41..a1eb118f 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -813,8 +813,10 @@
 		if(!$result)	return	$result;
 
 		$result = DBexecute("delete from items where itemid=$itemid");
-		if($result)
-		{
+		if(!$result)	return	$result;
+		
+		$result = rm4favorites('web.favorite.graphids',$itemid,ZBX_FAVORITES_ALL,'itemid');
+		if($result){
 			info("Item '".$host["host"].":".$item["key_"]."' deleted");
 		}
 		return $result;
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index d598ba76..098484ed 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -199,6 +199,9 @@
 
 		$result = DBexecute("delete from sysmaps_elements where sysmapid=$sysmapid");
 		if(!$result)	return	$result;
+		
+		$result = rm4favorites('web.favorite.sysmapids',$sysmapd,ZBX_FAVORITES_ALL,'sysmapid');
+		if(!$result)	return	$result;
 
 	return DBexecute("delete from sysmaps where sysmapid=$sysmapid");
 	}
diff --git a/frontends/php/include/profiles.inc.php b/frontends/php/include/profiles.inc.php
index fd958d34..241fbefc 100644
--- a/frontends/php/include/profiles.inc.php
+++ b/frontends/php/include/profiles.inc.php
@@ -209,7 +209,7 @@ function rm4favorites($favobj,$favid,$favcnt=null,$resource=null){
 			if($favcnt < 1){
 				unset($favorites[$key]);
 				unset($fav_rsrc[$key]);
-				break;
+				if($favcnt > ZBX_FAVORITES_ALL) break;
 			}
 		}
 		$favcnt--;
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index cce172ee..af344d78 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -98,7 +98,7 @@
 		return $screenid;
         }
 
-        function        update_screen($screenid,$name,$hsize,$vsize)
+        function update_screen($screenid,$name,$hsize,$vsize)
         {
                 $sql="update screens set name=".zbx_dbstr($name).",hsize=$hsize,vsize=$vsize where screenid=$screenid";
                 return  DBexecute($sql);
@@ -114,6 +114,9 @@
 			$result=DBexecute('delete from slides where screenid='.$screenid);
 			if(!$result) return $result;
 			
+			$result = rm4favorites('web.favorite.screenids',$screenid,ZBX_FAVORITES_ALL,'screenid');
+			if(!$result)	return	$result;
+			
 		return  DBexecute("delete from screens where screenid=$screenid");
         }