--- loncom/interface/londocs.pm	2005/03/10 02:34:58	1.170
+++ loncom/interface/londocs.pm	2006/06/30 00:47:14	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.170 2005/03/10 02:34:58 www Exp $
+# $Id: londocs.pm,v 1.234 2006/06/30 00:47:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,8 @@ use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my $iconpath;
 
@@ -86,17 +88,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+)$/);
 	    }
@@ -119,16 +121,18 @@ sub authorhosts {
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
+    my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     my $output='</td><td bgcolor="#DDDDCC">';
     if ($home) {
 	return '</td><td bgcolor="#DDDDCC">'.
 	    '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump Course DOCS to Construction Space').'" />'.
+	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
 	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
     } else {
 	return'</td><td bgcolor="#DDDDCC">'.
-     &mt('Dump Course DOCS to Construction Space: available on other servers');
+     &mt('Dump '.$type.
+	 ' DOCS to Construction Space: available on other servers');
     }
 }
 
@@ -140,33 +144,35 @@ sub clean {
 # -------------------------------------------------------- Actually dump course
 
 sub dumpcourse {
-    my $r=shift;
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>Dump DOCS</title></head>'.
-        &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
+    my ($r) = @_;
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Dump '.$type.' 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'};
+	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+)$//;
+	    my $ext=$1;
 	    $newfilename=&clean($newfilename);
+	    $newfilename.='.'.$ext;
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -181,12 +187,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 {
@@ -219,7 +225,7 @@ sub dumpcourse {
 	    $r->print('</select>');
 	}
 	my $title=$origcrsdata{'description'};
-	$title=~s/\s+/\_/gs;
+	$title=~s/[\/\s]+/\_/gs;
 	$title=&clean($title);
 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
@@ -242,24 +248,25 @@ sub dumpcourse {
 	$r->print("</table>\n");
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>');
     }
 }
 
 # ------------------------------------------------------ Generate "export" button
 
 sub exportbutton {
-    return '';
+    my $type = &Apache::loncommon::course_type();
     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');
+            &mt('Export '.$type.' to IMS').'" />'.
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
 }
 
 sub exportcourse {
     my $r=shift;
+    my $type = &Apache::loncommon::course_type();
     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);
@@ -268,26 +275,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 {
@@ -304,21 +297,15 @@ 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 />';
+                $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
                 if ($copyresult) {
                     $outcome .= 'The following errors occurred during export - '.$copyresult;
                 }
@@ -326,15 +313,13 @@ 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 />';
             }
         }
-	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(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
         $r->print($outcome);
-        $r->print('</body></html>');
+        $r->print(&Apache::loncommon::end_page());
     } else {
         my $display;
         $display = '<form name="exportdoc" method="post">'."\n";
-        $display .= 'Choose which items you wish to export from your course.<br /><br />';
+        $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
         $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
                     '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
                     '<input type="button" value="check all" '.
@@ -468,15 +453,13 @@ function containerCheck(item) {
 
 </script>
         |;
-	my $html=&Apache::lonxml::xmlbegin();
-        $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
-            &Apache::loncommon::bodytag('Export course to IMS content package'
-));
-
-        $r->print($display.'</table>'.
+	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
+						 $scripttag));
+	$r->print($display.'</table>'.
                   '<p><input type="hidden" name="finishexport" value="1">'.
                   '<input type="submit" name="exportcourse" value="'.
-                  &mt('Export Course DOCS').'" /></p></form></body></html>');
+                  &mt('Export '.$type.' DOCS').'" /></p></form>'.
+		  &Apache::loncommon::end_page());
     }
 }
 
@@ -491,7 +474,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);
     }
@@ -508,13 +491,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 />'
 ;
@@ -532,8 +526,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 ++;
@@ -562,7 +556,6 @@ sub build_package {
     $count = 0;
     my $imsresources;
     my $pkgdepth;
-    my $included = 0;
     while ($curRes = $it->next()) {
         if ($curRes == $it->BEGIN_MAP()) {
             $prevdepth = $depth;
@@ -583,16 +576,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;
@@ -603,7 +599,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) {
@@ -630,8 +626,6 @@ sub build_package {
                     }
                 }
                 $pkgdepth = $depth;
-            } else {
-                $included = 0;
             }
         }
     }
@@ -666,7 +660,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 @uploads = ();
     if ($curRes->is_sequence()) {
         $content_type = 'sequence';
@@ -699,7 +692,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';
@@ -717,9 +710,10 @@ sub process_content {
         $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
     } 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;
         }
+# only include problem code where current user is author
         if ($canedit) {
             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
         } else {
@@ -768,11 +762,13 @@ sub replicate_content {
         if ($copiedfile = Apache::File->new('>'.$destination)) {
             my $content;
             if ($caller eq 'resource') {
-                $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$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 'uploaded' || $caller eq 'templateupload') {
@@ -780,10 +776,10 @@ sub replicate_content {
                 $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. 
@@ -795,23 +791,85 @@ sub replicate_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;
 }
 
@@ -832,9 +890,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';
             }
         }
     }
@@ -859,9 +917,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. ';
@@ -872,7 +929,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'; }
@@ -889,19 +946,18 @@ 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'});
+    if ($env{'form.markedcopy_url'}) {
        $cpinfo='&markedcopy_url='.
-               &Apache::lonnet::escape($ENV{'form.markedcopy_url'}).
+               &escape($env{'form.markedcopy_url'}).
                '&markedcopy_title='.
-               &Apache::lonnet::escape($ENV{'form.markedcopy_title'});
+               &escape($env{'form.markedcopy_title'});
     }
     while (@folders) {
 	my $folder=shift(@folders);
@@ -909,39 +965,41 @@ sub breadcrumbs {
 	if ($folderpath) {$folderpath.='&';}
 	$folderpath.=$folder.'&'.$foldername;
 	my $url='/adm/coursedocs?folderpath='.
-	    &Apache::lonnet::escape($folderpath);
+	    &escape($folderpath);
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
-		       'title'=>&Apache::lonnet::unescape($foldername),
+		       'title'=>&unescape($foldername),
 		       'text'=>'<font size="+1">'.
-			   &Apache::lonnet::unescape($foldername).'</font>'
+			   &unescape($foldername).'</font>'
 		       });
 		       
 						 
     }
-    return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,
-					       0,'nohelp');
+    return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
+					       'LC_docs_path');
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
+    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'})) {
+    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;
+	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) {
@@ -950,32 +1008,32 @@ sub editor {
 # ------------------------------------------------------------ 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) {
@@ -1014,10 +1072,10 @@ sub editor {
 		}
 		
 	    }
-	    if ($ENV{'form.pastemarked'}) {
+	    if ($env{'form.pastemarked'}) {
 # paste resource to end of list
-                my $url=$ENV{'form.markedcopy_url'};
-		my $title=$ENV{'form.markedcopy_title'};
+                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;
@@ -1027,7 +1085,7 @@ sub editor {
 		    my $storefn=$newurl;
                     $storefn=~s/^\/\w+\/\w+\/\w+\///;
 		    &Apache::loncreatecourse::writefile
-			($ENV{'request.course.id'},$storefn,
+			($env{'request.course.id'},$storefn,
 			 &Apache::lonnet::getfile($url));
 		    $url=$newurl;
 		}
@@ -1038,7 +1096,7 @@ sub editor {
 		if ($url=~/^http\:\/\//) { $ext='true'; }
 		$url=~s/\:/\&colon;/g;
 # Now insert the URL at the bottom
-                my $newidx=1+$#Apache::lonratedt::resources;
+                my $newidx=&Apache::lonratedt::getresidx($url);
 		$Apache::lonratedt::resources[$newidx]=
 		    $title.':'.$url.':'.$ext.':normal:res';
 		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
@@ -1050,49 +1108,30 @@ sub editor {
 		}
 
 	    }
-# 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 $newidx=$#Apache::lonratedt::resources+1;
-	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
-              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) {
-		  $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];
@@ -1113,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;
@@ -1132,13 +1171,13 @@ 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);
-			$url=&Apache::lonnet::unescape($url);
+			$name=&unescape($name);
+			$url=&unescape($url);
 			push @imports, $name, $url;
 		    }
 		}
@@ -1151,22 +1190,25 @@ 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++;
-                   $Apache::lonratedt::resources[$idx]=$_;
-                   $Apache::lonratedt::order
-		       [$#Apache::lonratedt::order+1]=$idx;
-	       }
-
+	   if ($env{'form.loadmap'}) {
+               if ($env{'form.importmap'}=~/\w/) {
+	          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;
+	          }
 # Store the changed version
-	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+  	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
 					   $folder.'.'.$container);
-	       if ($fatal) {
-		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
-		   return;
-	       }
+	          if ($fatal) {
+		      $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		      return;
+	          }
+               } else {
+                   $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
+               }
            }
        }
 # ---------------------------------------------------------------- End commands
@@ -1176,6 +1218,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));
@@ -1186,25 +1230,25 @@ sub editor {
 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
 	}
         $r->print("\n</table>\n");
-	if ($ENV{'form.markedcopy_url'}) {
+	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'}" />
+<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'});
+		(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'}" />
+<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'}" />
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 FOLDERINFO
 	    }
 	    $r->print('</form></p>');
@@ -1212,13 +1256,142 @@ FOLDERINFO
     }
 }
 
+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="'.&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="'.&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="'.&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 .=  $2.'/';
+    }
+    $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 {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
-     &Apache::lonnet::unescape($title)),'"<>&\'');
+     &unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
     my $pagetitle=$title;
@@ -1230,28 +1403,29 @@ sub entryline {
 	    &Apache::loncommon::plainname($2,$3).': <br />'.
 	    $foldertitle;
     }
+    $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # 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=&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=&escape($env{'form.pagepath'});
+        $pagesymb=&escape($env{'form.pagesymb'});
     }
     my $cpinfo='';
-    if ($ENV{'form.markedcopy_url'}) {
+    if ($env{'form.markedcopy_url'}) {
        $cpinfo='&markedcopy_url='.
-               &Apache::lonnet::escape($ENV{'form.markedcopy_url'}).
+               &escape($env{'form.markedcopy_url'}).
                '&markedcopy_title='.
-               &Apache::lonnet::escape($ENV{'form.markedcopy_title'});
+               &escape($env{'form.markedcopy_title'});
     }
     if ($allowed) {
 	my $incindex=$index+1;
@@ -1280,15 +1454,33 @@ sub entryline {
                 'up' => 'Move Up',
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
+                'ct' => 'Cut',
 		'rn' => 'Rename',
 		'cp' => 'Copy');
-        if ($ENV{'form.pagepath'}) {
+	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="markedcopy_url" value="$ENV{'form.markedcopy_url'}" />
-<input type="hidden" name="markedcopy_title" value="$ENV{'form.markedcopy_title'}" />
+<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">
@@ -1302,17 +1494,24 @@ sub entryline {
 </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>
-<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+$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="markedcopy_url" value="$ENV{'form.markedcopy_url'}" />
-<input type="hidden" name="markedcopy_title" value="$ENV{'form.markedcopy_title'}" />
+<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">
@@ -1326,10 +1525,11 @@ END
 </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>
-<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+$copylink
 END
         }
     }
@@ -1359,12 +1559,12 @@ END
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
-    $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
+    $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-;
     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));
@@ -1383,21 +1583,21 @@ END
 	} elsif ($url=~m|^/ext/|) { 
 	    $url='/adm/wrapper'.$url;
 	}
-	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&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);
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
     }
     my $parameterset='&nbsp;';
-    if ($isfolder) {
-	my $foldername=&Apache::lonnet::escape($foldertitle);
-	my $folderpath=$ENV{'form.folderpath'};
+    if ($isfolder || $extension eq 'sequence') {
+	my $foldername=&escape($foldertitle);
+	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
-	$url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo;
+	$url.='folderpath='.&escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
 	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&Apache::lonratedt::getparameter($orderidx,
@@ -1407,26 +1607,26 @@ END
        
     }
     if ($ispage) {
-        my $pagename=&Apache::lonnet::escape($pagetitle);
+        my $pagename=&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).$cpinfo;
+	$url.='pagepath='.&escape($pagepath).
+	    '&pagesymb='.&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',
@@ -1452,14 +1652,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;
 	    }
@@ -1470,13 +1670,14 @@ sub tiehash {
 sub untiehash {
     if ($hashtied) { untie %hash; }
     $hashtied=0;
+    return OK;
 }
 
 # --------------------------------------------------------------- check on this
 
 sub checkonthis {
     my ($r,$url,$level,$title)=@_;
-    $url=&Apache::lonnet::unescape($url);
+    $url=&unescape($url);
     $alreadyseen{$url}=1;
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
@@ -1489,7 +1690,7 @@ sub checkonthis {
        if ($url=~/^\/res\//) {
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
-          if ($result eq 'OK') {
+          if ($result eq 'ok') {
              $r->print('<font color="green">'.&mt('ok').'</font>');
              $r->rflush();
              &Apache::lonnet::countacc($url);
@@ -1503,7 +1704,8 @@ sub checkonthis {
                  $r->print('- '.&mt('Rendering').': ');
 		 my ($errorcount,$warningcount)=split(/:/,
 	       &Apache::lonnet::ssi_body($url,
-			       ('return_only_error_and_warning_counts' => 1)));
+			       ('grade_target'=>'web',
+				'return_only_error_and_warning_counts' => 1)));
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
@@ -1528,9 +1730,9 @@ sub checkonthis {
                     &checkonthis($r,$_,$level+1);
                  }
              }
-          } elsif ($result eq 'HTTP_SERVICE_UNAVAILABLE') {
+          } elsif ($result eq 'unavailable') {
              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
-          } elsif ($result eq 'HTTP_NOT_FOUND') {
+          } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
 		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
 	      } else {
@@ -1545,29 +1747,45 @@ sub checkonthis {
 
 
 #
+# ----------------------------------------------------------------- List Symbs
+# 
+sub list_symbs {
+    my ($r) = @_;
+
+    $r->print(&Apache::loncommon::start_page('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 ($r) = @_;
+    my $type = &Apache::loncommon::course_type();
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-   my $html=&Apache::lonxml::xmlbegin();
-   $r->print($html.'<head><title>Verify Content</title></head>'.
-              &Apache::loncommon::bodytag('Verify Course Documents'));
+   $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
    &tiehash();
    foreach (keys %hash) {
        if ($hash{$_}=~/\.(page|sequence)$/) {
-	   if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
 	       $r->print('<hr /><font color="red">'.
-			 &mt('The following sequence or page is included more than once in your course: ').
-			 &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
+			 &mt('The following sequence or page is included more than once in your '.$type.': ').
+			 &unescape($hash{$_}).'</font><br />'.
 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
 	   }
        }
-       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
        }
    }
@@ -1576,13 +1794,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;
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>Check Versions</title></head>'.
-              &Apache::loncommon::bodytag('Check Course Document Versions'));
+    my ($r) = @_;
+    my $type = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
     my $header='';
     my $startsel='';
     my $monthsel='';
@@ -1593,44 +1817,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>');
@@ -1638,9 +1865,9 @@ 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');
+	$header=&mt('All Documents in '.$type);
 	$allsel=1;
 	foreach (keys %hash) {
 	    if ($_=~/^ids\_(\/res\/.+)$/) {
@@ -1651,28 +1878,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';
 	    }
@@ -1682,10 +1909,10 @@ 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',
+	      ('st' => 'Version changes since start of '.$type,
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
@@ -1694,9 +1921,9 @@ sub checkversions {
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
-	       've' => 'Version used in Course',
-               'vu' => 'Set Version to be used in Course',
-'sv' => 'Set Versions to be used in Course according to Selections below',
+	       've' => 'Version used in '.$type,
+               'vu' => 'Set Version to be used in '.$type,
+'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
 	       'di' => 'Differences');
@@ -1743,7 +1970,7 @@ ENDHEADERS
                       '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
                       '<font size="+1">'.$currentversion.'</font>'.
                       '</nobr></td>'.
-                      '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
+                      '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
                       '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
@@ -1844,26 +2071,31 @@ 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=&escape($env{'form.folderpath'});
+    if (!defined($url)) {
+	if (defined($env{'form.pagepath'})) {
+	    $pathvar='pagepath';
+	    $path=&escape($env{'form.pagepath'});
+	    $path.='&amp;pagesymb='.&escape($env{'form.pagesymb'});
+	}
+	$url='/adm/coursedocs?'.$pathvar.'='.$path;
+    }
+    my $course_type = &Apache::loncommon::course_type();
+    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_type).'" onClick="reinit(this.form)" />').
+$help{'Caching'}.'</font></h3></form>'."\n\n");
 }
 
 # ================================================================ Main Handler
@@ -1872,16 +2104,17 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
+    my $type = &Apache::loncommon::course_type();
 
 # --------------------------------------------- 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');
@@ -1895,253 +2128,186 @@ 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','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);
+					    ['folderpath','pagepath',
+					     'pagesymb','markedcopy_url',
+					     'markedcopy_title']);
+    if ($env{'form.folderpath'}) {
+	my (@folderpath)=split('&',$env{'form.folderpath'});
+	$env{'form.foldername'}=&unescape(pop(@folderpath));
+	$env{'form.folder'}=pop(@folderpath);
+    }
+    if ($env{'form.pagepath'}) {
+        my (@pagepath)=split('&',$env{'form.pagepath'});
+        $env{'form.pagename'}=&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'); 
        }
     } else { # got called in sequence from course
        $allowed=0;
-       $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
-       $events='onLoad="'.&Apache::lonmenu::loadevents.
-           '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
     }
 
 # 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 $plainname=&Apache::lonnet::escape(
+# get personal data 
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
+    my $plainname=&escape(
                      &Apache::loncommon::plainname($uname,$udom));
 
 # graphics settings
 
-    $iconpath = $r->dir_config('lonIconsURL') . "/";
-
-    my $now=time;
-
-# print screen
-       my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDDOCUMENT);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script>
-$script
-</script>
-ENDDOCUMENT
-   if ($allowed) {
-    $r->print(<<ENDNEWSCRIPT);
-<script>
-function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('Name of New Folder','New Folder');
-    if (foldername) {
-	targetform.importdetail.value=foldername+"="+folderseq;
-        targetform.submit();
-    }
-}
-
-function makenewpage(targetform,folderseq) {
-    var pagename=prompt('Name of New Page','New Page');
-    if (pagename) {
-        targetform.importdetail.value=pagename+"="+folderseq;
-        targetform.submit();
-    }
-}
-
-function makenewext(targetname) {
-    this.document.forms.extimport.useform.value=targetname;
-    window.open('/adm/rat/extpickframe.html');
-}
-
-function makeexamupload() {
-   var title=prompt('Listed Title for the Uploaded Score');
-   if (title) { 
-    this.document.forms.newexamupload.importdetail.value=
-	title+'=/res/lib/templates/examupload.problem';
-    this.document.forms.newexamupload.submit();
-   }
-}
-
-function makesmppage() {
-   var title=prompt('Listed Title for the Page');
-   if (title) { 
-    this.document.forms.newsmppg.importdetail.value=
-	title+'=/adm/$udom/$uname/$now/smppg';
-    this.document.forms.newsmppg.submit();
-   }
-}
-
-function makesmpproblem() {
-   var title=prompt('Listed Title for the Problem');
-   if (title) { 
-    this.document.forms.newsmpproblem.importdetail.value=
-	title+'=/res/lib/templates/simpleproblem.problem';
-    this.document.forms.newsmpproblem.submit();
-   }
-}
-
-function makebulboard() {
-   var title=prompt('Listed Title for the Bulletin Board');
-   if (title) {
-    this.document.forms.newbul.importdetail.value=
-	title+'=/adm/$udom/$uname/$now/bulletinboard';
-    this.document.forms.newbul.submit();
-   }
-}
-
-function makeabout() {
-   var user=prompt("Enter user\@domain for User's 'About Me' Page");
-   if (user) {
-       var comp=new Array();
-       comp=user.split('\@');
-       if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
-	   if ((comp[0]) && (comp[1])) {
-	       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;
-}
-
-
-function finishpick() {
-    var title=this.document.forms.extimport.title.value;
-    var url=this.document.forms.extimport.url.value;
-    var form=this.document.forms.extimport.useform.value;
-    eval
-     ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
-    '";this.document.forms.'+form+'.submit();');
-}
-
-function changename(folderpath,index,oldtitle,container,pagesymb) {
-    var title=prompt('New Title',oldtitle);
-    if (title) {
-	this.document.forms.renameform.title.value=title;
-	this.document.forms.renameform.cmd.value='rename_'+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 removeres(folderpath,index,oldtitle,container,pagesymb) {
-    if (confirm('Remove "'+oldtitle+'"?')) {
-	this.document.forms.renameform.cmd.value='del_'+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();
-    }
-}
+    $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
 
-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;
+    if ($allowed) {
+	$script .= &editing_js($udom,$uname);
     }
-    this.document.forms.renameform.submit();
-}
-
-</script>
-
-ENDNEWSCRIPT
-  }
 # -------------------------------------------------------------------- Body tag
-  $r->print('</head>'.
-            &Apache::loncommon::bodytag('Course Documents','',$events,
-					'','',$showdoc).
-	    &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
-  unless ($showdoc) {
+    $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+    $r->print(&Apache::loncommon::start_page("$type Documents", $script,
+					     {'force_register' => $showdoc,}).
+	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
+  
+  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 = &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} = &unescape($env{'form.embedded_orig_'.$i});
+                  if (exists($env{'form.embedded_codebase_'.$i})) {
+                      $javacodebase =  &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}},&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; #' stupid emacs
+                      }
+                  }
+# 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',
+                'uplm' => 'Upload a new main '.lc($type).' document',
+                'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',
                 'pubd' => 'Published documents',
-		'copm' => 'All documents out of a published map',
+		'copm' => 'All documents out of a published map into this folder',
                 'spec' => 'Special documents',
                 'upld' => 'Upload Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
+		'book' => 'Import Bookmarks',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
+                'reco' => 'Recover Deleted Resources',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
                 'extr' => 'External Resource',
@@ -2149,6 +2315,7 @@ ENDNEWSCRIPT
                 'navc' => 'Navigate Contents',
                 'sipa' => 'Simple Page',
                 'sipr' => 'Simple Problem',
+                'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
@@ -2156,7 +2323,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) {
@@ -2165,17 +2333,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'));
+		   &escape(&mt('Main '.$type.' Documents'));
 	   }
        }
-       unless ($ENV{'form.pagepath'}) {
+       unless ($env{'form.pagepath'}) {
            $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
        }
@@ -2199,11 +2368,13 @@ $uploadtag
     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
 $exportbut
+</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',
-		     &mt('Editing the Table of Contents for your Course')));
+		     &mt('Editing the Table of Contents for your '.$type)));
     }
 # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
@@ -2211,10 +2382,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&'.&escape(&mt('Main '.$type.' Documents'));
        }
        my $postexec='';
        if ($folder eq 'default') {
@@ -2223,7 +2394,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()
        }
@@ -2232,7 +2403,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>
@@ -2241,13 +2416,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'}
@@ -2258,23 +2441,30 @@ $uploadtag
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 $lt{'pubd'}<br />
 $uploadtag
-<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
+<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+<br />
 <nobr>
-<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
+<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
 $help{'Importing_LON-CAPA_Resource'}
 </nobr>
+<br />
+<input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
 <p>
 <hr />
-$lt{'copm'}
-<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>
+<hr />
+<form action="/adm/groupsort" method="post" name="recover">
+<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" 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">
@@ -2285,7 +2475,7 @@ $uploadtag
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
-<form action="/adm/imsimportdocs" method="post" name="ims">
+<br /><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>
@@ -2293,10 +2483,10 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 ENDFORM
        }
        $r->print('</td><td bgcolor="#DDDDDD">');
-       unless ($ENV{'form.pagepath'}) {
+       unless ($env{'form.pagepath'}) {
            $r->print(<<ENDFORM);
-<form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<br /><form action="/adm/coursedocs" method="post" name="newfolder">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -2304,8 +2494,8 @@ onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newpage">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<br /><form action="/adm/coursedocs" method="post" name="newpage">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newpage" type="button"
@@ -2313,7 +2503,7 @@ onClick="javascript:makenewpage(this.for
 value="$lt{'newp'}" />$help{'Adding_Pages'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsyl">
+<br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
@@ -2322,7 +2512,7 @@ value="Syllabus=/public/$coursedom/$cour
  $help{'Syllabus'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newnav">
+<br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
@@ -2331,7 +2521,7 @@ value="Navigate Content=/adm/navmaps">
 $help{'Navigate_Content'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsmppg">
+<br /><form action="/adm/coursedocs" method="post" name="newsmppg">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2339,7 +2529,7 @@ $uploadtag
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2347,7 +2537,15 @@ $uploadtag
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newexamupload">
+<br /><form action="/adm/coursedocs" method="post" name="newdropbox">
+$uploadtag      
+<input type=hidden name="importdetail" value="">
+<nobr>          
+<input name="newdropbox" type="button" value="$lt{'drbx'}"
+onClick="javascript:makedropbox();" />
+</nobr>         
+</form> 
+<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2356,7 +2554,7 @@ onClick="javascript:makeexamupload();" /
 $help{'Score_Upload_Form'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newbul">
+<br /><form action="/adm/coursedocs" method="post" name="newbul">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2365,7 +2563,7 @@ onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newaboutme">
+<br /><form action="/adm/coursedocs" method="post" name="newaboutme">
 $uploadtag
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
@@ -2374,16 +2572,17 @@ value="$plainname=/adm/$udom/$uname/abou
 $help{'My Personal Info'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <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
@@ -2393,7 +2592,7 @@ $uploadtag
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newexamupload">
+<br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
@@ -2401,8 +2600,8 @@ $uploadtag
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </nobr>
+</form>
 ENDBLOCK
-           $r->print('</form>');
        }
        $r->print('</td></tr>'."\n".
 '</table>');
@@ -2413,14 +2612,14 @@ ENDBLOCK
        $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&'.
-	       &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
+	   $env{'form.folderpath'} =~ /^default\&/) {
+	   $env{'form.folderpath'}='supplemental&'.
+	       &escape(&mt('Supplemental '.$type.' Documents'));
        }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {
@@ -2436,11 +2635,19 @@ ENDBLOCK
 <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'}">
@@ -2450,7 +2657,7 @@ ENDBLOCK
 </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"
@@ -2458,8 +2665,8 @@ onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" /> $help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<br /><form action="/adm/coursedocs" method="post" name="supnewext">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" 
@@ -2467,8 +2674,8 @@ onClick="javascript:makenewext('supnewex
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -2476,8 +2683,8 @@ value="Syllabus=/public/$coursedom/$cour
 $help{'Syllabus'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
+<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -2491,20 +2698,189 @@ 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>');
+ $r->print(&Apache::loncommon::end_page());
  return OK;
 } 
 
+
+sub editing_js {
+    my ($udom,$uname) = @_;
+    my $now = time();
+
+    return <<ENDNEWSCRIPT;
+function makenewfolder(targetform,folderseq) {
+    var foldername=prompt('Name of New Folder','New Folder');
+    if (foldername) {
+       targetform.importdetail.value=foldername+"="+folderseq;
+        targetform.submit();
+    }
+}
+
+function makenewpage(targetform,folderseq) {
+    var pagename=prompt('Name of New Page','New Page');
+    if (pagename) {
+        targetform.importdetail.value=pagename+"="+folderseq;
+        targetform.submit();
+    }
+}
+
+function makenewext(targetname) {
+    this.document.forms.extimport.useform.value=targetname;
+    window.open('/adm/rat/extpickframe.html');
+}
+
+function makeexamupload() {
+   var title=prompt('Listed Title for the Uploaded Score');
+   if (title) { 
+    this.document.forms.newexamupload.importdetail.value=
+	title+'=/res/lib/templates/examupload.problem';
+    this.document.forms.newexamupload.submit();
+   }
+}
+
+function makesmppage() {
+   var title=prompt('Listed Title for the Page');
+   if (title) { 
+    this.document.forms.newsmppg.importdetail.value=
+	title+'=/adm/$udom/$uname/$now/smppg';
+    this.document.forms.newsmppg.submit();
+   }
+}
+
+function makesmpproblem() {
+   var title=prompt('Listed Title for the Problem');
+   if (title) { 
+    this.document.forms.newsmpproblem.importdetail.value=
+	title+'=/res/lib/templates/simpleproblem.problem';
+    this.document.forms.newsmpproblem.submit();
+   }
+}
+
+function makedropbox() {
+   var title=prompt('Listed Title for the Drop Box');
+   if (title) { 
+    this.document.forms.newdropbox.importdetail.value=
+        title+'=/res/lib/templates/DropBox.problem';
+    this.document.forms.newdropbox.submit();
+   }
+}
+
+function makebulboard() {
+   var title=prompt('Listed Title for the Bulletin Board');
+   if (title) {
+    this.document.forms.newbul.importdetail.value=
+	title+'=/adm/$udom/$uname/$now/bulletinboard';
+    this.document.forms.newbul.submit();
+   }
+}
+
+function makeabout() {
+   var user=prompt("Enter user\@domain for User's 'About Me' Page");
+   if (user) {
+       var comp=new Array();
+       comp=user.split('\@');
+       if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
+	   if ((comp[0]) && (comp[1])) {
+	       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;
+}
+
+
+function finishpick() {
+    var title=this.document.forms.extimport.title.value;
+    var url=this.document.forms.extimport.url.value;
+    var form=this.document.forms.extimport.useform.value;
+    eval
+     ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
+    '";this.document.forms.'+form+'.submit();');
+}
+
+function changename(folderpath,index,oldtitle,container,pagesymb) {
+    var title=prompt('New Title',oldtitle);
+    if (title) {
+	this.document.forms.renameform.title.value=title;
+	this.document.forms.renameform.cmd.value='rename_'+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 removeres(folderpath,index,oldtitle,container,pagesymb) {
+    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;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
+        this.document.forms.renameform.submit();
+    }
+}
+
+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();
+}
+
+ENDNEWSCRIPT
+}
 1;
 __END__