- added support of value type Text (Alexei)

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

1 files changed, 24 insertions, 2 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 3da498c3..0ab61d3a 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1070,11 +1070,21 @@ COpt::profiling_start("page");
 	function&	get_screen_plaintext($itemid,$elements)
 	{
 		$item=get_item_by_itemid($itemid);
-		if($item["value_type"]==0)
+		if($item["value_type"]==ITEM_VALUE_TYPE_FLOAT)
 		{
 			$sql="select clock,value from history where itemid=$itemid".
 				" order by clock desc";
 		}
+		else if($item["value_type"]==ITEM_VALUE_TYPE_UINT64)
+		{
+			$sql="select clock,value from history_uint where itemid=$itemid".
+				" order by clock desc";
+		}
+		else if($item["value_type"]==ITEM_VALUE_TYPE_TEXT)
+		{
+			$sql="select clock,value from history_text where itemid=$itemid".
+				" order by clock desc";
+		}
 		else
 		{
 			$sql="select clock,value from history_str where itemid=$itemid".
@@ -1086,7 +1096,19 @@ COpt::profiling_start("page");
 		$table->SetHeader(array(S_TIMESTAMP,item_description($item["description"],$item["key_"])));
 		while($row=DBfetch($result))
 		{
-			$table->AddRow(array(date(S_DATE_FORMAT_YMDHMS,$row["clock"]),	$row["value"]));
+			if($item["value_type"]==ITEM_VALUE_TYPE_TEXT)
+			{
+				$value = nbsp(htmlspecialchars($row["value"]));
+			}
+			else if($item["value_type"]==ITEM_VALUE_TYPE_STRING)
+			{
+				$value = nbsp(htmlspecialchars($row["value"]));
+			}
+			else
+			{
+				$value = $row["value"];
+			}
+			$table->AddRow(array(date(S_DATE_FORMAT_YMDHMS,$row["clock"]),	$value));
 		}
 		return $table;
 	}