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

fix broken SSL redirection

Browse source
This commit is contained in:
Graham Knop 2007-11-13 18:25:26 +00:00
parent fd8cff2b8f
commit 20e496d002
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -10,6 +10,7 @@
7.4.14
- fix: CS posts won't allow new attachments after deleting an old one
- fix: SSL redirection broken
7.4.13
- fix: field_loop missing from SQL Form template

5
lib/WebGUI/Asset.pm
View file

@ -275,8 +275,9 @@ sub checkView {
my $self = shift;
return $self->session->privilege->noAccess() unless $self->canView;
my ($conf, $env, $var, $http) = $self->session->quick(qw(config env var http));
if ($conf->get("sslEnabled") && $self->get("encryptPage") && $env->("HTTPS") ne "on" && !$env->get("SSLPROXY")) {
$http->setRedirect("https://".$conf->get("sitename")->[0].$self->getUrl);
if ($conf->get("sslEnabled") && $self->get("encryptPage") && $env->get("HTTPS") ne "on" && !$env->get("SSLPROXY")) {
# getUrl already changes url to https if 'encryptPage'
$http->setRedirect($self->getUrl);
return "redirect";
}
elsif ($var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash