[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonsource.pm

[raeburn]

raeburn		Sat Oct  7 21:07:18 2017 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonsource.pm 
  Log:
  - "View source" link in Functions bar for published assessment items in a 
    course, where user does not have editing privileges, but does have vxc 
    priv in course, and system-level bre priv, and item publised source open. 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.480 loncom/interface/lonmenu.pm:1.481
--- loncom/interface/lonmenu.pm:1.480	Fri Sep 29 19:18:10 2017
+++ loncom/interface/lonmenu.pm	Sat Oct  7 21:07:17 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.480 2017/09/29 19:18:10 raeburn Exp $
+# $Id: lonmenu.pm,v 1.481 2017/10/07 21:07:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1212,6 +1212,9 @@
                             if (($env{'request.course.adhocsrcaccess'} ne '') &&
                                 (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
                                 $viewsrcbutton = 1;
+                            } elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
+                                     (&Apache::lonnet::allowed('bre','/'))) {
+                                $viewsrcbutton = 1;
                             }
                         }
                     }
Index: loncom/interface/lonsource.pm
diff -u loncom/interface/lonsource.pm:1.37 loncom/interface/lonsource.pm:1.38
--- loncom/interface/lonsource.pm:1.37	Fri Sep 29 19:18:10 2017
+++ loncom/interface/lonsource.pm	Sat Oct  7 21:07:17 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Source Code handler
 #
-# $Id: lonsource.pm,v 1.37 2017/09/29 19:18:10 raeburn Exp $
+# $Id: lonsource.pm,v 1.38 2017/10/07 21:07:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -366,9 +366,13 @@
                 &Apache::lonenc::check_decrypt(\$filename);
                 if (($env{'request.role.domain'} eq $cdom) && ($filename =~ /$LONCAPA::assess_re/)) {
                     my ($auname) = ($filename =~ m{^\Q/res/$cdom/\E($match_username)/});
-                    if (($env{'request.course.adhocsrcaccess'} ne '') &&
+                    if (($auname ne '') && ($env{'request.course.adhocsrcaccess'} ne '') &&
                         (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
                         $canview = 1;
+                    } elsif ((&Apache::lonnet::metadata($filename) eq 'open') &&
+                             ($filename =~ m{^\Q/res/$cdom/}) &&
+                             (&Apache::lonnet::allowed('bre','/'))) {
+                        $canview = 1;
                     }
                 }
             }