--- loncom/interface/londocs.pm	2004/12/23 16:31:27	1.159
+++ loncom/interface/londocs.pm	2005/11/17 19:37:30	1.213
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.159 2004/12/23 16:31:27 raeburn Exp $
+# $Id: londocs.pm,v 1.213 2005/11/17 19:37:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,17 +86,17 @@ sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
-    foreach (keys %ENV) {
+    foreach (keys %env) {
 	if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
 	    my $realm=$2;
-	    my ($start,$end)=split(/\./,$ENV{$_});
+	    my ($start,$end)=split(/\./,$env{$_});
 	    if (($start) && ($start>time)) { next; }
 	    if (($end) && (time>$end)) { next; }
 	    my $ca; my $cd;
 	    if ($1 eq 'au') {
-		$ca=$ENV{'user.name'};
-		$cd=$ENV{'user.domain'};
+		$ca=$env{'user.name'};
+		$cd=$env{'user.domain'};
 	    } else {
 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
 	    }
@@ -132,35 +132,44 @@ sub dumpbutton {
     }
 }
 
+sub clean {
+    my ($title)=@_;
+    $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
+    return $title;	
+}
 # -------------------------------------------------------- Actually dump course
 
 sub dumpcourse {
     my $r=shift;
-    $r->print('<html><head><title>Dump DOCS</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Dump DOCS</title></head>'.
         &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
 	      '<form name="dumpdoc" method="post">');
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
-    my $origcrsid=$ENV{'request.course.id'};
+    my $origcrsid=$env{'request.course.id'};
     my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
-    if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) {
+    if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) {
 # Do the dumping
-	unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
-	my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
+	unless ($outhash{'home_'.$env{'form.authorspace'}}) { return ''; }
+	my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
-	my $title=$ENV{'form.authorfolder'};
-	$title=~s/[^\w\/]+/\_/g;
+	my $title=$env{'form.authorfolder'};
+	$title=&clean($title);
 	my %replacehash=();
-	foreach (keys %ENV) {
+	foreach (keys %env) {
 	    if ($_=~/^form\.namefor\_(.+)/) {
-		$replacehash{$1}=$ENV{$_};
+		$replacehash{$1}=$env{$_};
 	    }
 	}
-	my $crs='/uploaded/'.$ENV{'request.course.id'}.'/';
+	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
 	foreach (keys %replacehash) {
 	    my $newfilename=$title.'/'.$replacehash{$_};
-	    $newfilename=~s/[^\w\/\.\/]+/\_/g;
+	    $newfilename=~s/\.(\w+)$//;
+	    my $ext=$1;
+	    $newfilename=&clean($newfilename);
+	    $newfilename.='.'.$ext;
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -175,12 +184,12 @@ sub dumpcourse {
 	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
 		if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
 		    print $fh &Apache::loncreatecourse::rewritefile(
-         &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_),
+         &Apache::loncreatecourse::readfile($env{'request.course.id'},$_),
 				     (%replacehash,$crs => '')
 								    );
 		} else {
 		    print $fh
-         &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_);
+         &Apache::loncreatecourse::readfile($env{'request.course.id'},$_);
 		       }
 		$fh->close();
 	    } else {
@@ -214,7 +223,7 @@ sub dumpcourse {
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
-	$title=~s/\W//gs;
+	$title=&clean($title);
 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
@@ -223,12 +232,13 @@ sub dumpcourse {
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $title=~s/&colon;/:/g;
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    unless ($title) {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/[^\w\/]+/\_/gs;
+	    $title=&clean($title);
 	    $title.='.'.$ext;
 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
@@ -245,13 +255,13 @@ sub exportbutton {
     return '</td><td bgcolor="#DDDDCC">'.
             '<input type="submit" name="exportcourse" value="'.
             &mt('Export Course to IMS').'" />'.
-            &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
 }
 
 sub exportcourse {
     my $r=shift;
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                                               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+                                               $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
     my $numdisc = keys %discussiontime;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
@@ -260,26 +270,12 @@ sub exportcourse {
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['finishexport']);
-    if ($ENV{'form.finishexport'}) {
+    if ($env{'form.finishexport'}) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['archive','discussion']);
 
-        my @exportitems = ();
-        if (defined($ENV{'form.archive'})) {
-            if (ref($ENV{'form.archive'}) eq 'ARRAY') {
-                @exportitems = @{$ENV{'form.archive'}};
-            } else {
-                $exportitems[0] = $ENV{'form.archive'};
-            }
-        }
-        my @discussions = ();
-        if (defined($ENV{'form.discussion'})) {
-            if (ref($ENV{'form.discussion'}) eq 'ARRAY') {
-                @discussions = $ENV{'form.discussion'};
-            } else {
-                $discussions[0] = $ENV{'form.discussion'};
-            }
-        }
+        my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
+        my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
         if (@exportitems == 0 && @discussions == 0) {
             $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
         } else {
@@ -296,20 +292,14 @@ sub exportcourse {
 
 #Create zip file in prtspool
                 my $imszipfile = '/prtspool/'.
-                $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+                $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
                    time.'_'.rand(1000000000).'.zip';
-# zip can cause an sh launch which can pass along all of %ENV
-# which can be too large for /bin/sh to handle
-                my %oldENV=%ENV;
-                undef(%ENV);
                 my $cwd = &Cwd::getcwd();
                 my $imszip = '/home/httpd/'.$imszipfile;
                 chdir $tempexport;
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
-                %ENV=%oldENV;
-                undef(%oldENV);
                 $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />';
                 if ($copyresult) {
                     $outcome .= 'The following errors occurred during export - '.$copyresult;
@@ -318,8 +308,8 @@ sub exportcourse {
                 $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
             }
         }
-
-        $r->print('<html><head><title>Export Course</title></head>'.
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title></head>'.
             &Apache::loncommon::bodytag('Export course to IMS content package'));
         $r->print($outcome);
         $r->print('</body></html>');
@@ -460,7 +450,8 @@ function containerCheck(item) {
 
 </script>
         |;
-        $r->print('<html><head><title>Export Course</title>'.$scripttag.'</head>'.
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
             &Apache::loncommon::bodytag('Export course to IMS content package'
 ));
 
@@ -482,7 +473,7 @@ sub create_ims_store {
     if (!-e $$tempexport) {
         mkdir($$tempexport,0700);
     }
-    $$tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
+    $$tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'};
     if (!-e $$tempexport) {
         mkdir($$tempexport,0700);
     }
@@ -499,13 +490,24 @@ sub create_ims_store {
 '<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
 ' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
 ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
-' identifier="MANIFEST-'.$ENV{'request.course.id'}.'-'.$now.'"'.
+' identifier="MANIFEST-'.$env{'request.course.id'}.'-'.$now.'"'.
 '  xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'.
 '  http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n".
-'  <organizations default="ORG-'.$ENV{'request.course.id'}.'-'.$now.'">'."\n".
-'    <organization identifier="ORG-'.$ENV{'request.course.id'}.'-'.$now.'"'.
+'  <metadata>
+    <schema></schema>
+    <imsmd:lom>
+      <imsmd:general>
+        <imsmd:identifier>'.$env{'request.course.id'}.'</imsmd:identifier>
+        <imsmd:title>
+          <imsmd:langstring xml:lang="en">'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</imsmd:langstring>
+        </imsmd:title>
+      </imsmd:general>
+    </imsmd:lom>
+  </metadata>'."\n".
+'  <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
+'    <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
 ' structure="hierarchical">'."\n".
-'      <title>'.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.'</title>'
+'      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'
     } else {
         $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
 ;
@@ -523,8 +525,8 @@ sub build_package {
     my $lastcontainer = 0;
     my %parent = ();
     my @dependencies = ();
-    my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     while ($curRes = $it->next()) {
         if (ref($curRes)) {
             $count ++;
@@ -553,7 +555,6 @@ sub build_package {
     $count = 0;
     my $imsresources;
     my $pkgdepth;
-    my $included = 0;
     while ($curRes = $it->next()) {
         if ($curRes == $it->BEGIN_MAP()) {
             $prevdepth = $depth;
@@ -574,16 +575,19 @@ sub build_package {
                     $isvisible = 'false';
                 }
                 unless ($curRes->is_sequence()) {
-                    $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"';
+                    $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
                 }
-                if (($depth <= $prevdepth) && ($count > 1) && ($included)) {
-                    print $ims_manifest "\n".'  </item>'."\n";
+                my $step = $prevdepth - $depth;
+                if (($step >= 0) && ($count > 1)) {
+                    while ($step >= 0) {
+                        print $ims_manifest "\n".'  </item>'."\n";
+                        $step --;
+                    }
                 }
-                $included = 1;
                 $prevdepth = $depth;
 
                 my $itementry =
-              '<item identifier="ITEM-'.$ENV{'request.course.id'}.'-'.$count.
+              '<item identifier="ITEM-'.$env{'request.course.id'}.'-'.$count.
               '" isvisible="'.$isvisible.'" '.$resourceref.'>'.
               '<title>'.$curRes->title().'</title>';
                 print $ims_manifest "\n".$itementry;
@@ -594,7 +598,7 @@ sub build_package {
                     &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);
                     if ($content_file) {
                         $imsresources .= "\n".
-                     '   <resource identifier="RES-'.$ENV{'request.course.id'}.'-'.$count.
+                     '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                      '" type="webcontent" href="'.$content_file.'">'."\n".
                      '       <file href="'.$content_file.'" />'."\n";
                         foreach (@hrefs) {
@@ -621,8 +625,6 @@ sub build_package {
                     }
                 }
                 $pkgdepth = $depth;
-            } else {
-                $included = 0;
             }
         }
     }
@@ -657,8 +659,6 @@ sub process_content {
     my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
     my $content_type;
     my $message;
-# find where user is author or co-author
-    my %roleshash = &Apache::lonnet::get_my_roles();
     my @uploads = ();
     if ($curRes->is_sequence()) {
         $content_type = 'sequence';
@@ -691,7 +691,7 @@ sub process_content {
         if ($contents) {
             $$content_file = &store_template($contents,$tempexport,$count,$content_type);
         }
-    } elsif ($symb =~ m-lib/templates/examupload\.problem-m) {
+    } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
         $content_type = 'examupload';
     } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
         $content_type = 'bulletinboard';
@@ -705,29 +705,21 @@ sub process_content {
         if ($contents) {
             $$content_file = &store_template($contents,$tempexport,$count,$content_type);
         }
-    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
-        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
     } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) {
         $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
-    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/])/([^/])-) {
-        my $coauth = $3.':'.$2.':ca';
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
         my $canedit = 0;
-        if ($2 eq $ENV{'user.domain'} && $3 eq $ENV{'user.name'})  {
+        if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'})  {
             $canedit= 1;
-        } elsif (defined($roleshash{$coauth})) {
-            if ($roleshash{$coauth} =~ /(\d+):(\d+)/) {
-                if (($1 < time || $1 == 0) && ($2 == 0 || $2 >= time)) {
-                    $canedit = 1;
-                }
-            } elsif ($roleshash{$coauth} eq ':') {
-                $canedit = 1;
-            }
         }
+# only include problem code where current user is author
         if ($canedit) {
             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
         } else {
             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
         }
+    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
     }
     if (@uploads > 0) {
         foreach my $item (@uploads) {
@@ -769,46 +761,114 @@ sub replicate_content {
         if ($copiedfile = Apache::File->new('>'.$destination)) {
             my $content;
             if ($caller eq 'resource') {
-                $content = &Apache::lonnet::getfile($url);
+                my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
+                my $filepath = &Apache::lonnet::filelocation($respath,$url);
+                $content = &Apache::lonnet::getfile($filepath);
                 if ($content eq -1) {
                     $$message = 'Could not copy file '.$filename;
                 } else {
-                    &extract_media($content,$count,$tempexport,$href,'resource');
+                    &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'resource');
                     $repstatus = 'ok';
                 }
-            } elsif ($caller eq 'noedit' || $caller eq 'uploaded' || $caller eq 'templateupload') {
+            } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
                 my $rtncode;
                 $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
                 if ($repstatus eq 'ok') {
                     if ($url =~ /\.html?$/i) {
-                        &extract_media(\$content,$count,$tempexport,$href,'uploaded');
+                        &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'uploaded');
                     }
                 } else {
-                    $$message = 'Could not render '.$url.' server message - '.$rtncode;
+                    $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                 }
+            } elsif ($caller eq 'noedit') {
+# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. 
+                $repstatus = 'ok';
+                $content = 'Not the owner of this resource'; 
             }
             if ($repstatus eq 'ok') {
                 print $copiedfile $content;
             }
             close($copiedfile);
         } else {
-            $$message = 'Could not open destination file for '.$filename."\n";
+            $$message = 'Could not open destination file for '.$filename."<br />\n";
         }
     } else {
-        $$message = 'Could not determine name of file for '.$symb."\n";
+        $$message = 'Could not determine name of file for '.$symb."<br />\n";
     }
     if ($repstatus eq 'ok') {
-        $content_name = $count.'/'.$filename;
+        $content_name = 'resources/'.$count.'/'.$filename;
     }
     return $content_name;
 }
 
 sub extract_media {
-    my ($content,$count,$tempexport,$href,$caller) = @_;
-# @$href will contain path to any embedded resources in the content.
-# For LON-CAPA problems this would be images. applets etc. 
-# For uploaded HTML files this would be images etc.
-# paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths. 
+    my ($url,$cdom,$cnum,$content,$count,$tempexport,$href,$message,$caller) = @_;
+    my ($dirpath,$container);
+    my %allfiles = ();
+    my %codebase = ();
+    if ($url =~ m-(.*/)([^/]+)$-) {
+        $dirpath = $1;
+        $container = $2;
+    } else {
+        $dirpath = $url;
+        $container = '';
+    }
+    &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);
+    foreach my $embed_file (keys(%allfiles)) {
+        my $filename;
+        if ($embed_file =~ m#([^/]+)$#) {
+            $filename = $1;
+        } else {
+            $filename = $embed_file;
+        }
+        my $newname = 'res/'.$filename;
+        my ($rtncode,$embed_content,$repstatus);
+        my $embed_url;
+        if ($embed_file =~ m-^/-) {
+            $embed_url = $embed_file;           # points to absolute path
+        } else {
+            if ($embed_file =~ m-https?://-) {
+                next;                           # points to url
+            } else {
+                $embed_url = $dirpath.$embed_file;  # points to relative path
+            }
+        }
+        if ($caller eq 'resource') {
+            my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';  
+            my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url); 
+            $embed_content = &Apache::lonnet::getfile($embed_path);
+            unless ($embed_content eq -1) {
+                $repstatus = 'ok';
+            }
+        } elsif ($caller eq 'uploaded') {
+            
+            $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
+        }
+        if ($repstatus eq 'ok') {
+            my $destination = $tempexport.'/resources/'.$count.'/res';
+            if (!-e "$destination") {
+                mkdir($destination,0755);
+            }
+            $destination .= '/'.$filename;
+            my $copiedfile;
+            if ($copiedfile = Apache::File->new('>'.$destination)) {
+                print $copiedfile $embed_content;
+                push @{$href}, 'resources/'.$count.'/res/'.$filename;
+                my $attrib_regexp = '';
+                if (@{$allfiles{$embed_file}} > 1) {
+                    $attrib_regexp = join('|',@{$allfiles{$embed_file}});
+                } else {
+                    $attrib_regexp = $allfiles{$embed_file}[0];
+                }
+                $$content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$embed_file\E(['"]?)#$1$newname$2#gi;
+                if ($caller eq 'resource' && $container =~ /\.(problem|library)$/) {
+                    $$content =~ s#\Q$embed_file\E#$newname#gi;
+                }
+            }
+        } else {
+            $$message .= 'replication of embedded file - '.$embed_file.' in '.$url.' failed, reason -'.$rtncode."<br />\n";
+        }
+    }
     return;
 }
 
@@ -829,9 +889,9 @@ sub store_template {
                 close($storetemplate);
             }
             if ($content_type eq 'external') {
-                return $count.'/'.$content_type.'.html';
+                return 'resources/'.$count.'/'.$content_type.'.html';
             } else {
-                return $count.'/'.$content_type.'.xml';
+                return 'resources/'.$count.'/'.$content_type.'.xml';
             }
         }
     }
@@ -856,9 +916,8 @@ sub group_import {
                             '<link from="1" to="2" index="1"></link>'."\n".
                             '<resource id="2" src="" type="finish"></resource>'."\n".
                             '</map>';
-            $ENV{'form.output'}=$newmapstr;
-            my $home=&Apache::lonnet::homeserver($coursenum,$coursedom);
-            my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home,
+            $env{'form.output'}=$newmapstr;
+            my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                 'output',$1.$2);
             if ($result != m|^/uploaded/|) {
                 $errtext.='Map not saved: A network error occured when trying to save the new map. ';
@@ -869,7 +928,7 @@ sub group_import {
             }
         }
 	if ($url) {
-	    my $idx = $#Apache::lonratedt::resources + 1;
+	    my $idx = &Apache::lonratedt::getresidx($url);
 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
 	    my $ext = 'false';
 	    if ($url=~/^http:\/\//) { $ext = 'true'; }
@@ -886,12 +945,20 @@ sub breadcrumbs {
     my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
-    if ($ENV{'form.pagepath'}) {
-        @folders = split('&',$ENV{'form.pagepath'});
+    if ($env{'form.pagepath'}) {
+        @folders = split('&',$env{'form.pagepath'});
     } else {
-        @folders=split('&',$ENV{'form.folderpath'});
+        @folders=split('&',$env{'form.folderpath'});
     }
     my $folderpath;
+    my $cpinfo='';
+    if ($env{'form.markedcopy_url'}) {
+	&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'});
+       $cpinfo='&markedcopy_url='.
+               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               '&markedcopy_title='.
+               &Apache::lonnet::escape($env{'form.markedcopy_title'});
+    }
     while (@folders) {
 	my $folder=shift(@folders);
 	my $foldername=shift(@folders);
@@ -900,7 +967,7 @@ sub breadcrumbs {
 	my $url='/adm/coursedocs?folderpath='.
 	    &Apache::lonnet::escape($folderpath);
 	    &Apache::lonhtmlcommon::add_breadcrumb(
-		      {'href'=>$url,
+		      {'href'=>$url.$cpinfo,
 		       'title'=>&Apache::lonnet::unescape($foldername),
 		       'text'=>'<font size="+1">'.
 			   &Apache::lonnet::unescape($foldername).'</font>'
@@ -913,53 +980,60 @@ sub breadcrumbs {
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
-
-    $r->print(&breadcrumbs($folder));
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
     my $errtext='';
     my $fatal=0;
     my $container='sequence';
-    if ($ENV{'form.pagepath'}) {
+    if ($env{'form.pagepath'}) {
         $container='page';
     }
     ($errtext,$fatal)=
               &mapread($coursenum,$coursedom,$folder.'.'.$container);
     if ($#Apache::lonratedt::order<1) {
-       	$Apache::lonratedt::order[0]=1;
-        $Apache::lonratedt::resources[1]='';
+	my $idx=&Apache::lonratedt::getresidx();
+	if ($idx<=0) { $idx=1; }
+       	$Apache::lonratedt::order[0]=$idx;
+        $Apache::lonratedt::resources[$idx]='';
+    }
+    if (defined($env{'form.markcopy'})) {
+# Mark for copying
+	my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]);
+	$env{'form.markedcopy_title'}=$title;
+	$env{'form.markedcopy_url'}=$url;
     }
+    $r->print(&breadcrumbs($folder));
     if ($fatal) {
 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
-	if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
+	if (($allowed) && ($env{'form.folder'} eq $folder)) {
 # set parameters and change order
-	    if (defined($ENV{'form.setparms'})) {
-		my $idx=$ENV{'form.setparms'};
+	    if (defined($env{'form.setparms'})) {
+		my $idx=$env{'form.setparms'};
 # set parameters
-		if ($ENV{'form.randpick_'.$idx}) {
-		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
+		if ($env{'form.randpick_'.$idx}) {
+		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
 		} else {
 		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
 		}
-		if ($ENV{'form.hidprs_'.$idx}) {
+		if ($env{'form.hidprs_'.$idx}) {
 		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
 		} else {
 		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
 		}
-		if ($ENV{'form.encprs_'.$idx}) {
+		if ($env{'form.encprs_'.$idx}) {
 		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
 		} else {
 		    &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
 		}
 
-		if ($ENV{'form.newpos'}) {
+		if ($env{'form.newpos'}) {
 # change order
 
-		    my $newpos=$ENV{'form.newpos'}-1;
-		    my $currentpos=$ENV{'form.currentpos'}-1;
+		    my $newpos=$env{'form.newpos'}-1;
+		    my $currentpos=$env{'form.currentpos'}-1;
 		    my $i;
 		    my @neworder=();
 		    if ($newpos>$currentpos) {
@@ -998,50 +1072,66 @@ sub editor {
 		}
 		
 	    }
+	    if ($env{'form.pastemarked'}) {
+# paste resource to end of list
+                my $url=$env{'form.markedcopy_url'};
+		my $title=$env{'form.markedcopy_title'};
+# Maps need to be copied first
+		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
+		    $title=&mt('Copy of').' '.$title;
+                    my $newid=$$.time;
+		    $url=~/^(.+)\.(\w+)$/;
+		    my $newurl=$1.$newid.'.'.$2;
+		    my $storefn=$newurl;
+                    $storefn=~s/^\/\w+\/\w+\/\w+\///;
+		    &Apache::loncreatecourse::writefile
+			($env{'request.course.id'},$storefn,
+			 &Apache::lonnet::getfile($url));
+		    $url=$newurl;
+		}
+		$title=~s/\</\&lt\;/g;
+		$title=~s/\>/\&gt\;/g;
+		$title=~s/\:/\&colon;/g;
+		my $ext='false';
+		if ($url=~/^http\:\/\//) { $ext='true'; }
+		$url=~s/\:/\&colon;/g;
+# Now insert the URL at the bottom
+                my $newidx=&Apache::lonratedt::getresidx($url);
+		$Apache::lonratedt::resources[$newidx]=
+		    $title.':'.$url.':'.$ext.':normal:res';
+		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
+# Store the result
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
 
-# upload a file, if present
-           if (($ENV{'form.uploaddoc.filename'}) &&
-               ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
-	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
-# this is for a course, not a user, so set coursedoc flag
-# probably the only place in the system where this should be "1"
-	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
-              my $ext='false';
-              if ($url=~/^http\:\/\//) { $ext='true'; }
-              $url=~s/\:/\&colon;/g;
-	      my $comment=$ENV{'form.comment'};
-              $comment=~s/\</\&lt\;/g;
-              $comment=~s/\>/\&gt\;/g;
-              $comment=~s/\:/\&colon;/g;
-              if ($folder=~/^supplemental/) {
-		  $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
-		      $ENV{'user.domain'}.'___&&&___'.$comment;
-              }
-              my $newidx=$#Apache::lonratedt::resources+1;
-              $Apache::lonratedt::resources[$newidx]=
-                  $comment.':'.$url.':'.$ext.':normal:res';
-              $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
-                                                              $newidx;       
-
-	      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-	      if ($fatal) {
-		  $r->print('<p><font color="red">'.$errtext.'</font></p>');
-		  return;
-	      }
-	     }
-            }
-	    if ($ENV{'form.cmd'}) {
-                my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
+	    }
+            $r->print($upload_output);
+	    if ($env{'form.cmd'}) {
+                my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
                 if ($cmd eq 'del') {
 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
-		    if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
+		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
 			&Apache::lonnet::removeuploadedurl($url);
+		    } else {
+			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    }
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];
                     }
                     $#Apache::lonratedt::order--;
+                } elsif ($cmd eq 'cut') {
+		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
+		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
+		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
+                        $Apache::lonratedt::order[$i]=
+                          $Apache::lonratedt::order[$i+1];
+                    }
+                    $#Apache::lonratedt::order--;
                 } elsif ($cmd eq 'up') {
 		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
                     my $i=$Apache::lonratedt::order[$idx-1];
@@ -1062,7 +1152,7 @@ sub editor {
                        $Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]);
                     my $comment=
-                     &HTML::Entities::decode($ENV{'form.title'});
+                     &HTML::Entities::decode($env{'form.title'});
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
@@ -1081,9 +1171,9 @@ sub editor {
 		}
             }
 # Group import/search
-	    if ($ENV{'form.importdetail'}) {
+	    if ($env{'form.importdetail'}) {
 		my @imports;
-		foreach (split(/\&/,$ENV{'form.importdetail'})) {
+		foreach (split(/\&/,$env{'form.importdetail'})) {
 		    if (defined($_)) {
 			my ($name,$url)=split(/\=/,$_);
 			$name=&Apache::lonnet::unescape($name);
@@ -1100,10 +1190,10 @@ sub editor {
 		}
             }
 # Loading a complete map
-	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
-	       foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
-                   my $idx=$#Apache::lonratedt::resources;
-                   $idx++;
+	   if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {
+	       foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
+		   my ($title,$url,$ext,$type)=split(/\:/,$_);
+                   my $idx=&Apache::lonratedt::getresidx($url);
                    $Apache::lonratedt::resources[$idx]=$_;
                    $Apache::lonratedt::order
 		       [$#Apache::lonratedt::order+1]=$idx;
@@ -1125,6 +1215,8 @@ sub editor {
         $r->print('<table>');
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
+	   $name=&Apache::lonratsrv::qtescape($name);
+	   $url=&Apache::lonratsrv::qtescape($url);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { $idx++; next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
@@ -1134,10 +1226,162 @@ sub editor {
 	unless ($shown) {
 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
 	}
-        $r->print('</table>');
+        $r->print("\n</table>\n");
+	if ($env{'form.markedcopy_url'}) {
+	    $r->print(<<ENDPASTE);
+<p><form name="pasteform" action="/adm/coursedocs" method="post">
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+ENDPASTE
+            $r->print(
+	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
+		      '" /> '.&Apache::loncommon::filedescription(
+		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
+		      $env{'form.markedcopy_title'});
+            if ($container eq 'page') {
+		$r->print(<<PAGEINFO);
+<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+PAGEINFO
+            } else {
+		$r->print(<<FOLDERINFO);
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+FOLDERINFO
+	    }
+	    $r->print('</form></p>');
+	}
     }
 }
 
+sub process_file_upload {
+    my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
+# upload a file, if present
+    my $parseaction;
+   if ($env{'form.parserflag'}) {
+        $parseaction = 'parse';
+    }
+    my $phase_status;
+    my $folder=$env{'form.folder'};
+    if ($folder eq '') {
+        $folder='default';
+    }
+    if ( ($folder=~/^$uploadcmd/) || ($uploadcmd eq 'default') ) {
+        my $errtext='';
+        my $fatal=0;
+        my $container='sequence';
+        if ($env{'form.pagepath'}) {
+            $container='page';
+        }
+        ($errtext,$fatal)=
+              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+        if ($#Apache::lonratedt::order<1) {
+            $Apache::lonratedt::order[0]=1;
+            $Apache::lonratedt::resources[1]='';
+        }
+        if ($fatal) {
+            return 'failed';
+        }
+        my $destination = 'docs/';
+        if ($folder =~ /^supplemental/) {
+            $destination = 'supplemental/';
+        }
+        if (($folder eq 'default') || ($folder eq 'supplemental')) {
+            $destination .= 'default/';
+        } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
+            $destination .=  $2.'/';
+        }
+# this is for a course, not a user, so set coursedoc flag
+# probably the only place in the system where this should be "1"
+        my $newidx=&Apache::lonratedt::getresidx();
+        $destination .= $newidx;
+        my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
+						$parseaction,$allfiles,
+						$codebase);
+        my $ext='false';
+        if ($url=~/^http\:\/\//) { $ext='true'; }
+        $url=~s/\:/\&colon;/g;
+        my $comment=$env{'form.comment'};
+        $comment=~s/\</\&lt\;/g;
+        $comment=~s/\>/\&gt\;/g;
+        $comment=~s/\:/\&colon;/g;
+        if ($folder=~/^supplemental/) {
+              $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                  $env{'user.domain'}.'___&&&___'.$comment;
+        }
+
+        $Apache::lonratedt::resources[$newidx]=
+                  $comment.':'.$url.':'.$ext.':normal:res';
+        $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx;
+        ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+				    $folder.'.'.$container);
+        if ($fatal) {
+            $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+            return 'failed';
+        } else {
+            if ($parseaction eq 'parse') {
+                my $total_embedded = keys(%{$allfiles});
+                if ($total_embedded > 0) {
+                    my $num = 0;
+                    $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
+   <form name="upload_embedded" action="/adm/coursedocs"
+                  method="post" enctype="multipart/form-data">
+   <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />   <input type="hidden" name="cmd" value="upload_embedded" />
+   <input type="hidden" name="newidx" value="'.$newidx.'" />
+   <input type="hidden" name="primaryurl" value="'.&Apache::lonnet::escape($url).'" />
+   <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
+                    $$upload_output .= '<b>Upload embedded files</b>:<br />
+   <table>';
+                    foreach my $embed_file (keys(%{$allfiles})) {
+                        $$upload_output .= '<tr><td>'.$embed_file.
+          '<input name="embedded_item_'.$num.'" type="file" />
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'" />';
+                        my $attrib;
+                        if (@{$$allfiles{$embed_file}} > 1) {
+                            $attrib = join(':',@{$$allfiles{$embed_file}});
+                        } else {
+                            $attrib = $$allfiles{$embed_file}[0];
+                        }
+                        $$upload_output .=
+           '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
+                        if (exists($$codebase{$embed_file})) {
+                            $$upload_output .= 
+          '<input name="codebase_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($$codebase{$embed_file}).'" />';
+                        }
+                        $$upload_output .= '</td></tr>';
+                        $num ++;
+                    }
+                    $phase_status = 'phasetwo';
+                    $$upload_output .= '</table><br />
+   <input type ="submit" value="Complete upload" />
+   </form>';
+                } else {
+                    $$upload_output .= 'No embedded items identified<br />';
+                }
+            }
+        }
+    }
+    return $phase_status;
+}
+
+sub process_secondary_uploads {
+    my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
+    my $folder=$env{'form.folder'};
+    my $destination = 'docs/';
+    if ($folder =~ /^supplemental/) {
+        $destination = 'supplemental/';
+    }
+    if (($folder eq 'default') || ($folder eq 'supplemental')) {
+        $destination .= 'default/';
+    } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
+        $destination .=  $1.'/';
+    }
+    $destination .= $newidx;
+    my ($url,$filename);
+    $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
+    ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-);
+    return $filename;
+}
+
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
@@ -1161,21 +1405,35 @@ sub entryline {
 # Edit commands
     my $container;
     my $folderpath;
-    if ($ENV{'form.folderpath'}) {
+    if ($env{'form.folderpath'}) {
         $container = 'sequence';
-	$folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
-	# $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
+	$folderpath=&Apache::lonnet::escape($env{'form.folderpath'});
+	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
     }
     my ($pagepath,$pagesymb);
-    if ($ENV{'form.pagepath'}) {
+    if ($env{'form.pagepath'}) {
         $container = 'page';
-        $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'});
-        $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'});
+        $pagepath=&Apache::lonnet::escape($env{'form.pagepath'});
+        $pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'});
+    }
+    my $cpinfo='';
+    if ($env{'form.markedcopy_url'}) {
+       $cpinfo='&markedcopy_url='.
+               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               '&markedcopy_title='.
+               &Apache::lonnet::escape($env{'form.markedcopy_title'});
     }
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
-	if ($folder!~/^supplemental/) {
+	if (($folder!~/^supplemental/) &&
+	    ($#Apache::lonratedt::order>0) && 
+	    ((split(/\:/,
+	     $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1] 
+	     ne '') && 
+	    ((split(/\:/,
+	     $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1] 
+	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
 		'<select name="newpos" onChange="this.form.submit()">';
@@ -1192,47 +1450,82 @@ sub entryline {
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
-		'rn' => 'Rename');
-        if ($ENV{'form.pagepath'}) {
+                'ct' => 'Cut',
+		'rn' => 'Rename',
+		'cp' => 'Copy');
+	my $nocopy=0;
+        if ($url=~/\.(page|sequence)$/) {
+	    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+		my ($title,$url,$ext,$type)=split(/\:/,$_);
+		if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+		    $nocopy=1;
+		    last;
+		}
+	    }
+	}
+        my $copylink='&nbsp;';
+        if ($env{'form.pagepath'}) {
+           unless ($nocopy) {
+               $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ENDCOPY
+            }
             $line.=(<<END);
 <form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="pagepath" value="$ENV{'form.pagepath'}" />
-<input type="hidden" name="pagesymb" value="$ENV{'form.pagesymb'}" />
+<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
 <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
+<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
+<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td>
 <td>$selectbox
 </td><td bgcolor="#DDDDDD">
 <a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#550044">$lt{'ct'}</font></a>
 <a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a></td>
+<font size="-2" color="#009900">$lt{'rn'}</font></a>
+$copylink
 END
         } else {
+           unless ($nocopy) {
+               $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ENDCOPY
+            }
             $line.=(<<END); 
 <form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
 <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
+<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
+<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td>
 <td>$selectbox
 </td><td bgcolor="#DDDDDD">
 <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
+<font size="-2" color="#550044">$lt{'ct'}</font></a>
 <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a></td>
+<font size="-2" color="#009900">$lt{'rn'}</font></a>
+$copylink
 END
         }
     }
@@ -1266,8 +1559,8 @@ END
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
-           $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-           $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
+           $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+           $env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder.
            '.sequence').
            '___'.$residx.'___'.
 	   &Apache::lonnet::declutter($url));
@@ -1288,7 +1581,7 @@ END
 	}
 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
 	if ($container eq 'page') {
-	    my $symb=$ENV{'form.pagesymb'};
+	    my $symb=$env{'form.pagesymb'};
 	    	    
 	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
@@ -1297,56 +1590,53 @@ END
     my $parameterset='&nbsp;';
     if ($isfolder) {
 	my $foldername=&Apache::lonnet::escape($foldertitle);
-	my $folderpath=$ENV{'form.folderpath'};
+	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
-	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
+	$url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&Apache::lonratedt::getparameter($orderidx,
                                               'parameter_randompick'))[0].
-                                              '" />'.'</label>';
+                                              '" />'.
+'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
        
     }
     if ($ispage) {
         my $pagename=&Apache::lonnet::escape($pagetitle);
         my $pagepath;
-        my $folderpath=$ENV{'form.folderpath'};
+        my $folderpath=$env{'form.folderpath'};
         if ($folderpath) { $pagepath = $folderpath.'&' };
         $pagepath.=$pagearg.'&'.$pagename;
-	my $symb=$ENV{'form.pagesymb'};
+	my $symb=$env{'form.pagesymb'};
 	if (!$symb) {
 	    my $path='uploaded/'.
-		$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-		$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/';
+		$env{'course.'.$env{'request.course.id'}.'.domain'}.'/'.
+		$env{'course.'.$env{'request.course.id'}.'.num'}.'/';
 	    $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence',
 					       $residx,
 					       $path.$pagearg.'.page');
 	}
 	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
-	    '&pagesymb='.&Apache::lonnet::escape($symb);
+	    '&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo;
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+        "<td bgcolor='#FFFFBB'><a href=\"$url\">$title</a></td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
- 			      'ec' => 'URL hidden',
- 			      'sp' => 'Store Parameters');
+ 			      'ec' => 'URL hidden');
 	my $enctext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
 	my $hidtext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
-<td bgcolor="#BBBBFF"><font size='-2'>
-<input type="submit" value="$lt{'sp'}" />
-</font></td>
 ENDPARMS
     }
     $line.="</form></tr>";
@@ -1358,14 +1648,14 @@ ENDPARMS
 sub tiehash {
     my ($mode)=@_;
     $hashtied=0;
-    if ($ENV{'request.course.fn'}) {
+    if ($env{'request.course.fn'}) {
 	if ($mode eq 'write') {
-	    if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
+	    if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
 		    &GDBM_WRCREAT(),0640)) {
                 $hashtied=2;
 	    }
 	} else {
-	    if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
+	    if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
 		    &GDBM_READER(),0640)) {
                 $hashtied=1;
 	    }
@@ -1395,7 +1685,7 @@ sub checkonthis {
        if ($url=~/^\/res\//) {
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
-          if ($result==OK) {
+          if ($result eq 'ok') {
              $r->print('<font color="green">'.&mt('ok').'</font>');
              $r->rflush();
              &Apache::lonnet::countacc($url);
@@ -1407,23 +1697,20 @@ sub checkonthis {
                      $r->print('&nbsp;');
                  }
                  $r->print('- '.&mt('Rendering').': ');
-                 my $oldpath=$ENV{'request.filename'};
-                 $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
-                 &Apache::lonxml::xmlparse($r,'web',
-                   &Apache::lonnet::getfile(
-                    &Apache::lonnet::filelocation('',$url)));
-		 undef($Apache::lonhomework::parsing_a_problem);
-		 $ENV{'request.filename'}=$oldpath;
-                 if (($Apache::lonxml::errorcount) ||
-                     ($Apache::lonxml::warningcount)) {
-		     if ($Apache::lonxml::errorcount) {
+		 my ($errorcount,$warningcount)=split(/:/,
+	       &Apache::lonnet::ssi_body($url,
+			       ('grade_target'=>'web',
+				'return_only_error_and_warning_counts' => 1)));
+                 if (($errorcount) ||
+                     ($warningcount)) {
+		     if ($errorcount) {
                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
-			  $Apache::lonxml::errorcount.' '.
+			  $errorcount.' '.
 				  &mt('error(s)').'</b></font> ');
                      }
-		     if ($Apache::lonxml::warningcount) {
+		     if ($warningcount) {
                         $r->print('<font color="blue">'.
-			  $Apache::lonxml::warningcount.' '.
+			  $warningcount.' '.
 				  &mt('warning(s)').'</font>');
                      }
                  } else {
@@ -1438,9 +1725,9 @@ sub checkonthis {
                     &checkonthis($r,$_,$level+1);
                  }
              }
-          } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
+          } elsif ($result eq 'unavailable') {
              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
-          } elsif ($result==HTTP_NOT_FOUND) {
+          } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
 		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
 	      } else {
@@ -1455,14 +1742,32 @@ sub checkonthis {
 
 
 #
+# ----------------------------------------------------------------- List Symbs
+# 
+sub list_symbs {
+   my $r=shift; 
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Symb List</title></head>'.
+              &Apache::loncommon::bodytag('Symb List'));
+   my $navmap = Apache::lonnavmaps::navmap->new();
+   $r->print("<pre>\n");
+   foreach my $res ($navmap->retrieveResources()) {
+       $r->print($res->compTitle()."\t".$res->symb()."\n");
+   }
+   $r->print("\n</pre>\n");
+   $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
+}
+
+
+#
 # -------------------------------------------------------------- Verify Content
 # 
 sub verifycontent {
    my $r=shift; 
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-
-   $r->print('<html><head><title>Verify Content</title></head>'.
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Verify Content</title></head>'.
               &Apache::loncommon::bodytag('Verify Course Documents'));
    $hashtied=0;
    undef %alreadyseen;
@@ -1486,11 +1791,19 @@ sub verifycontent {
 	     &mt('Return to DOCS').'</a>');
 }
 
+
 # -------------------------------------------------------------- Check Versions
 
+sub devalidateversioncache {
+    my $src=shift;
+    &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
+					  &Apache::lonnet::clutter($src));
+}
+
 sub checkversions {
     my $r=shift;
-    $r->print('<html><head><title>Check Versions</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
     my $header='';
     my $startsel='';
@@ -1502,44 +1815,47 @@ sub checkversions {
     my $starttime=0;
     my $haschanged=0;
     my %setversions=&Apache::lonnet::dump('resourceversions',
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'});
 
     $hashtied=0;
     &tiehash();
     my %newsetversions=();
-    if ($ENV{'form.setmostrecent'}) {
+    if ($env{'form.setmostrecent'}) {
 	$haschanged=1;
 	foreach (keys %hash) {
 	    if ($_=~/^ids\_(\/res\/.+)$/) {
 		$newsetversions{$1}='mostrecent';
+                &devalidateversioncache($1);
 	    }
 	}
-    } elsif ($ENV{'form.setcurrent'}) {
+    } elsif ($env{'form.setcurrent'}) {
 	$haschanged=1;
 	foreach (keys %hash) {
 	    if ($_=~/^ids\_(\/res\/.+)$/) {
 		my $getvers=&Apache::lonnet::getversion($1);
 		if ($getvers>0) {
 		    $newsetversions{$1}=$getvers;
+		    &devalidateversioncache($1);
 		}
 	    }
 	}
-    } elsif ($ENV{'form.setversions'}) {
+    } elsif ($env{'form.setversions'}) {
 	$haschanged=1;
-	foreach (keys %ENV) {
+	foreach (keys %env) {
 	    if ($_=~/^form\.set_version_(.+)$/) {
 		my $src=$1;
-		if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
-		    $newsetversions{$src}=$ENV{$_};
+		if (($env{$_}) && ($env{$_} ne $setversions{$src})) {
+		    $newsetversions{$src}=$env{$_};
+		    &devalidateversioncache($src);
 		}
 	    }
 	}
     }
     if ($haschanged) {
         if (&Apache::lonnet::put('resourceversions',\%newsetversions,
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') {		
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {		
 	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
 	} else {
 	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
@@ -1547,7 +1863,7 @@ sub checkversions {
 	&mark_hash_old();
     }
     &changewarning($r,'');
-    if ($ENV{'form.timerange'} eq 'all') {
+    if ($env{'form.timerange'} eq 'all') {
 # show all documents
 	$header=&mt('All Documents in Course');
 	$allsel=1;
@@ -1560,28 +1876,28 @@ sub checkversions {
     } else {
 # show documents which changed
 	%changes=&Apache::lonnet::dump
-	 ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	 ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
+                     $env{'course.'.$env{'request.course.id'}.'.num'});
 	my $firstkey=(keys %changes)[0];
 	unless ($firstkey=~/^error\:/) {
-	    unless ($ENV{'form.timerange'}) {
-		$ENV{'form.timerange'}=604800;
+	    unless ($env{'form.timerange'}) {
+		$env{'form.timerange'}=604800;
 	    }
-	    my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' '
+	    my $seltext=&mt('during the last').' '.$env{'form.timerange'}.' '
 		.&mt('seconds');
-	    if ($ENV{'form.timerange'}==-1) {
+	    if ($env{'form.timerange'}==-1) {
 		$seltext='since start of course';
 		$startsel='selected';
-		$ENV{'form.timerange'}=time;
+		$env{'form.timerange'}=time;
 	    }
-	    $starttime=time-$ENV{'form.timerange'};
-	    if ($ENV{'form.timerange'}==2592000) {
+	    $starttime=time-$env{'form.timerange'};
+	    if ($env{'form.timerange'}==2592000) {
 		$seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
 		$monthsel='selected';
-	    } elsif ($ENV{'form.timerange'}==604800) {
+	    } elsif ($env{'form.timerange'}==604800) {
 		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
 		$weeksel='selected';
-	    } elsif ($ENV{'form.timerange'}==86400) {
+	    } elsif ($env{'form.timerange'}==86400) {
 		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
 		$daysel='selected';
 	    }
@@ -1591,8 +1907,8 @@ sub checkversions {
 	}
     }
     %setversions=&Apache::lonnet::dump('resourceversions',
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+			  $env{'course.'.$env{'request.course.id'}.'.domain'},
+			  $env{'course.'.$env{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
 	      ('st' => 'Version changes since start of Course',
 	       'lm' => 'Version changes since last Month',
@@ -1753,26 +2069,30 @@ sub is_hash_old {
 }
 
 sub changewarning {
-    my ($r,$postexec)=@_;
+    my ($r,$postexec,$message,$url)=@_;
     if (!&is_hash_old()) { return; }
     my $pathvar='folderpath';
-    my $path=&Apache::lonnet::escape($ENV{'form.folderpath'});
-    if (defined($ENV{'form.pagepath'})) {
-	$pathvar='pagepath';
-	$path=&Apache::lonnet::escape($ENV{'form.pagepath'});
-	$path.='&amp;symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'});
-    }
-    $r->print(
-'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
-'<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs?'.
-$pathvar.'='.$path.
+    my $path=&Apache::lonnet::escape($env{'form.folderpath'});
+    if (!defined($url)) {
+	if (defined($env{'form.pagepath'})) {
+	    $pathvar='pagepath';
+	    $path=&Apache::lonnet::escape($env{'form.pagepath'});
+	    $path.='&amp;pagesymb='.&Apache::lonnet::escape($env{'form.pagesymb'});
+	}
+	$url='/adm/coursedocs?'.$pathvar.'='.$path;
+    }
+    if (!defined($message)) {
+	$message='Changes will become active for your current session after [_1], or the next time you log in.';
+    }
+    $r->print("\n\n".
+'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
+'<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
-&mt('Changes will become active for your current session after').
-' <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="'.
-&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.').
-$help{'Caching'}.'</font></h3></form>');
+&mt($message,' <input type="hidden" name="'.
+    $env{'request.role'}.'" value="1" /><input type="button" value="'.
+    &mt('re-initializing course').'" onClick="reinit(this.form)" />').
+$help{'Caching'}.'</font></h3></form>'."\n\n");
 }
 
 # ================================================================ Main Handler
@@ -1783,14 +2103,14 @@ sub handler {
     return OK if $r->header_only;
 
 # --------------------------------------------- Initialize help topics for this
-  foreach ('Adding_Course_Doc','Main_Course_Documents',
-           'Adding_External_Resource','Navigate_Content',
-           'Adding_Folders','Docs_Overview', 'Load_Map',
-           'Supplemental','Score_Upload_Form','Adding_Pages',
-           'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
-	   'Check_Resource_Versions','Verify_Content') {
-      $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
-  }
+    foreach ('Adding_Course_Doc','Main_Course_Documents',
+	     'Adding_External_Resource','Navigate_Content',
+	     'Adding_Folders','Docs_Overview', 'Load_Map',
+	     'Supplemental','Score_Upload_Form','Adding_Pages',
+	     'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+	     'Check_Resource_Versions','Verify_Content') {
+	$help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
+    }
     # Composite help files
     $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
 		    'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
@@ -1804,54 +2124,56 @@ sub handler {
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
 
-  if ($ENV{'form.verify'}) {
+# does this user have privileges to modify docs
+    my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+
+  if ($allowed && $env{'form.verify'}) {
       &verifycontent($r);
-  } elsif ($ENV{'form.versions'}) {
+  } elsif ($allowed && $env{'form.listsymbs'}) {
+      &list_symbs($r);
+  } elsif ($allowed && $env{'form.versions'}) {
       &checkversions($r);
-  } elsif ($ENV{'form.dumpcourse'}) {
+  } elsif ($allowed && $env{'form.dumpcourse'}) {
       &dumpcourse($r);
-  } elsif ($ENV{'form.exportcourse'}) {
+  } elsif ($allowed && $env{'form.exportcourse'}) {
       &exportcourse($r);
   } else {
 # is this a standard course?
 
-    my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
+    my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
     my $forcestandard = 0;
     my $forcesupplement;
     my $script='';
-    my $allowed;
     my $events='';
     my $showdoc=0;
     my $containertag;
     my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['folderpath','pagepath','pagesymb']);
-    if ($ENV{'form.folderpath'}) {
-	my (@folderpath)=split('&',$ENV{'form.folderpath'});
-	$ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
-	$ENV{'form.folder'}=pop(@folderpath);
-    }
-    if ($ENV{'form.pagepath'}) {
-        my (@pagepath)=split('&',$ENV{'form.pagepath'});
-        $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
-        $ENV{'form.folder'}=pop(@pagepath);
+    ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']);
+    if ($env{'form.folderpath'}) {
+	my (@folderpath)=split('&',$env{'form.folderpath'});
+	$env{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
+	$env{'form.folder'}=pop(@folderpath);
+    }
+    if ($env{'form.pagepath'}) {
+        my (@pagepath)=split('&',$env{'form.pagepath'});
+        $env{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
+        $env{'form.folder'}=pop(@pagepath);
         $containertag = '<input type="hidden" name="pagepath" value="" />'.
 	    '<input type="hidden" name="pagesymb" value="" />';
-        $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />'.
-	    '<input type="hidden" name="pagesymb" value="'.$ENV{'form.pagesymb'}.'" />';
+        $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
+	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
     }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       if (($ENV{'form.folder'}=~/^default_/) || 
-          ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) {
+       if (($env{'form.folder'}=~/^default_/) || 
+          ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
            $forcestandard = 1;
        } 
-       $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
+       $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
 
-# does this user have privileges to post, etc?
-       $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
        if ($allowed) { 
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
          $script=&Apache::lonratedt::editscript('simple'); 
@@ -1864,25 +2186,26 @@ sub handler {
     }
 
 # get course data
-    my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
 
 # get personal data
  
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
     my $plainname=&Apache::lonnet::escape(
                      &Apache::loncommon::plainname($uname,$udom));
 
 # graphics settings
 
-    $iconpath = $r->dir_config('lonIconsURL') . "/";
+    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
 
     my $now=time;
 
 # print screen
+       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
@@ -1959,16 +2282,20 @@ function makeabout() {
 	       this.document.forms.newaboutsomeone.importdetail.value=
 		   'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
 	       this.document.forms.newaboutsomeone.submit();
-	   }
+	   } else {
+               alert("Not a valid user\@domain");
+           }
+       } else {
+           alert("Please enter both user and domain in the format user\@domain"); 
        }
    }
 }
 
 function makeims() {
-    var caller = document.forms.ims.folder.value
-    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"
-    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes")
-    newWindow.location.href = newlocation
+    var caller = document.forms.ims.folder.value;
+    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+    newWindow.location.href = newlocation;
 }
 
 
@@ -1998,7 +2325,7 @@ function changename(folderpath,index,old
 }
 
 function removeres(folderpath,index,oldtitle,container,pagesymb) {
-    if (confirm('Remove "'+oldtitle+'"?')) {
+    if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {
             this.document.forms.renameform.folderpath.value=folderpath;
@@ -2011,6 +2338,33 @@ function removeres(folderpath,index,oldt
     }
 }
 
+function cutres(folderpath,index,oldtitle,container,pagesymb) {
+    if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+	this.document.forms.renameform.cmd.value='cut_'+index;
+	this.document.forms.renameform.markcopy.value=index;
+        if (container == 'sequence') {
+            this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
+        this.document.forms.renameform.submit();
+    }
+}
+
+function markcopy(folderpath,index,oldtitle,container,pagesymb) {
+    this.document.forms.renameform.markcopy.value=index;
+    if (container == 'sequence') {
+	this.document.forms.renameform.folderpath.value=folderpath;
+    }
+    if (container == 'page') {
+	this.document.forms.renameform.pagepath.value=folderpath;
+	this.document.forms.renameform.pagesymb.value=pagesymb;
+    }
+    this.document.forms.renameform.submit();
+}
+
 </script>
 
 ENDNEWSCRIPT
@@ -2020,18 +2374,103 @@ ENDNEWSCRIPT
             &Apache::loncommon::bodytag('Course Documents','',$events,
 					'','',$showdoc).
 	    &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
-  unless ($showdoc) {
+  my %allfiles = ();
+  my %codebase = ();
+  my ($upload_result,$upload_output);
+  if ($allowed) {
+      if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+# Process file upload - phase one - upload and parse primary file.  
+          $upload_result = &process_file_upload(\$upload_output,$coursenum,
+						$coursedom,\%allfiles,
+						\%codebase,$1);
+          if ($upload_result eq 'phasetwo') {
+              $r->print($upload_output);
+          }
+      } elsif ($env{'form.phasetwo'}) {
+          my %newname = ();
+          my %origname = ();
+          my %attribs = ();
+          my $updateflag = 0;
+          my $residx = $env{'form.newidx'};
+          my $primary_url = &Apache::lonnet::unescape($env{'form.primaryurl'});
+# Process file upload - phase two - gather secondary files.
+          for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
+              if ($env{'form.embedded_item_'.$i.'.filename'}) {
+                  my $javacodebase;
+                  $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
+                  $origname{$i} = &Apache::lonnet::unescape($env{'form.embedded_orig_'.$i});
+                  if (exists($env{'form.embedded_codebase_'.$i})) {
+                      $javacodebase =  &Apache::lonnet::unescape($env{'form.embedded_codebase_'.$i});  
+                      $origname{$i} =~ s#^\Q$javacodebase\E/##; 
+                  }
+                  my @attributes = ();
+                  if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
+                      @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+                  } else {
+                      @attributes = ($env{'form.embedded_attrib_'.$i});
+                  }
+                  foreach (@attributes) {
+                      push(@{$attribs{$i}},&Apache::lonnet::unescape($_));
+                  }
+                  if ($javacodebase) {
+                      $codebase{$i} = $javacodebase;
+                      $codebase{$i} =~ s#/$##;
+                      $updateflag = 1;
+                  }
+              }
+              unless ($newname{$i} eq $origname{$i}) {
+                  $updateflag = 1;
+              }
+          }
+# Process file upload - phase three - modify primary file
+          if ($updateflag) {
+              my ($content,$rtncode);
+              my $updateflag = 0;
+              my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
+              if ($getstatus eq 'ok') {
+                  foreach my $item (keys %newname) {
+                      if ($newname{$item} ne $origname{$item}) {
+                          my $attrib_regexp = '';
+                          if (@{$attribs{$item}} > 1) {
+                              $attrib_regexp = join('|',@{$attribs{$item}});
+                          } else {
+                              $attrib_regexp = $attribs{$item}[0];
+                          }
+                          if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {
+                          } 
+                          $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi; 
+                      }
+                      if (exists($codebase{$item})) {
+                          $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i;
+                      }
+                  }
+# Save edited file.
+                  my $saveresult;
+                  my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+                  my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+                  my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
+              } else {
+                  &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus); 
+              }
+          }
+      }
+  }
+
+  unless ($showdoc ||  $upload_result eq 'phasetwo') {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
                 'uplm' => 'Upload a new main course document',
                 'upls' => 'Upload a new supplemental course document',
-                'impp' => 'Import a published document',
+                'impp' => 'Import a document',
+                'pubd' => 'Published documents',
+		'copm' => 'All documents out of a published map into this folder',
                 'spec' => 'Special documents',
                 'upld' => 'Upload Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
+                'reco' => 'Recover Deleted Resources',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
                 'extr' => 'External Resource',
@@ -2046,7 +2485,8 @@ ENDNEWSCRIPT
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
-                'comment' => 'Comment' 
+                'comment' => 'Comment',
+                'parse' => 'If HTML file, upload embedded images/multimedia files'
 					  );
 # -----------------------------------------------------------------------------
     if ($allowed) {
@@ -2055,17 +2495,18 @@ ENDNEWSCRIPT
        my %lt=&Apache::lonlocal::texthash(
 					 'vc' => 'Verify Content',
 					 'cv' => 'Check/Set Resource Versions',
+					 'ls' => 'List Symbs',
 					  );
 
-       my $folderpath=$ENV{'form.folderpath'};
+       my $folderpath=$env{'form.folderpath'};
        if (!$folderpath) {
-	   if ($ENV{'form.folder'} eq '' ||
-	       $ENV{'form.folder'} eq 'supplemental') {
+	   if ($env{'form.folder'} eq '' ||
+	       $env{'form.folder'} eq 'supplemental') {
 	       $folderpath='default&'.
 		   &Apache::lonnet::escape(&mt('Main Course Documents'));
 	   }
        }
-       unless ($ENV{'form.pagepath'}) {
+       unless ($env{'form.pagepath'}) {
            $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
        }
@@ -2074,6 +2515,7 @@ ENDNEWSCRIPT
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
+<input type="hidden" name="markcopy" />
 $containertag
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
@@ -2088,7 +2530,9 @@ $uploadtag
     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
 $exportbut
-</td></tr></table>
+</td><!-- <td bgcolor="#DDDDCC">
+    <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+</td>--></tr></table>
 </form>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
@@ -2100,10 +2544,10 @@ ENDCOURSEVERIFY
 	$r->print('<tr><td bgcolor="#BBBBBB">');
 #  '<h2>'.&mt('Main Course Documents').
 #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
-       my $folder=$ENV{'form.folder'};
+       my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';
-	   $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
+	   $env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
        }
        my $postexec='';
        if ($folder eq 'default') {
@@ -2112,7 +2556,7 @@ ENDCOURSEVERIFY
            #$postexec='self.close();';
        }
        $hadchanges=0;
-       &editor($r,$coursenum,$coursedom,$folder,$allowed);
+       &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
        if ($hadchanges) {
 	   &mark_hash_old()
        }
@@ -2121,7 +2565,11 @@ ENDCOURSEVERIFY
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.page';
-
+	my $container='sequence';
+	if ($env{'form.pagepath'}) {
+	    $container='page';
+	}
+	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
        $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
@@ -2130,13 +2578,21 @@ ENDCOURSEVERIFY
 </tr>
 <tr><td bgcolor="#DDDDDD">
 $lt{'file'}:<br />
-<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
 <br />
 $lt{'title'}:<br />
 <input type="text" size="50" name="comment">
 $uploadtag
 <input type="hidden" name="cmd" value="upload_default">
+<br />
+<nobr>
+<label>$lt{'parse'}?
+<input type="checkbox" name="parserflag" />
+</label>
+</nobr>
+<br />
+<br />
 <nobr>
 <input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}
@@ -2145,6 +2601,7 @@ $uploadtag
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+$lt{'pubd'}<br />
 $uploadtag
 <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <nobr>
@@ -2153,20 +2610,42 @@ $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
 <hr />
-<input type="text" size="20" name="importmap"><br />
+$lt{'copm'}<br />
+<input type="text" size="40" name="importmap"><br />
 <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
 value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
 $help{'Load_Map'}</nobr>
 </p>
 </form>
-</td>
-<td bgcolor="#DDDDDD">
+<hr />
+<form action="/adm/groupsort" method="post" name="recover">
+<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1)" value="$lt{'reco'}" />
+</form>
 ENDFORM
-       unless ($ENV{'form.pagepath'}) {
+       unless ($env{'form.pagepath'}) {
+	   $r->print(<<ENDFORM);
+<hr />
+<form action="/adm/coursedocs" method="post" name="newext">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+</nobr>
+</form>
+<form action="/adm/imsimportdocs" method="post" name="ims">
+<input type="hidden" name="folder" value="$folder" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+</nobr>
+</form>
+ENDFORM
+       }
+       $r->print('</td><td bgcolor="#DDDDDD">');
+       unless ($env{'form.pagepath'}) {
            $r->print(<<ENDFORM);
 <form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -2175,7 +2654,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newpage">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newpage" type="button"
@@ -2183,14 +2662,6 @@ onClick="javascript:makenewpage(this.for
 value="$lt{'newp'}" />$help{'Adding_Pages'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newext">
-$uploadtag
-<input type=hidden name="importdetail" value="">
-<nobr>
-<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
-</form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type=hidden name="importdetail" 
@@ -2259,9 +2730,10 @@ $uploadtag
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />
 </nobr>
+</form>
 ENDFORM
        }
-       if ($ENV{'form.pagepath'}) {
+       if ($env{'form.pagepath'}) {
            $r->print(<<ENDBLOCK);
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
@@ -2281,15 +2753,6 @@ $help{'Score_Upload_Form'}
 </nobr>
 </form>
 ENDBLOCK
-       } else {
-           $r->print(<<ENDFORM);
-</form>
-<form action="/adm/imsimportdocs" method="post" name="ims">
-<input type="hidden" name="folder" value="$folder" />
-<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
-</nobr>
-</form>
-ENDFORM
        }
        $r->print('</td></tr>'."\n".
 '</table>');
@@ -2300,13 +2763,13 @@ ENDFORM
        $r->print('<tr><td bgcolor="#BBBBBB">');
 # '<h2>'.&mt('Supplemental Course Documents').
 #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
-       my $folder=$ENV{'form.folder'};
+       my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {
 	   $folder='supplemental';
        }
        if ($folder =~ /^supplemental$/ &&
-	   $ENV{'form.folderpath'} =~ /^default\&/) {
-	   $ENV{'form.folderpath'}='supplemental&'.
+	   $env{'form.folderpath'} =~ /^default\&/) {
+	   $env{'form.folderpath'}='supplemental&'.
 	       &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
        }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
@@ -2323,11 +2786,19 @@ ENDFORM
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
-<br />$lt{'comment'}:<br />
+<br />
+<br />
+<nobr>
+<label>$lt{'parse'}?
+<input type="checkbox" name="parserflag" />
+</label>
+</nobr>
+<br /><br />
+$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <br />
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
 <input type="submit" value="$lt{'upld'}">
@@ -2337,7 +2808,7 @@ ENDFORM
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -2346,7 +2817,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" 
@@ -2355,7 +2826,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -2364,7 +2835,7 @@ $help{'Syllabus'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -2378,15 +2849,17 @@ ENDSUPFORM
        }
     }
     if ($allowed) {
-	$r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
+	$r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
     }
     $r->print('</table>');
   } else {
+      unless ($upload_result eq 'phasetwo') {
 # -------------------------------------------------------- This is showdoc mode
-      $r->print("<h1>".&mt('Uploaded Document').' - '.
+          $r->print("<h1>".&mt('Uploaded Document').' - '.
 		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
-         &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+      }
   }
  }
  $r->print('</body></html>');