[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /homework daxesave.pm

[damieng]

damieng		Fri Mar 18 18:21:09 2016 EDT

  Modified files:              
    /loncom/homework	daxesave.pm 
    /loncom	loncapa_apache.conf 
  Log:
  added support for editing course coordinator web pages with Daxe
  
Index: loncom/homework/daxesave.pm
diff -u loncom/homework/daxesave.pm:1.3 loncom/homework/daxesave.pm:1.4
--- loncom/homework/daxesave.pm:1.3	Wed Feb 17 00:05:14 2016
+++ loncom/homework/daxesave.pm	Fri Mar 18 18:21:01 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Convert and save a problem from Daxe.
 #
-# $Id: daxesave.pm,v 1.3 2016/02/17 00:05:14 damieng Exp $
+# $Id: daxesave.pm,v 1.4 2016/03/18 18:21:01 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,7 @@
     $request->content_type('text/plain');
     
     # path should be in the form "/daxeopen/priv/..."
-    # or ^/daxeopen/uploaded/[^/]+/[^/]+/supplemental/.*html?$
+    # or ^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$
     my $path = $env{'form.path'};
     $path =~ s/^\/daxeopen//;
     
@@ -60,11 +60,11 @@
                 }
             }
         }
-    } elsif ($path =~ m|^/uploaded/[^/]+/[^/]+/supplemental/|) {
+    } elsif ($path =~ m|^/uploaded/[^/]+/[^/]+/|) {
         if ($env{'user.name'} ne '' && $env{'user.domain'} ne '' && $env{'request.course.id'}) {
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
             $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            if ($path =~ m|^/uploaded/\Q$cdom\E/\Q$cnum\E/supplemental/| && $path !~ /\.\./) {
+            if ($path =~ m|^/uploaded/\Q$cdom\E/\Q$cnum\E/| && $path !~ /\.\./) {
                 if (&Apache::lonnet::allowed('mdc', $env{'request.course.id'})) {
                     $allowed = 1;
                 }
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.242 loncom/loncapa_apache.conf:1.243
--- loncom/loncapa_apache.conf:1.242	Mon Feb 22 12:44:20 2016
+++ loncom/loncapa_apache.conf	Fri Mar 18 18:21:08 2016
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.242 2016/02/22 12:44:20 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.243 2016/03/18 18:21:08 damieng Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -483,7 +483,7 @@
 PerlHandler Apache::daxepage
 </LocationMatch>
 
-<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/supplemental/.*html?$">
+<LocationMatch "^/daxepage/uploaded/[^/]+/[^/]+/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxepage
 </LocationMatch>
@@ -498,7 +498,7 @@
 PerlHandler Apache::daxeopen
 </LocationMatch>
 
-<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/supplemental/.*html?$">
+<LocationMatch "^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$">
 SetHandler perl-script
 PerlHandler Apache::daxeopen
 </LocationMatch>