- fixed Plain Text values (Alexei)

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

4 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 497d1eb0..be634ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.0beta8:
 
+ - fixed Plain Text values (Alexei)
  - fixed improper handling of special characters i.e. '\/" (Alexei)
  - fixed Last100 and Prev100 for both Alarms and Alerts (Alexei)
  - fixed "STATUS OF ZABBIX". Command was changed to 'ps aux' (Alexei)
diff --git a/TODO b/TODO
index c16dee45..f1436333 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,6 @@ BUGS:
  - mass-adding of actions
  - BUG. No horizontal lines. Replace ImageDashedLine() to gdImageLine() plus
    ImageSetStyle()
- - BUG. Plain text values.
 
 PERFORMANCE IMPROVEMENTS:
 
diff --git a/frontends/php/history.php b/frontends/php/history.php
index 3b54c9c6..ffa6cbe1 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -43,6 +43,10 @@
 	{
 		show_header("$host:$description",0,0);
 	}
+	if($HTTP_GET_VARS["action"]=="plaintext")
+	{
+		show_header("$host:$description",0,1);
+	}
 
 	if(!check_right("Item","R",$HTTP_GET_VARS["itemid"]))
 	{
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index bc8786bb..17d18d11 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1166,9 +1166,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 	{
 		$sql="select clock,value from history where itemid=$itemid and clock>$from and clock<$till order by clock";
 		$result=DBselect($sql);
-		echo $sql;
 
-		echo "<PRE>";
+		echo "<PRE>\n";
 		for($i=0;$i<DBnum_rows($result);$i++)
 		{
 			$clock=DBget_field($result,$i,0);