- added configurable number of plain text elements for screens (Alexei)

 - added screens_items.elements (Alexei)


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

1 files changed, 4 insertions, 4 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2a62a268..ecad6837 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1218,21 +1218,21 @@ echo "</head>";
 	}
 
 	# Show screen cell containing plain text values
-	function	show_screen_plaintext($itemid)
+	function	show_screen_plaintext($itemid,$elements)
 	{
 		$item=get_item_by_itemid($itemid);
 		if($item["value_type"]==0)
 		{
-			$sql="select clock,value from history where itemid=$itemid order by clock desc limit 25";
+			$sql="select clock,value from history where itemid=$itemid order by clock desc limit $elements";
 		}
 		else
 		{
-			$sql="select clock,value from history_str where itemid=$itemid order by clock desc limit 25";
+			$sql="select clock,value from history_str where itemid=$itemid order by clock desc limit $elements";
 		}
                 $result=DBselect($sql);
 
 		table_begin();
-		table_header(array(S_CLOCK,$item["description"]));
+		table_header(array(S_TIMESTAMP,$item["description"]));
 		$col=0;
 		while($row=DBfetch($result))
 		{