--- loncom/interface/londocs.pm	2004/02/19 21:51:11	1.107
+++ loncom/interface/londocs.pm	2004/02/27 19:11:08	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.107 2004/02/19 21:51:11 albertel Exp $
+# $Id: londocs.pm,v 1.109 2004/02/27 19:11:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -411,38 +411,42 @@ sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx)=@_;
     $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) {
-	 my %lt=('up' => 'Move Up',
-		 'dw' => 'Move Down',
-		 'rm' => 'Remove',
-		 'rn' => 'Rename');
-      $line.=(<<END);
+    if ($allowed) {
+	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'>
+<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'>
+<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");'>
+<a href='javascript:removeres("$folder","$index","$renametitle","$htmlfoldername");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:changename("$folder","$index","$renametitle");'>
+<a href='javascript:changename("$folder","$index","$renametitle","$htmlfoldername");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END
     }
@@ -504,7 +508,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;');
        }
@@ -592,7 +596,8 @@ 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
@@ -1017,20 +1022,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) {
+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();
     }
 }
@@ -1082,10 +1089,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">
@@ -1101,6 +1110,7 @@ ENDCOURSEVERIFY
 		     &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').
@@ -1134,7 +1144,7 @@ $lt{'file'}:<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>
@@ -1145,7 +1155,7 @@ $lt{'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>
@@ -1165,7 +1175,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"
@@ -1175,7 +1185,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');"
@@ -1184,7 +1194,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>
@@ -1194,7 +1204,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>
@@ -1204,7 +1214,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'}"
@@ -1213,7 +1223,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'}"
@@ -1222,7 +1232,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'}"
@@ -1232,7 +1242,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'}"
@@ -1242,7 +1252,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>
@@ -1252,7 +1262,7 @@ $help{'My Personal Info'}
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 <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="newaboutsomeone" type="button" value="$lt{'abou'}" 
@@ -1289,7 +1299,7 @@ ENDFORM
 <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'}">
@@ -1300,7 +1310,7 @@ ENDFORM
 <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"
@@ -1310,7 +1320,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" 
@@ -1320,7 +1330,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>
@@ -1330,7 +1340,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>