projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove things deprecated since v3
[freeside.git]
/
FS
/
FS
/
CGI.pm
diff --git
a/FS/FS/CGI.pm
b/FS/FS/CGI.pm
index
96047f6
..
fc0f652
100644
(file)
--- a/
FS/FS/CGI.pm
+++ b/
FS/FS/CGI.pm
@@
-6,7
+6,7
@@
use Exporter;
use CGI;
use URI::URL;
#use CGI::Carp qw(fatalsToBrowser);
use CGI;
use URI::URL;
#use CGI::Carp qw(fatalsToBrowser);
-use FS::UID;
+use FS::UID
qw( cgi )
;
@ISA = qw(Exporter);
@EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable
@ISA = qw(Exporter);
@EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable
@@
-194,16
+194,24
@@
sub myexit {
}
}
}
}
-=item popurl LEVEL
+=item popurl LEVEL
[URL]
-Returns current URL with LEVEL levels of path removed from the end (default 0).
+Returns current (or, optionally, passed) URL with LEVEL levels of path removed
+from the end (default 0).
=cut
sub popurl {
=cut
sub popurl {
- my($up)=@_;
- my $cgi = &FS::UID::cgi;
- my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ my $up = shift;
+
+ my $url_string;
+ if ( scalar(@_) ) {
+ $url_string = shift;
+ } else {
+ my $cgi = &FS::UID::cgi;
+ $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ }
+
$url_string =~ s/\?.*//;
my $url = new URI::URL ( $url_string );
my(@path)=$url->path_components;
$url_string =~ s/\?.*//;
my $url = new URI::URL ( $url_string );
my(@path)=$url->path_components;
@@
-219,9
+227,15
@@
sub popurl {
=cut
sub rooturl {
=cut
sub rooturl {
- # better to start with the client-provided URL
- my $cgi = &FS::UID::cgi;
- my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ my $url_string;
+ if ( scalar(@_) ) {
+ $url_string = shift;
+ } else {
+ # better to start with the client-provided URL
+ my $cgi = cgi;
+ $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ }
+
$url_string =~ s/\?.*//;
#even though this is kludgy
$url_string =~ s/\?.*//;
#even though this is kludgy
@@
-230,18
+244,13
@@
sub rooturl {
$url_string =~
s{
/
$url_string =~
s{
/
- (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
- /
- (process/)?
- ([\w\-\.\/]+)
+ (browse|config|docs|edit|graph|misc|search|view|loginout|pref|rt|torrus)
+ (/process)?
+ ([\w\-\.\/]*)
$
}
{}x;
$
}
{}x;
- #elements because of progress-popup.html...
- #XXX remove anything from elements that is called directly & prevent
- #those pages from being served up
-
$url_string .= '/' unless $url_string =~ /\/$/;
$url_string;
$url_string .= '/' unless $url_string =~ /\/$/;
$url_string;