diff options
| author | Pim van den Berg | 2009-12-28 15:47:42 +0100 |
|---|---|---|
| committer | Pim van den Berg | 2009-12-28 15:47:42 +0100 |
| commit | 5a138d4c0464b591177cf523ebb8e0603e32d650 (patch) | |
| tree | 31ef3a927d160c6dfab67e689d08bf3b2342e262 /type/Default.class.php | |
| parent | replace duplicate code by function plugin_header (diff) | |
| download | apt-panopticon_cgp-5a138d4c0464b591177cf523ebb8e0603e32d650.zip apt-panopticon_cgp-5a138d4c0464b591177cf523ebb8e0603e32d650.tar.gz apt-panopticon_cgp-5a138d4c0464b591177cf523ebb8e0603e32d650.tar.bz2 apt-panopticon_cgp-5a138d4c0464b591177cf523ebb8e0603e32d650.tar.xz | |
replace duplicate code by function rrd_options
Diffstat (limited to 'type/Default.class.php')
| -rw-r--r-- | type/Default.class.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/type/Default.class.php b/type/Default.class.php index f40d12d..817521a 100644 --- a/type/Default.class.php +++ b/type/Default.class.php | |||
| @@ -84,9 +84,7 @@ class Type_Default { | |||
| 84 | } | 84 | } |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | function rrd_gen_graph() { | 87 | function rrd_options() { |
| 88 | $filename = $this->get_filename(); | ||
| 89 | |||
| 90 | $rrdgraph[] = '/usr/bin/rrdtool graph - -a PNG'; | 88 | $rrdgraph[] = '/usr/bin/rrdtool graph - -a PNG'; |
| 91 | $rrdgraph[] = sprintf('-w %d', is_numeric($this->width) ? $this->width : 400); | 89 | $rrdgraph[] = sprintf('-w %d', is_numeric($this->width) ? $this->width : 400); |
| 92 | $rrdgraph[] = sprintf('-h %d', is_numeric($this->heigth) ? $this->heigth : 175); | 90 | $rrdgraph[] = sprintf('-h %d', is_numeric($this->heigth) ? $this->heigth : 175); |
| @@ -95,6 +93,14 @@ class Type_Default { | |||
| 95 | $rrdgraph[] = sprintf('-v "%s"', $this->rrd_vertical); | 93 | $rrdgraph[] = sprintf('-v "%s"', $this->rrd_vertical); |
| 96 | $rrdgraph[] = sprintf('-s -%d', is_numeric($this->seconds) ? $this->seconds : 86400); | 94 | $rrdgraph[] = sprintf('-s -%d', is_numeric($this->seconds) ? $this->seconds : 86400); |
| 97 | 95 | ||
| 96 | return $rrdgraph; | ||
| 97 | } | ||
| 98 | |||
| 99 | function rrd_gen_graph() { | ||
| 100 | $filename = $this->get_filename(); | ||
| 101 | |||
| 102 | $rrdgraph = $this->rrd_options(); | ||
| 103 | |||
| 98 | if (is_array($this->args['tinstance'])) | 104 | if (is_array($this->args['tinstance'])) |
| 99 | $array = is_array($this->order) ? $this->order : $this->args['tinstance']; | 105 | $array = is_array($this->order) ? $this->order : $this->args['tinstance']; |
| 100 | else | 106 | else |
