From 334ec7968c236ad0bc7937b4ab87f5abd7c116a2 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@iki.fi>
Date: Mon, 14 Nov 2005 21:57:00 +0000
Subject: * (trunk)/   lib/Smokeping.pm,   CHANGES:   + use the 'cgiurl'
 variable from the 'General' section for all CGI self-refering links

---
 CHANGES          | 3 +++
 lib/Smokeping.pm | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 41e6bf4..8b277fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+* use the 'cgiurl' variable from the 'General' section for all CGI self-refering 
+  links -- niko, from Christian Hammers <ch .*debian.org> (Debian bug #339019)
+
 2005/11/14 -- released version 20051114_trunk
 
 2005/11/13 -- released version 20051113_trunk
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index c5d0eef..09ff150 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -106,7 +106,7 @@ sub lnk ($$) {
     if ($q->isa('dummyCGI')) {
 	return $path . ".html";
     } else {
-	return ($q->script_name() || '') . "?target=" . $path;
+	return $cfg->{General}->{cgiurl} . "?target=" . $path;
     }
 }
 
@@ -997,7 +997,7 @@ sub display_webpage($$){
        {
 	menu => target_menu($cfg->{Targets},
 			    [@$open], #copy this because it gets changed
-			    ($q->script_name() || '')."?target="),
+			    $cfg->{General}->{cgiurl}."?target="),
 	title => $tree->{title},
 	remark => ($tree->{remark} || ''),
 	overview => get_overview( $cfg,$q,$tree,$open ),
-- 
cgit v1.2.3-24-g4f1b