--- loncom/auth/lonlogout.pm 2017/08/18 18:13:33 1.51 +++ loncom/auth/lonlogout.pm 2018/05/01 13:47:53 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network # Logout Handler # -# $Id: lonlogout.pm,v 1.51 2017/08/18 18:13:33 raeburn Exp $ +# $Id: lonlogout.pm,v 1.53 2018/05/01 13:47:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,7 @@ use Apache::loncommon; use Apache::lonmenu; use CGI::Cookie(); use Apache::lonlocal; -use LONCAPA qw(:DEFAULT :match); +use LONCAPA qw(:DEFAULT :match); sub handler { my $r = shift; @@ -100,7 +100,7 @@ sub handler { -value => '', -expires => '-10y',); $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', -value => '', -expires => '-10y',); @@ -130,7 +130,7 @@ sub handler { $ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config("lonSSOUserLogoutHeadFile_$domain")); if ($ssofile eq $r->dir_config("lonSSOUserLogoutHeadFile_$domain")) { if ($ssofile =~ /^\Q$londocroot\E/) { - if (open(my $fh,"<$ssofile")) { + if (open(my $fh,'<',$ssofile)) { $headextra = join('',<$fh>); close($fh); } @@ -142,7 +142,7 @@ sub handler { $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")) { + if (open(my $fh,'<',$ssofile)) { $headextra.= join('',<$fh>); close($fh); } @@ -210,14 +210,14 @@ Due to security reasons in new web brows } if ($env{'request.sso.login'} && 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>); close($fh); } } if ($env{'request.sso.login'} && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) { - if (open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'))) { + if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutMessageFile'))) { $relogmessage.= join('',<$fh>); close($fh); }