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

merging 5.5.6. changes

Browse source
This commit is contained in:
JT Smith 2004-04-11 20:46:37 +00:00
parent dc41a0c9ae
commit a8c39c01c1
10 changed files with 63 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/WebGUI/URL.pm
View file

@ -47,22 +47,28 @@ These subroutines are available from this package:
=cut
#-------------------------------------------------------------------
sub _getSiteURL {
my $site;
if ($session{setting}{hostToUse} eq "sitename") {
$site = $session{config}{sitename} || $session{env}{HTTP_HOST};
} else {
$site = $session{env}{HTTP_HOST} || $session{config}{sitename};
}
my $proto = "http://";
if ($session{env}{SERVER_PORT} == 443) {
$proto = "https://";
}
return $proto.$site;
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;
}
#-------------------------------------------------------------------
=head2 append ( url, pairs )