--- loncom/interface/londocs.pm	2003/10/22 21:41:11	1.88
+++ loncom/interface/londocs.pm	2004/04/07 20:36:54	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.88 2003/10/22 21:41:11 www Exp $
+# $Id: londocs.pm,v 1.114 2004/04/07 20:36:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,10 +68,13 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
-    $hadchanges=1;
-    return
+    my ($outtext,$errtext)=
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
+    if ($errtext) { return ($errtext,2); }
+    
+    $hadchanges=1;
+    return ($errtext,0);
 }
 
 # ----------------------------------------- Return hash with valid author names
@@ -94,13 +97,15 @@ sub authorhosts {
 	    } else {
 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
 	    }
-	    if (&Apache::lonnet::homeserver($ca,$cd) eq 
-		$Apache::lonnet::perlvar{'lonHostID'}) {
+	    my $allowed=0;
+	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
+	    my @ids=&Apache::lonnet::current_machine_ids();
+	    foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
+	    if ($allowed) {
 		$home++;
 		$outhash{'home_'.$ca.'@'.$cd}=1;
 	    } else {
-		$outhash{'otherhome_'.$ca.'@'.$cd}=
-		    &Apache::lonnet::homeserver($ca,$cd);
+		$outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
 		$other++;
 	    }
 	}
@@ -250,14 +255,57 @@ sub group_import {
 		join ':', ($name, $url, $ext, 'normal', 'res');
 	}
     }
-    &storemap($coursenum, $coursedom, $folder.'.sequence');
+    return &storemap($coursenum, $coursedom, $folder.'.sequence');
 }
 
-sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
+sub breadcrumbs {
+    my ($where)=@_;
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($where =~ /^default/) {
+	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
+				    'title'=>'Main Course Documents',
+				    'text' =>'Main Course Documents'});
+    } elsif ($where =~ /^supplemental/) {
+	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
+				    'title'=>'Supplemental Course Documents',
+				    'text' =>'Supplemental Course Documents'});
+
+    } else {
+	&Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',
+						'title'=>$where,
+						'text' =>$where});
+    }
     if ($ENV{'form.foldername'}) {
-	$r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
+	my @folders;
+	if (defined($ENV{'form.folders'})) {
+	    @folders=@{$ENV{'form.folders'}};
+	}
+	@folders=(@folders,$ENV{'form.folder'},
+		  &Apache::lonnet::escape($ENV{'form.foldername'}));
+
+	my $folderpath;
+	while (@folders) {
+	    my $folder=shift(@folders);
+	    my $foldername=shift(@folders);
+	    if ($folderpath) {$folderpath.='&';}
+	    $folderpath.=$folder.'&'.$foldername;
+	    my $url='/adm/coursedocs?folderpath='.
+		&Apache::lonnet::escape($folderpath);
+	    &Apache::lonhtmlcommon::add_breadcrumb(
+		      {'href'=>$url,
+		       'title'=>&Apache::lonnet::unescape($foldername),
+		       'text'=>&Apache::lonnet::unescape($foldername)});
+		       
+						 
+	}
     }
+    return &Apache::lonhtmlcommon::breadcrumbs();
+}
+
+sub editor {
+    my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
+
+    $r->print(&breadcrumbs($folder));
     my $errtext='';
     my $fatal=0;
     ($errtext,$fatal)=
@@ -275,7 +323,7 @@ sub editor {
 # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
-	    if ($folder=~/^$1/) {
+	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"
 	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
@@ -295,7 +343,12 @@ sub editor {
                   $comment.':'.$url.':'.$ext.':normal:res';
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                               $newidx;       
- 	      &storemap($coursenum,$coursedom,$folder.'.sequence');
+
+	      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+	      if ($fatal) {
+		  $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		  return;
+	      }
 	     }
             }
 	    if ($ENV{'form.cmd'}) {
@@ -335,7 +388,12 @@ sub editor {
                     
                 }
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					    $folder.'.sequence');
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Group import/search
 	    if ($ENV{'form.importdetail'}) {
@@ -349,21 +407,30 @@ sub editor {
 		    }
 		}
 # Store the changed version
-		group_import($coursenum, $coursedom, $folder, @imports);
+		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
+					       @imports);
+		if ($fatal) {
+		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    return;
+		}
             }
 # Loading a complete map
 	   if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
-              foreach
-(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+	       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;
-                }
+		       [$#Apache::lonratedt::order+1]=$idx;
+	       }
 
 # Store the changed version
-		&storemap($coursenum,$coursedom,$folder.'.sequence');
+	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+					   $folder.'.sequence');
+	       if ($fatal) {
+		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		   return;
+	       }
            }
        }
 # ---------------------------------------------------------------- End commands
@@ -373,8 +440,8 @@ sub editor {
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
+           unless ($name) { next; }
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
         }
         $r->print('</table>');
@@ -384,75 +451,88 @@ sub editor {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
-     &Apache::lonnet::unescape($title)),'\"\<\>\&\'');
+     &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
-    if ($title=~
- /^(\d+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(.*)$/
-	) { 
-            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-            $renametitle=$4;
-            $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
-                &Apache::loncommon::plainname($2,$3).': <br />'.
-		$foldertitle;
-	}
+    if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) { 
+	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+	$renametitle=$4;
+	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
+	    &Apache::loncommon::plainname($2,$3).': <br />'.
+	    $foldertitle;
+    }
     $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
     if ($allowed) {
-       $line.=(<<END);
+	my %lt=('up' => 'Move Up',
+		'dw' => 'Move Down',
+		'rm' => 'Remove',
+		'rn' => 'Rename');
+	my ($foldername,$htmlfoldername);
+	if ($ENV{'form.foldername'}) {
+	    $foldername='&foldername='.
+		&Apache::lonnet::escape($ENV{'form.foldername'});
+	    $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
+	}
+	$line.=(<<END);
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>
-<img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
+<a href='/adm/coursedocs?folder=$folder&cmd=up_$index$foldername'>
+<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>
-<img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
+<a href='/adm/coursedocs?folder=$folder&cmd=down_$index$foldername'>
+<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folder","$index","$renametitle");'>
-<font size="-2" color="#990000">Remove</font></a>
-<a href='javascript:changename("$folder","$index","$renametitle");'>
-<font size="-2" color="#009900">Rename</font></a></td>
+<a href='javascript:removeres("$folder","$index","$renametitle","$htmlfoldername");'>
+<font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:changename("$folder","$index","$renametitle","$htmlfoldername");'>
+<font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
-    my $icon='unknown';
-    if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
-	$icon=$extension;
-    }
+    my $icon=&Apache::loncommon::icon($url);
     my $isfolder=0;
+    my $folderarg;
     if ($uploaded) {
        if ($extension eq 'sequence') {
-	  $icon='folder_closed';
-          $url=~/\/(\w+)\.sequence/;
-          $url='/adm/coursedocs?folder='.$1;
+	  $icon=$iconpath.'/folder_closed.gif';
+          $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+          $url='/adm/coursedocs?';
+	  $folderarg=$1;
           $isfolder=1;
        } else {
 	  $url=&Apache::lonnet::tokenwrapper($url);
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if (($residx) && ($folder!~/supplemental/)) {
-       $url.=(($url=~/\?/)?'&':'?').'symb='.
-       &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
+	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
            '.sequence').
            '___'.$residx.'___'.
-	   &Apache::lonnet::declutter($url)));
+	   &Apache::lonnet::declutter($url));
+	(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+	$url=&Apache::lonnet::clutter($url);
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+    }
+    if ($isfolder) {
+	my $foldername=&Apache::lonnet::escape($foldertitle);
+	my $folderpath=$ENV{'form.folderpath'};
+	if ($folderpath) { $folderpath.='&' };
+	$folderpath.=$folderarg.'&'.$foldername;
+	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
     }
-    if ($isfolder) { $url.='&foldername='.
-       &Apache::lonnet::escape($foldertitle); }
-    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
-'"><img src="/adm/lonIcons/'.
-        $icon.'.gif" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
+    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+	'" border="0"></a></td>'.
+        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
     return $line;
 }
 
@@ -480,7 +560,7 @@ sub checkonthis {
     $alreadyseen{$url}=1;
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
-       $r->print('<br />');
+       $r->print("\n<br />");
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
        }
@@ -506,11 +586,12 @@ sub checkonthis {
                  &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));
+		 undef($Apache::lonhomework::parsing_a_problem);
 		 $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {
 		     if ($Apache::lonxml::errorcount) {
-                        $r->print('<font color="red"><b>'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
 			  $Apache::lonxml::errorcount.' '.
 				  &mt('error(s)').'</b></font> ');
                      }
@@ -534,7 +615,11 @@ sub checkonthis {
           } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
           } elsif ($result==HTTP_NOT_FOUND) {
-             $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+	      unless ($url=~/\$/) {
+		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+	      } else {
+		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+	      }
           } else {
              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
           }
@@ -563,66 +648,138 @@ sub verifycontent {
        }
    }
    &untiehash();
-   $r->print('<h1>'.&mt('Done').'.</h1>');
+   $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
+	     &mt('Return to DOCS').'</a>');
 }
 
 # -------------------------------------------------------------- Check Versions
 
 sub checkversions {
     my $r=shift;
-   $r->print('<html><head><title>Check Versions</title></head>'.
+    $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
-   $hashtied=0;
-   &tiehash();
-   my %changes=&Apache::lonnet::dump
-    ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+    my $header='';
+    my $startsel='';
+    my $monthsel='';
+    my $weeksel='';
+    my $daysel='';
+    my $allsel='';
+    my %changes=();
+    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'});
+
+    $hashtied=0;
+    &tiehash();
+    my %newsetversions=();
+    if ($ENV{'form.setmostrecent'}) {
+	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		$newsetversions{$1}='mostrecent';
+	    }
+	}
+    } elsif ($ENV{'form.setcurrent'}) {
+	$haschanged=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $getvers=&Apache::lonnet::getversion($1);
+		if ($getvers>0) {
+		    $newsetversions{$1}=$getvers;
+		}
+	    }
+	}
+    } elsif ($ENV{'form.setversions'}) {
+	$haschanged=1;
+	foreach (keys %ENV) {
+	    if ($_=~/^form\.set_version_(.+)$/) {
+		my $src=$1;
+		&Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
+		if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
+		    $newsetversions{$src}=$ENV{$_};
+		}
+	    }
+	}
+    }
+    if ($haschanged) {
+        if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+			  $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>');
+	}
+	&changewarning($r,'');
+    }
+    if ($ENV{'form.timerange'} eq 'all') {
+# show all documents
+	$header=&mt('All Documents in Course');
+	$allsel=1;
+	foreach (keys %hash) {
+	    if ($_=~/^ids\_(\/res\/.+)$/) {
+		my $src=$1;
+		$changes{$src}=1;
+	    }
+	}
+    } else {
+# show documents which changed
+	%changes=&Apache::lonnet::dump
+	 ('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;
-       }
-       my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' '
-	   .&mt('seconds');
-       my $startsel='';
-       my $monthsel='';
-       my $weeksel='';
-       my $daysel='';
-       my $allsel='';
-       if ($ENV{'form.timerange'}==-1) {
-	   $seltext='since start of course';
-           $startsel='selected';
-           $ENV{'form.timerange'}=time;
-       }
-       my $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) {
-           $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-           $weeksel='selected';
-       } elsif ($ENV{'form.timerange'}==86400) {
-           $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
-           $daysel='selected';
-       } elsif ($ENV{'form.timerange'} eq 'all') {
-	   $allsel='all';
-       }
-       my %lt=&Apache::lonlocal::texthash
+	my $firstkey=(keys %changes)[0];
+	unless ($firstkey=~/^error\:/) {
+	    unless ($ENV{'form.timerange'}) {
+		$ENV{'form.timerange'}=604800;
+	    }
+	    my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' '
+		.&mt('seconds');
+	    if ($ENV{'form.timerange'}==-1) {
+		$seltext='since start of course';
+		$startsel='selected';
+		$ENV{'form.timerange'}=time;
+	    }
+	    $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) {
+		$seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+		$weeksel='selected';
+	    } elsif ($ENV{'form.timerange'}==86400) {
+		$seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+		$daysel='selected';
+	    }
+	    $header=&mt('Content changed').' '.$seltext;
+	} else {
+	    $header=&mt('No content modifications yet.');
+	}
+    }
+    %setversions=&Apache::lonnet::dump('resourceversions',
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    my %lt=&Apache::lonlocal::texthash
 	      ('st' => 'Version changes since start of Course',
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
-               'al' => 'All Resources',
+               'al' => 'All Resources (possibly large output)',
 	       'sd' => 'Display',
-               'cc' => 'Content changed',
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
 	       've' => 'Version used in Course',
-               'vu' => 'Set Version to be used in Course', 
+               'vu' => 'Set Version to be used in Course',
+'sv' => 'Set Versions to be used in Course 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');
-       $r->print(<<ENDHEADERS);
+    $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">
+<input type="hidden" name="versions" value="1" />
+<input type="submit" name="setmostrecent" value="$lt{'sm'}" />
+<input type="submit" name="setcurrent" value="$lt{'sc'}" /><hr />
 <select name="timerange">
 <option value='all' $allsel>$lt{'al'}</option>
 <option value="-1" $startsel>$lt{'st'}</option>
@@ -630,71 +787,123 @@ sub checkversions {
 <option value="604800" $weeksel>$lt{'lw'}</option>
 <option value="86400" $daysel>$lt{'sy'}</option>
 </select>
-<input type="submit" name="versions" value="$lt{'sd'}" />
-</form>
-<h3>$lt{'cc'} $seltext</h3>
-<table border="2">
-<tr>
-<th>$lt{'fi'}</th><th>$lt{'md'}</th><th>$lt{'mr'}</th>
-<th>$lt{'ve'}</th><th>$lt{'vu'}</th><th>$lt{'di'}</th></tr>
+<input type="submit" name="display" value="$lt{'sd'}" />
+<h3>$header</h3>
+<input type="submit" name="setversions" value="$lt{'sv'}" />
+<table border="0">
 ENDHEADERS
-       foreach (keys %changes) {
-	  if ($changes{$_}>$starttime) {
-	     my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
-             my $currentversion=&Apache::lonnet::getversion($_);
-             my $linkurl=&Apache::lonnet::clutter($_);
-             $r->print(
-                 '<tr><td><a href="'.$linkurl.'" target="cat">'.$linkurl.
-                 '</a></td><td>'.
-                 &Apache::lonlocal::locallocaltime($changes{$_}).
-                      '</td><td><font size="+2">'.
-		       $currentversion.'</font></td><td><font size="+2">');
+    foreach (sort keys %changes) {
+	if ($changes{$_}>$starttime) {
+	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
+	    my $currentversion=&Apache::lonnet::getversion($_);
+	    if ($currentversion<0) {
+		$currentversion=&mt('Could not be determined.');
+	    }
+	    my $linkurl=&Apache::lonnet::clutter($_);
+	    $r->print(
+		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
+		      &Apache::lonnet::gettitle($linkurl).
+                      '</b></font></td></tr>'.
+                      '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
+                      '<td colspan="4">'.
+                      '<a href="'.$linkurl.'" target="cat">'.$linkurl.
+		      '</a></td></tr>'.
+                      '<tr><td></td>'.
+                      '<td title="'.$lt{'md'}.'">'.
+		      &Apache::lonlocal::locallocaltime(
+                           &Apache::lonnet::metadata($root.'.'.$extension,
+                                                     'lastrevisiondate')
+                                                        ).
+                      '</td>'.
+                      '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                      '<font size="+1">'.$currentversion.'</font>'.
+                      '</nobr></td>'.
+                      '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
+                      '<font size="+1">');
 # Used in course
-	     my $usedversion=$hash{'version_'.$linkurl};
-	     if ($usedversion) {
-		 $r->print($usedversion);
-	     } else {
-		 $r->print($currentversion);
-	     }
-	     $r->print('</font></td><td>');
+	    my $usedversion=$hash{'version_'.$linkurl};
+	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
+		$r->print($usedversion);
+	    } else {
+		$r->print($currentversion);
+	    }
+	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+                      '<nobr>Use: ');
 # Set version
-	     $r->print(&Apache::loncommon::select_form($usedversion,
-						       'set_version_'.$linkurl,
-                               ('' => '',
-                              'current' => 'current',
-                               map {$_,$_} (1..$currentversion))));
-	     $r->print('</td><td>');
-             my $lastold=1;
-             for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
-                 my $url=$root.'.'.$prevvers.'.'.$extension;
-                 if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
-                                                             $starttime) {
-                     $lastold=$prevvers;
-                 }
-             }
+	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
+						      'set_version_'.$linkurl,
+						      ('' => '',
+						       'mostrecent' => 'most recent',
+						       map {$_,$_} (1..$currentversion))));
+	    $r->print('</nobr></td></tr><tr><td></td>');
+	    my $lastold=1;
+	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+		my $url=$root.'.'.$prevvers.'.'.$extension;
+		if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
+		    $starttime) {
+		    $lastold=$prevvers;
+		}
+	    }
+            # 
+            # Code to figure out how many version entries should go in
+            # each of the four columns
+            my $entries_per_col = 0;
+            my $num_entries = ($currentversion-$lastold);
+            if ($num_entries % 4 == 0) {
+                $entries_per_col = $num_entries/4;
+            } else {
+                $entries_per_col = $num_entries/4 + 1;
+            }
+            my $entries_count = 0;
+            $r->print('<td valign="top"><font size="-2">'); 
+            my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
-                 my $url=$root.'.'.$prevvers.'.'.$extension;
-                 $r->print('<a href="'.&Apache::lonnet::clutter($url).
-                   '">'.&mt('Version').' '.$prevvers.' ('.
-                 &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
-                 ')</a>');
-                 if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+		my $url=$root.'.'.$prevvers.'.'.$extension;
+		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
+			  &Apache::lonlocal::locallocaltime(
+                                &Apache::lonnet::metadata($url,
+                                                          'lastrevisiondate')
+                                                            ).
+			  ')');
+		if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
                     $r->print(' <a href="/adm/diff?filename='.
-                            &Apache::lonnet::clutter($root.'.'.$extension).
-                            '&versionone='.$prevvers.
-			     '">'.&mt('Diffs').'</a>');
-                 }
-                 $r->print('<br />');
-             }
-             $r->print('</td></tr>');
-          }
-       }
-       $r->print('</table>');
-       $r->print('<h1>'.&mt('Done').'.</h1>');
-   } else {
-       $r->print('<p>'.&mt('No content modifications yet.').'</p>');
-   }
-   &untiehash();
+			      &Apache::lonnet::clutter($root.'.'.$extension).
+			      '&versionone='.$prevvers.
+			      '">'.&mt('Diffs').'</a>');
+		}
+		$r->print('</nobr><br />');
+                if (++$entries_count % $entries_per_col == 0) {
+                    $r->print('</font></td>');
+                    if ($cols_output != 4) {
+                        $r->print('<td valign="top"><font size="-2">');
+                        $cols_output++;
+                    }
+                }
+	    }
+            while($cols_output++ < 4) {
+                $r->print('</font></td><td><font>')
+            }
+	    $r->print('</font></td></tr>'."\n");
+	}
+    }
+    $r->print('</table></form>');
+    $r->print('<h1>'.&mt('Done').'.</h1>');
+
+    &untiehash();
+}
+
+sub changewarning {
+    my ($r,$postexec)=@_;
+    $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" /><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>');
 }
 
 # ================================================================ Main Handler
@@ -704,7 +913,6 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    &Apache::lonlocal::clearreroutetrans();
 # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
@@ -743,7 +951,13 @@ sub handler {
     my $events='';
     my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-       ['folder','foldername']);
+					    ['folderpath']);
+    if ($ENV{'form.folderpath'}) {
+	my (@folderpath)=split('&',$ENV{'form.folderpath'});
+	$ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
+	$ENV{'form.folder'}=pop(@folderpath);
+	$ENV{'form.folders'}=\@folderpath;
+    }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc=$1;
     }
@@ -842,6 +1056,29 @@ function makebulboard() {
    }
 }
 
+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();
+	   }
+       }
+   }
+}
+
+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;
@@ -851,20 +1088,22 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folder,index,oldtitle) {
+function changename(folder,index,oldtitle,foldername) {
     var title=prompt('New Title',oldtitle);
     if (title) {
 	this.document.forms.renameform.title.value=title;
 	this.document.forms.renameform.cmd.value='rename_'+index;
 	this.document.forms.renameform.folder.value=folder;
+	this.document.forms.renameform.foldername.value=foldername;
         this.document.forms.renameform.submit();
     }
 }
 
-function removeres(folder,index,oldtitle) {
-    if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {
+function removeres(folder,index,oldtitle,foldername) {
+    if (confirm('Remove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
 	this.document.forms.renameform.folder.value=folder;
+	this.document.forms.renameform.foldername.value=foldername;
         this.document.forms.renameform.submit();
     }
 }
@@ -875,7 +1114,9 @@ ENDNEWSCRIPT
 # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,
-					'','',$showdoc));
+					'','',$showdoc).
+	    &Apache::loncommon::help_open_faq(273).
+	    &Apache::loncommon::help_open_bug('RAT'));
   unless ($showdoc) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
@@ -896,7 +1137,12 @@ ENDNEWSCRIPT
                 'sipr' => 'Simple Problem',
                 'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',
-                'mypi' => 'My Personal Info'
+                'mypi' => 'My Personal Info',
+		'abou' => 'About User',
+                'imsf' => 'Import IMS package',
+                'file' =>  'File',
+                'title' => 'Title',
+                'comment' => 'Comment' 
 					  );
 # -----------------------------------------------------------------------------
     if ($allowed) {
@@ -910,10 +1156,12 @@ ENDNEWSCRIPT
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
 <input type="hidden" name="folder" />
+<input type="hidden" name="foldername" />
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folder" />
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
@@ -926,15 +1174,18 @@ $dumpbut
 </form>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     'Editing the Table of Contents for your Course'));
+		     &mt('Editing the Table of Contents for your Course')));
     }
 # --------------------------------------------------------- Standard documents
+    my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder=~/^default/) { $folder='default'; }
+       if ($folder eq '') {
+           $folder='default';
+       }
        my $postexec='';
        if ($folder eq 'default') {
 	   $r->print('<script>this.window.name="loncapaclient";</script>');
@@ -944,15 +1195,7 @@ ENDCOURSEVERIFY
        $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($hadchanges) {
-	   $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" /><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>');
+	   &changewarning($r,$postexec);
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
@@ -963,14 +1206,14 @@ $help{'Caching'}.'</font></h3></form>');
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
-File:<br />
+$lt{'file'}:<br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
 <br />
-Title:<br />
+$lt{'title'}:<br />
 <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="$lt{'upld'}">
 <nobr>
@@ -981,7 +1224,7 @@ Title:<br />
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=button onClick=
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
 <nobr>
@@ -1001,7 +1244,7 @@ $help{'Load_Map'}</nobr>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -1011,7 +1254,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 </form>
 <form action="/adm/coursedocs" method="post" name="newext">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
@@ -1020,7 +1263,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -1030,7 +1273,7 @@ value="Syllabus=/public/$coursedom/$cour
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
 <nobr>
@@ -1040,7 +1283,7 @@ $help{'Navigate_Content'}
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
@@ -1049,7 +1292,7 @@ onClick="javascript:makesmppage();" /> $
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
@@ -1058,7 +1301,7 @@ onClick="javascript:makesmpproblem();" /
 </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
@@ -1068,7 +1311,7 @@ $help{'Score_Upload_Form'}
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"
@@ -1078,7 +1321,7 @@ $help{'Bulletin Board'}
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -1086,6 +1329,20 @@ value="$plainname=/adm/$udom/$uname/abou
 $help{'My Personal Info'}
 </nobr>
 </form>
+<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$htmlfoldername">
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
+onClick="javascript:makeabout();" />
+</nobr>
+</form>
+<form action="/adm/imsimportdocs" method="post" name="ims">
+<input type="hidden" name="folder" value="$folder" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+</nobr>
+</form>
 </td></tr>
 </table>
 ENDFORM
@@ -1107,17 +1364,16 @@ ENDFORM
           $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">
-<br />Comment:<br />
+<br />$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
 <input type="submit" value="$lt{'upld'}">
@@ -1126,26 +1382,9 @@ ENDFORM
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
-<input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
-<input type=hidden name="importdetail" value="">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
-<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
-<p>
-<hr />
-<input type="text" size="20" name="importmap">
-<input type=button 
-onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"
-value="$lt{'selm'}"><input type="submit" name="loadmap" value="$lt{'load'}">$help{'Load_Map'}
-</p>
-</form>
-</td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newfolder" type="button"
@@ -1155,7 +1394,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" 
@@ -1165,7 +1404,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -1175,7 +1414,7 @@ $help{'Syllabus'}
 </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">
-<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
+<input type="hidden" name="foldername" value="$htmlfoldername">
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -1199,7 +1438,7 @@ ENDSUPFORM
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }
  }
- $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');
+ $r->print('</body></html>');
  return OK;
 }