From ab2bcff2d4bba317317e9e8fae071c840add63c7 Mon Sep 17 00:00:00 2001
From: Peter Wu
Date: Sun, 14 Dec 2014 01:07:14 +0100
Subject: 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
---
 detail.php            |  2 --
 inc/functions.inc.php | 10 ----------
 inc/html.inc.php      |  8 --------
 js/CGP.js             |  6 ------
 type/Base.class.php   |  2 ++
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/detail.php b/detail.php
index 270a935..777294b 100644
--- a/detail.php
+++ b/detail.php
@@ -55,9 +55,7 @@ print "</ul>\n";
 
 if ($CONFIG['graph_type'] == 'canvas') {
 	chdir($CONFIG['webdir']);
-	printf('<canvas id="%s" class="rrd">', generate_uuid());
 	include $CONFIG['webdir'].'/graph.php';
-	print '</canvas>';
 } else {
 	printf("<img src=\"%s%s\">\n",
 		htmlentities($CONFIG['weburl']),
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() {
 	readfile('layout/error.png');
 	exit;
 }
-
-function generate_uuid() {
-	return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-		mt_rand( 0, 0xffff ),
-		mt_rand( 0, 0x0fff ) | 0x4000,
-		mt_rand( 0, 0x3fff ) | 0x8000,
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-	);
-}
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) {
 			isset($items['t']) ? $_GET['t'] = $items['t'] : $_GET['t'] = '';
 			isset($items['ti']) ? $_GET['ti'] = $items['ti'] : $_GET['ti'] = '';
 			$_GET['s'] = $time;
-			$uuid = generate_uuid();
-			printf('<canvas id="%s" class="rrd">', $uuid);
 			include $CONFIG['webdir'].'/graph.php';
-			print '</canvas>';
-			printf('<a href="%s%s"><img id="%s-img" alt="graph"></a>'."\n",
-				htmlentities($CONFIG['weburl']),
-				htmlentities(build_url('detail.php', $items, $time)),
-				$uuid
-			);
 		} else {
 			printf('<a href="%1$s%2$s"><img src="%1$s%3$s"></a>'."\n",
 				htmlentities($CONFIG['weburl']),
diff --git a/js/CGP.js b/js/CGP.js
index 5ed729b..d726533 100644
--- a/js/CGP.js
+++ b/js/CGP.js
@@ -132,12 +132,6 @@ var CGP = (function() {
         var canvases = document.getElementsByClassName('rrd');
         for (var i = 0; i < canvases.length; i++) {
             draw(canvases[i].id, async);
-
-            if (document.getElementById(canvases[i].id + '-img')) {
-                document.getElementById(canvases[i].id).style.display = 'none';
-                var dataURL = canvases[i].toDataURL();
-                document.getElementById(canvases[i].id + '-img').src = dataURL;
-            }
         }
     }
 
diff --git a/type/Base.class.php b/type/Base.class.php
index ee5050b..8d51121 100644
--- a/type/Base.class.php
+++ b/type/Base.class.php
@@ -225,9 +225,11 @@ class Type_Base {
 				print '</pre>';
 			break;
 			case 'canvas':
+				printf('<canvas id="%s" class="rrd">', sha1(serialize($graphoptions)));
 				foreach ($graphoptions as $d) {
 					printf("\"%s\"\n", htmlentities($d));
 				}
+				print '</canvas>';
 			break;
 			case 'debug':
 			case 1:
-- 
cgit v1.1