--- loncom/homework/daxesave.pm	2015/12/10 16:26:43	1.2
+++ loncom/homework/daxesave.pm	2016/12/13 21:37:35	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Convert and save a problem from Daxe.
 #
-# $Id: daxesave.pm,v 1.2 2015/12/10 16:26:43 damieng Exp $
+# $Id: daxesave.pm,v 1.5 2016/12/13 21:37:35 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,17 +43,31 @@ sub handler {
     
     $request->content_type('text/plain');
     
-    my $path = $env{'form.path'}; # should be in the form "/daxeopen/priv/..."
+    # path should be in the form "/daxeopen/priv/..."
+    # or ^/daxeopen/uploaded/[^/]+/[^/]+/.*html?$
+    my $path = $env{'form.path'};
     $path =~ s/^\/daxeopen//;
     
-    my $allowed;
-    my ($ownername,$ownerdom,$ownerhome) = 
-        &Apache::lonnet::constructaccess($path, 'setpriv');
-    if (($ownername ne '') && ($ownerdom ne '') && ($ownerhome ne '')) {
-        unless ($ownerhome eq 'no_host') {
-            my @hosts = &Apache::lonnet::current_machine_ids();
-            if (grep(/^\Q$ownerhome\E$/,@hosts)) {
-                $allowed = 1;
+    my $allowed = 0;
+    if ($path =~ /^\/priv/) {
+        my ($ownername,$ownerdom,$ownerhome) = 
+            &Apache::lonnet::constructaccess($path, 'setpriv');
+        if (($ownername ne '') && ($ownerdom ne '') && ($ownerhome ne '')) {
+            unless ($ownerhome eq 'no_host') {
+                my @hosts = &Apache::lonnet::current_machine_ids();
+                if (grep(/^\Q$ownerhome\E$/,@hosts)) {
+                    $allowed = 1;
+                }
+            }
+        }
+    } 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/| && $path !~ /\.\./) {
+                if (&Apache::lonnet::allowed('mdc', $env{'request.course.id'})) {
+                    $allowed = 1;
+                }
             }
         }
     }
@@ -68,18 +82,24 @@ sub handler {
 
     my $contents = $env{'form.file'};
     
-    try {
-        $contents = &Apache::xml_to_loncapa::convert_file($contents);
-    } catch {
-        $request->print("error\nconvert failed for $path: $_");
-        return OK;
-    };
+    my $mode;
+    if ($path =~ /\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$/) {
+        try {
+            $contents = &Apache::xml_to_loncapa::convert_file($contents);
+        } catch {
+            $request->print("error\nconvert failed for $path: $_");
+            return OK;
+        };
+        $mode = '>:encoding(UTF-8)';
+    } else {
+        $mode = '>';
+    }
     
     my $filebak = $newpath.".bak";
     if (-e $newpath) {
         copy($newpath, $filebak); # errors ignored
     }
-    open my $out, '>:encoding(UTF-8)', $newpath;
+    open my $out, $mode, $newpath;
     print $out $contents;
     close $out;