version 1.50, 2017/02/25 20:00:36
|
version 1.54, 2018/05/08 15:37:41
|
Line 45 use strict;
|
Line 45 use strict;
|
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::File; |
use Apache::File; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::loncommon; |
use Apache::lonmenu; |
use Apache::lonmenu; |
use CGI::Cookie(); |
use CGI::Cookie(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use LONCAPA qw(:DEFAULT :match); |
|
|
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
Line 98 sub handler {
|
Line 100 sub handler {
|
-value => '', |
-value => '', |
-expires => '-10y',); |
-expires => '-10y',); |
$r->headers_out->add('Set-cookie' => $c); |
$r->headers_out->add('Set-cookie' => $c); |
if (($name eq 'lonID') && ($env{'user.linkeenv'})) { |
if (($name eq 'lonID') && ($env{'user.linkedenv'})) { |
my $other = new CGI::Cookie(-name => 'lonLinkID', |
my $other = new CGI::Cookie(-name => 'lonLinkID', |
-value => '', |
-value => '', |
-expires => '-10y',); |
-expires => '-10y',); |
Line 120 sub handler {
|
Line 122 sub handler {
|
$switch); |
$switch); |
} else { |
} else { |
my $domain = $env{'user.domain'}; |
my $domain = $env{'user.domain'}; |
my $headextra; |
my ($headextra,$ssofile); |
if ($env{'request.sso.login'} |
if ($env{'request.sso.login'}) { |
&& defined($r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) { |
my $londocroot = $r->dir_config('lonDocRoot'); |
if (open(my $fh,$r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) { |
if ($domain =~ /^$match_domain$/) { |
$headextra = join('',<$fh>); |
if (defined($r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) { |
close($fh); |
$ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config("lonSSOUserLogoutHeadFile_$domain")); |
} |
if ($ssofile eq $r->dir_config("lonSSOUserLogoutHeadFile_$domain")) { |
} |
if ($ssofile =~ /^\Q$londocroot\E/) { |
if ($env{'request.sso.login'} |
if (open(my $fh,'<',$ssofile)) { |
&& defined($r->dir_config('lonSSOUserLogoutHeadFile'))) { |
$headextra = join('',<$fh>); |
if (open(my $fh,$r->dir_config('lonSSOUserLogoutHeadFile'))) { |
close($fh); |
$headextra.= join('',<$fh>); |
} |
close($fh); |
} |
|
} |
|
} |
|
} |
|
if (defined($r->dir_config('lonSSOUserLogoutHeadFile'))) { |
|
$ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config('lonSSOUserLogoutHeadFile')); |
|
if ($ssofile eq $r->dir_config('lonSSOUserLogoutHeadFile')) { |
|
if ($ssofile =~ /^\Q$londocroot\E/) { |
|
if (open(my $fh,'<',$ssofile)) { |
|
$headextra.= join('',<$fh>); |
|
close($fh); |
|
} |
|
} |
|
} |
} |
} |
} |
} |
$start_page=&Apache::loncommon::start_page('Logged Out',$headextra, |
$start_page=&Apache::loncommon::start_page('Logged Out',$headextra, |
Line 176 sub handler {
|
Line 191 sub handler {
|
$login_url = $relogin_server.'/adm/'. |
$login_url = $relogin_server.'/adm/'. |
($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain); |
($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain); |
} |
} |
$relogmessage.='<p>'.&mt('You have been successfully logged out.').' ' |
$relogmessage.='<p>'.&mt('You have been successfully logged out.'); |
.&mt('You can [_1]close this window[_2] now.' |
unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) { |
,'','') # ,'<a href="javascript:self.close();">','</a>') |
$relogmessage.=' '.&mt('You can [_1]close this window[_2] now.', |
.'</p>'; |
'',''); # ,'<a href="javascript:self.close();">','</a>'); |
|
} |
|
$relogmessage.='</p>'; |
=pod |
=pod |
|
|
=head1 NOTES: |
=head1 NOTES: |
Line 189 sub handler {
|
Line 206 sub handler {
|
Due to security reasons in new web browsers a window could only be closed with javascript, if this window has also been opened with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01) |
Due to security reasons in new web browsers a window could only be closed with javascript, if this window has also been opened with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01) |
|
|
=cut |
=cut |
$relogmessage.='<p>'.&mt('[_1]Log in again[_2]' |
unless ($env{'request.lti.login'}) { |
,'<a href="'.$login_url.'">','</a>') |
$relogmessage.='<p>'.&mt('[_1]Log in again[_2]' |
.'</p>'; |
,'<a href="'.$login_url.'">','</a>') |
|
.'</p>'; |
|
} |
} |
} |
if ($env{'request.sso.login'} |
if ($env{'request.sso.login'} |
&& defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { |
&& defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { |
if (open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { |
if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { |
$relogmessage.= join('',<$fh>); |
$relogmessage.= join('',<$fh>); |
close($fh); |
close($fh); |
} |
} |
} |
} |
if ($env{'request.sso.login'} |
if ($env{'request.sso.login'} |
&& defined($r->dir_config('lonSSOUserLogoutMessageFile'))) { |
&& defined($r->dir_config('lonSSOUserLogoutMessageFile'))) { |
if (open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'))) { |
if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutMessageFile'))) { |
$relogmessage.= join('',<$fh>); |
$relogmessage.= join('',<$fh>); |
close($fh); |
close($fh); |
} |
} |