diff options
author | Peter Wu | 2014-12-14 01:07:14 +0100 |
---|---|---|
committer | Pim van den Berg | 2014-12-14 15:58:35 +0100 |
commit | ab2bcff2d4bba317317e9e8fae071c840add63c7 (patch) | |
tree | 1c1d2bbc833c450f1e852a15f44b575253fbd2c1 /inc | |
parent | inc/html: include jquery from local source (diff) | |
download | apt-panopticon_cgp-ab2bcff2d4bba317317e9e8fae071c840add63c7.zip apt-panopticon_cgp-ab2bcff2d4bba317317e9e8fae071c840add63c7.tar.gz apt-panopticon_cgp-ab2bcff2d4bba317317e9e8fae071c840add63c7.tar.bz2 apt-panopticon_cgp-ab2bcff2d4bba317317e9e8fae071c840add63c7.tar.xz |
Revert "make detail page accessible when using "canvas" graph_type"
This reverts commit 82d88098f4203cf7402d4faf5ad100cada70efaf.
Breaks async rendering, see
https://github.com/pommi/CGP/issues/106#issuecomment-66896905
Diffstat (limited to 'inc')
-rw-r--r-- | inc/functions.inc.php | 10 | ||||
-rw-r--r-- | inc/html.inc.php | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/inc/functions.inc.php b/inc/functions.inc.php index df02d20..abe0763 100644 --- a/inc/functions.inc.php +++ b/inc/functions.inc.php | |||
@@ -59,13 +59,3 @@ function error_image() { | |||
59 | readfile('layout/error.png'); | 59 | readfile('layout/error.png'); |
60 | exit; | 60 | exit; |
61 | } | 61 | } |
62 | |||
63 | function generate_uuid() { | ||
64 | return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', | ||
65 | mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), | ||
66 | mt_rand( 0, 0xffff ), | ||
67 | mt_rand( 0, 0x0fff ) | 0x4000, | ||
68 | mt_rand( 0, 0x3fff ) | 0x8000, | ||
69 | mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) | ||
70 | ); | ||
71 | } | ||
diff --git a/inc/html.inc.php b/inc/html.inc.php index 7bc1852..2d745ec 100644 --- a/inc/html.inc.php +++ b/inc/html.inc.php | |||
@@ -360,15 +360,7 @@ function graphs_from_plugin($host, $plugin, $overview=false) { | |||
360 | isset($items['t']) ? $_GET['t'] = $items['t'] : $_GET['t'] = ''; | 360 | isset($items['t']) ? $_GET['t'] = $items['t'] : $_GET['t'] = ''; |
361 | isset($items['ti']) ? $_GET['ti'] = $items['ti'] : $_GET['ti'] = ''; | 361 | isset($items['ti']) ? $_GET['ti'] = $items['ti'] : $_GET['ti'] = ''; |
362 | $_GET['s'] = $time; | 362 | $_GET['s'] = $time; |
363 | $uuid = generate_uuid(); | ||
364 | printf('<canvas id="%s" class="rrd">', $uuid); | ||
365 | include $CONFIG['webdir'].'/graph.php'; | 363 | include $CONFIG['webdir'].'/graph.php'; |
366 | print '</canvas>'; | ||
367 | printf('<a href="%s%s"><img id="%s-img" alt="graph"></a>'."\n", | ||
368 | htmlentities($CONFIG['weburl']), | ||
369 | htmlentities(build_url('detail.php', $items, $time)), | ||
370 | $uuid | ||
371 | ); | ||
372 | } else { | 364 | } else { |
373 | printf('<a href="%1$s%2$s"><img src="%1$s%3$s"></a>'."\n", | 365 | printf('<a href="%1$s%2$s"><img src="%1$s%3$s"></a>'."\n", |
374 | htmlentities($CONFIG['weburl']), | 366 | htmlentities($CONFIG['weburl']), |