aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--conf/config.php4
-rw-r--r--detail.php2
-rw-r--r--graph.php2
-rw-r--r--type/Default.class.php8
4 files changed, 8 insertions, 8 deletions
diff --git a/conf/config.php b/conf/config.php
index fc10a43..5ce761b 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -59,10 +59,10 @@ $CONFIG['page_refresh'] = '';
59 59
60# default width/height of the graphs 60# default width/height of the graphs
61$CONFIG['width'] = 400; 61$CONFIG['width'] = 400;
62$CONFIG['heigth'] = 175; 62$CONFIG['height'] = 175;
63# default width/height of detailed graphs 63# default width/height of detailed graphs
64$CONFIG['detail-width'] = 800; 64$CONFIG['detail-width'] = 800;
65$CONFIG['detail-heigth'] = 350; 65$CONFIG['detail-height'] = 350;
66 66
67# collectd's unix socket (unixsock plugin) 67# collectd's unix socket (unixsock plugin)
68# enabled: 'unix:///var/run/collectd-unixsock' 68# enabled: 'unix:///var/run/collectd-unixsock'
diff --git a/detail.php b/detail.php
index 5bf2883..524c708 100644
--- a/detail.php
+++ b/detail.php
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php';
9if (empty($_GET['x'])) 9if (empty($_GET['x']))
10 $_GET['x'] = $CONFIG['detail-width']; 10 $_GET['x'] = $CONFIG['detail-width'];
11if (empty($_GET['y'])) 11if (empty($_GET['y']))
12 $_GET['y'] = $CONFIG['detail-heigth']; 12 $_GET['y'] = $CONFIG['detail-height'];
13 13
14$host = validate_get(GET('h'), 'host'); 14$host = validate_get(GET('h'), 'host');
15$plugin = validate_get(GET('p'), 'plugin'); 15$plugin = validate_get(GET('p'), 'plugin');
diff --git a/graph.php b/graph.php
index 31f697c..37e442a 100644
--- a/graph.php
+++ b/graph.php
@@ -5,7 +5,7 @@ require_once 'inc/functions.inc.php';
5 5
6$plugin = validate_get(GET('p'), 'plugin'); 6$plugin = validate_get(GET('p'), 'plugin');
7$width = empty($_GET['x']) ? $CONFIG['width'] : $_GET['x']; 7$width = empty($_GET['x']) ? $CONFIG['width'] : $_GET['x'];
8$heigth = empty($_GET['y']) ? $CONFIG['heigth'] : $_GET['y']; 8$height = empty($_GET['y']) ? $CONFIG['height'] : $_GET['y'];
9 9
10if (validate_get(GET('h'), 'host') === NULL) { 10if (validate_get(GET('h'), 'host') === NULL) {
11 error_log('CGP Error: plugin contains unknown characters'); 11 error_log('CGP Error: plugin contains unknown characters');
diff --git a/type/Default.class.php b/type/Default.class.php
index 8704d06..5e19e73 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -18,7 +18,7 @@ class Type_Default {
18 var $rrd_format; 18 var $rrd_format;
19 var $scale = 1; 19 var $scale = 1;
20 var $width; 20 var $width;
21 var $heigth; 21 var $height;
22 var $graph_type; 22 var $graph_type;
23 var $negative_io; 23 var $negative_io;
24 var $graph_smooth; 24 var $graph_smooth;
@@ -37,8 +37,8 @@ class Type_Default {
37 $this->identifiers = $this->file2identifier($this->files); 37 $this->identifiers = $this->file2identifier($this->files);
38 $this->width = GET('x'); 38 $this->width = GET('x');
39 if (empty($this->width)) $this->width = $config['width']; 39 if (empty($this->width)) $this->width = $config['width'];
40 $this->heigth = GET('y'); 40 $this->height = GET('y');
41 if (empty($this->heigth)) $this->heigth = $config['heigth']; 41 if (empty($this->height)) $this->height = $config['height'];
42 $this->graph_type = $config['graph_type']; 42 $this->graph_type = $config['graph_type'];
43 $this->negative_io = $config['negative_io']; 43 $this->negative_io = $config['negative_io'];
44 $this->graph_smooth = $config['graph_smooth']; 44 $this->graph_smooth = $config['graph_smooth'];
@@ -227,7 +227,7 @@ class Type_Default {
227 if ($this->graph_smooth) 227 if ($this->graph_smooth)
228 $rrdgraph[] = '-E'; 228 $rrdgraph[] = '-E';
229 $rrdgraph[] = sprintf('-w %d', is_numeric($this->width) ? $this->width : 400); 229 $rrdgraph[] = sprintf('-w %d', is_numeric($this->width) ? $this->width : 400);
230 $rrdgraph[] = sprintf('-h %d', is_numeric($this->heigth) ? $this->heigth : 175); 230 $rrdgraph[] = sprintf('-h %d', is_numeric($this->height) ? $this->height : 175);
231 $rrdgraph[] = '-l 0'; 231 $rrdgraph[] = '-l 0';
232 $rrdgraph[] = sprintf('-t "%s on %s"', $this->rrd_title, $this->args['host']); 232 $rrdgraph[] = sprintf('-t "%s on %s"', $this->rrd_title, $this->args['host']);
233 if ($this->rrd_vertical) 233 if ($this->rrd_vertical)