--- loncom/auth/lonacc.pm 2017/01/21 20:40:46 1.159.2.5 +++ loncom/auth/lonacc.pm 2018/09/05 23:06:53 1.159.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.5 2017/01/21 20:40:46 raeburn Exp $ +# $Id: lonacc.pm,v 1.159.2.6 2018/09/05 23:06:53 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') { @@ -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 ''))) {