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

Added a new parameter called "sitename" to the config.

Browse source
This commit is contained in:
JT Smith 2003-05-04 23:26:21 +00:00
parent f0f79a39d6
commit f7ca23aa03
4 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/MessageLog.pm
View file

@ -131,7 +131,7 @@ sub addEntry {
subject, status) values ($messageLogId,".$u->userId.",
".quote($message).",".quote($url).",".time().",".quote($subject).", ".quote($status).")");
if ($url ne "") {
$message .= "\n".WebGUI::URL::append('http://'.$session{env}{HTTP_HOST}.$url,'mlog='.$messageLogId);
$message .= "\n".WebGUI::URL::append($url,'mlog='.$messageLogId);
}
_notify($u,$subject,$message);
}
@ -203,7 +203,7 @@ sub addInternationalizedEntry {
WebGUI::SQL->write("insert into messageLog values ($messageLogId,".$u->userId.",
".quote($message).",".quote($url).",".time().",".quote($message).",".quote($status).")");
if ($url ne "") {
$message .= "\n".WebGUI::URL::append('http://'.$session{env}{HTTP_HOST}.$url,'mlog='.$messageLogId);
$message .= "\n".WebGUI::URL::append($url,'mlog='.$messageLogId);
}
_notify($u,$subject,$message);
}

19
lib/WebGUI/URL.pm
View file

@ -48,6 +48,19 @@ These subroutines are available from this package:
#-------------------------------------------------------------------
sub _getSiteURL {
my $site = $session{env}{HTTP_HOST} || $session{config}{sitename};
my $proto = "http://";
my $port;
if ($session{env}{SERVER_PORT} == 443) {
$proto = "https://";
} elsif ($session{env}{SERVER_PORT} != 80) {
$port = ":".$session{env}{SERVER_PORT};
}
return $proto.$site.$port;
}
#-------------------------------------------------------------------
=head2 append ( url, pairs )
@ -127,8 +140,7 @@ Name value pairs to add to the URL in the form of:
=cut
sub gateway {
my ($url);
$url = $session{config}{scripturl}.'/'.$_[0];
my $url = _getSiteURL().$session{config}{scripturl}.'/'.$_[0];
if ($_[1]) {
$url = append($url,$_[1]);
}
@ -186,8 +198,7 @@ Name value pairs to add to the URL in the form of:
=cut
sub page {
my ($url);
$url = $session{page}{url};
my $url = _getSiteURL().$session{page}{url};
if ($_[0]) {
$url = append($url,$_[0]);
}