- fixed large SQLs calling (Eugene)

 - increased message size for alerts (Eugene)
 - fixed macros substitution for messages (Eugene)

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

1 files changed, 13 insertions, 12 deletions

diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index c8138d46..41d80ce2 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -295,7 +295,7 @@
 			10*$start+$num);
 
 		$table = new CTableInfo(S_NO_ACTIONS_FOUND);
-		$table->SetHeader(array(S_TIME, S_TYPE, S_STATUS, S_RECIPIENTS, S_SUBJECT, S_MESSAGE, S_ERROR));
+		$table->SetHeader(array(S_TIME, S_TYPE, S_STATUS, S_RECIPIENTS, S_MESSAGE, S_ERROR));
 		$col=0;
 		$skip=$start;
 		while(($row=DBfetch($result))&&($col<$num))
@@ -309,15 +309,17 @@
 
 			if($row["status"] == 1)
 			{
-				$status=new CCol(S_SENT,"off");
+				$status=new CSpan(S_SENT,"off");
 			}
 			else
 			{
-				$status=new CCol(S_NOT_SENT,"on");
+				$status=new CSpan(S_NOT_SENT,"on");
 			}
 			$sendto=htmlspecialchars($row["sendto"]);
-			$subject="<pre>".htmlspecialchars($row["subject"])."</pre>";
-			$message="<pre>".htmlspecialchars($row["message"])."</pre>";
+
+			$subject = empty($row["subject"]) ? '' : "<pre>".bold(S_SUBJECT.': ').htmlspecialchars($row["subject"])."</pre>";
+			$message = array($subject,"<pre>".htmlspecialchars($row["message"])."</pre>");
+
 			if($row["error"] == "")
 			{
 				$error=new CSpan(SPACE,"off");
@@ -327,13 +329,12 @@
 				$error=new CSpan($row["error"],"on");
 			}
 			$table->AddRow(array(
-				$time,
-				$row["description"],
-				$status,
-				$sendto,
-				$subject,
-				$message,
-				$error));
+				new CCol($time, 'top'),
+				new CCol($row["description"], 'top'),
+				new CCol($status, 'top'),
+				new CCol($sendto, 'top'),
+				new CCol($message, 'top'),
+				new CCol($error, 'top')));
 			$col++;
 		}