--- loncom/interface/londocs.pm	2023/07/11 12:44:18	1.700
+++ loncom/interface/londocs.pm	2025/01/07 03:51:55	1.720
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.700 2023/07/11 12:44:18 raeburn Exp $
+# $Id: londocs.pm,v 1.720 2025/01/07 03:51:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ use Apache::lonpublisher();
 use Apache::loncourserespicker();
 use HTML::Entities;
 use HTML::TokeParser;
+use HTML::LCParser;
 use GDBM_File;
 use File::MMagic;
 use File::Copy;
@@ -102,6 +103,7 @@ sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $key (keys(%env)) {
 	if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
@@ -118,7 +120,6 @@ sub authorhosts {
 	    }
 	    my $allowed=0;
 	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
-	    my @ids=&Apache::lonnet::current_machine_ids();
 	    foreach my $id (@ids) {
                 if ($id eq $myhome) {
                     $allowed=1;
@@ -263,11 +264,12 @@ ENDJS
                          add_entries => {'onload' => "hide_searching();"},
                      };
     }
-    $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n".
-              &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n");
+    $r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n");
     $r->print(&startContentScreen('tools'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) {
+        $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); 
         $r->print(&endContentScreen());
         return '';
     }
@@ -276,7 +278,8 @@ ENDJS
     if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
 # Do the dumping
 	unless ($outhash{'home_'.$env{'form.authorspace'}}) {
-            $r->print(&endContentScreen());
+            $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'.
+                      &endContentScreen());
             return '';
         }
 	my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
@@ -572,49 +575,13 @@ $contents{webreferences}.'
         if (!ref($navmap)) {
             $r->print($errormsg);
         } else {
-            $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
-            $r->rflush();
-            my ($preamble,$formname);
-            $formname = 'dumpdoc';
-	    unless ($home==1) {
-	        $preamble = '<div class="LC_left_float">'.
-		            '<fieldset><legend>'.
-                            &mt('Select the Authoring Space').
-                            '</legend><select name="authorspace">';
-	    }
-            my @orderspaces = ();
-	    foreach my $key (sort(keys(%outhash))) {
-                if ($key=~/^home_(.+)$/) {
-                    if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) {
-                        unshift(@orderspaces,$1);
-                    } else {
-                        push(@orderspaces,$1);
-                    }
-                } 
-            }
-            if ($home>1) {
-                $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>';
-            }
-            foreach my $user (@orderspaces) {
-		if ($home==1) {
-		    $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
-		} else {
-		    $preamble .= '<option value="'.$user.'">'.$user.' - '.
-			         &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
-	        }
-	    }
-	    unless ($home==1) {
-	        $preamble .= '</select></fieldset></div>'."\n";
-	    }
 	    my $title=$origcrsdata{'description'};
 	    $title=~s/[\/\s]+/\_/gs;
 	    $title=&clean($title);
-	    $preamble .= '<div class="LC_left_float">'.
-                         '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
-                         '<input type="text" size="50" name="authorfolder" value="'.
-                         $title.'" />'.
-                         '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
-            my %uploadedfiles;
+	    my $formname = 'dumpdoc';
+	    my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash).
+                           '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+	    my %uploadedfiles;
 	    &tiehash();
 	    foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
 	        my ($ext)=($file=~/\.(\w+)$/);
@@ -640,6 +607,48 @@ $contents{webreferences}.'
     $r->print(&endContentScreen());
 }
 
+sub authorspace_selector {
+    my ($r,$formname,$home,$title,%outhash) = @_;
+    $r->print('<div id="searching">'.&mt('Searching ...').'</div>'."\n");
+    $r->rflush();
+    my $preamble;
+    unless ($home==1) {
+        $preamble = '<div class="LC_left_float">'.
+                    '<fieldset><legend>'.
+                    &mt('Select the Authoring Space').
+                    '</legend><select name="authorspace">';
+    }
+    my @orderspaces = ();
+    foreach my $key (sort(keys(%outhash))) {
+        if ($key=~/^home_(.+)$/) {
+            if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) {
+                unshift(@orderspaces,$1);
+            } else {
+                push(@orderspaces,$1);
+            }
+        }
+    }
+    if ($home>1) {
+        $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>';
+    }
+    foreach my $user (@orderspaces) {
+        if ($home==1) {
+            $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />';
+        } else {
+            $preamble .= '<option value="'.$user.'">'.$user.' - '.
+                         &Apache::loncommon::plainname(split(/\:/,$user)).'</option>';
+        }
+    }
+    unless ($home==1) {
+        $preamble .= '</select></fieldset></div>'."\n";
+    }
+    $preamble .= '<div class="LC_left_float">'.
+                 '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'.
+                 '<input type="text" size="30" name="authorfolder" value="'.$title.'" />'."\n".
+                 '</fieldset></div>'."\n";
+    return $preamble;
+}
+
 sub recurse_html {
     my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_;
     return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH'));
@@ -684,6 +693,957 @@ sub recurse_html {
     return;
 }
 
+sub copycrsauthored {
+    my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_;
+    my ($starthash,$js,$title,$formname);
+    my %origcrsdata=&Apache::lonnet::coursedescription($env{'request.course.id'});
+    $title=$origcrsdata{'description'};
+    $title=~s/[\/\s]+/\_/gs;
+    $title=&clean($title);
+    my ($home,$other,%outhash)=&authorhosts();
+    unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        my %js_lt;
+        $formname = 'copycrsauthored';
+        if ($home) {
+            %js_lt =
+                &Apache::lonlocal::texthash(
+                    yomu => 'You must select an Authoring Space',
+                    whco => 'When Copyright set to "custom", URL of a published rights file is needed.',
+            );
+            &js_escape(\%js_lt);
+        }
+        if ($home > 1) {
+            $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function validCrsCopy() {
+    var dest = document.$formname.authorspace.options[document.$formname.authorspace.selectedIndex].value;
+    if (dest == '') {
+        alert("$js_lt{'yomu'}");
+        return false;
+    }
+    var dist = document.$formname.copyright.options[document.$formname.copyright.selectedIndex].value;
+    if (dist == 'custom') {
+        if (document.$formname.customrights.value == '') {
+            alert("$js_lt{'whco'}");
+            return false;
+        }
+    }
+    return true;
+}
+
+function init_copycrs_form() {
+    document.$formname.authorspace.selectedIndex = "0";
+    document.$formname.authorfolder.value = '$title';
+    document.$formname.copyright.selectedIndex = "0";
+}
+
+// ]]>
+</script>
+
+ENDJS
+        } elsif ($home) {
+            $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function init_copycrs_form() {
+    document.$formname.authorfolder.value = '$title';
+    document.$formname.copyright.selectedIndex = "0";
+}
+
+// ]]>
+</script>
+
+ENDJS
+        }
+        $js .= <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+
+function hide_searching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
+function showHideCustom(caller,divid) {
+    if (document.getElementById(divid)) {
+        if (caller.options[caller.selectedIndex].value == 'custom') {
+            document.getElementById(divid).style.display="inline-block";
+        } else {
+            document.getElementById(divid).style.display="none";
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+ENDJS
+
+        $js .= "\n".&Apache::lonhtmlcommon::scripttag(&Apache::loncommon::browser_and_searcher_javascript())."\n";
+        $starthash = {
+                         add_entries => {'onload' => "hide_searching(); init_copycrs_form();"},
+                     };
+    }
+    $r->print(&Apache::loncommon::start_page('Copy from Course Authoring to User Authoring',$js,$starthash)."\n".
+              &Apache::lonhtmlcommon::breadcrumbs('Copy from Course Authoring Space')."\n");
+    $r->print(&startContentScreen('tools'));
+    unless ($home) {
+        $r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>');
+        $r->print(&endContentScreen());
+        return '';
+    }
+    my $docroot = $r->dir_config('lonDocRoot');
+    my $is_course_home;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/,@ids))) {
+        $is_course_home = 1;
+    }
+    my $exclude = &Apache::lonnet::priv_exclude();
+    my $srcurl = "/priv/$coursedom/$coursenum";
+    my $srctop = $docroot.$srcurl;
+    my $resurl = "/res/$coursedom/$coursenum";
+    my $res_exclude = &Apache::lonnet::res_exclude();
+    if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
+        $r->print('<h3>'.&mt('Copying Files and/or Sub-directories').'</h3>');
+        if ($readonly) {
+            $r->print('<p class="LC_info">'.
+                      &mt('You do not have permission to copy files and/or directories from Course Authoring Space.').
+                      '</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        unless ($outhash{'home_'.$env{'form.authorspace'}}) {
+            $r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
+        my $desturl = "/priv/$cd/$ca";
+        my $destresurl = "/res/$cd/$ca";
+        my $desttop = $docroot.$desturl;
+        my $subdir = &clean($env{'form.authorfolder'});
+        $subdir = &cleandir($subdir);
+        if ($subdir eq '') {
+            $r->print('<p class="LC_info">'.&mt('After removal of disallowed characters target sub-directory name was blank.').'</p>'.
+                      &endContentScreen());
+            return '';
+        } elsif ($subdir =~/^_+$/) {
+            $r->print('<p class="LC_info">'.&mt('After replacement of non-alphanumeric characters with _ in target sub-directory name, nothing but underscores was left.').'</p>'.
+                      &endContentScreen());
+            return '';
+        }
+        my (%tocopy,%dirs_to_make,%files_to_copy);
+        map { $tocopy{&unescape($_)} = 1; } &Apache::loncommon::get_env_multiple('form.copytouser');
+        if (keys(%tocopy)) {
+            my (%subdirs,%files);
+            &Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files);
+            foreach my $possible (sort(keys(%tocopy))) {
+                if ($possible =~ m{/$}) {
+                    my $possdir = $possible;
+                    $possdir =~ s{^/+|/+$}{}g;
+                    if (exists($subdirs{$possdir})) {
+                        $dirs_to_make{$possdir} = 1;
+                    } else {
+                        delete($tocopy{$possible});
+                    }
+                } else {
+                    my ($path,$fname) = ($possible =~ m{(.*/)([^/]+)$});
+                    my $found = 0;
+                    if ($path eq '/') {
+                        if (ref($files{$path}) eq 'HASH') {
+                            if (exists($files{$path}{$fname})) {
+                                $found = 1;
+                                $files_to_copy{$fname} = 1;
+                            }
+                        }
+                    } else {
+                        $path =~ s{^/+|/+$}{}g;
+                        if (ref($files{$path}) eq 'HASH') {
+                            if (exists($files{$path}{$fname})) {
+                                $dirs_to_make{$path} = 1;
+                                $files_to_copy{"$path/$fname"} = 1;
+                                $found = 1;
+                            }
+                        }
+                    }
+                    unless ($found) {
+                        delete($tocopy{$possible});
+                    }
+                }
+            }
+        } else {
+            $r->print('<p>'.&mt('No files or directories selected for copying').'</p>');
+            $r->print(&endContentScreen());
+            return '';
+        }
+        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,%newresfile);
+            $r->print('<p>'.&mt('Copy to: [_1]',
+                                '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                      '</p>'."\n");
+            if (keys(%dirs_to_make)) {
+                unless (-e $desttop.'/'.$subdir) {
+                    mkdir($desttop.'/'.$subdir,0755);
+                }
+                if (-e $desttop.'/'.$subdir) {
+                    foreach my $dir (sort(keys(%dirs_to_make))) {
+                        my @dirs=split(/\//,$dir);
+                        my $path="$desttop/$subdir";
+                        my $makepath=$path;
+                        my $fail;
+                        for (my $i=0;$i<@dirs;$i++) {
+                            $makepath.='/'.$dirs[$i];
+                            unless (-e $makepath) {
+                                unless (mkdir($makepath,0755)) {
+                                    $fail = 1;
+                                    last;
+                                }
+                                if (($i == scalar(@dirs)-1) && (!$fail))  {
+                                    $newdir{$dir} = 1;
+                                }
+                            }
+                        }
+                        if ($fail) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$dir.'</span>').
+                                      '</p>'."\n");
+                        }
+                    }
+                } else {
+                    $notopdir = 1;
+                }
+            }
+            if (keys(%files_to_copy)) {
+                unless (-e $desttop.'/'.$subdir) {
+                    mkdir($desttop.'/'.$subdir,0755);
+                }
+                if (-e $desttop.'/'.$subdir) {
+                    my $num = 0;
+                    my ($copyright,$customdistfile);
+                    if ($env{'form.copyright'} eq 'default' || $env{'form.copyright'} eq 'domain' || $env{'form.copyright'} eq 'public') {
+                        $copyright = $env{'form.copyright'};
+                    } elsif ($env{'form.copyright'} eq 'custom') {
+                        if ($env{'form.customrights'} =~ m{^/res/$match_domain/$match_username/.+\.rights$}) {
+                            my ($rightsdom,$rightsuname) = ($1,$2);
+                            my $rightshome = &Apache::lonnet::homeserver($rightsdom,$rightsuname);
+                            if (($rightshome eq 'no_host') || ($rightshome eq '')) {
+                                $copyright = 'default';
+                            } elsif (grep(/^\Q$rightshome\E$/,@ids)) {
+                                if (-e $docroot.$env{'form.customrights'}) {
+                                    $copyright = 'custom';
+                                    $customdistfile = $env{'form.customrights'};
+                                } else {
+                                    $copyright = 'default';
+                                }
+                            } else {
+                                my $rightsfile = &Apache::lonnet::filelocation('',$env{'form.customrights'});
+                                unless (&Apache::lonnet::getfile($rightsfile) eq '-1') {
+                                    $customdistfile = $env{'form.customrights'};
+                                }
+                            }
+                        }
+                    }
+                    my $sourceavail;
+                    if ($env{'form.sourceavail'} =~ /^(open|closed)$/) {
+                        $sourceavail = $env{'form.sourceavail'};
+                    }
+                    my $respublish;
+                    if ($env{'form.respublish'}) {
+                        $respublish = 1;
+                    }
+                    my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes'));
+                    foreach my $file (keys(%files_to_copy)) {
+                        my ($fail,$dup,$dir_is_file,$src,$dest,$path,$fname);
+                        if ($file =~ m{/}) {
+                            ($path,$fname) = ($file =~ m{^(.+)/([^/]+)$});
+                            if (-d "$desttop/$subdir/$path") {
+                                if (-e "$desttop/$subdir/$path/$fname") {
+                                    $dup = 1;
+                                } else {
+                                    $src = "$srctop/$path/$fname";
+                                    $dest = "$desttop/$subdir/$path/$fname";
+                                }
+                            } elsif (-f "$desttop/$subdir/$path") {
+                                $dir_is_file = 1;
+                            } else {
+                                $fail = 1;
+                            }
+                        } elsif (-e "$desttop/$subdir/$file") {
+                            $dup = 1;
+                        } else {
+                            $src = "$srctop/$file";
+                            $dest = "$desttop/$subdir/$file";
+                            $fname = $file;
+                        }
+                        if ($fail) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$path.'</span>').
+                                      '</p>'."\n");
+                        } elsif ($dup) {
+                            $r->print('<p class="LC_warning">'.&mt('Target file: [_1] already exists -- not overwriting.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>').
+                                      '</p>'."\n");
+                        } elsif ($dir_is_file) {
+                            $r->print('<p class="LC_warning">'.&mt('Target directory: [_1] name is already in a use for a file -- not overwriting.',
+                                                                   '<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>').
+                                      '</p>'."\n");
+                        } elsif (($src ne '') && ($dest ne '')) {
+                            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 ($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);
+                                                }
+                                            }
+                                        } else {
+                                            if (&File::Copy::copy($src,$dest)) {
+                                                $newfile{$file} = $desturl.'/'.$subdir.'/'.$file;
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                                }
+                                            }
+                                        }
+                                    } 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 {
+                                                if (&File::Copy::copy($src.'.meta',$dest.'.meta')) {
+                                                    &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                       $customdistfile,$sourceavail,\%checkdeps);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    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;
+                                    }  
+                                }
+                                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);
+                                                    }
+                                                }
+                                            } else {
+                                                if ($embstyle eq 'ssi') {
+                                                    &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                                }
+                                                $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 {
+                                                &crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright,
+                                                                   $customdistfile,$sourceavail,\%checkdeps);
+                                            }
+                                        }
+                                    } else {
+                                        if (!-e $dest.'.meta') {
+                                            $needprivmeta = 1;
+                                        }
+                                    }
+                                    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 ($needpriv) {
+                                    if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') {
+                                        if ($embstyle eq 'ssi') {
+                                            &crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir);
+                                        }
+                                        $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);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    $notopdir = 1;
+                }
+            }
+            if ($notopdir) {
+                $r->print('<p><span class="LC_info">'.&mt('No files or sub-directories copied').'</span><br />'."\n".
+                          '<span class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.',
+                                                          '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                          '</span></p>'."\n");
+            }
+            if (keys(%newdir)) {
+                 $r->print('<p>'.&mt('Created the following directories in [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                           '</p>'."\n".
+                           '<ul><li>'.join('</li><li>',sort(keys(%newdir))).'</li></ul></p>'."\n");
+            }
+            if (keys(%newfile)) {
+                $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 $key (keys(%newfile)) {
+                    my %storehash = ( 
+                                      'priv' => $newfile{$key},
+                                      '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;
+                foreach my $depfile (sort(keys(%checkdeps))) {
+                    unless (-e "$desttop/$depfile") {
+                        $missingdep{$depfile} = 1;
+                    }
+                }
+                if (keys(%missingdep)) {
+                    $r->print('<p>'.&mt('You may also need to copy the following missing dependencies for files copied to [_1]:',
+                                        '<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>').
+                          '</p>'."\n".
+                          '<ul><li>'.join('</li><li>',sort(keys(%missingdep))).'</li></ul></p>'."\n");
+                }
+            }
+        } else {
+            $r->print('<p>'.&mt('No currently existing files or directories in Course Authoring Space selected for copying').'</p>');
+            $r->print(&endContentScreen());
+            return '';
+        }
+    } else {
+        my $chkname = 'copytouser';
+        my $context = 'crsauthored';
+        my (%subdirs,%files,@dirs_by_depth,@files_by_depth,%parent,%children,%hierarchy,@checked_maps);
+        &Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files,1);
+        foreach my $key (keys(%subdirs)) {
+            next if (($key eq '/') || ($key eq ''));
+            my @items = split(/\//,$key);
+            my $dir = pop(@items);
+            my $depth = scalar(@items);
+            my $path;
+            if (!$depth) {
+                $path = '/';
+            } else {
+                $path = join('/',@items);
+            }
+            $dirs_by_depth[$depth]{$path}{$dir} = 1;
+        }
+        foreach my $path (keys(%files)) {
+            next if ($path eq '');
+            my $depth;
+            if ($path eq '/') {
+                $depth = 0;
+            } else {
+                $depth = scalar(split(/\//,$path));
+            }
+            if (ref($files{$path}) eq 'HASH') {
+                foreach my $file (keys(%{$files{$path}})) {
+                    $files_by_depth[$depth]{$path}{$file} = $files{$path}{$file};
+                }
+            }
+        }
+        my ($info,$display,$onsubmit,$togglebuttons,$disabled);
+        my (%resdirs,%resfiles);
+        &Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles);
+        my $numpub = 0;
+        if (keys(%resfiles)) {
+            foreach my $dir (keys(%resfiles)) {
+                if (ref($resfiles{$dir}) eq 'HASH') {
+                    foreach my $file (keys(%{$resfiles{$dir}})) {
+                        if (exists($files{$dir}{$file})) {
+                            $numpub ++;
+                        }
+                    }
+                }
+            }
+        }
+        if ($readonly) {
+            $disabled = ' disabled="disabled"';
+        }
+        if ($disabled) {
+            $togglebuttons = '<br />';
+        } else {
+            $togglebuttons = '<input type="button" value="'.&mt('check all').'" '.
+                             'onclick="javascript:checkAll(document.'.$formname.'.'.$chkname.')" />'.
+                             '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
+                             ' onclick="javascript:uncheckAll(document.'.$formname.'.'.$chkname.')" />';
+        }
+        my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash).
+                       &courseresource_options($formname,$numpub).
+                       '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
+        my $display = '<form name="'.$formname.'" action="" method="post" onsubmit="return validCrsCopy();">'."\n".
+                      $preamble."\n".
+                      '<div class="LC_float_left">'."\n".
+                      '<fieldset>'."\n".
+                      '<legend>'.&mt('Content to copy').('&nbsp;'x4).$togglebuttons.'</legend>'."\n".
+                      '<span class="LC_fontsize_medium">'.
+                      &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;
+        my $lastcontainer = $startcount;
+        $display .= &Apache::loncommon::start_data_table()."\n".
+                    &Apache::loncommon::start_data_table_header_row().
+                    '<th>'.&mt('Copy?').'</th>'.
+                    '<th>'.&mt('Name').'</th>'.
+                    '<th>'.&mt('Last modified').'</th>'.
+                    '<th>'.&mt('Published?').'</th>'.
+                    &Apache::loncommon::end_data_table_header_row()."\n";
+        $count = &recurse_crsauthored(0,\@dirs_by_depth,\@files_by_depth,'/',$startcount,
+                                      $count,\$display,\%parent,\%children,$readonly,
+                                      $formname,$chkname,\$lastcontainer,\%resfiles);
+        $display .= &Apache::loncommon::end_data_table().'</fieldset>';
+        unless ($readonly) {
+            $display .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                        '<div>'.
+                        '<input type="submit" name="copyauthored" value="'.&mt("Copy Selected Content").'" />'.
+                        '</div>';
+        }
+        $display .= &Apache::loncourserespicker::respicker_javascript($startcount,$count,$context,$formname,\%children,
+                                                                      \%hierarchy,\@checked_maps,$home,$chkname);
+        $r->print($display);
+    }
+    $r->print(&endContentScreen());
+}
+
+sub recurse_crsauthored {
+    my ($currdepth,$dirs_by_depth,$files_by_depth,$currpath,$startcount,$count,$displayref,
+        $parent,$children,$readonly,$formname,$chkname,$lastcontainerref,$resfilesref) = @_;
+    return $count unless ((ref($dirs_by_depth) eq 'ARRAY') && (ref($files_by_depth) eq 'ARRAY') &&
+                          (ref($resfilesref) eq 'HASH'));
+    my ($disabled,$hasdirs,$hasfiles,%unique,%dirs,%files);
+    if ((ref($dirs_by_depth->[$currdepth]) eq 'HASH') &&
+        (ref($dirs_by_depth->[$currdepth]{$currpath}) eq 'HASH')) {
+        $hasdirs = 1;
+        %dirs = %{$dirs_by_depth->[$currdepth]{$currpath}};
+        map { $unique{$_} = 1; } keys(%dirs);
+    }
+    if ((ref($files_by_depth->[$currdepth]) eq 'HASH') &&
+        (ref($files_by_depth->[$currdepth]{$currpath}) eq 'HASH')) {
+        $hasfiles = 1;
+        %files = %{$files_by_depth->[$currdepth]{$currpath}};
+        map { $unique{$_} = 1; } keys(%files);
+    }
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+    my $whitespace =
+        '<img src="'.$location.'/whitespace_21.gif" class="LC_docs_spacer" alt="" />';
+    $parent->{$currdepth} = $$lastcontainerref;
+    foreach my $item (sort { lc($a) cmp lc($b) } (keys(%unique))) {
+        next if ($item eq '');
+        my $currelem;
+        if ($hasdirs && exists($dirs{$item})) {
+            $count ++;
+            my $deeper = $currdepth+1;
+            my ($newpath,$showpath);
+            if ($currpath eq '/') {
+                $newpath = $item;
+                $showpath = $currpath.$item.'/';
+            } else {
+                $newpath = $currpath.'/'.$item;
+                $showpath = '/'.$currpath.'/'.$item.'/';
+            }
+            $currelem = $count+$startcount;
+            $$lastcontainerref = $currelem;
+            $children->{$parent->{$currdepth}} .= $currelem.':';
+            my $icon = 'src="'.$location.'/navmap.folder.open.gif" alt="'.&mt('Folder').'"';
+            $$displayref .= &Apache::loncommon::start_data_table_row().
+                            '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath).'" '.
+                            'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" '.
+                            $disabled.' /></td><td>';
+            for (my $i=0; $i<$currdepth; $i++) {
+                $$displayref .= "$whitespace\n";
+            }
+            $$displayref .= '<img '.$icon.' />&nbsp;'.$item.'</td><td>&nbsp;</td><td>&nbsp;</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            $count = &recurse_crsauthored($deeper,$dirs_by_depth,$files_by_depth,$newpath,
+                                          $startcount,$count,$displayref,$parent,$children,
+                                          $readonly,$formname,$chkname,$lastcontainerref,$resfilesref);
+        }
+        if ($hasfiles && exists($files{$item})) {
+            $count ++;
+            $currelem = $count+$startcount;
+            $children->{$parent->{$currdepth}} .= $currelem.':';
+            my $icon = 'src="'.&Apache::loncommon::icon($item).'"';
+            my ($ext) = ($item =~ /\.([^.]+)$/);
+            my $alttext;
+            if (lc($ext) eq 'problem') {
+                $alttext = ' alt="'.&mt('Problem Icon').'"';
+            } elsif ($ext =~ /^x?html?$/i) {
+                $alttext = ' alt="'.&mt('Web Page Icon').'"';
+            } elsif ($ext =~ /^(jpg|gif|png|svg|jpeg)$/) {
+                $alttext = ' alt="'.&mt('Image Icon').'"';
+            } else {
+                $alttext = ' alt="'.&mt('Resource Icon').'"';
+            }
+            my $showpath;
+            if ($currpath eq '/') {
+                $showpath = $currpath;
+            } else {
+                $showpath = "/$currpath/";
+            }
+            my ($published,$lastmod);
+            if ((ref($resfilesref->{$currpath})) && (exists($resfilesref->{$currpath}{$item}))) {
+                $published = '<img src="'.$location.'/navmap.correct.gif" alt="'.&mt('yes').'" />';
+            } else {
+                $published = '<img src="'.$location.'/navmap.wrong.gif" alt="'.&mt('no').'" />';
+            }
+            $$displayref .= &Apache::loncommon::start_data_table_row().
+                            '<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath.$item).'" '.
+                            'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" '.
+                            $disabled.' /></td><td>';
+            for (my $i=0; $i<$currdepth; $i++) {
+                $$displayref .= "$whitespace\n";
+            }
+            $$displayref .= '<img '.$icon.$alttext.' />&nbsp;'.$item.'</td>'.
+                            '<td>'.&Apache::lonlocal::locallocaltime($files{$item}).'</td>'.
+                            '<td style="text-align: center;">'.$published.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+        }
+    }
+    $$lastcontainerref = $parent->{$currdepth};
+    return $count;
+}
+
+sub courseresource_options {
+    my ($formname,$numpub) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                                          'default' => 'System wide - can be used for any courses system wide',
+                                          'domain'  => 'Domain only - use limited to courses in the domain',
+                                          'custom'  => 'Customized right of use ...',
+                                          'public'  => 'Public - no authentication or authorization required for use',
+                                          'closed'  => 'Closed - XML source is closed to everyone',
+                                          'open'    => 'Open - XML source is open to people who want to use it',
+                                          'sel'     => 'Select',
+                                        );
+    my $output;
+    if ($numpub) {
+        $output .= '<div class="LC_left_float">'.
+                   '<fieldset><legend>'.&mt('Published Resources').'</legend>'.
+                   &mt('[quant,_1,file] in Course Authoring Space also exist in Resource Space.',
+                       $numpub).'</br />'.
+                   &mt('Publish copied files in selected Authoring Space?').': '."\n".
+                   '<label><input type="radio" name="respublish" checked="checked" value="1" />'.
+                   &mt('Yes').'</label>'."\n".
+                   '<label><input type="radio" name="respublish" value="0" />'.
+                   &mt('No').'</label>'."\n".
+                   '</fieldset></div>'."\n";
+    }
+    $output .= '<div class="LC_left_float">'.
+               '<fieldset><legend>'.&mt('Distribution to set in metadata').'</legend>'.
+               &mt('Copyright').': '.
+               '<select name="copyright" onchange="showHideCustom(this,'."'LC_customfile'".');">'."\n".
+               '<option value="default" selected="selected">'.$lt{'default'}.'</option>'."\n".
+               '<option value="domain">'.$lt{'domain'}.'</option>'."\n".
+               '<option value="public">'.$lt{'public'}.'</option>'."\n".
+               '<option value="custom">'.$lt{'custom'}.'</option>'."\n".
+               '</select><div id="LC_customfile" style="padding:0;clear:both;margin:0;border:0;display:none">'."\n".
+               '<input type="text" name="customrights" size="60" value="" />'.
+               '<a href="javascript:openbrowser('."'$formname','customrights','rights'".');">'.
+               $lt{'sel'}.'</a></div><br />'."\n".
+               &mt('Source').' :'.
+               '<select name="sourceavail">'."\n".
+               '<option value="closed" selected="selected">'.$lt{'closed'}.'</option>'."\n".
+               '<option value="open">'.$lt{'open'}.'</option>'."\n".
+               '</select><br />'."\n".
+               '</fieldset></div>'."\n";
+    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,
@@ -1419,7 +2379,7 @@ sub print_paste_buffer {
     }
 
     my @currpaste = split(/,/,$env{'docs.markedcopies'});
-    my ($pasteitems,@pasteable);
+    my ($pasteitems,@pasteable,$same_institution,$checkedsameinst);
     my $clipboardcount = 0;
 
 # Construct identifiers for current contents of user's paste buffer
@@ -1432,11 +2392,13 @@ sub print_paste_buffer {
             ($url ne '')) {
             $clipboardcount ++;
             my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent,
-                $canpaste,$nopaste,$othercrs,$areachange,$is_exttool);
+                $canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom,
+                $toolcnum,$marker);
             my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1];
             if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
                 $is_external = 1;
-            } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
+            } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
                 $is_exttool = 1;
             }
             if ($folder =~ /^supplemental/) {
@@ -1474,17 +2436,56 @@ sub print_paste_buffer {
                     if ($cid ne $env{'request.course.id'}) {
                         my ($srcdom,$srcnum) = split(/_/,$cid);
                         if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
-                            if (($is_exttool) && ($srcdom ne $coursedom)) {
-                                $canpaste = 0;
-                                $nopaste = &mt('Paste from another domain unavailable.');
-                            } else {
-                                $othercrs = '<br />'.&mt('(from another course)');
+                            if ($is_exttool) {
+                                if ($toolcdom ne $coursedom) {
+                                    $canpaste = 0;
+                                    $nopaste = &mt('Paste from another domain unavailable.');
+                                } elsif ($toolcnum ne $coursenum) {
+                                    my %toolsettings =
+                                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
+                                    my %tooltypes = &Apache::loncommon::usable_exttools();
+                                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                                        $canpaste = 0;
+                                        $nopaste = &mt('Paste from another course unavailable.');
+                                    } elsif ($toolsettings{'id'} =~ /^c\d+$/) {
+                                        unless ($checkedsameinst) {
+                                            my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
+                                            my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                                            if ($intdom ne '') {
+                                                my $internet_names =
+                                                    &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                                                if (ref($internet_names) eq 'ARRAY') {
+                                                    if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                                        $same_institution = 1;
+                                                    }
+                                                }
+                                            }
+                                            $checkedsameinst = 1;
+                                        }
+                                        if ($same_institution) {
+                                            $othercrs = '<br />'.&mt('(from another course)');
+                                        } else {
+                                            $nopaste = &mt('Paste from another course unavailable.');
+                                        }
+                                    } else {
+                                        $othercrs = '<br />'.&mt('(from another course)');
+                                    }
+                                }
                             }
                         } else {
                             $canpaste = 0;
                             $nopaste = &mt('Paste from another course unavailable.');
                         }
                     }
+                } elsif ($url =~ m{/res/($match_domain)/($match_username)/}) {
+                    my ($audom,$auname) = ($1,$2);
+                    unless (($auname eq $coursenum) && ($audom eq $coursedom)) {
+                        if (&Apache::lonnet::is_course($audom,$auname)) {
+                            $canpaste = 0;
+                            $nopaste = &mt('Paste from another course unavailable.');
+                        }
+                    }
                 }
                 if ($canpaste) {
                     push(@pasteable,$suffix);
@@ -1777,9 +2778,12 @@ sub do_paste_from_buffer {
         return();
     }
 
-    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult);
-
+    my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,
+        %othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx,
+        %marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools,
+        %currltititles,$currltimax,$gotcrsltitools);
+    $currltimax = 0;
+    $gotcrsltitools = 0;
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
         my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix});
@@ -1818,13 +2822,53 @@ sub do_paste_from_buffer {
                 }
             }
 # When buffer was populated using an active role in a different course
-# disallow pasting of External Tool if course is in a different domain.
-            if (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) {
-                $notindom{$suffix} = 1;
-                next;
+# disallow pasting of External Tool if course is in a different domain,
+# or if External Tool use is not permitted in this course.
+            if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3);
+                if ($toolcdom ne $coursedom) {
+                    $notindom{$suffix} = 1;
+                    next;
+                } elsif ($toolcnum ne $coursenum) {
+                    my %toolsettings =
+                        &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum);
+                    my %tooltypes = &Apache::loncommon::usable_exttools();
+                    if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                        (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                        $othcrstool{$suffix} = 1;
+                        next;
+                    }
+                    if ($toolsettings{'id'} =~ /^c\d+$/) {
+                        unless ($gotcrsltitools) {
+                            %currcrsltitools =
+                                &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer');
+                            foreach my $item (sort(keys(%currcrsltitools))) {
+                                if (ref($currcrsltitools{$item}) eq 'HASH') {
+                                    $currltimax ++;
+                                    if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
+                                        push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
+                                    } else {
+                                        $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
+                                    }
+                                }
+                            }
+                            $gotcrsltitools = 1;
+                        }
+                    }
+                }
             }
             $srcdom{$suffix} = $srcd;
             $srcnum{$suffix} = $srcn;
+        } elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) {
+            my ($audom,$auname) = ($1,$2);
+# When buffer was populated using an active role in a different course
+# disallow pasting of published resources from Course Authoring Space
+            unless (($auname eq $coursenum) && ($audom eq $coursedom)) {
+                if (&Apache::lonnet::is_course($audom,$auname)) {
+                    $othcrsres{$suffix} = 1;
+                    next;
+                }
+            }
         }
         $srcmapidx{$suffix} = $mapidx;
         push(@dopaste,$suffix);
@@ -1876,6 +2920,8 @@ sub do_paste_from_buffer {
                 notinsupp => 'Paste failed: content type is not supported within Supplemental Content',
                 notincrs  => 'Paste failed: Item is from a different course which you do not have rights to edit.',
                 notindom  => 'Paste failed: Item is an external tool from a course in a different domain.',
+                othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.',
+                othcrsres => 'Paste failed: Item is a course-authored resource from a different course',
                 duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.',
             );
 
@@ -1904,7 +2950,9 @@ sub do_paste_from_buffer {
 # Retrieve information about all course maps in main content area 
 
     my $allmaps = {};
-    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk);
+    my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk,
+        @updatetoolsenc,$updatetoolscache,$checkedsameinst,
+        $same_institution);
 
 # Loop over the items to paste
     foreach my $suffix (@dopaste) {
@@ -2003,12 +3051,27 @@ sub do_paste_from_buffer {
                     $fromothercrs = 1;
                     $info{'cdom'} = $srcdom{$suffix};
                     $info{'cnum'} = $srcnum{$suffix};
+                    unless ($checkedsameinst) {
+                        my $primary_id = &Apache::lonnet::domain($coursedom,'primary');
+                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                        if ($intdom ne '') {
+                            my $internet_names =
+                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                            if (ref($internet_names) eq 'ARRAY') {
+                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                    $same_institution = 1;
+                                }
+                            }
+                        }
+                        $checkedsameinst = 1;
+                    }
                 }
             }
             unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) {
                 my (%lockerr,$msg);
                 my ($newurl,$result,$errtext) =
-                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr);
+                    &dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles,
+                            \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
                 if ($result eq 'ok') {
                     $url = $newurl;
                     $title=&mt('Copy of').' '.$title;
@@ -2177,6 +3240,10 @@ sub do_paste_from_buffer {
             }
         }
     }
+    if (($updatetoolscache) || (@updatetoolsenc)) {
+        &update_ltitools_caches($coursedom,$coursenum,$updatetoolscache,
+                                \@updatetoolsenc);
+    }
     &clear_from_buffer(\@toclear,\@currpaste);
     my $msgsarray;
     foreach my $suffix (keys(%msgs)) {
@@ -2225,6 +3292,30 @@ sub clear_from_buffer {
     return $numdel;
 }
 
+sub update_ltitools_caches {
+    my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_;
+    my $hashid=$coursedom.'_'.$coursenum;
+    if ($updatetoolscache) {
+        &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
+    }
+    if ((ref($updatetoolsenc) eq 'ARRAY') &&
+        (@{$updatetoolsenc})) {
+        my @ids=&Apache::lonnet::current_machine_ids();
+        my $updatedone;
+        foreach my $lonhost (@{$updatetoolsenc}) {
+            if (grep(/^\Q$lonhost\E$/,@ids)) {
+                unless ($updatedone) {
+                    &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
+                }
+                $updatedone = 1;
+            } else {
+                &Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]);
+            }
+        }
+    }
+    return;
+}
+
 sub get_newmap_url {
     my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum,
         $titleref,$allmaps,$newurls) = @_;
@@ -2286,7 +3377,8 @@ sub get_newmap_url {
 }
 
 sub dbcopy {
-    my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
+    my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles,
+        $currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_;
     my ($url,$result,$errtext);
     if (ref($dbref) eq 'HASH') {
         $url = $dbref->{'src'};
@@ -2330,6 +3422,117 @@ sub dbcopy {
                     my %contents=&Apache::lonnet::dump($db_name,
                                                        $dbref->{'cdom'},
                                                        $dbref->{'cnum'});
+                    my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs);
+                    if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") {
+                        if ($contents{'id'} =~ /^(|c)(\d+)$/) {
+                            $oldtoolid = $2;
+                            if ($1 eq 'c') {
+                                $defincrs = 1;
+                                %toolinfo =
+                                    &Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'});
+                            } else {
+                                %toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer');
+                            }
+                            if (ref($toolinfo{$oldtoolid}) eq 'HASH') {
+                                if ($toolinfo{$oldtoolid}{'passback'}) {
+                                    $toolpassback = 1;
+                                }
+                                if ($toolinfo{$oldtoolid}{'roster'}) {
+                                    $toolroster = 1;
+                                }
+                            } else {
+                                $toolcopyerror = 1;
+                                $errtext = &mt('Could not retrieve original settings for pasted external tool.');
+                            }
+                        }
+                        unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) {
+                            $url = "/adm/$coursedom/$coursenum/$marker/ext.tool";
+                            if ($contents{'crstitle'} ne '') {
+                                $contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'};
+                            }
+                            if (($defincrs) && (!$toolcopyerror)) {
+                                my %newtool;
+                                my $oldcdom = $dbref->{'cdom'};
+                                my $oldcnum = $dbref->{'cnum'};
+                                my $title = $toolinfo{$oldtoolid}{'title'};
+                                if (ref($currltititles) eq 'HASH') {
+                                    if (exists($currltititles->{$title})) {
+                                        $title .= ' (copied from another course)';
+                                    }
+                                }
+                                my ($newid,$iderror) =
+                                    &Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title);
+                                if ($newid =~ /^\d+$/) {
+                                    %{$newtool{$newid}} = %{$toolinfo{$oldtoolid}};
+                                    $newtool{$newid}{'title'} = $title;
+                                    if (ref($currltimax)) {
+                                        $newtool{$newid}{'order'} = $$currltimax;
+                                    }
+                                    if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) {
+                                        my $fname = $1;
+                                        my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'});
+                                        if ($content eq '-1') {
+                                            delete($newtool{$newid}{'image'});
+                                        } else {
+                                            $env{'form.'.$suffix.'.image'} = $content;
+                                            my $newlogo =
+                                                &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname");
+                                            delete($env{'form.'.$suffix.'.image'});
+                                            if ($newlogo =~ m{^/uploaded/}) {
+                                                $newtool{$newid}{'image'} = $newlogo;
+                                            } else {
+                                                delete($newtool{$newid}{'image'});
+                                            }
+                                        }
+                                    }
+                                    my $newusable;
+                                    if ($same_institution) {
+                                        my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum);
+                                        if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') {
+                                            my %newtoolsenc;
+                                            %{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}};
+                                            my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1);
+                                            if ($putres eq 'ok') {
+                                                if (ref($updatetoolsenc) eq 'ARRAY') {
+                                                    my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom);
+                                                    unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) {
+                                                        push(@{$updatetoolsenc},$newhome);
+                                                    }
+                                                }
+                                                $newusable = 1;
+                                            }
+                                        }
+                                    }
+                                    if ($newtool{$newid}{'usable'}) {
+                                        unless ($newusable) {
+                                            delete($newtool{$newid}{'usable'});
+                                        }
+                                    }
+                                    my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum);
+                                    if ($putres eq 'ok') {
+                                        $contents{'id'} = "c$newid";
+                                        if (ref($updatetoolscache)) {
+                                            $$updatetoolscache ++;
+                                        }
+                                        if (ref($currltititles->{$title}) eq 'ARRAY') {
+                                            push(@{$currltititles->{$title}},$newid);
+                                        } else {
+                                            $currltititles->{$title} = [$newid];
+                                        }
+                                        if (ref($currltimax)) {
+                                            $$currltimax ++;
+                                        }
+                                    } else {
+                                        $toolcopyerror = 1;
+                                        $errtext = &mt('Unable to save external tool definition in Course Settings.');
+                                    }
+                                } else {
+                                    $toolcopyerror = 1;
+                                    $errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.');
+                                }
+                            }
+                        }
+                    }
                     if (exists($contents{'uploaded.photourl'})) {
                         my $photo = $contents{'uploaded.photourl'};
                         my ($subdir,$fname) =
@@ -2349,13 +3552,40 @@ sub dbcopy {
                         }
                     }
                     $db_name =~ s{_\d*$ }{_$suffix}x;
-                    if (($prefix eq 'exttool') && ($dbref->{'delgradable'}) && ($contents{'gradable'})) {
-                        delete($contents{'gradable'});
+                    if ($prefix eq 'exttool') {
+                        unless ($toolcopyerror) {
+                            foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') {
+                                if (exists($contents{$key})) {
+                                    delete($contents{$key});
+                                }
+                            }
+                            if ($dbref->{'delgradable'}) {
+                                if (exists($contents{'gradable'})) {
+                                    delete($contents{'gradable'});
+                                }
+                            }
+                            if ($toolpassback) {
+                                if ($contents{'gradable'}) {
+                                    my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                    $contents{'gradesecret'} = $gradesecret;
+                                    $contents{'gradesecretdate'} = time;
+                                }
+                            }
+                            if ($toolroster) {
+                                my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
+                                $contents{'rostersecret'} = $rostersecret;
+                                $contents{'rostersecretdate'} = time;
+                            }
+                        }
                     }
-                    $result=&Apache::lonnet::put($db_name,\%contents,
-                                                 $coursedom,$coursenum);
-                    if ($result eq 'ok') {
-                        $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x;
+                    if (($prefix eq 'exttool') && ($toolcopyerror)) {
+                        $result = 'error';
+                    } else {
+                        $result=&Apache::lonnet::put($db_name,\%contents,
+                                                     $coursedom,$coursenum);
+                        if ($result eq 'ok') {
+                            $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x;
+                        }
                     }
                 }
                 if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
@@ -2510,18 +3740,37 @@ sub contained_map_check {
             if ($token->[1] eq 'resource') {
                 next if ($token->[2]->{'type'} eq 'zombie');
                 my $ressrc = $token->[2]->{'src'};
-                if ($ressrc =~ m{^/adm/($match_domain)/$match_courseid/\d+/ext\.tool$}) {
-                    my $srcdom = $1;
+                if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) {
+                    my ($srcdom,$srcnum,$marker) = ($1,$2,$3);
                     unless ($srcdom eq $coursedom) {
                         $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         next;
                     }
+                    unless ($srcnum eq $coursenum) {
+                        my %toolsettings =
+                            &Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum);
+                        my %tooltypes = &Apache::loncommon::usable_exttools();
+                        if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) ||
+                            (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            next;
+                        }
+                    }
                 } elsif ($folder =~ /^supplemental/) {
                     unless (&supp_pasteable($ressrc)) {
                         $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
                         next;
                     }
                 }
+                if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) {
+                    my ($srcdom,$srcnum) = ($1,$2);
+                    unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) {
+                        if (&Apache::lonnet::is_course($srcdom,$srcnum)) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                            next;
+                        }
+                    }
+                }
                 if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) {
                     if ($1 eq 'uploaded') {
                         $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc;
@@ -2716,7 +3965,9 @@ sub apply_fixups {
         $oldurl,$url,$caller) = @_;
     my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles,
         %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs,
-        %resdatacopy,%lockerrors,$lockmsg);
+        %resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools,
+        %currltititles,$currltimax);
+    $currltimax = 0;
     if (ref($updated) eq 'HASH') {
         if (ref($updated->{'rewrites'}) eq 'HASH') {
             %rewrites = %{$updated->{'rewrites'}};
@@ -2867,6 +4118,7 @@ sub apply_fixups {
                 }
             }
         }
+        my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst);
         foreach my $key (keys(%updates)) {
             my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
             if (ref($rewrites{$key}) eq 'HASH') {
@@ -2887,10 +4139,63 @@ sub apply_fixups {
             if (ref($dbcopies{$key}) eq 'HASH') {
                 foreach my $idx (keys(%{$dbcopies{$key}})) {
                     if (ref($dbcopies{$key}{$idx}) eq 'HASH') {
+                        my $oldurl = $dbcopies{$key}{$idx}{'src'};
+                        my $oldcdom = $dbcopies{$key}{$idx}{'cdom'};
+                        my $oldcnum = $dbcopies{$key}{$idx}{'cnum'};
+                        my $oldmarker;
+                        if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) {
+                            $oldmarker = $1;
+                            unless (($gotcrsltitools) ||
+                                    (($oldcnum eq $cnum) && ($oldcdom eq $cdom))) {
+                                my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum);
+                                if ($oldtoolsettings{'id'} =~ /^c\d+$/) {
+                                    unless ($gotcrsltitools) {
+                                        %currcrsltitools =
+                                            &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+                                        foreach my $item (sort(keys(%currcrsltitools))) {
+                                            if (ref($currcrsltitools{$item}) eq 'HASH') {
+                                                $currltimax ++;
+                                                if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') {
+                                                    push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item);
+                                                } else {
+                                                    $currltititles{$currcrsltitools{$item}{'title'}} = [$item];
+                                                }
+                                            }
+                                        }
+                                        $gotcrsltitools = 1;
+                                    }
+                                    unless ($checkedsameinst) {
+                                        my $primary_id = &Apache::lonnet::domain($cdom,'primary');
+                                        my $intdom = &Apache::lonnet::internet_dom($primary_id);
+                                        if ($intdom ne '') {
+                                            my $internet_names =
+                                                &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+                                            if (ref($internet_names) eq 'ARRAY') {
+                                                if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                                                    $same_institution = 1;
+                                                }
+                                            }
+                                        }
+                                        $checkedsameinst = 1;
+                                    }
+                                }
+                            }
+                        }
                         my ($newurl,$result,$errtext) =
-                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors);
+                            &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles,
+                                    \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution);
                         if ($result eq 'ok') {
                             $newdb{$idx} = $newurl;
+                            if ($newurl =~ /ext\.tool$/) {
+                                if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") {
+                                    if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) {
+                                        my $newmarker = $1;
+                                        unless ($oldmarker eq $newmarker) {
+                                            $torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool";
+                                        }
+                                    }
+                                }
+                            }
                         } elsif (ref($errors) eq 'HASH') {
                             $errors->{$key} = 1;
                         }
@@ -3029,6 +4334,10 @@ sub apply_fixups {
                 }
             }
         }
+        if (($updatetoolscache) || (@updatetoolsenc)) {
+            &update_ltitools_caches($cdom,$cnum,$updatetoolscache,
+                                    \@updatetoolsenc);
+        }
     }
     return ('ok',\@msgs,$lockmsg);
 }
@@ -4385,7 +5694,7 @@ END
                 }
                 $nomodal = 1;
             }
-        } elsif (($uploaded) && (!$allowed) && ($url ne '/adm/supplemental?')) {
+        } elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) {
             my $embstyle=&Apache::loncommon::fileembstyle($extension);
             unless ($embstyle eq 'ssi') {
                 if (($embstyle eq 'img')
@@ -4491,7 +5800,7 @@ $form_common."\n".
 '<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'.
 $form_end; 
         }
-    } elsif ($supplementalflag && !$allowed) {
+    } elsif ($supplementalflag) {
         my $isexttool;
         if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) {
             $url='/adm/wrapper'.$url;
@@ -4554,7 +5863,7 @@ $form_end;
     } else {
         $reinit = &mt('(re-initialize course to access)');
     }
-    $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink;
+    $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>';
     if ($orig_url =~ /$LONCAPA::assess_re/) {
         $line.= '<br />';
         if ($curralias ne '') {
@@ -4565,7 +5874,7 @@ $form_end;
                    $lt{'sa'}.'</a></span>';
         }
     }
-    $line.='</td><td>';
+    $line.='</td><td><span class="LC_nobreak">';
     my ($link,$nolink);
     if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
         if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) {
@@ -4586,12 +5895,20 @@ $form_end;
                $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&');
            }
        }
-       if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) {
+       if (($nomodal) && ($hostname ne '')) {
            $link = 'http://'.$hostname.$url;
        } else {
            $link = $url;
        }
-       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').'inhibitmenu=yes'.$anchor);
+       my $inhibitmenu;
+       if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) ||
+           (($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) ||
+                           ($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) {
+           $inhibitmenu = 'only_body=1';
+       } else {
+           $inhibitmenu = 'inhibitmenu=yes';
+       }
+       $link = &js_escape($link.(($url=~/\?/)?'&amp;':'?').$inhibitmenu.$anchor);
        if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) {
            if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) {
                $nolink = 1;
@@ -5045,7 +6362,7 @@ sub short_urls {
         }
         my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
         $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef,
-                                                             undef,undef,undef,undef,undef,\%currtiny,$readonly));
+                                                             undef,undef,undef,undef,undef,\%currtiny,undef,$readonly));
     }
     $r->print(&endContentScreen());
 }
@@ -5520,6 +6837,7 @@ sub handler {
     my $crstype = &Apache::loncommon::course_type();
     my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $coursehome=$env{'course.'.$env{'request.course.id'}.'.home'};
 
 # get docroot
     my $londocroot = $r->dir_config('lonDocRoot');
@@ -5535,7 +6853,9 @@ sub handler {
 	               'Load_Map','Supplemental','Score_Upload_Form',
 	               'Adding_Pages','Importing_LON-CAPA_Resource',
 	               'Importing_IMS_Course','Uploading_From_Harddrive',
-                       'Course_Roster','Web_Page','Dropbox','Simple_Problem') {
+                       'Course_Roster','Web_Page','Dropbox','Simple_Problem',
+                       'Standard_Problem','Course_Resources',
+                       'Search_LON-CAPA_Resource','Import_Stored_Links') {
 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
@@ -5606,8 +6926,15 @@ sub handler {
       &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions');
       &checkversions($r,$canedit);
   } elsif ($canedit && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space');
+      &init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space');
       &dumpcourse($r);
+  } elsif (($canedit || $canview) && ($env{'form.copyauthored'})) {
+      &init_breadcrumbs('copyauthored','Copy from Course Authoring to User Authoring');
+      my $readonly;
+      if (!$canedit) {
+          $readonly = 1;
+      }
+      &copycrsauthored($r,$coursenum,$coursedom,$coursehome,$readonly);
   } elsif ($canedit && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
       &Apache::imsexport::exportcourse($r);
@@ -5710,8 +7037,11 @@ sub handler {
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
     if ($env{'form.forcestandard'})   { $supplementalflag=0; }
-    unless ($allowed) { $supplementalflag=1; }
-    unless ($standard) { $supplementalflag=1; }
+    unless (($supplementalflag) ||
+            ($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) {
+        unless ($allowed) { $supplementalflag=1; }
+        unless ($standard) { $supplementalflag=1; }
+    }
     my $toolsflag=0;
     if ($env{'form.tools'}) { $toolsflag=1; }
 
@@ -5787,9 +7117,9 @@ sub handler {
             &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom);
         }
     }
-   
-# If we are not allowed to make changes, all we can see are supplemental docs
-    if (!$allowed) {
+
+# Set folderpath if we are not allowed to make changes and this is supplemental content
+    if ((!$allowed) && ($supplementalflag)) {
         unless ($env{'form.folderpath'} =~ /^supplemental/) {
             $env{'form.folderpath'} = &supplemental_base();
         }
@@ -6020,7 +7350,8 @@ sub handler {
         if ($supplementalflag) {
             my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&');
             my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
-            $args = {'bread_crumbs' => $brcrum};
+            $args = {'bread_crumbs' => $brcrum,
+                     'bread_crumbs_nomenu' => 1};
         } else {
             $args = {'force_register' => $showdoc};
         }
@@ -6049,8 +7380,13 @@ sub handler {
             }
         }
         my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
+        my $args = {'bread_crumbs' => $brcrum};
+        unless (($env{'form.folderpath'} eq '') ||
+                ($env{'form.folder'} eq 'supplemental')) {
+            $args->{'bread_crumbs_nomenu'} = 1;
+        }
         $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef,
-                                                {'bread_crumbs' => $brcrum,}));
+                                                 $args));
     } else {
         my ($breadtext,$breadtitle,$helpitem);
         $breadtext = "$crstype Editor";
@@ -6135,7 +7471,7 @@ sub handler {
 
   if ($allowed && $toolsflag) {
       $r->print(&startContentScreen('tools'));
-      $r->print(&generate_admin_menu($crstype,$canedit));
+      $r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom));
       $r->print(&endContentScreen());
   } elsif ((!$showdoc) && (!$uploadphase)) {
 # -----------------------------------------------------------------------------
@@ -6143,8 +7479,8 @@ sub handler {
 		'copm' => 'All documents out of a published map into this folder',
                 'upfi' => 'Upload File',
                 'upld' => 'Upload Content',
-                'srch' => 'Search',
-                'impo' => 'Import',
+                'srch' => 'Search Repository',
+                'impo' => 'Import from Repository',
 		'lnks' => 'Import from Stored Links',
                 'impm' => 'Import from Assembled Map',
                 'imcr' => 'Import from Course Resources',
@@ -6233,10 +7569,7 @@ sub handler {
 	my $fileupload=(<<FIUP);
         $quotainfo
 	$lt{'file'}:<br />
-	<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
-        <input type="hidden" id="LC_free_space" value="$free_space" />
 FIUP
-
 	my $checkbox=(<<CHBO);
 	<!-- <label>$lt{'parse'}?
 	<input type="checkbox" name="parserflag" />
@@ -6256,6 +7589,8 @@ CHBO
         <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 />
+        <input type="hidden" id="LC_free_space_ims" value="$free_space" />
         <br />
         <p>
         $lt{'cms'}:&nbsp; 
@@ -6282,6 +7617,8 @@ IMSFORM
         <legend>$lt{'upfi'}</legend>
 	<input type="hidden" name="active" value="aa" />
     $fileupload
+        <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled />
+        <input type="hidden" id="LC_free_space" value="$free_space" />
 	<br />
 	$lt{'title'}:<br />
 	<input type="text" size="60" name="comment" $disabled />
@@ -6320,13 +7657,33 @@ FUFORM
         </form>
 
 SEDFFORM
-        my $importcrsresform;
-        my ($numdirs,$pickfile) = 
-            &Apache::loncommon::import_crsauthor_form('coursepath','coursefile',
-                                                      "resize_scrollbox('contentscroll','1','0');",
-                                                      undef,'res');
-        if ($pickfile) {
-            $importcrsresform=(<<CRSFORM);
+        my ($importcrsresform,$checkcrsres);
+        if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) {
+            $checkcrsres = 1;
+        } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') {
+            my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom);
+            my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+            unless (($type eq 'community') || ($type eq 'placement')) {
+                $type = 'unofficial';
+                if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') {
+                    $type = 'official';
+                } elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') {
+                    $type = 'textbook';
+                } else {
+                    $type = 'unofficial';
+                }
+            }
+            if ($domdefs{$type.'crsauthor'}) {
+                $checkcrsres = 1;
+            }
+        }
+        if ($checkcrsres) {
+            my ($numdirs,$pickfile) = 
+                &Apache::loncommon::import_crsauthor_form('coursepath','coursefile',
+                                                          "resize_scrollbox('contentscroll','1','0');",
+                                                          undef,'res');
+            if ($pickfile) {
+                $importcrsresform=(<<CRSFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');">
         $lt{'imcr'}</a>$help{'Course_Resources'}
         <form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();">
@@ -6349,6 +7706,7 @@ SEDFFORM
         </fieldset>
         </form>
 CRSFORM
+            }
         }
 
         my $fromstoredjs;
@@ -6359,13 +7717,13 @@ CRSFORM
         }
 
 	my @importpubforma = (
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>$help{'Search_LON-CAPA_Resource'}" },
 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} },
         { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform },
         );
-        if ($pickfile) {
-            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform});
+        if ($importcrsresform) {
+            push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'"  onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform});
 	}
 	$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
         my $extresourcesform =
@@ -6565,7 +7923,7 @@ NROSTFORM
         $help{'Web_Page'}
         </form>
 NWEBFORM
-
+        my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
         my @ids=&Apache::lonnet::current_machine_ids();
         my $machines_str = "'".join("','",@ids)."'";
         my (%is_home,%toppath,$rolehomes);
@@ -6617,13 +7975,14 @@ NWEBFORM
                 }
             }
         }
-        $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n".
-                    '</select><br />'."\n".
+        if ($checkcrsres) {
+            $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n";
+        }
+        $pickdir .= '</select><br />'."\n".
                     $lt{'dire'}.
                     '<select name="authorpath" onchange="toggleCrsResTitle();">'.
                     '<option value=""></option>'.
                     '</select><br />'."\n";
-
         my %seltemplate_menus;
         my @files = &Apache::lonhomework::get_template_list('problem');
         my @noexamplelink = ('blank.problem','blank.library','script.library');
@@ -6663,29 +8022,33 @@ NWEBFORM
                                                                 "resize_scrollbox('contentscroll','1','0');",
                                                                 "toggleExampleText();",'template').'<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=(<<RESFORM);
+                               '<span id="newresexample">'.&mt('Example').'</span></a>';
+        my $crsresform;
+        if (($env{'user.author'}) || ($checkcrsres)) {
+            $crsresform=(<<RESFORM);
         <a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');">
-        $lt{'stpr'}</a>$help{'Course_Resource'}
+        $lt{'stpr'}</a>$help{'Standard_Problem'}
         <form action="/adm/coursedocs" method="post" name="courseresform">
         <fieldset id="crsresform" style="display:none;">
         <legend>$lt{'stpr'}</legend>
         <input type="hidden" name="active" value="bb" />
         <p>
         $pickdir
+        </p>
         <div id="newstdproblem" style="display:none;">
+        <p>
         <span class="LC_nobreak">$lt{'news'}?&nbsp;
         <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>
         <input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" />
-        </div>
         </p>
+        </div>
         $lt{'fnam'}
         <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled />
-        <p>
         <div id="newresource" style="display:none">
+        <p>
         $lt{'addp'}
         <label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled />
         $lt{'no'}</label>&nbsp;&nbsp;
@@ -6693,24 +8056,23 @@ NWEBFORM
         $lt{'yes'}</label>
         <span id="newrestitle"></span>
         <input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled />
-        </div>
         </p>
+        </div>
         <p>
         $lt{'uste'}
         <label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled />
         $lt{'no'}</label>&nbsp;&nbsp;
         <label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled />
         $lt{'yes'}</label>
+        </p>
         <div id="newrestemplate" style="display:none">
         $templates
         $templatepreview
         </div>
-        </p>
         <span class="LC_nobreak">
-        <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+        <input type="hidden" name="folderpath" value="$showpath" />
         <input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled />
         </span>
-        </div>
         <div id="stdprobswitch" style="display:none;">
         $rolehomes
         <input type="button" name="switchfornewprob" value="$lt{'swit'}" onclick="switchForProb();" />
@@ -6719,6 +8081,7 @@ NWEBFORM
         </form>
 
 RESFORM
+        }
 
 my $specialdocumentsform;
 my @specialdocumentsforma;
@@ -6812,9 +8175,13 @@ NGFFORM
         @gradingforma=(
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
-        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
         );
+        if ($crsresform) {
+            push(@gradingforma,
+                 {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform}
+            );
+        }
         $gradingform = &create_form_ul(&create_list_elements(@gradingforma));
 
         @communityforma=(
@@ -6828,9 +8195,9 @@ NGFFORM
 
 my %orderhash = (
                 'aa' => ['Upload',$fileuploadform],
-                'bb' => ['Import',$importpubform],
-                'cc' => ['External',$externalform],
-                'dd' => ['Grading',$gradingform],
+                'bb' => ['External',$externalform],
+                'cc' => ['Import',$importpubform],
+                'dd' => ['Assessment',$gradingform],
                 'ff' => ['Other',$specialdocumentsform],
                 );
 unless ($container eq 'page') {
@@ -6883,6 +8250,8 @@ unless ($container eq 'page') {
         <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 />
+        <input type="hidden" id="LC_free_space_supp" value="$free_space" />
 	<br />
 	<br />
 	<span class="LC_nobreak">
@@ -7207,7 +8576,7 @@ sub remove_archive {
 }
 
 sub generate_admin_menu {
-    my ($crstype,$canedit) = @_;
+    my ($crstype,$canedit,$coursenum,$coursedom) = @_;
     my $lc_crstype = lc($crstype);
     my ($home,$other,%outhash)=&authorhosts();
     my %lt= ( # do not translate here
@@ -7215,14 +8584,17 @@ sub generate_admin_menu {
                                          'cv'   => 'Check/Set Resource Versions',
                                          'ls'   => 'List Resource Identifiers',
                                          'ct'   => 'Display/Set Shortened URLs for Deep-linking',
+                                         'ca'   => "Enter $crstype Authoring Space",
                                          'imse' => 'Export contents to IMS Archive',
-                                         'dcd'  => "Copy $crstype Content to Authoring Space",
+                                         'dcd'  => 'Copy uploaded content to Authoring Space',
+                                         'cpc'  => 'Copy from Course Authoring to User Authoring',
             );
-    my ($candump,$dumpurl);
+    my ($candump,$dumpurl,$exportcrsurl);
     if ($home + $other > 0) {
         $candump = 'F';
         if ($home) {
             $dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')";
+            $exportcrsurl = "javascript:injectData(document.courseverify,'dummy','copyauthored','$lt{'cpc'}')";
         } else {
             my @hosts;
             foreach my $aurole (keys(%outhash)) {
@@ -7236,8 +8608,10 @@ sub generate_admin_menu {
                                &HTML::Entities::encode($env{'request.role'},'"<>&').'&amp;origurl='.
                                &HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&');
                 $dumpurl = "javascript:dump_needs_switchserver('$switchto')";
+                $exportcrsurl = $dumpurl;
             } else {
                 $dumpurl = "javascript:choose_switchserver_window()";
+                $exportcrsurl = $dumpurl;
             }
         }
     }
@@ -7275,6 +8649,33 @@ sub generate_admin_menu {
                 ]
         });
     if ($canedit) {
+        my ($crsauname,$crsaudom,$crshome);
+        if (($coursenum ne '') && ($coursedom ne '')) {
+            my $crsauthorurl = "/priv/$coursedom/$coursenum/";
+            ($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl);
+            if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) {
+                my @ids=&Apache::lonnet::current_machine_ids();
+                my $linkurl;
+                if (grep(/^\Q$crshome\E$/,@ids)) {
+                    $linkurl = $crsauthorurl;
+                } else {
+                    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') && ($linkurl)) {
+                     push(@{$menu[0]->{items}},
+                     {   linktext   => $lt{'ca'},
+                         url        => $linkurl,
+                         permission => 'F',
+                         help       => 'Docs_Course_Authorspace',
+                         icon       => 'impcrsau.png',
+                         linktitle  => $lt{'ca'},
+                     });
+                }
+            }
+        }
         push(@menu,
         {   categorytitle=>'Export',
             items =>[
@@ -7294,6 +8695,18 @@ sub generate_admin_menu {
                 },
                 ]
         });
+        if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) {
+            if ((ref($menu[1]) eq 'HASH') && (ref($menu[1]->{'items'}) eq 'ARRAY')) {
+                push(@{$menu[1]->{items}},
+                     {   linktext   => $lt{'cpc'},
+                         url        => $exportcrsurl,
+                         permission => 'F',
+                         help       => 'Docs_Export_Course_Author',
+                         icon       => 'res.png',
+                         linktitle  => $lt{'cpc'},
+                     });
+            }
+        }
     }
     return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n".
            '<input type="hidden" id="dummy" />'."\n".
@@ -7812,6 +9225,13 @@ function toggleMap(caller) {
             }
         }
         document.getElementById('importmapform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importcrsresform')) {
+                if (document.getElementById('importcrsresform').style.display == 'block') {
+                    document.getElementById('importcrsresform').style.display = 'none';
+                }
+            }
+        }
         resize_scrollbox('contentscroll','1','1');
     }
     return;
@@ -8012,6 +9432,13 @@ function toggleImportCrsres(caller) {
             }
         }
         document.getElementById('importcrsresform').style.display=disp;
+        if (disp == 'block') {
+            if (document.getElementById('importmapform')) {
+                if (document.getElementById('importmapform').style.display == 'block') {
+                    document.getElementById('importmapform').style.display = 'none';
+                }
+            }
+        }
         resize_scrollbox('contentscroll','1','0');
     }
     return;
@@ -8063,6 +9490,7 @@ function populateDirSelects(form,locsel,
                 }
             }
         }
+        var templateradio = document.courseresform.elements['newresusetemp'];
         if (athome) {
             if (document.getElementById('stdprobswitch')) {
                 document.getElementById('stdprobswitch').style.display = 'none';
@@ -8070,6 +9498,16 @@ function populateDirSelects(form,locsel,
             if (document.getElementById('newstdproblem')) {
                 document.getElementById('newstdproblem').style.display = 'none';
             }
+            var canedit = '$canedit';
+            if (canedit) {
+                if (templateradio.length > 1) {
+                    for (var i=0; i<templateradio.length; i++) {
+                        templateradio[i].disabled = false;
+                    }
+                }
+                document.courseresform.newresourcename.disabled = false;
+                document.courseresform.newcrs.disabled = false;
+            }
             var http = new XMLHttpRequest();
             var url = "/adm/courseauthor";
             var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1";
@@ -8108,6 +9546,13 @@ function populateDirSelects(form,locsel,
             if (document.getElementById('newstdproblem')) {
                 document.getElementById('newstdproblem').style.display = 'none';
             }
+            if (templateradio.length > 1) {
+                for (var i=0; i<templateradio.length; i++) {
+                    templateradio[i].disabled = true;
+                }
+            }
+            document.courseresform.newresourcename.disabled = true;
+            document.courseresform.newcrs.disabled = true;
         }
     }
     return;
@@ -8959,7 +10404,7 @@ sub dump_switchserver_js {
     );
     my %html_js_lt = &Apache::lonlocal::texthash(
         swit => 'Switch server?',
-        duco => 'Copying Content to Authoring Space',
+        duco => 'Copying uploaded content to Authoring Space',
         yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.',
         chos => 'Choose server',
     );
@@ -9100,55 +10545,8 @@ sub makenewproblem {
                         if ($redirect) {
                             my $rightsfile = 'default.rights';
                             my $sourcerights = "$path/$rightsfile";
+                            &Apache::loncommon::crsauthor_rights($rightsfile,$path,$docroot,$coursenum,$coursedom);
                             my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile";
-                            my $now = time;
-                            if (!-e $sourcerights) {
-                                my $cid = $coursedom.'_'.$coursenum;
-                                if (open(my $fh,">$sourcerights")) {
-                                    print $fh <<END;
-<accessrule effect="deny" realm="" type="course" role="" />
-<accessrule effect="allow" realm="$cid" type="course" role="" />
-END
-                                    close($fh);
-                                }
-                            }
-                            if (!-e "$sourcerights.meta") {
-                                if (open(my $fh,">$sourcerights.meta")) {
-                                    my $author=$env{'environment.firstname'}.' '.
-                                               $env{'environment.middlename'}.' '.
-                                               $env{'environment.lastname'}.' '.
-                                               $env{'environment.generation'};
-                                    $author =~ s/\s+$//;
-                                    print $fh <<"END";
-
-<abstract></abstract>
-<author>$author</author>
-<authorspace>$coursenum:$coursedom</authorspace>
-<copyright>private</copyright>
-<creationdate>$now</creationdate>
-<customdistributionfile></customdistributionfile>
-<dependencies></dependencies>
-<domain>$coursedom</domain>
-<highestgradelevel>0</highestgradelevel>
-<keywords></keywords>
-<language>notset </language>
-<lastrevisiondate>$now</lastrevisiondate>
-<lowestgradelevel>0</lowestgradelevel>
-<mime>rights</mime>
-<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>
-<notes></notes>
-<obsolete></obsolete>
-<obsoletereplacement></obsoletereplacement>
-<owner>$coursenum:$coursedom</owner>
-<rule>deny:::course,allow:$cid::course</rule>
-<sourceavail></sourceavail>
-<standards></standards>
-<subject></subject>
-<title></title>
-END
-                                    close($fh);
-                                }
-                            }
                             if ((-e $sourcerights) && (-e "$sourcerights.meta")) {
                                 if (!-e "$docroot/res/$coursedom") {
                                     mkdir("$docroot/res/$coursedom",0755);