aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.htaccess2
-rw-r--r--rrd.php2
-rw-r--r--type/Default.class.php2
3 files changed, 2 insertions, 4 deletions
diff --git a/.htaccess b/.htaccess
index 3272499..889dfc6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -8,5 +8,3 @@ Options -Indexes
8 8
9RewriteEngine On 9RewriteEngine On
10RewriteRule ^.git(ignore|/) - [F,L] 10RewriteRule ^.git(ignore|/) - [F,L]
11
12RewriteRule ^rrd/(.*) rrd.php?path=$1
diff --git a/rrd.php b/rrd.php
index 58614a0..a6f341a 100644
--- a/rrd.php
+++ b/rrd.php
@@ -4,7 +4,7 @@ require_once 'conf/common.inc.php';
4require_once 'inc/functions.inc.php'; 4require_once 'inc/functions.inc.php';
5require_once 'inc/html.inc.php'; 5require_once 'inc/html.inc.php';
6 6
7if ($file = validateRRDPath($CONFIG['datadir'], $_GET['path'])) { 7if ($file = validateRRDPath($CONFIG['datadir'], $_SERVER['PATH_INFO'])) {
8 header('Content-Type: application/octet-stream'); 8 header('Content-Type: application/octet-stream');
9 header('Content-Disposition: attachment; filename='.basename($file)); 9 header('Content-Disposition: attachment; filename='.basename($file));
10 header("Expires: " .date(DATE_RFC822,strtotime($CONFIG['cache']." seconds"))); 10 header("Expires: " .date(DATE_RFC822,strtotime($CONFIG['cache']." seconds")));
diff --git a/type/Default.class.php b/type/Default.class.php
index 42d5090..8632328 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -116,7 +116,7 @@ class Type_Default {
116 116
117 function parse_filename($file) { 117 function parse_filename($file) {
118 if ($this->graph_type == 'canvas') { 118 if ($this->graph_type == 'canvas') {
119 $file = 'rrd' . str_replace($this->datadir, '', $file); 119 $file = 'rrd.php/' . str_replace($this->datadir . '/', '', $file);
120 } 120 }
121 return $this->rrd_escape($file); 121 return $this->rrd_escape($file);
122 } 122 }