oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 5.8.0 and 6.1.1 changes

Browse source
This commit is contained in:
JT Smith 2004-07-18 17:43:08 +00:00
parent ae87943d1e
commit 797b8581b6
14 changed files with 109 additions and 16296 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/WebGUI/URL.pm
View file

@ -36,6 +36,7 @@ This package provides URL writing functionality. It is important that all WebGUI
$url = WebGUI::URL::append($url,$pairs);
$string = WebGUI::URL::escape($string);
$url = WebGUI::URL::gateway($url,$pairs);
$url = WebGUI::URL::getSiteURL();
$url = WebGUI::URL::makeCompliant($string);
$url = WebGUI::URL::makeAbsolute($url);
$url = WebGUI::URL::page($url,$pairs);
@ -49,27 +50,6 @@ These subroutines are available from this package:
=cut
#-------------------------------------------------------------------
sub _getSiteURL {
my $site;
my @sitenames;
if (ref $session{config}{sitename} eq "ARRAY") {
@sitenames = @{$session{config}{sitename}};
} else {
push(@sitenames,$session{config}{sitename});
}
if ($session{setting}{hostToUse} eq "sitename" || !isIn($session{env}{HTTP_HOST},@sitenames)) {
$site = $session{config}{defaultSitename};
} else {
$site = $session{env}{HTTP_HOST} || $session{config}{defaultSitename};
}
my $proto = "http://";
if ($session{env}{SERVER_PORT} == 443) {
$proto = "https://";
}
return $proto.$site;
}
#-------------------------------------------------------------------
@ -150,7 +130,7 @@ Name value pairs to add to the URL in the form of:
=cut
sub gateway {
my $url = _getSiteURL().($session{config}{scripturl} || $session{env}{SCRIPT_NAME}).'/'.$_[0];
my $url = getSiteURL().$_[0];
if ($_[1]) {
$url = append($url,$_[1]);
}
@ -186,6 +166,42 @@ sub makeAbsolute {
return URI->new_abs($url,$baseURL);
}
#-------------------------------------------------------------------
=head2 getSiteURL ( )
Returns a constructed site url from protocol to gateway.
=cut
sub getSiteURL {
my $site;
my @sitenames;
if (ref $session{config}{sitename} eq "ARRAY") {
@sitenames = @{$session{config}{sitename}};
} else {
push(@sitenames,$session{config}{sitename});
}
if ($session{setting}{hostToUse} eq "sitename" || !isIn($session{env}{HTTP_HOST},@sitenames)) {
$site = $session{config}{defaultSitename};
} else {
$site = $session{env}{HTTP_HOST} || $session{config}{defaultSitename};
}
my $proto = "http://";
if ($session{env}{SERVER_PORT} == 443) {
$proto = "https://";
}
my $scripturl;
if (exists $session{config}{scripturl}) {
$scripturl .= $session{config}{scripturl};
} else {
$scripturl .= $session{env}{SCRIPT_NAME};
}
$scripturl .= '/';
return $proto.$site.$scripturl;
}
#-------------------------------------------------------------------
=head2 makeCompliant ( string )
@ -235,7 +251,7 @@ Name value pairs to add to the URL in the form of:
=cut
sub page {
my $url = _getSiteURL().$session{page}{url};
my $url = getSiteURL().$session{page}{urlizedTitle};
if ($_[0]) {
$url = append($url,$_[0]);
}