--- loncom/homework/daxeopen.pm	2016/01/06 16:44:30	1.4
+++ loncom/homework/daxeopen.pm	2017/02/23 21:32:08	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Opening converted problems and directory listings for Daxe
 #
-# $Id: daxeopen.pm,v 1.4 2016/01/06 16:44:30 damieng Exp $
+# $Id: daxeopen.pm,v 1.5 2017/02/23 21:32:08 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Try::Tiny;
 use File::stat;
 use Fcntl ':mode';
 
+use LONCAPA qw(:match);
 use Apache::loncommon;
 use Apache::lonnet;
 use Apache::pre_xml;
@@ -91,39 +92,89 @@ sub convert_problem {
 
 sub directory_listing {
     my ($uri, $request) = @_;
-    my $dirpath = &Apache::lonnet::filelocation('', $uri);
-    if (! -e $dirpath) {
+    my $res = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+    if ($uri eq '/') {
+        # root: let users browse /res
+        $res .= "<directory name=\"/\">\n";
+        $res .= "<directory name=\"res\"/>\n";
+    } elsif ($uri !~ /^\/(priv|res)\//) {
         $request->status(404);
         return OK;
-    }
-    $dirpath =~ s/\/$//;
-    opendir my $dir, $dirpath or die "Cannot open directory: $dirpath";
-    my @files = readdir $dir;
-    closedir $dir;
-    my $res = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
-    my $dirname = $dirpath;
-    $dirname =~ s/^.*\/([^\/]*)$/$1/;
-    $res .= "<directory name=\"$dirname\">\n";
-    foreach my $name (@files) {
-        if ($name eq '.' || $name eq '..') {
-            next;
+    } elsif ($uri =~ /^\/res\//) {
+	(my $listref, $listerror) = &Apache::lonnet::dirlist($uri);
+	if ($listerror) {
+            $request->content_type('text/plain');
+            $request->print("listing error: $listerror");
+            $request->status(406);
+            return OK;
+	}
+        my $dirname = $uri;
+        $dirname =~ s/^.*\/([^\/]*)$/$1/;
+        $res .= "<directory name=\"$dirname/\">\n";
+        if (ref($listref) eq 'ARRAY') {
+            my @lines = @{$listref};
+            foreach my $line (@lines) {
+                my ($path, $dom, undef, $testdir, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $obs, undef) = split(/\&/, $line, 16);
+                my $isdir = ($testdir & 16384) || $dom =~ /^(user|domain)$/;
+                $path =~ s/^\/home\/httpd\/html\/res\///;
+                next if $path eq '.' || $path eq '..';
+                next if $path =~ /\.meta$/ || $obs || $path =~ /\.\d+\.[^.]+$/;
+                if ($dom ne 'domain') {
+                    my ($udom,$uname);
+                    if ($dom eq 'user') {
+                        ($udom) = ($uri =~ m{^/res/($match_domain)});
+                        $uname = $path;
+                    } else {
+                        ($udom, $uname) = ($uri =~ m{^/res/($match_domain)/($match_courseid)});
+                    }
+                    if ($udom ne '' && $uname ne '') {
+                        # remove courses from the list
+                        next if (&Apache::lonnet::is_course($udom, $uname));
+                    }
+                }
+                $path =~ s/\/$//;
+                my $name = $path;
+                if ($isdir) {
+                    $res .= "<directory name=\"$name\"/>\n";
+                } else {
+                    $res .= "<file name=\"$name\"/>\n";
+                }
+            }
         }
-        if ($name =~ /\.(bak|log|meta|save)$/) {
-            next;
+    } else {
+        my $dirpath = &Apache::lonnet::filelocation('', $uri);
+        if (! -e $dirpath) {
+            $request->status(404);
+            return OK;
         }
-        $sb = stat($dirpath.'/'.$name);
-        my $mode = $sb->mode;
-        if (S_ISDIR($mode)) {
-            $res .= "<directory name=\"$name\"/>\n";
-        } else {
-            $res .= "<file name=\"$name\"";
-            my $size = $sb->size; # total size of file, in bytes
-            $res .= " size=\"$size\"";
-            my $mtime = $sb->mtime; # last modify time in seconds since the epoch
-            my $dt = DateTime->from_epoch(epoch => $mtime);
-            my $modified = $dt->iso8601().'Z';
-            $res .= " modified=\"$modified\"";
-            $res .= "/>\n";
+        $dirpath =~ s/\/$//;
+        opendir my $dir, $dirpath or die "Cannot open directory: $dirpath";
+        my @files = readdir $dir;
+        closedir $dir;
+        my $dirname = $dirpath;
+        $dirname =~ s/^.*\/([^\/]*)$/$1/;
+        $res .= "<directory name=\"$dirname\">\n";
+        foreach my $name (@files) {
+            if ($name eq '.' || $name eq '..') {
+                next;
+            }
+            if ($name =~ /\.(bak|log|meta|save)$/) {
+                next;
+            }
+            $sb = stat($dirpath.'/'.$name);
+            my $mode = $sb->mode;
+            if (S_ISDIR($mode)) {
+                $res .= "<directory name=\"$name\"/>\n";
+            } else {
+                $res .= "<file name=\"$name\"";
+                my $size = $sb->size; # total size of file, in bytes
+                $res .= " size=\"$size\"";
+                my $mtime = $sb->mtime; # last modify time in seconds since the epoch
+                my $dt = DateTime->from_epoch(epoch => $mtime);
+                my $modified = $dt->iso8601().'Z';
+                $res .= " modified=\"$modified\"";
+                $res .= "/>\n";
+            }
         }
     }
     $res .= "</directory>\n";