[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonacc.pm

[raeburn]

raeburn		Tue Dec 22 23:53:36 2020 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonacc.pm 
  Log:
  - For 2.11
    Backport 1.185
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.159.2.15 loncom/auth/lonacc.pm:1.159.2.16
--- loncom/auth/lonacc.pm:1.159.2.15	Fri Oct 23 21:33:46 2020
+++ loncom/auth/lonacc.pm	Tue Dec 22 23:53:36 2020
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.15 2020/10/23 21:33:46 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.16 2020/12/22 23:53:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -589,23 +589,26 @@
 
 # ---------------------------------------------------------------- Check access
 	my $now = time;
-        my $check_symb;
+        my ($check_symb,$check_access);
 	if ($requrl !~ m{^/(?:adm|public|(?:prt|zip)spool)/}
 	    || $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
-            my ($access,$poss_symb);
-            if (($env{'request.course.id'}) && (!$suppext)) {
-                $requrl=~/\.(\w+)$/;
-                if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-                    ($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) ||
-                    ($requrl=~/^\/adm\/wrapper\//) ||
-                    ($requrl=~m|^/adm/coursedocs/showdoc/|) ||
-                    ($requrl=~m|\.problem/smpedit$|) ||
-                    ($requrl=~/^\/public\/.*\/syllabus$/) ||
-                    ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
-                    ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
-                    $check_symb = 1;
-                }
+            $check_access = 1;
+        }
+        if (($env{'request.course.id'}) && (!$suppext)) {
+            $requrl=~/\.(\w+)$/;
+            if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+                ($requrl=~/^\/adm\/.*\/(aboutme|smppg|bulletinboard)(\?|$ )/x) ||
+                ($requrl=~/^\/adm\/wrapper\//) ||
+                ($requrl=~m|^/adm/coursedocs/showdoc/|) ||
+                ($requrl=~m|\.problem/smpedit$|) ||
+                ($requrl=~/^\/public\/.*\/syllabus$/) ||
+                ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) ||
+                ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) {
+                $check_symb = 1;
             }
+        }
+        if ($check_access) {
+            my ($access,$poss_symb);
             if ($check_symb) {
                 if ($env{'form.symb'}) {
                     $poss_symb=&Apache::lonnet::symbclean($env{'form.symb'});