include trailing slash in config weburl variable

When running CGP in the root, the header didn't link to the overview page because the href was empty. Reported-by: Nikoli <Nikoli@lavabit.com>
author: Pim van den Berg 2011-10-08 11:29:11 +0200
committer: Pim van den Berg 2011-10-08 11:29:11 +0200
commit: a652177a65cc17c8dddaa739d30ce40dc20d68a9 (patch)
tree: e7b7dd3b4ef84460b398ec5abc5886a78ffeeac6 /inc
parent: plugin/interface: fix empty instance descr. for collectd 5 (diff)
download: apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.zip
apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.gz
apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.bz2
apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.xz
2 files changed, 6 insertions, 6 deletions
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index 11dc91f..439d507 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -133,7 +133,7 @@ function graphs_from_plugin($host, $plugin) {
                        ? $CONFIG['time_range'][$plugin]
                        : $CONFIG['time_range']['default'];
-                printf('<a href="%s/%s"><img src="%s/%s"></a>'."\n",
+                printf('<a href="%s%s"><img src="%s%s"></a>'."\n",
                        $CONFIG['weburl'],
                        build_url('detail.php', $items, $time),
                        $CONFIG['weburl'],
diff --git a/inc/html.inc.php b/inc/html.inc.php
index d4a31f2..2e71488 100644
--- a/inc/html.inc.php
+++ b/inc/html.inc.php
@@ -18,8 +18,8 @@ function html_start() {
 <head>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
        <title>CGP{$path}</title>
-        <link rel="stylesheet" href="{$CONFIG['weburl']}/layout/style.css" type="text/css">
+        <link rel="stylesheet" href="{$CONFIG['weburl']}layout/style.css" type="text/css">
-        <script type="text/javascript" src="{$CONFIG['weburl']}/ajax.js"></script>
+        <script type="text/javascript" src="{$CONFIG['weburl']}ajax.js"></script>
 </head>
 <body>
@@ -51,7 +51,7 @@ function html_end() {
        echo <<<EOT
 </div>
 <div id="footer">
-<hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}/doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span>
+<hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span>
 </div>
 </body>
 </html>
@@ -71,7 +71,7 @@ function plugin_header($host, $plugin, $status) {
                $a = '-';
        }
-        return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%s/layout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin);
+        return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%slayout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin);
 }
 function host_summary($hosts) {
@@ -88,7 +88,7 @@ function host_summary($hosts) {
                $host_counter++;
                printf('<tr class="%s">', $row_style[$host_counter % 2]);
-                printf('<th><a href="%s/host.php?h=%s">%s</a></th>',
+                printf('<th><a href="%shost.php?h=%s">%s</a></th>',
                        $CONFIG['weburl'],$host, $host);
                if ($CONFIG['showload']) {
author	Pim van den Berg	2011-10-08 11:29:11 +0200
committer	Pim van den Berg	2011-10-08 11:29:11 +0200
commit	a652177a65cc17c8dddaa739d30ce40dc20d68a9 (patch)
tree	e7b7dd3b4ef84460b398ec5abc5886a78ffeeac6 /inc
parent	plugin/interface: fix empty instance descr. for collectd 5 (diff)
download	apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.zip apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.gz apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.bz2 apt-panopticon_cgp-a652177a65cc17c8dddaa739d30ce40dc20d68a9.tar.xz

diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php index 11dc91f..439d507 100644 --- a/inc/collectd.inc.php +++ b/inc/collectd.inc.php
@@ -133,7 +133,7 @@ function graphs_from_plugin($host, $plugin) {
133	? $CONFIG['time_range'][$plugin]	133	? $CONFIG['time_range'][$plugin]
134	: $CONFIG['time_range']['default'];	134	: $CONFIG['time_range']['default'];
135		135
136	printf('<a href="%s/%s"><img src="%s/%s"></a>'."\n",	136	printf('<a href="%s%s"><img src="%s%s"></a>'."\n",
137	$CONFIG['weburl'],	137	$CONFIG['weburl'],
138	build_url('detail.php', $items, $time),	138	build_url('detail.php', $items, $time),
139	$CONFIG['weburl'],	139	$CONFIG['weburl'],


diff --git a/inc/html.inc.php b/inc/html.inc.php index d4a31f2..2e71488 100644 --- a/inc/html.inc.php +++ b/inc/html.inc.php
@@ -18,8 +18,8 @@ function html_start() {
18	<head>	18	<head>
19	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">	19	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
20	<title>CGP{$path}</title>	20	<title>CGP{$path}</title>
21	<link rel="stylesheet" href="{$CONFIG['weburl']}/layout/style.css" type="text/css">	21	<link rel="stylesheet" href="{$CONFIG['weburl']}layout/style.css" type="text/css">
22	<script type="text/javascript" src="{$CONFIG['weburl']}/ajax.js"></script>	22	<script type="text/javascript" src="{$CONFIG['weburl']}ajax.js"></script>
23	</head>	23	</head>
24	<body>	24	<body>
25		25
@@ -51,7 +51,7 @@ function html_end() {
51	echo <<<EOT	51	echo <<<EOT
52	</div>	52	</div>
53	<div id="footer">	53	<div id="footer">
54	<hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}/doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span>	54	<hr><span class="small"><a href="http://pommi.nethuis.nl/category/cgp/" rel="external">Collectd Graph Panel</a> ({$version}) is distributed under the <a href="{$CONFIG['weburl']}doc/LICENSE" rel="licence">GNU General Public License (GPLv3)</a></span>
55	</div>	55	</div>
56	</body>	56	</body>
57	</html>	57	</html>
@@ -71,7 +71,7 @@ function plugin_header($host, $plugin, $status) {
71	$a = '-';	71	$a = '-';
72	}	72	}
73		73
74	return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%s/layout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin);	74	return printf("<h3><span class=\"point\" onclick=\"javascript:%sP('%s','%s')\"><img src=\"%slayout/%s.gif\" alt=\"[%s]\"> %s</span></h3>\n", $f, $host, $plugin, $CONFIG['weburl'], $i, $a, $plugin);
75	}	75	}
76		76
77	function host_summary($hosts) {	77	function host_summary($hosts) {
@@ -88,7 +88,7 @@ function host_summary($hosts) {
88	$host_counter++;	88	$host_counter++;
89		89
90	printf('<tr class="%s">', $row_style[$host_counter % 2]);	90	printf('<tr class="%s">', $row_style[$host_counter % 2]);
91	printf('<th><a href="%s/host.php?h=%s">%s</a></th>',	91	printf('<th><a href="%shost.php?h=%s">%s</a></th>',
92	$CONFIG['weburl'],$host, $host);	92	$CONFIG['weburl'],$host, $host);
93		93
94	if ($CONFIG['showload']) {	94	if ($CONFIG['showload']) {