--- loncom/homework/daxeopen.pm	2017/02/24 17:34:55	1.6
+++ loncom/homework/daxeopen.pm	2023/08/23 20:39:06	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Opening converted problems and directory listings for Daxe
 #
-# $Id: daxeopen.pm,v 1.6 2017/02/24 17:34:55 damieng Exp $
+# $Id: daxeopen.pm,v 1.8 2023/08/23 20:39:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,8 +28,9 @@
 ###
 
 package Apache::daxeopen;
+use strict;
 
-use Apache::Constants;
+use Apache::Constants qw(:common);
 use DateTime;
 use Try::Tiny;
 use File::stat;
@@ -46,11 +47,11 @@ use Apache::post_xml;
 sub handler {
     my $request = shift;
     my $uri = $request->uri;
-    $uri =~ s/^\/daxeopen//;
+    $uri =~ s{^/daxeopen}{};
     &Apache::loncommon::no_cache($request);
-    if ($uri =~ /\/$/) {
+    if ($uri =~ m{/$}) {
         return directory_listing($uri, $request);
-    } elsif ($uri =~ /^\/priv\/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$/) {
+    } elsif ($uri =~ m{^/priv/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$}) {
         return convert_problem($uri, $request);
     } else {
         # Apache should send other files directly
@@ -62,7 +63,7 @@ sub handler {
 sub convert_problem {
     my ($uri, $request) = @_;
     
-    if ($uri =~ /^\/priv\/([^\/]+)\/([^\/]+)\//) {
+    if ($uri =~ m{^/priv/([^/]+)/([^/]+)/}) {
         my ($domain, $user) = ($1, $2);
         my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'});
         if (!defined $uname || !defined $udom || $domain ne $udom || $user ne $uname) {
@@ -88,7 +89,7 @@ sub convert_problem {
           $case_sensitive = 0;
         }
         $textref = &Apache::html_to_xml::html_to_xml($textref, $warnings, $case_sensitive);
-        my $text = &Apache::post_xml::post_xml($textref, $file, $perlvar{'lonDocRoot'}, $warnings);
+        my $text = &Apache::post_xml::post_xml($textref, $file, $Apache::lonnet::perlvar{'lonDocRoot'}, $warnings);
         &Apache::loncommon::content_type($request, 'text/xml', 'utf-8');
         $request->print($text);
         return OK;
@@ -113,29 +114,29 @@ sub directory_listing {
         $request->print("Not found: $uri");
         $request->status(404);
         return OK;
-    } elsif ($uri =~ /^\/res\//) {
+    } elsif ($uri =~ m{^/res/}) {
         # NOTE: dirlist does not return an error for /res/idontexist/
-	(my $listref, $listerror) = &Apache::lonnet::dirlist($uri);
+	my ($listref, $listerror) = &Apache::lonnet::dirlist($uri);
 	if ($listerror) {
             $request->content_type('text/plain');
             $request->print("listing error: $listerror");
             $request->status(406);
             return OK;
-	} elsif ($uri =~ /^\/res\/[^\/]+\/$/ && scalar(@{$listref}) == 0) {
+	} elsif ($uri =~ m{^/res/[^/]+/$} && scalar(@{$listref}) == 0) {
             $request->content_type('text/plain');
             $request->print("Not found: $uri");
             $request->status(404);
             return OK;
 	}
         my $dirname = $uri;
-        $dirname =~ s/^.*\/([^\/]*)$/$1/;
+        $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, $size, undef, $mtime, undef, undef, undef, $obs, undef) = split(/\&/, $line, 16);
                 my $isdir = ($testdir & 16384) || $dom =~ /^(user|domain)$/;
-                $path =~ s/^\/home\/httpd\/html\/res\///;
+                $path =~ s{^/home/httpd/html/res/}{};
                 next if $path eq '.' || $path eq '..';
                 next if $path =~ /\.meta$/ || $obs || $path =~ /\.\d+\.[^.]+$/;
                 if ($dom ne 'domain') {
@@ -151,7 +152,7 @@ sub directory_listing {
                         next if (&Apache::lonnet::is_course($udom, $uname));
                     }
                 }
-                $path =~ s/\/$//;
+                $path =~ s{/$}{};
                 my $name = $path;
                 if ($isdir) {
                     $res .= "<directory name=\"$name\"/>\n";
@@ -172,7 +173,7 @@ sub directory_listing {
         }
         $res .= "<directory name=\"priv\">\n";
         $res .= "<directory name=\"$udom\"/>\n";
-    } elsif ($uri =~ /^\/priv\/([^\/]+)\/$/) {
+    } elsif ($uri =~ m{^/priv/([^/]+)/$}) {
         my $domain = $1;
         my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'});
         if (!defined $uname || !defined $udom || $domain ne $udom) {
@@ -183,7 +184,7 @@ sub directory_listing {
         }
         $res .= "<directory name=\"$domain\">\n";
         $res .= "<directory name=\"$uname\"/>\n";
-    } elsif ($uri =~ /^\/priv\/([^\/]+)\/([^\/]+)\//) {
+    } elsif ($uri =~ m{^/priv/([^/]+)/([^/]+)/}) {
         my ($domain, $user) = ($1, $2);
         my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'});
         if (!defined $uname || !defined $udom || $domain ne $udom || $user ne $uname) {
@@ -199,12 +200,12 @@ sub directory_listing {
             $request->status(404);
             return OK;
         }
-        $dirpath =~ s/\/$//;
+        $dirpath =~ s{/$}{};
         opendir my $dir, $dirpath or die "Cannot open directory: $dirpath";
         my @files = readdir $dir;
         closedir $dir;
         my $dirname = $dirpath;
-        $dirname =~ s/^.*\/([^\/]*)$/$1/;
+        $dirname =~ s{^.*/([^/]*)$}{$1};
         $res .= "<directory name=\"$dirname\">\n";
         foreach my $name (@files) {
             if ($name eq '.' || $name eq '..') {
@@ -213,7 +214,7 @@ sub directory_listing {
             if ($name =~ /\.(bak|log|meta|save)$/) {
                 next;
             }
-            $sb = stat($dirpath.'/'.$name);
+            my $sb = stat($dirpath.'/'.$name);
             my $mode = $sb->mode;
             if (S_ISDIR($mode)) {
                 $res .= "<directory name=\"$name\"/>\n";