- [DEV-124] screen actions moved to Audit, added filter for Audit (Artem)

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

3 files changed, 11 insertions, 10 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index 547ecf46..c35ca4a9 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -767,7 +767,7 @@ include_once 'include/discovery.inc.php';
 		return TRUE;
 	}
 	
-	function get_history_of_actions($start,$num){
+	function get_history_of_actions($start,$num,$sql_cond=''){
 		$available_triggers = get_accessible_triggers(PERM_READ_ONLY, null, get_current_nodeid());
 
 		$table = new CTableInfo(S_NO_ACTIONS_FOUND);
@@ -782,15 +782,16 @@ include_once 'include/discovery.inc.php';
 				S_ERROR
 				));
 				
-		
-		$result=DBselect('SELECT DISTINCT a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error '.
+		$sql = 'SELECT DISTINCT a.alertid,a.clock,mt.description,a.sendto,a.subject,a.message,a.status,a.retries,a.error '.
 				' FROM alerts a,media_type mt,events e '.
 				' WHERE mt.mediatypeid=a.mediatypeid '.
 					' AND e.eventid = a.eventid'.
+					$sql_cond.
 					' AND e.objectid IN ('.$available_triggers.') '.
 					' AND '.DBin_node('a.alertid').
-				order_by('a.clock,a.alertid,mt.description,a.sendto,a.status,a.retries'),
-			10*$start+$num);
+				order_by('a.clock,a.alertid,mt.description,a.sendto,a.status,a.retries');
+
+		$result=DBselect($sql,10*$start+$num);
 			
 		$col=0;
 		$skip=$start;
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 25de5be1..082dc0e2 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -336,6 +336,7 @@
 	'S_ALERTS_BIG'=>			'ALERTS',
 	'S_TYPE'=>				'Type',
 	'S_RECIPIENTS'=>			'Recipient(s)',
+	'S_RECIPIENT'=>			'Recipient',
 	'S_ERROR'=>				'Error',
 	'S_SENT'=>				'sent',
 	'S_NOT_SENT'=>				'not sent',
@@ -1418,8 +1419,10 @@
 
 
 //	audit.php
-	'S_AUDIT_LOG'=>				'Audit log',
-	'S_AUDIT_LOG_BIG'=>			'AUDIT LOG',
+	'S_AUDIT'=>					'Audit',
+	'S_AUDIT_BIG'=>				'AUDIT',
+	'S_AUDIT_LOGS'=>			'Audit logs',
+	'S_AUDIT_ACTIONS'=>			'Audit actions',
 	'S_ACTION'=>				'Action',
 	'S_DETAILS'=>				'Details',
 	'S_UNKNOWN_ACTION'=>			'Unknown action',
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index ef70b9aa..6efb46cb 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -129,9 +129,6 @@ COpt::profiling_start("page");
 							"sub_pages"=>array("tr_events.php")
 						),
 					array(
-							"url"=>"actions.php",
-							"label"=>S_ACTIONS),
-					array(
 							"url"=>"discovery.php",
 							"label"=>S_DISCOVERY, 
 							"user_type"=>USER_TYPE_ZABBIX_ADMIN),