#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/)?
- ([\w\-\.]+)
+ ([\w\-\.\/]+)
$
}
{}x;
+ $url_string .= '/' unless $url_string =~ /\/$/;
+
$url_string;
}
# ##
# 'ahref' => 1, # if set true, returns <A HREF="$url">
-use FS::CGI qw(popurl);
+use FS::CGI qw(rooturl);
sub svc_url {
my %opt = @_;
$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};