summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/config.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-03 17:03:31 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-03 17:03:31 +0000
commit46f4daf879cb71b022874fc3b6551d97d400fe1b (patch)
treea9e4d56860802c11418a3a67da3d91a82b9e911f /frontends/php/include/config.inc.php
parent1f829e896d022a4ed202d443d127346d26cbf7f2 (diff)
- Frontend improvements (Eugene)
+ Configuration -> General (finished) + Configuration -> Users (finished) + Configuration -> Hosts (finished) + Configuration -> Items (finished) git-svn-id: svn://svn.zabbix.com/trunk@2603 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
-rw-r--r--frontends/php/include/config.inc.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 7cc6205e..d186c885 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -115,7 +115,6 @@ function SDI($msg="SDI") { echo "DEBUG INFO: $msg ".BR; } # DEBUG INFO!!!
function error($msg)
{
global $ERROR_MSG;
-
if(is_array($ERROR_MSG))
{
array_push($ERROR_MSG,$msg);
@@ -710,6 +709,7 @@ function SDI($msg="SDI") { echo "DEBUG INFO: $msg ".BR; } # DEBUG INFO!!!
function show_infomsg()
{
global $INFO_MSG;
+ global $ERROR_MSG;
if(is_array($INFO_MSG))
{
@@ -728,17 +728,13 @@ function SDI($msg="SDI") { echo "DEBUG INFO: $msg ".BR; } # DEBUG INFO!!!
if(!$bool)
{
- if(is_null($errmsg))
- return;
+ if(!is_null($errmsg))
+ $msg="ERROR:".$errmsg;
- $msg="ERROR:".$errmsg;
$color="#AA0000";
}
else
{
- if(is_null($msg))
- return;
-
$color="#223344";
}