--- loncom/interface/londocs.pm	2024/12/28 12:19:21	1.715
+++ loncom/interface/londocs.pm	2025/02/03 22:52:36	1.723
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.715 2024/12/28 12:19:21 raeburn Exp $
+# $Id: londocs.pm,v 1.723 2025/02/03 22:52:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -729,7 +729,7 @@ function validCrsCopy() {
             alert("$js_lt{'whco'}");
             return false;
         }
-    }   
+    }
     return true;
 }
 
@@ -884,7 +884,7 @@ ENDJS
         if (keys(%tocopy)) {
             my (%resdirs,%resfiles);
             &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles);
-            my ($notopdir,%newdir,%newfile,%checkdeps);
+            my ($notopdir,%newdir,%newfile,%checkdeps,%newresfile);
             $r->print('<p>'.&mt('Copy to: [_1]',
                                 '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
                       '</p>'."\n");
@@ -995,231 +995,164 @@ ENDJS
                                                                    '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>').
                                       '</p>'."\n");
                         } elsif (($src ne '') && ($dest ne '')) {
-                            if ($is_course_home) {
-                                if (&File::Copy::copy($src,$dest)) {
-                                    $newfile{$file} = 1;
-                                }
-                            } else {
-                                if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
-                                    $newfile{$file} = 1;
-                                }
-                            }
-                            if ($newfile{$file}) {
-                                my $gotmeta;
-                                if ($is_course_home) {
-                                    if ((-e $src.'.meta') && (!-e $dest.'.meta')) {
-                                        if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
-                                            $gotmeta = 1;
-                                        }
-                                    }
-                                } else {
-                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') {
-                                        $gotmeta = 1;
+                            my $ressrc = $docroot.$resurl.'/'.$file;
+                            my $ressrcmeta = $ressrc.'.meta';
+                            my ($ext) = ($file =~ /\.(\w+)$/);
+                            my $embstyle=&Apache::loncommon::fileembstyle($ext);
+                            my ($getres,$getresmeta);
+                            if ($respublish) {
+                                if ($path eq '') {
+                                    if ((ref($resfiles{'/'}) eq 'HASH') &&
+                                        (exists($resfiles{'/'}{$fname}))) {
+                                        $getres = 1;
+                                        $getresmeta = 1;
                                     }
+                                } elsif ((ref($resfiles{$path}) eq 'HASH') &&
+                                         (exists($resfiles{$path}{$fname}))) {
+                                    $getres = 1;
+                                    $getresmeta = 1;
                                 }
-                                if ($gotmeta) {
-                                    if (open(my $fh,'<',$dest.'.meta')) {
-                                        my ($output,$now,setsourceavail);
-                                        $now = time;
-                                        if (($file =~ /\.(xml|html|htm|xhtml|xhtm)$/i) || ($file =~ /$LONCAPA::assess_re/)) {
-                                            $setsourceavail = 1;
-                                        }
-                                        while (my $line=<$fh>) {
-                                            chomp($line);
-                                            if ($line eq "<authorspace>$coursenum:$coursedom</authorspace>") {
-                                                $output .= "<authorspace>$ca:$cd</authorspace>\n";
-                                            } elsif ($line eq '<copyright>custom</copyright>') {
-                                                $output .= "<copyright>$copyright</copyright>\n";
-                                            } elsif ($line =~ m{^<creationdate>\d+</creationdate>$}) {
-                                                $output .= "<creationdate>$now</creationdate>\n";
-                                            } elsif ($line eq "<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>") {
-                                                $output .= "<customdistributionfile>$customdistfile</customdistributionfile>\n";
-                                            } elsif ($line =~ m{^<sourceavail>(open|closed)</sourceavail>$}) {
-                                                if ($setsourceavail) {
-                                                    $output .= "<sourceavail>$sourceavail</sourceavail>\n";
+                            }
+                            if ($is_course_home) {
+                                my ($needpriv,$needprivmeta);
+                                if ($respublish) {
+                                    if ($getres) {
+                                        if (&Apache::londiff::are_different_files($src,$ressrc)) {
+                                            $needpriv = 1;
+                                            if (&File::Copy::copy($ressrc,$dest)) {
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd);
                                                 }
-                                            } elsif ($line eq "<domain>$coursedom</domain>") {
-                                                $output .= "<domain>$cd</domain>\n";
-                                            } elsif ($line =~ m{^<lastrevisiondate>\d+</lastrevisiondate>$}) {
-                                                $output .= "<lastrevisiondate>$now</lastrevisiondate>\n";
-                                            } elsif ($line =~ m{^<modifyinguser>$match_username:$match_domain</modifyinguser>$}) {
-                                                $output .= "<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>\n";
-                                            } elsif ($line eq "<owner>$coursenum:$coursedom</owner>") {
-                                                $output .= "<owner>$ca:$cd</owner>\n";
-                                            } elsif ($line =~ m{^<dependencies>(.+)</dependencies>$}) {
-                                                my @deps = split(/\s*,\s*/,$1);
-                                                my @newdeps;
-                                                my $changed = 0;
-                                                foreach my $dep (@deps) {
-                                                    if ($dep =~ m{^/res/$coursedom/$coursenum/(.+)$}) {
-                                                        my $rest = $1;
-                                                        push(@newdeps,"/res/$cd/$ca/$rest");
-                                                        $checkdeps{$rest} = 1;
-                                                        $changed ++;
-                                                    } else {
-                                                        push(@newdeps,$dep);
-                                                    }
+                                            }
+                                        } else {
+                                            if (&File::Copy::copy($src,$dest)) {
+                                                $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
                                                 }
-                                                if ($changed) {
-                                                    $output .= '<dependencies>'.join(',',@newdeps).'</dependencies>'."\n";
+                                            }
+                                        }
+                                    } else {
+                                        $needpriv = 1;
+                                    }
+                                    if ($getresmeta) {
+                                        if ((-e $src.'.meta') && (!-e $dest.'.meta')) {
+                                            if (&Apache::londiff::are_different_files($src.'.meta',$ressrc.'.meta')) {
+                                                if (&File::Copy::copy($ressrc.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
                                                 }
+                                                $needprivmeta = 1;
                                             } else {
-                                                $output .= "$line\n";
+                                                if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
+                                                }
                                             }
                                         }
-                                        close($fh);
-                                        if (open(my $fh,'>',$dest.'.meta')) {
-                                            print $fh $output;
-                                            close($fh);
+                                    }
+                                    if ($getres) {
+                                        my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file;
+                                        if (-e $dest) {
+                                            my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                            if (-e $destresfile) {
+                                                $newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file;
+                                            }
                                         }
                                     }
+                                } else {
+                                    $needpriv = 1;
+                                    if ((-e $src.'.meta') && (!-e $dest.'.meta')) {
+                                        $needprivmeta = 1;
+                                    }  
                                 }
-                                my ($ext) = ($file =~ /\.(\w+)$/);
-                                my $embstyle=&Apache::loncommon::fileembstyle($ext);
-                                if ($embstyle eq 'ssi') {
-                                    my $outstring='';
-                                    my $changes = 0;
-                                    my @parser;
-                                    $parser[0]=HTML::LCParser->new($dest);
-                                    $parser[-1]->xml_mode(1);
-                                    my $token;
-                                    while (@parser) {
-                                        while ($token=$parser[-1]->get_token) {
-                                            if ($token->[0] eq 'S') {
-                                                my $tag=$token->[1];
-                                                my $lctag=lc($tag);
-                                                my %parms=%{$token->[2]};
-                                                foreach my $type ('src','href','background','bgimg') {
-                                                    foreach my $key (keys(%parms)) {
-                                                        if ($key =~ /^$type$/i) {
-                                                            next if (($lctag eq 'img') && ($type eq 'src') &&
-                                                                     ($parms{$key} =~ m{^data\:image/gif;base64,}));
-                                                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
-                                                                $changes ++;
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                # probably a <randomlabel> image type <label>
-                                                # or a <image> tag inside <imageresponse> or <drawimage>
-                                                if (($lctag eq 'label' && defined($parms{'description'}))
-                                                     || ($lctag eq 'image') || ($lctag eq 'import')) {
-                                                    my $next_token=$parser[-1]->get_token();
-                                                    if ($next_token->[0] eq 'T') {
-                                                        $next_token->[1] =~ s/[\n\r\f]+//g;
-                                                        if ($next_token->[1] =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                            $next_token->[1] =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
-                                                            $changes ++;
-                                                        }
-                                                    }
-                                                    $parser[-1]->unget_token($next_token);
-                                                }
-                                                if ($lctag eq 'applet') {
-                                                    my $havecodebase=0;
-                                                    foreach my $key (keys(%parms)) {
-                                                        if (lc($key) eq 'codebase') {
-                                                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
-                                                                $changes ++;
-                                                            }
-                                                            $havecodebase = 1;
-                                                        }
-                                                    }
-                                                    unless ($havecodebase) {
-                                                        foreach my $key (keys(%parms)) {
-                                                            if ($key =~ /(archive|code|object)/i) {
-                                                                if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                    $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/si};
-                                                                    $changes ++;
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                my $newparmstring='';
-                                                my $endtag='';
-                                                foreach my $parkey (keys(%parms)) {
-                                                    if ($parkey eq '/') {
-                                                        $endtag=' /';
-                                                    } else {
-                                                        my $quote=($parms{$parkey}=~/\"/?"'":'"');
-                                                        $newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote;
+                                if ($needpriv) {
+                                    if (&File::Copy::copy($src,$dest)) {
+                                        $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                        if ($embstyle eq 'ssi') {
+                                            &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                        }
+                                    }
+                                }
+                                if ($needprivmeta) {
+                                    if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
+                                         &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                            $customdistfile,$sourceavail,\%checkdeps);
+                                    }
+                                }
+                            } else {
+                                my ($needpriv,$needprivmeta);
+                                if ($respublish) {
+                                    if ($getres) {
+                                        &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file);
+                                    }
+                                    if ($getresmeta) {
+                                        &Apache::lonnet::repcopy($docroot.$resurl.'/'.$file.'.meta');
+                                    }
+                                    if (-e $docroot.$resurl.'/'.$file) {
+                                        if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
+                                            if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file,$dest)) {
+                                                $needpriv = 1;
+                                                if (&File::Copy::copy($docroot.$resurl.'/'.$file,$dest)) {
+                                                    if ($embstyle eq 'ssi') {
+                                                        &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd);
                                                     }
                                                 }
-                                                if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
-                                                $outstring.='<'.$tag.$newparmstring.$endtag.'>';
-                                                if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
-                                                    $lctag eq 'tex') {
-                                                    $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
-                                                } elsif ($lctag eq 'script') {
-                                                    if ($parms{'type'} eq 'loncapa/perl') {
-                                                        $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
-                                                    } else {
-                                                        my $needsupdate;
-                                                        my $script = &Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
-                                                        if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) {
-                                                            my $src = $2;
-                                                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                $needsupdate = 1;
-                                                            }
-                                                        }
-                                                        if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) {
-                                                            my $scriptslist = $2;
-                                                            my $needsupdate = 1;
-                                                            my @srcs = split(/\s*,\s*/,$scriptslist);
-                                                            foreach my $src (@srcs) {
-                                                                if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) {
-                                                                    my $quote = $1;
-                                                                    my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/);
-                                                                    if ($url =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                        $needsupdate = 1;
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                        if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) {
-                                                            my $src = $2;
-                                                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
-                                                                $needsupdate = 1;
-                                                            }
-                                                        }
-                                                        if ($needsupdate) {
-                                                            $script =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/gsi};
-                                                            $changes ++;
-                                                        }
-                                                        $outstring .= $script;
-                                                    }
+                                            } else {
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
                                                 }
-                                            } elsif ($token->[0] eq 'E') {
-                                                if ($token->[2]) {
-                                                    unless ($token->[1] eq 'allow') {
-                                                        $outstring.='</'.$token->[1].'>';
-                                                    }
+                                                $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                            }
+                                        }
+                                    } else {
+                                        $needpriv = 1;
+                                    }
+                                    if (-e $docroot.$resurl.'/'.$file.'.meta') {
+                                        if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') {
+                                            if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) {
+                                                $needprivmeta = 1;
+                                                if (&File::Copy::copy($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
                                                 }
                                             } else {
-                                                $outstring.=$token->[1];
+                                                &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                   $customdistfile,$sourceavail,\%checkdeps);
                                             }
                                         }
-                                        pop(@parser);
+                                    } else {
+                                        if (!-e $dest.'.meta') {
+                                            $needprivmeta = 1;
+                                        }
                                     }
-                                    if ($changes) {
-                                        if (open(my $fh,'>',$dest)) {
-                                            print $fh $outstring;
-                                            close($fh);
+                                    if ($getres) {
+                                        my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file;
+                                        if (-e $dest) {
+                                            my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                            if (-e $destresfile) {
+                                                $newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file;
+                                            }
                                         }
                                     }
+                                } else {
+                                    $needpriv = 1;
+                                    if (!-e $dest.'.meta') {
+                                        $needprivmeta = 1;
+                                    }
                                 }
-                                if ($respublish) {
-                                    my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file;
-                                    if ($path eq '') {
-                                        if ((ref($resfiles{'/'}) eq 'HASH') &&
-                                            (exists($resfiles{'/'}{$fname}))) {
-                                            my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                if ($needpriv) {
+                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
+                                        if ($embstyle eq 'ssi') {
+                                            &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
                                         }
-                                    } elsif ((ref($resfiles{$path}) eq 'HASH') &&
-                                             (exists($resfiles{$path}{$fname}))) {
-                                        my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1);
+                                        $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                    }
+                                }
+                                if ($needprivmeta) {
+                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') {
+                                        &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                           $customdistfile,$sourceavail,\%checkdeps);
                                     }
                                 }
                             }
@@ -1244,6 +1177,16 @@ ENDJS
                 $r->print('<p>'.&mt('Copied the following files to [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
                           '</p>'."\n".
                           '<ul><li>'.join('</li><li>',sort(keys(%newfile))).'</li></ul></p>'."\n");
+                foreach my $file (keys(%newfile)) {
+                    my %storehash = (
+                                      'priv' => $newfile{$file},
+                                      'who'  => $env{'user.name'}.':'.$env{'user.domain'},
+                                    );
+                    if (exists($newresfile{$file})) {
+                        $storehash{'res'} = 1;
+                    }
+                    &Apache::lonnet::store_userdata(\%storehash,$file,'copycourseauthor',$coursedom,$coursenum);
+                }
             }
             if (keys(%checkdeps)) {
                 my %missingdep;
@@ -1334,7 +1277,32 @@ ENDJS
                       &mt('Choose the files and/or folders to copy from Course Authoring to User Authoring').
                       '</span><br /><br />'."\n";
         my $count = 0;
-        my $startcount = 4 + $home;
+#
+# Warning to developers:
+#
+# If you add or remove form elements which precede the table of items to copy
+# you will need to modify the value for startcount. Form elements include both:
+# <input> and <fieldset> tags.
+# $startcount (set to 9) contains the following:
+# fieldsets with following legends: (a) Folder in Authoring Space, (b) Distribution to set in metadata
+# (c) Content to copy
+# inputs: textbox for destination folder; dropdown lists: (a) Copyright, (b) Source
+# hidden: customrights file;  buttons: (a) check all, (b) uncheck all.
+# authorspace: if more than 1: a fieldset with legend: Select the Authoring Space,
+# or if 1: an input (hidden) with available author/coauthor role.
+# if there are multiple possible author/coauthor roles (i.e., $home > 1),
+# incerement startcount by 1 for the dropdown list uses to select the target.
+#
+# If there are published files, increment startcount by 3:
+# fieldset (legend: Published Resources), and two radio buttons (Yes/No).
+#
+        my $startcount = 9;
+        if ($home > 1) {
+            $startcount ++;
+        }
+        if ($numpub) {
+            $startcount += 3;
+        }
         my $lastcontainer = $startcount;
         $display .= &Apache::loncommon::start_data_table()."\n".
                     &Apache::loncommon::start_data_table_header_row().
@@ -1506,6 +1474,201 @@ sub courseresource_options {
     return $output;
 }
 
+sub crsres_fixup_meta {
+    my ($dest,$coursenum,$coursedom,$ca,$cd,$copyright,$customdistfile,$sourceavail,$checkdeps) = @_;
+    return unless (ref($checkdeps) eq 'HASH');
+    if (open(my $fh,'<',$dest.'.meta')) {
+        my ($output,$now,$setsourceavail);
+        $now = time;
+        if (($dest =~ /\.(xml|html|htm|xhtml|xhtm)$/i) || ($dest =~ /$LONCAPA::assess_re/)) {
+            $setsourceavail = 1;
+        }
+        while (my $line=<$fh>) {
+            chomp($line);
+            if ($line eq "<authorspace>$coursenum:$coursedom</authorspace>") {
+                $output .= "<authorspace>$ca:$cd</authorspace>\n";
+            } elsif ($line eq '<copyright>custom</copyright>') {
+                $output .= "<copyright>$copyright</copyright>\n";
+            } elsif ($line =~ m{^<creationdate>\d+</creationdate>$}) {
+                $output .= "<creationdate>$now</creationdate>\n";
+            } elsif ($line eq "<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>") {
+                $output .= "<customdistributionfile>$customdistfile</customdistributionfile>\n";
+            } elsif ($line =~ m{^<sourceavail>(open|closed)</sourceavail>$}) {
+                if ($setsourceavail) {
+                    $output .= "<sourceavail>$sourceavail</sourceavail>\n";
+                }
+            } elsif ($line eq "<domain>$coursedom</domain>") {
+                $output .= "<domain>$cd</domain>\n";
+            } elsif ($line =~ m{^<lastrevisiondate>\d+</lastrevisiondate>$}) {
+                $output .= "<lastrevisiondate>$now</lastrevisiondate>\n";
+            } elsif ($line =~ m{^<modifyinguser>$match_username:$match_domain</modifyinguser>$}) {
+                $output .= "<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>\n";
+            } elsif ($line eq "<owner>$coursenum:$coursedom</owner>") {
+                $output .= "<owner>$ca:$cd</owner>\n";
+            } elsif ($line =~ m{^<dependencies>(.+)</dependencies>$}) {
+                my @deps = split(/\s*,\s*/,$1);
+                my @newdeps;
+                my $changed = 0;
+                foreach my $dep (@deps) {
+                    if ($dep =~ m{^/res/$coursedom/$coursenum/(.+)$}) {
+                        my $rest = $1;
+                        push(@newdeps,"/res/$cd/$ca/$rest");
+                        $checkdeps->{$rest} = 1;
+                        $changed ++;
+                    } else {
+                        push(@newdeps,$dep);
+                    }
+                }
+                if ($changed) {
+                    $output .= '<dependencies>'.join(',',@newdeps).'</dependencies>'."\n";
+                }
+            } else {
+                $output .= "$line\n";
+            }
+        }
+        close($fh);
+        if (open(my $fh,'>',$dest.'.meta')) {
+            print $fh $output;
+            close($fh);
+        }
+    }
+}
+
+sub crsres_fixup {
+    my ($dest,$coursenum,$coursedom,$ca,$cd,$subdir) = @_;
+    my $outstring='';
+    my $changes = 0;
+    my @parser;
+    $parser[0]=HTML::LCParser->new($dest);
+    $parser[-1]->xml_mode(1);
+    my $token;
+    while (@parser) {
+        while ($token=$parser[-1]->get_token) {
+            if ($token->[0] eq 'S') {
+                my $tag=$token->[1];
+                my $lctag=lc($tag);
+                my %parms=%{$token->[2]};
+                foreach my $type ('src','href','background','bgimg') {
+                    foreach my $key (keys(%parms)) {
+                        if ($key =~ /^$type$/i) {
+                            next if (($lctag eq 'img') && ($type eq 'src') &&
+                                     ($parms{$key} =~ m{^data\:image/gif;base64,}));
+                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                                $changes ++;
+                            }
+                        }
+                    }
+                }
+                # probably a <randomlabel> image type <label>
+                # or a <image> tag inside <imageresponse> or <drawimage>
+                if (($lctag eq 'label' && defined($parms{'description'}))
+                    || ($lctag eq 'image') || ($lctag eq 'import')) {
+                    my $next_token=$parser[-1]->get_token();
+                    if ($next_token->[0] eq 'T') {
+                        $next_token->[1] =~ s/[\n\r\f]+//g;
+                        if ($next_token->[1] =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                            $next_token->[1] =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                            $changes ++;
+                        }
+                    }
+                    $parser[-1]->unget_token($next_token);
+                }
+                if ($lctag eq 'applet') {
+                    my $havecodebase=0;
+                    foreach my $key (keys(%parms)) {
+                        if (lc($key) eq 'codebase') {
+                            if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si;
+                                $changes ++;
+                            }
+                            $havecodebase = 1;
+                        }
+                    }
+                    unless ($havecodebase) {
+                        foreach my $key (keys(%parms)) {
+                            if ($key =~ /(archive|code|object)/i) {
+                                if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                    $parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/si};
+                                    $changes ++;
+                                }
+                            }
+                        }
+                    }
+                }
+                my $newparmstring='';
+                my $endtag='';
+                foreach my $parkey (keys(%parms)) {
+                    if ($parkey eq '/') {
+                        $endtag=' /';
+                    } else {
+                        my $quote=($parms{$parkey}=~/\"/?"'":'"');
+                        $newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote;
+                    }
+                }
+                if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
+                $outstring.='<'.$tag.$newparmstring.$endtag.'>';
+                if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
+                    $lctag eq 'tex') {
+                    $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                } elsif ($lctag eq 'script') {
+                    if ($parms{'type'} eq 'loncapa/perl') {
+                        $outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                    } else {
+                        my $needsupdate;
+                        my $script = &Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser);
+                        if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) {
+                            my $src = $2;
+                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $needsupdate = 1;
+                            }
+                        }
+                        if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) {
+                            my $scriptslist = $2;
+                            my @srcs = split(/\s*,\s*/,$scriptslist);
+                            foreach my $src (@srcs) {
+                                if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) {
+                                    my $quote = $1;
+                                    my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/);
+                                    if ($url =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                        $needsupdate = 1;
+                                    }
+                                }
+                            }
+                        }
+                        if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) {
+                            my $src = $2;
+                            if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) {
+                                $needsupdate = 1;
+                            }
+                        }
+                        if ($needsupdate) {
+                            $script =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/gsi};
+                            $changes ++;
+                        }
+                        $outstring .= $script;
+                    }
+                }
+            } elsif ($token->[0] eq 'E') {
+                if ($token->[2]) {
+                    unless ($token->[1] eq 'allow') {
+                        $outstring.='</'.$token->[1].'>';
+                    }
+                }
+            } else {
+                $outstring.=$token->[1];
+            }
+        }
+        pop(@parser);
+    }
+    if ($changes) {
+        if (open(my $fh,'>',$dest)) {
+            print $fh $outstring;
+            close($fh);
+        }
+    }
+}
+
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_;
     my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap,
@@ -2363,6 +2526,15 @@ sub print_paste_buffer {
                     &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix});
             } else {
                 my $icon = &Apache::loncommon::icon($extension);
+                my $icontext;
+                if ($extension eq 'sequence') {
+                    $icontext = &mt('folder icon');
+                } elsif ($extension eq 'page') {
+                    $icontext = &mt('composite page icon');
+                } else {
+                    $icontext = &mt('file icon');
+                }
+                $icontext = &HTML::Entities::encode($icontext);
                 if ($extension eq 'sequence' &&
                     $url =~ m{/default_\d+\.sequence$}x) {
                     $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -2372,7 +2544,7 @@ sub print_paste_buffer {
                 if ($title eq '') {
                     ($title) = ($url =~ m{/([^/]+)$});
                 }
-                $buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
+                $buffer = '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />'.
                           ': '.
                           &Apache::loncommon::parse_supplemental_title(
                              &LONCAPA::map::qtescape($title));
@@ -4808,16 +4980,18 @@ sub editor {
             if (!$allowed) {
                 $helpitem = 'Supplemental_Navigation';
             }
-            $toolslink = '<table><tr><td>'
+            $toolslink = '<div class="LC_navtools">'
+                       .'<div class="LC_navtools">'
                        .&Apache::loncommon::help_open_menu('Navigation Screen',
                                                            $helpitem,undef,'RAT')
-                       .'</td><td class="LC_middle">'.&mt('Tools:').'</td>'
-                       .'<td align="left"><ul id="LC_toolbar">'
+                       .'</div><div class="LC_navtools">'.&mt('Tools:').'</div>'
+                       .'<div class="LC_navtools">'."\n".'<ul id="LC_toolbar">' 
                        .'<li><a href="/adm/coursedocs?forcesupplement=1&amp;command=editsupp" '
                        .'id="LC_content_toolbar_edittoplevel" '
                        .'class="LC_toolbarItem" '
                        .'title="'.&mt('Supplemental Content Editor').'">'
-                       .'</a></li></ul></td></tr></table><br />';
+                       .'</a></li></ul></div></div>'."\n"
+                       .'<div style="padding:0;clear:both;margin:0;border:0"></div><br />'."\n";
         }
         if ($shown) {
             if ($allowed) {
@@ -5320,7 +5494,7 @@ ENDCOPY
 	    $copylink=(<<ENDCOPY);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+<label><input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a></label>
 $form_end
 ENDCOPY
             if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
@@ -5338,7 +5512,7 @@ ENDCUT
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" />
-<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+<label><input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a></label>
 $form_end
 ENDCUT
             if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
@@ -5357,7 +5531,7 @@ ENDREM
 $form_common
 <input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
 <input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
-<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+<label><input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a></label>
 $form_end
 ENDREM
             if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
@@ -5402,8 +5576,17 @@ $copylink
 </td>
 END
     }
+    my $icontext;
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
+    if ($extension eq 'sequence') {
+        $icontext = &mt('folder icon');
+    } elsif ($extension eq 'page') {
+        $icontext = &mt('composite page icon');
+    } else {
+        $icontext = &mt('file icon');
+    }
+    $icontext = &HTML::Entities::encode($icontext);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
     my $isfolder;
@@ -5745,9 +5928,9 @@ $form_end;
             }
         }
         if ($nolink) {
-            $line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+            $line .= '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
         } else {
-            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+            $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" /></a>';
         }
     } elsif ($url) {
        if ($anchor ne '') {
@@ -5777,16 +5960,16 @@ $form_end;
            }
        }
        if ($nolink) {
-           $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+           $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
        } elsif ($nomodal) {
            $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'.
-                  '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>';
+                  '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" border="0" /></a>';
        } else {
            $line.=&Apache::loncommon::modal_link($link,
-                                                 '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+                                                 '<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />',600,500);
        }
     } else {
-       $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+       $line.='<img src="'.$icon.'" alt="'.$icontext.'" class="LC_icon" />';
     }
     $line.='</span></td><td'.$tdwidth.'>';
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
@@ -7428,10 +7611,6 @@ sub handler {
     my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.',
                               $percent.'%',$quota.' MB').'</p>';
 
-	my $fileupload=(<<FIUP);
-        $quotainfo
-	$lt{'file'}:<br />
-FIUP
 	my $checkbox=(<<CHBO);
 	<!-- <label>$lt{'parse'}?
 	<input type="checkbox" name="parserflag" />
@@ -7450,8 +7629,9 @@ CHBO
         <form name="uploadims" action="/adm/imsimportdocs" method="post" enctype="multipart/form-data" target="IMSimport">
         <fieldset id="uploadimsform" style="display: none;">
         <legend>$lt{'imsf'}</legend>
-        $fileupload
-        <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled />
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space_ims" value="$free_space" />
         <br />
         <p>
@@ -7478,12 +7658,14 @@ IMSFORM
         <fieldset id="uploaddocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
-    $fileupload
-        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
+        $quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space" value="$free_space" />
 	<br />
+        <label>
 	$lt{'title'}:<br />
-	<input type="text" size="60" name="comment" $disabled />
+	<input type="text" size="60" name="comment" $disabled /></label>
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
@@ -7509,11 +7691,11 @@ FUFORM
         <fieldset id="importmapform" style="display: none;">
         <legend>$lt{'impm'}</legend>
 	<input type="hidden" name="active" value="bb" />
-        $lt{'copm'}<br />
+        <label>$lt{'copm'}<br />
         <span class="LC_nobreak">
         <input type="text" name="importmap" size="40" value="" 
         onfocus="this.blur();$mapimportjs" $disabled />
-        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span><br />
+        &nbsp;<a href="$mapimportjs">$lt{'selm'}</a></span></label><br />
         <input type="submit" name="loadmap" value="$lt{'load'}" $disabled />
         </fieldset>
         </form>
@@ -7554,9 +7736,9 @@ SEDFFORM
         <div id="importcrsrescontent" style="display: none;">
         <input type="hidden" name="active" value="bb" />
         $pickfile
-        <p>
+        <p><label>
         $lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled />
-        </p>
+        </label></p>
         <input type="hidden" name="importdetail" value="" />
         <input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br />
         </div>
@@ -7819,7 +8001,7 @@ NWEBFORM
             $is_home{'course'} = 1;
         }
         $rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n";
-        my $pickdir = $lt{'loca'}.
+        my $pickdir = '<label>'.$lt{'loca'}.
                    '<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n".
                    '<option value="" selected="selected">'.&mt('Select').'</option>'."\n";
         if ($env{'user.author'}) {
@@ -7840,11 +8022,11 @@ NWEBFORM
         if ($checkcrsres) {
             $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n";
         }
-        $pickdir .= '</select><br />'."\n".
-                    $lt{'dire'}.
+        $pickdir .= '</select></label><br />'."\n".
+                    '<label>'.$lt{'dire'}.
                     '<select name="authorpath" onchange="toggleCrsResTitle();">'.
                     '<option value=""></option>'.
-                    '</select><br />'."\n";
+                    '</select></label><br />'."\n";
         my %seltemplate_menus;
         my @files = &Apache::lonhomework::get_template_list('problem');
         my @noexamplelink = ('blank.problem','blank.library','script.library');
@@ -7877,12 +8059,17 @@ NWEBFORM
             }
         }
 
-        my $templates = $lt{'cate'}.' '.
-                        &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
-                                                                $defcategory,'tempcategory','template',
-                                                                \%seltemplate_menus,\@catorder,
-                                                                "resize_scrollbox('contentscroll','1','0');",
-                                                                "toggleExampleText();",'template').'<br />';
+        my ($templates,$haslabel);
+        if ($lt{'cate'} ne '') {
+            $templates = '<label>';
+            $haslabel = 1;
+        }
+        $templates .= $lt{'cate'}.' '.
+                      &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ',
+                                                              $defcategory,'tempcategory','template',
+                                                              \%seltemplate_menus,\@catorder,
+                                                              "resize_scrollbox('contentscroll','1','0');",
+                                                              "toggleExampleText();",'template',$haslabel).'<br />';
         my $templatepreview =  '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true);  return false;">'.
                                '<span id="newresexample">'.&mt('Example').'</span></a>';
         my $crsresform;
@@ -7903,12 +8090,12 @@ NWEBFORM
         <label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label>
         &nbsp;
         <label><input type="radio" name="newsubdir" value="1" onclick="toggleNewsubdir(this.form);" $disabled />Yes</label>
-        </span><span id="newsubdir"></span>
+        </span><label for="newsubdirname"><span id="newsubdir"></span></label>
         <input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" />
         </p>
         </div>
-        $lt{'fnam'}
-        <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled />
+        <label>$lt{'fnam'}
+        <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /></label>
         <div id="newresource" style="display:none">
         <p>
         $lt{'addp'}
@@ -7916,7 +8103,7 @@ NWEBFORM
         $lt{'no'}</label>&nbsp;&nbsp;
         <label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" $disabled />
         $lt{'yes'}</label>
-        <span id="newrestitle"></span>
+        <label for="newresourcetitle"><span id="newrestitle"></span></label>
         <input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled />
         </p>
         </div>
@@ -8111,8 +8298,9 @@ unless ($container eq 'page') {
         <fieldset id="uploadsuppdocform" style="display: none;">
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="ee" />
-	$fileupload
-        <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled />
+	$quotainfo
+        <label>$lt{'file'}:<br />
+        <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /></label>
         <input type="hidden" id="LC_free_space_supp" value="$free_space" />
 	<br />
 	<br />
@@ -8120,8 +8308,8 @@ unless ($container eq 'page') {
 	$checkbox
 	</span>
 	<br /><br />
-	$lt{'comment'}:<br />
-	<textarea cols="50" rows="4" name="comment"></textarea>
+	<label>$lt{'comment'}:<br />
+	<textarea cols="50" rows="4" name="comment"></textarea></label>
 	<br />
 	$pathitem
 	<input type="hidden" name="cmd" value="upload_supplemental" />
@@ -8521,10 +8709,12 @@ sub generate_admin_menu {
                 if (grep(/^\Q$crshome\E$/,@ids)) {
                     $linkurl = $crsauthorurl;
                 } else {
-                    $linkurl =
-                        &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1);
+                    my $jscall = &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1);
+                    if ($jscall) {
+                        $linkurl = 'javascript:'.$jscall;
+                    }
                 }
-                if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY')) {
+                if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY') && ($linkurl)) {
                      push(@{$menu[0]->{items}},
                      {   linktext   => $lt{'ca'},
                          url        => $linkurl,