diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-10 14:32:29 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-10 14:32:29 +0000 |
| commit | 65fb13bf23e53b616ff5849dc4ef292d992a57fd (patch) | |
| tree | f061dcb36d3ee127bb3876155d244827989c6c9e /frontends/php/include | |
| parent | 7621affa2fc1c48036f16f3de592a7b377a16a95 (diff) | |
| download | zabbix-65fb13bf23e53b616ff5849dc4ef292d992a57fd.tar.gz zabbix-65fb13bf23e53b616ff5849dc4ef292d992a57fd.tar.xz zabbix-65fb13bf23e53b616ff5849dc4ef292d992a57fd.zip | |
- [ZBX-19] fixed SMS sending (Sasha)
[svn merge svn://svn.zabbix.com/branches/1.4 -r4849:4851]
git-svn-id: svn://svn.zabbix.com/trunk@4852 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 6 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 2da381bb..f58b5c6c 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -794,6 +794,7 @@ include_once 'include/discovery.inc.php'; S_TIME, S_TYPE, S_STATUS, + S_RETRIES_LEFT, S_RECIPIENTS, S_MESSAGE, S_ERROR @@ -809,13 +810,15 @@ include_once 'include/discovery.inc.php'; } $time=date("Y.M.d H:i:s",$row["clock"]); - if($row["status"] == 1) + if($row["status"] == ALERT_STATUS_SENT) { $status=new CSpan(S_SENT,"off"); + $retries=new CSpan(SPACE,"off"); } else { $status=new CSpan(S_NOT_SENT,"on"); + $retries=new CSpan(3 - $row["retries"],"on"); } $sendto=htmlspecialchars($row["sendto"]); @@ -835,6 +838,7 @@ include_once 'include/discovery.inc.php'; new CCol($time, 'top'), new CCol($row["description"], 'top'), new CCol($status, 'top'), + new CCol($retries, 'top'), new CCol($sendto, 'top'), new CCol($message, 'top'), new CCol($error, 'top'))); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index b57fb589..3c481f0a 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -297,6 +297,7 @@ 'S_NOT_LIKE_SMALL'=> 'not like', 'S_IN_SMALL'=> 'in', 'S_NOT_IN_SMALL'=> 'not in', + 'S_RETRIES_LEFT'=> 'Retries left', // alarms.php 'S_ALARMS'=> 'Alarms', |