summaryrefslogtreecommitdiffstats
path: root/frontends/php
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-08-10 08:58:58 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-08-10 08:58:58 +0000
commitf50a7cb0d549dfa32c4238b33bf6a7bdbd9f48cd (patch)
tree21c0dc7a936e2f66affd3a30f0d0fa758aded9e5 /frontends/php
parent50b4987d2f3c02f238b469bce46d994c1717a245 (diff)
downloadzabbix-f50a7cb0d549dfa32c4238b33bf6a7bdbd9f48cd.tar.gz
zabbix-f50a7cb0d549dfa32c4238b33bf6a7bdbd9f48cd.tar.xz
zabbix-f50a7cb0d549dfa32c4238b33bf6a7bdbd9f48cd.zip
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@1959 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
-rw-r--r--frontends/php/history.php9
-rw-r--r--frontends/php/include/locales/en_gb.inc.php1
2 files changed, 9 insertions, 1 deletions
diff --git a/frontends/php/history.php b/frontends/php/history.php
index 7b9d665f..e83f8f4e 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -155,6 +155,8 @@
if($item["value_type"]==ITEM_VALUE_TYPE_LOG)
{
echo "<TD><B>".S_LOCAL."</B></TD>";
+ echo "<TD><B>".S_SOURCE."</B></TD>";
+ echo "<TD><B>".S_SEVERITY."</B></TD>";
}
echo "<TD><B>".S_VALUE."</B></TD>";
echo "</TR>";
@@ -166,7 +168,7 @@
}
else if($item["value_type"]==ITEM_VALUE_TYPE_LOG)
{
- $sql="select clock,value,timestamp from history_log where itemid=".$_GET["itemid"]." and clock>$time and clock<$till order by id desc, clock desc";
+ $sql="select clock,value,timestamp,source,severity from history_log where itemid=".$_GET["itemid"]." and clock>$time and clock<$till order by id desc, clock desc";
}
else
{
@@ -192,6 +194,9 @@
if($item["value_type"]==ITEM_VALUE_TYPE_LOG)
{
$local=DBget_field($result,$i,2);
+ $source=DBget_field($result,$i,3);
+ $severity=DBget_field($result,$i,4);
+
if($local==0)
{
echo "<TD>&nbsp;</TD>";
@@ -200,6 +205,8 @@
{
echo "<TD>".date("Y.M.d H:i:s",$local)."</TD>";
}
+ echo "<TD>$source</TD>";
+ echo "<TD>$severity</TD>";
}
if($item["value_type"]==ITEM_VALUE_TYPE_FLOAT)
{
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 1e54315b..b8d215a2 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -262,6 +262,7 @@
"S_VALUES_IN_PLAIN_TEXT_FORMAT"=> "Values in plain text format",
"S_TIMESTAMP"=> "Timestamp",
"S_LOCAL"=> "Local",
+ "S_SOURCE"=> "Source",
// hosts.php
"S_HOSTS"=> "Hosts",