diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-04 10:40:27 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-04 10:40:27 +0000 |
| commit | 8d742b5d3b4964adcd231f91172f0f0aca2a37ec (patch) | |
| tree | 89df462eca7792aa7342edb51ab1346121480b7f /frontends/php/include | |
| parent | 81e8c026e359c23a7ffa2091542cf58fe44b7b66 (diff) | |
- fixed generation of events for unknown status of triggers (Alexei)
- fixed processing of trigger statuses (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4092 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 15 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 3ef5d1f7..eb71666c 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -2046,4 +2046,19 @@ else if (document.getElementById) } return $array; } + + /* function: + * zbx_date2str + * + * description: + * Convert timestamp to string representation. Retun 'Never' if 0. + * + * author: Alexei Vladishev + */ + function zbx_date2str($format, $timestamp) + { + return ($timestamp==0)?S_NEVER:date($format,$timestamp); + } + + ?> diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index ec21e102..fe4f2b32 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -1179,6 +1179,7 @@ 'S_COMMENTS'=> 'Comments', 'S_ACKNOWLEDGED'=> 'Acknowledged', 'S_ACK'=> 'Ack', + 'S_NEVER'=> 'Never', // users.php 'S_ZABBIX_USER'=> 'ZABBIX User', |