diff options
| author | Karol Nowacki | 2011-04-21 20:24:38 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2011-04-21 20:30:07 +0200 |
| commit | 1bce11aec73bcd6f90fe8e72877b4061ae8d45af (patch) | |
| tree | 082af880c39ee01a241c0467fec29c239ef0155b /type | |
| parent | plugin/varnish: deduplicate rrd_format values (diff) | |
| download | apt-panopticon_cgp-1bce11aec73bcd6f90fe8e72877b4061ae8d45af.zip apt-panopticon_cgp-1bce11aec73bcd6f90fe8e72877b4061ae8d45af.tar.gz apt-panopticon_cgp-1bce11aec73bcd6f90fe8e72877b4061ae8d45af.tar.bz2 apt-panopticon_cgp-1bce11aec73bcd6f90fe8e72877b4061ae8d45af.tar.xz | |
resolve php notices
Including a lot of undefined $_GET values.
Diffstat (limited to 'type')
| -rw-r--r-- | type/Default.class.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/type/Default.class.php b/type/Default.class.php index 45c4458..6429e5e 100644 --- a/type/Default.class.php +++ b/type/Default.class.php | |||
| @@ -59,13 +59,13 @@ class Type_Default { | |||
| 59 | # parse $_GET values | 59 | # parse $_GET values |
| 60 | function parse_get() { | 60 | function parse_get() { |
| 61 | $this->args = array( | 61 | $this->args = array( |
| 62 | 'host' => $_GET['h'], | 62 | 'host' => GET('h'), |
| 63 | 'plugin' => $_GET['p'], | 63 | 'plugin' => GET('p'), |
| 64 | 'pinstance' => $_GET['pi'], | 64 | 'pinstance' => GET('pi'), |
| 65 | 'type' => $_GET['t'], | 65 | 'type' => GET('t'), |
| 66 | 'tinstance' => $_GET['ti'], | 66 | 'tinstance' => GET('ti'), |
| 67 | ); | 67 | ); |
| 68 | $this->seconds = $_GET['s']; | 68 | $this->seconds = GET('s'); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | function validate_color($color) { | 71 | function validate_color($color) { |
| @@ -82,12 +82,12 @@ class Type_Default { | |||
| 82 | 82 | ||
| 83 | $rgb = array('r', 'g', 'b'); | 83 | $rgb = array('r', 'g', 'b'); |
| 84 | 84 | ||
| 85 | $fg[r] = hexdec(substr($fgc,0,2)); | 85 | $fg['r'] = hexdec(substr($fgc,0,2)); |
| 86 | $fg[g] = hexdec(substr($fgc,2,2)); | 86 | $fg['g'] = hexdec(substr($fgc,2,2)); |
| 87 | $fg[b] = hexdec(substr($fgc,4,2)); | 87 | $fg['b'] = hexdec(substr($fgc,4,2)); |
| 88 | $bg[r] = hexdec(substr($bgc,0,2)); | 88 | $bg['r'] = hexdec(substr($bgc,0,2)); |
| 89 | $bg[g] = hexdec(substr($bgc,2,2)); | 89 | $bg['g'] = hexdec(substr($bgc,2,2)); |
| 90 | $bg[b] = hexdec(substr($bgc,4,2)); | 90 | $bg['b'] = hexdec(substr($bgc,4,2)); |
| 91 | 91 | ||
| 92 | foreach ($rgb as $pri) { | 92 | foreach ($rgb as $pri) { |
| 93 | $c[$pri] = dechex(round($percent * $fg[$pri]) + ((1.0 - $percent) * $bg[$pri])); | 93 | $c[$pri] = dechex(round($percent * $fg[$pri]) + ((1.0 - $percent) * $bg[$pri])); |
| @@ -95,7 +95,7 @@ class Type_Default { | |||
| 95 | $c[$pri] = '00'; | 95 | $c[$pri] = '00'; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | return $c[r].$c[g].$c[b]; | 98 | return $c['r'].$c['g'].$c['b']; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | function rrd_files() { | 101 | function rrd_files() { |