projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc85a60
)
fix svc_url to work no matter where we are coming from in the tree - use rooturl...
author
ivan
<ivan>
Sun, 21 Jan 2007 09:10:46 +0000
(09:10 +0000)
committer
ivan
<ivan>
Sun, 21 Jan 2007 09:10:46 +0000
(09:10 +0000)
FS/FS/CGI.pm
patch
|
blob
|
history
FS/FS/UI/Web.pm
patch
|
blob
|
history
diff --git
a/FS/FS/CGI.pm
b/FS/FS/CGI.pm
index
88548cd
..
a85d48a
100644
(file)
--- a/
FS/FS/CGI.pm
+++ b/
FS/FS/CGI.pm
@@
-239,14
+239,17
@@
sub rooturl {
#even though this is kludgy
$url_string =~
s{
#even though this is kludgy
$url_string =~
s{
- (browse|config|docs|edit|graph|misc|search|view|pref)
+ /
+ (browse|config|docs|edit|graph|misc|search|view|pref|rt)
/
(process/)?
/
(process/)?
- ([\w\-\.]+)
+ ([\w\-\.
\/
]+)
$
}
{}x;
$
}
{}x;
+ $url_string .= '/' unless $url_string =~ /\/$/;
+
$url_string;
}
$url_string;
}
diff --git
a/FS/FS/UI/Web.pm
b/FS/FS/UI/Web.pm
index
15ec1a7
..
d7730c1
100644
(file)
--- a/
FS/FS/UI/Web.pm
+++ b/
FS/FS/UI/Web.pm
@@
-91,7
+91,7
@@
passed as a list of name-value pairs, and include:
# ##
# 'ahref' => 1, # if set true, returns <A HREF="$url">
# ##
# 'ahref' => 1, # if set true, returns <A HREF="$url">
-use FS::CGI qw(
pop
url);
+use FS::CGI qw(
root
url);
sub svc_url {
my %opt = @_;
sub svc_url {
my %opt = @_;
@@
-112,8
+112,7
@@
sub svc_url {
$url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq '';
}
$url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq '';
}
- my $p = popurl(2); #?
- my $return = "$p$opt{action}/$url$query";
+ my $return = rooturl(). "$opt{action}/$url$query";
$return = qq!<A HREF="$return">! if $opt{ahref};
$return = qq!<A HREF="$return">! if $opt{ahref};