More support of new action schema.

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

2 files changed, 14 insertions, 32 deletions

diff --git a/frontends/php/alerts.php b/frontends/php/alerts.php
index d8db6f6a..17d3c904 100644
--- a/frontends/php/alerts.php
+++ b/frontends/php/alerts.php
@@ -80,11 +80,11 @@
 
 	if(!isset($_REQUEST["start"]))
 	{
-		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries,ac.scope,a.error from alerts a,actions ac,media_type mt where a.actionid=ac.actionid and mt.mediatypeid=a.mediatypeid and a.alertid>$maxalertid-200 order by a.clock desc limit 200";
+		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error from alerts a,media_type mt where mt.mediatypeid=a.mediatypeid and a.alertid>$maxalertid-200 order by a.clock desc limit 200";
 	}
 	else
 	{
-		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,ac.triggerid,a.status,a.retries,ac.scope,a.error from alerts a,actions ac,media_type mt where a.actionid=ac.actionid and mt.mediatypeid=a.mediatypeid and a.alertid>$maxalertid-200-".$_REQUEST["start"]." order by a.clock desc limit ".($_REQUEST["start"]+500);
+		$sql="select a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error from alerts a,media_type mt where mt.mediatypeid=a.mediatypeid and a.alertid>$maxalertid-200-".$_REQUEST["start"]." order by a.clock desc limit ".($_REQUEST["start"]+500);
 	}
 	$result=DBselect($sql);
 
@@ -95,33 +95,15 @@
 	while($row=DBfetch($result))
 	{
 		$zzz++;	
-		if(isset($_REQUEST["start"])&&($zzz<$_REQUEST["start"]))
-		{
-			continue;
-		}
-		if(($row["scope"]==0)&&!check_right_on_trigger("R",$row["triggerid"]))
-                {
-			continue;
-		}
-		if(($row["scope"]==1)&&!check_right("Host","R",$row["triggerid"]))
-                {
-			continue;
-		}
-		if(($row["scope"]==2)&&!check_anyright("Default permission","R"))
+		if(!check_anyright("Default permission","R"))
                 {
 			continue;
 		}
 
 		if($col>100)	break;
 
-		if($row["scope"]==0)
-		{
-			$time="<a href=\"alarms.php?triggerid=".$row["triggerid"]."\">".date("Y.M.d H:i:s",$row["clock"])."</a>";
-		}
-		else
-		{
-			$time=date("Y.M.d H:i:s",$row["clock"]);
-		}
+		$time=date("Y.M.d H:i:s",$row["clock"]);
+
 		if($row["status"] == 1)
 		{
 			$status=array("value"=>S_SENT,"class"=>"off");
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index 96186bd0..fd74f817 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -285,15 +285,15 @@
 			{
 				$actions="<A HREF=\"triggers.php?triggerid=".$row["triggerid"]."#form\">".S_CHANGE."</A>";
 			}
-			$actions=$actions." :: ";
-			if(get_action_count_by_triggerid($row["triggerid"])>0)
-			{
-				$actions=$actions."<A HREF=\"actions.php?triggerid=".$row["triggerid"]."\"><b>A</b>ctions</A>";
-			}
-			else
-			{
-				$actions=$actions."<A HREF=\"actions.php?triggerid=".$row["triggerid"]."\">".S_ACTIONS."</A>";
-			}
+//			$actions=$actions." :: ";
+//			if(get_action_count_by_triggerid($row["triggerid"])>0)
+//			{
+//				$actions=$actions."<A HREF=\"actions.php?triggerid=".$row["triggerid"]."\"><b>A</b>ctions</A>";
+//			}
+//			else
+//			{
+//				$actions=$actions."<A HREF=\"actions.php?triggerid=".$row["triggerid"]."\">".S_ACTIONS."</A>";
+//			}
 			table_row(array(
 				$id,
 				$description,