--- loncom/auth/lonacc.pm 2018/04/29 00:15:56 1.159.2.5.2.2 +++ loncom/auth/lonacc.pm 2019/07/31 17:42:29 1.159.2.7 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.5.2.2 2018/04/29 00:15:56 raeburn Exp $ +# $Id: lonacc.pm,v 1.159.2.7 2019/07/31 17:42:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -281,7 +281,6 @@ sub upload_size_allowed { sub sso_login { my ($r,$handle,$username) = @_; - my $lonidsdir=$r->dir_config('lonIDsDir'); if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') || (defined($env{'user.name'}) && (defined($env{'user.domain'})) && ($handle ne ''))) { @@ -498,7 +497,7 @@ sub handler { my $preserved; foreach my $pair (split(/&/,$query)) { my ($name, $value) = split(/=/,$pair); - unless ($name eq 'symb') { + unless (($name eq 'symb') || ($name eq 'usehttp')) { $preserved .= $pair.'&'; } if (($env{'request.course.id'}) && ($name eq 'folderpath')) { @@ -517,8 +516,7 @@ sub handler { } } elsif ($env{'request.course.id'} && (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || - ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}) || - ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) { + ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { my $query = $r->args; if ($query) { foreach my $pair (split(/&/,$query)) { @@ -666,8 +664,7 @@ sub handler { ($requrl=~m|\.problem/smpedit$|) || ($requrl=~/^\/public\/.*\/syllabus$/) || ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || - ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || - ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) { + ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { # ------------------------------------- This is serious stuff, get symb and log my $symb; if ($query) {