diff options
author | Pim van den Berg | 2015-05-25 11:26:47 +0200 |
---|---|---|
committer | Pim van den Berg | 2015-05-25 12:11:25 +0200 |
commit | 2a337e593359fb03472d1a6c4155971942b307be (patch) | |
tree | 2a2285fec7083ccfa87a9df6c5c325648ec85ebc /inc | |
parent | inc/html: s/licence/license/ (diff) | |
download | apt-panopticon_cgp-2a337e593359fb03472d1a6c4155971942b307be.zip apt-panopticon_cgp-2a337e593359fb03472d1a6c4155971942b307be.tar.gz apt-panopticon_cgp-2a337e593359fb03472d1a6c4155971942b307be.tar.bz2 apt-panopticon_cgp-2a337e593359fb03472d1a6c4155971942b307be.tar.xz |
inc/functions: make type argument of validate_get function exactly the same as $_GET value
Diffstat (limited to '')
-rw-r--r-- | inc/functions.inc.php | 12 | ||||
-rw-r--r-- | inc/html.inc.php | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/inc/functions.inc.php b/inc/functions.inc.php index abe0763..f667772 100644 --- a/inc/functions.inc.php +++ b/inc/functions.inc.php | |||
@@ -10,18 +10,18 @@ function GET($index) { | |||
10 | 10 | ||
11 | function validate_get($value, $type) { | 11 | function validate_get($value, $type) { |
12 | switch($type) { | 12 | switch($type) { |
13 | case 'host': | 13 | case 'h': # host |
14 | if (!preg_match('/^[\w-.]+$/u', $value)) | 14 | if (!preg_match('/^[\w-.]+$/u', $value)) |
15 | return NULL; | 15 | return NULL; |
16 | break; | 16 | break; |
17 | case 'plugin': | 17 | case 'p': # plugin |
18 | case 'category': | 18 | case 'c': # category |
19 | case 'type': | 19 | case 't': # type |
20 | if (!preg_match('/^\w+$/u', $value)) | 20 | if (!preg_match('/^\w+$/u', $value)) |
21 | return NULL; | 21 | return NULL; |
22 | break; | 22 | break; |
23 | case 'pinstance': | 23 | case 'pi': # plugin instance |
24 | case 'tinstance': | 24 | case 'ti': # type instance |
25 | if (!preg_match('/^[\w-]+$/u', $value)) | 25 | if (!preg_match('/^[\w-]+$/u', $value)) |
26 | return NULL; | 26 | return NULL; |
27 | break; | 27 | break; |
diff --git a/inc/html.inc.php b/inc/html.inc.php index cf3d15d..3998f54 100644 --- a/inc/html.inc.php +++ b/inc/html.inc.php | |||
@@ -313,15 +313,15 @@ function host_summary($cat, $hosts) { | |||
313 | 313 | ||
314 | function breadcrumbs() { | 314 | function breadcrumbs() { |
315 | $path = ''; | 315 | $path = ''; |
316 | if (validate_get(GET('h'), 'host')) | 316 | if (validate_get(GET('h'), 'h')) |
317 | $path .= ' - '.ucfirst(GET('h')); | 317 | $path .= ' - '.ucfirst(GET('h')); |
318 | if (validate_get(GET('p'), 'plugin')) | 318 | if (validate_get(GET('p'), 'p')) |
319 | $path .= ' - '.ucfirst(GET('p')); | 319 | $path .= ' - '.ucfirst(GET('p')); |
320 | if (validate_get(GET('pi'), 'pinstance')) | 320 | if (validate_get(GET('pi'), 'pi')) |
321 | $path .= ' - '.GET('pi'); | 321 | $path .= ' - '.GET('pi'); |
322 | if (validate_get(GET('t'), 'type') && validate_get(GET('p'), 'plugin') && GET('t') != GET('p')) | 322 | if (validate_get(GET('t'), 't') && validate_get(GET('p'), 'p') && GET('t') != GET('p')) |
323 | $path .= ' - '.GET('t'); | 323 | $path .= ' - '.GET('t'); |
324 | if (validate_get(GET('ti'), 'tinstance')) | 324 | if (validate_get(GET('ti'), 'ti')) |
325 | $path .= ' - '.GET('ti'); | 325 | $path .= ' - '.GET('ti'); |
326 | 326 | ||
327 | return $path; | 327 | return $path; |