diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-01 11:54:29 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-01 11:54:29 +0000 |
| commit | 939838fff9c58f1a80e18f09e0b5d2bf8bcc876e (patch) | |
| tree | 34a4e06e46fa86b105e9a4bac2602a6a4359615b /frontends/php/include | |
| parent | 24372356bb3dbd748c65bdb829069a14af3ac022 (diff) | |
| download | zabbix-939838fff9c58f1a80e18f09e0b5d2bf8bcc876e.tar.gz zabbix-939838fff9c58f1a80e18f09e0b5d2bf8bcc876e.tar.xz zabbix-939838fff9c58f1a80e18f09e0b5d2bf8bcc876e.zip | |
finished interface for web monitoring
git-svn-id: svn://svn.zabbix.com/trunk@3782 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/graphs.inc.php | 8 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 96ec5ef0..0bbb110a 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -391,7 +391,7 @@ function VDP($var, $msg=null) { echo "DEBUG DUMP: "; if(isset($msg)) echo '"'.$m $ret=$ret.$t."m"; $value=$value-$t*(60); } - $ret=$ret.round($value)."s"; + $ret=$ret.round($value, 2)."s"; return $ret; } diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php index 50ab85de..76855f29 100644 --- a/frontends/php/include/graphs.inc.php +++ b/frontends/php/include/graphs.inc.php @@ -672,12 +672,14 @@ $form->AddItem(S_PERIOD.SPACE); - if(in_array($_REQUEST["period"],array(3600,2*3600,4*3600,8*3600,12*3600,24*3600,7*24*3600,31*24*3600,365*24*3600))) + $period = get_request('period', 3600); + + if(in_array($period,array(3600,2*3600,4*3600,8*3600,12*3600,24*3600,7*24*3600,31*24*3600,365*24*3600))) $custom_per = 3*3600; else - $custom_per = $_REQUEST["period"]; + $custom_per = $period; - $cmbPeriod = new CComboBox("period",$_REQUEST["period"],"submit()"); + $cmbPeriod = new CComboBox("period",$period,"submit()"); $cmbPeriod->AddItem($custom_per,"custom"); $cmbPeriod->AddItem(3600,"1h"); $cmbPeriod->AddItem(2*3600,"2h"); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 1bced24b..0479e18e 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -35,10 +35,15 @@ // httpdetails.php "S_DETAILS_OF_SCENARIO"=> "Details of scenario", "S_DETAILS_OF_SCENARIO_BIG"=> "DETAILS OF SCENARIO", - "S_SPEED_PER_SECONDS"=> "Speed per seconds", + "S_SPEED"=> "Speed", "S_RESPONSE_CODE"=> "Response code", "S_TOTAL_BIG"=> "TOTAL", "S_RESPONSE_TIME"=> "Response time", + "S_IN_PROGRESS"=> "In progress", + "S_OF_SMALL"=> "of", + "S_IN_CHECK"=> "In check", + "S_IDLE_TILL"=> "Idle till", + "S_FAILED_ON"=> "Failed on", // httpmon.php "S_STATUS_OF_WEB_MONITORING"=> "Status of Web monitoring", |