- added "remove all" option in dashboard menus (Artem)

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

1 files changed, 8 insertions, 8 deletions

diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 96666d8b..bcb2014b 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -75,7 +75,7 @@ include_once "include/page_header.php";
 	check_fields($fields);
 
 	if(isset($_REQUEST['favobj'])){
-		if(in_array($_REQUEST['favobj'],array('screenid','slideid'))){
+		if(in_array($_REQUEST['favobj'],array('screenid','slideshowid'))){
 			$result = false;
 			if('add' == $_REQUEST['action']){
 				$result = add2favorites('web.favorite.screenids',$_REQUEST['favid'],$_REQUEST['favobj']);
@@ -149,7 +149,7 @@ include_once "include/page_header.php";
 				' order by name'
 				);
 		while($row=DBfetch($result)){
-			if(!screen_accessiable($row["elementid"], PERM_READ_ONLY))
+			if(!screen_accessible($row["elementid"], PERM_READ_ONLY))
 				continue;
 
 			$cmbElements->AddItem(
@@ -167,7 +167,7 @@ include_once "include/page_header.php";
 				' order by name'
 				);
 		while($row=DBfetch($result)){
-			if(!slideshow_accessiable($row["elementid"], PERM_READ_ONLY))
+			if(!slideshow_accessible($row["elementid"], PERM_READ_ONLY))
 				continue;
 
 			$cmbElements->AddItem(
@@ -185,12 +185,12 @@ include_once "include/page_header.php";
 
 	if(isset($elementid)){
 		if(0 == $config){
-			if(!screen_accessiable($elementid, PERM_READ_ONLY))
+			if(!screen_accessible($elementid, PERM_READ_ONLY))
 				access_deny();
 			$element = get_screen_by_screenid($elementid);
 		}
 		else{
-			if(!slideshow_accessiable($elementid, PERM_READ_ONLY))
+			if(!slideshow_accessible($elementid, PERM_READ_ONLY))
 				access_deny();
 			$element = get_slideshow_by_slideshowid($elementid);
 		}
@@ -200,15 +200,15 @@ include_once "include/page_header.php";
 			if($_REQUEST["fullscreen"]==0) $url .= "&fullscreen=1";
 			$text[] = array(nbsp(" / "),new CLink($element["name"], $url));
 			
-			if(infavorites('web.favorite.screenids',$elementid,(0 == $config)?'screenid':'slideid')){
+			if(infavorites('web.favorite.screenids',$elementid,(0 == $config)?'screenid':'slideshowid')){
 				$icon = new CDiv(SPACE,'iconminus');
 				$icon->AddOption('title',S_REMOVE_FROM.' '.S_FAVORITES);
-				$icon->AddAction('onclick',new CScript("javascript: rm4favorites('".((0 == $config)?'screenid':'slideid')."','".$elementid."',0);"));
+				$icon->AddAction('onclick',new CScript("javascript: rm4favorites('".((0 == $config)?'screenid':'slideshowid')."','".$elementid."',0);"));
 			}
 			else{
 				$icon = new CDiv(SPACE,'iconplus');
 				$icon->AddOption('title',S_ADD_TO.' '.S_FAVORITES);
-				$icon->AddAction('onclick',new CScript("javascript: add2favorites('".((0 == $config)?'screenid':'slideid')."','".$elementid."');"));
+				$icon->AddAction('onclick',new CScript("javascript: add2favorites('".((0 == $config)?'screenid':'slideshowid')."','".$elementid."');"));
 			}
 			
 			$icon->AddOption('id','addrm_fav');