--- loncom/auth/lonacc.pm 2017/04/04 02:59:40 1.166 +++ loncom/auth/lonacc.pm 2018/07/02 20:53:07 1.170 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.166 2017/04/04 02:59:40 raeburn Exp $ +# $Id: lonacc.pm,v 1.170 2018/07/02 20:53:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,7 +159,7 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } - } elsif ($fname =~ /\.(xls|doc|ppt)x$/i) { + } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { $value=~s/[\r\n]$//; } if (ref($fields) eq 'ARRAY') { @@ -289,7 +289,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 ''))) { @@ -526,7 +525,7 @@ sub handler { } elsif ($env{'request.course.id'} && (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || ($requrl eq "/public/$cdom/$cnum/syllabus") || - ($requrl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}))) { + ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) { my $query = $r->args; if ($query) { foreach my $pair (split(/&/,$query)) { @@ -584,7 +583,9 @@ sub handler { $env{'form.origurl'} = $r->uri; } } - + if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) { + return OK; + } # ---------------------------------------------------------------- Check access my $now = time; if ($requrl !~ m{^/(?:adm|public|prtspool)/} @@ -675,7 +676,7 @@ sub handler { ($requrl=~/^\/public\/.*\/syllabus$/) || ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || - ($requrl=~m{^/adm/$cdom/$cnum/\d+/exttools?$})) { + ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) { # ------------------------------------- This is serious stuff, get symb and log my $symb; if ($query) {