diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-06-02 06:42:49 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-06-02 06:42:49 +0000 |
| commit | 9bd43d7aea638b8c5ce7e2745ef052056bb36245 (patch) | |
| tree | c4ef361d6ace0ee6e15a0560d827a7104303b89d /frontends/php/include | |
| parent | 5f33760cba07eb31752aa71ce07853aaf3c6ac34 (diff) | |
| download | zabbix-9bd43d7aea638b8c5ce7e2745ef052056bb36245.tar.gz zabbix-9bd43d7aea638b8c5ce7e2745ef052056bb36245.tar.xz zabbix-9bd43d7aea638b8c5ce7e2745ef052056bb36245.zip | |
- added "set_image_header" function for global image controling (Eugene)
- Added database patch for oracle (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2938 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/classes/graph.inc.php | 6 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/frontends/php/include/classes/graph.inc.php b/frontends/php/include/classes/graph.inc.php index 31398cf8..9c2ea375 100644 --- a/frontends/php/include/classes/graph.inc.php +++ b/frontends/php/include/classes/graph.inc.php @@ -932,11 +932,7 @@ // $this->im = imagecreate($this->sizeX+$this->shiftX+61,$this->sizeY+2*$this->shiftY+40); - Header( "Content-type: text/html"); -/* - Header( "Content-type: image/png"); - Header( "Expires: Mon, 17 Aug 1998 12:51:50 GMT"); -/**/ + set_image_header(); check_authorisation(); diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 1b5c9e9e..65d8a719 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -2651,4 +2651,13 @@ COpt::profiling_stop("script"); $array = $new_array; return true; } + + function set_image_header() + { + // Header( "Content-type: text/html"); + + if(MAP_OUTPUT_FORMAT == "JPG") Header( "Content-type: image/jpeg"); + else Header( "Content-type: image/png"); + Header( "Expires: Mon, 17 Aug 1998 12:51:50 GMT"); + } ?> |