--- loncom/interface/londocs.pm	2002/11/18 15:21:31	1.37
+++ loncom/interface/londocs.pm	2002/12/09 22:27:20	1.40
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.37 2002/11/18 15:21:31 www Exp $
+# $Id: londocs.pm,v 1.40 2002/12/09 22:27:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
 use Apache::lonxml;
+use HTML::Entities;
 use GDBM_File;
 
 my $iconpath;
@@ -44,6 +45,8 @@ my %hash;
 my $hashtied;
 my %alreadyseen=();
 
+my $hadchanges;
+
 # Mapread read maps into lonratedt::global arrays 
 # @order and @resources, determines status
 # sets @order - pointer to resources in right order
@@ -59,6 +62,7 @@ sub mapread {
 
 sub storemap {
     my ($coursenum,$coursedom,$map)=@_;
+    $hadchanges=1;
     return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);
@@ -118,20 +122,25 @@ sub editor {
                     }
                     $#Apache::lonratedt::order--;
                 } elsif ($cmd eq 'up') {
+		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
                     my $i=$Apache::lonratedt::order[$idx-1];
                     $Apache::lonratedt::order[$idx-1]=
 			$Apache::lonratedt::order[$idx];
                     $Apache::lonratedt::order[$idx]=$i;
+		   }
                 } elsif ($cmd eq 'down') {
+		   if (defined($Apache::lonratedt::order[$idx+1])) {
                     my $i=$Apache::lonratedt::order[$idx+1];
                     $Apache::lonratedt::order[$idx+1]=
 			$Apache::lonratedt::order[$idx];
                     $Apache::lonratedt::order[$idx]=$i;
+		   }
                 } elsif ($cmd eq 'rename') {
                     my ($rtitle,@rrest)=split(/\:/,
                        $Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]);
-                    my $comment=$ENV{'form.title'};
+                    my $comment=
+                     &HTML::Entities::decode($ENV{'form.title'});
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
@@ -185,6 +194,21 @@ sub editor {
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed)=@_;
+    $title=~s/\&colon\;/\:/g;
+    $title=&HTML::Entities::encode(&HTML::Entities::decode(
+     &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>'.localtime($1).'</i> '.
+                &Apache::loncommon::plainname($2,$3).': <br>'.
+		$foldertitle;
+	}
+    $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
     if ($allowed) {
@@ -197,7 +221,7 @@ sub entryline {
 </table></td><td>
 <a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>
 <font size="-2">Remove</font></a>
-<a href='javascript:changename("$folder","$index","$title");'>
+<a href='javascript:changename("$folder","$index","$renametitle");'>
 <font size="-2">Rename</font></a></td>
 END
     }
@@ -220,17 +244,6 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-# Title
-    $title=&Apache::lonnet::unescape($title);
-    my $foldertitle=$title;
-    if ($title=~
- /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/
-	) { 
-            $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-            $title='<i>'.localtime($1).'</i> '.
-                &Apache::loncommon::plainname($2,$3).': <br>'.
-		$foldertitle;
-	}
     if ($isfolder) { $url.='&foldername='.$foldertitle; }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
 '"><img src="/adm/lonIcons/'.
@@ -511,17 +524,21 @@ function makenewext(targetname) {
 }
 
 function makesmppage() {
-    var title=prompt('Listed Title for the Page');
+   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 makebulboard() {
-    var title=prompt('Listed Title for the Bulletin Board');
+   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 finishpick() {
@@ -548,6 +565,11 @@ function changename(folder,index,oldtitl
 <input type="hidden" name="cmd" />
 <input type="hidden" name="folder" />
 </form>
+<form name="simpleedit" method="post" action="/adm/coursedocs">
+<input type=hidden name="importdetail" value="">
+<input type="hidden" name="folder" />
+</form>
+
 ENDNEWSCRIPT
   }
 # -------------------------------------------------------------------- Body tag
@@ -568,7 +590,11 @@ ENDCOURSEVERIFY
        $r->print('<tr><td bgcolor="#FFFFBB"><h2>Main Course Documents</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }
+       $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
+       if ($hadchanges) {
+	   $r->print('<h3><font color="red">Changes will become active after <a href="/adm/roles">re-initializing course</a> or at next login.</font></h3>');
+       }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        $r->print(<<ENDFORM);
@@ -591,13 +617,11 @@ Title:<br />
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
-<input type=hidden name="importdetail" value="">
+<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type=button onClick=
-"javascript:groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
-"javascript:groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">
@@ -686,13 +710,12 @@ ENDFORM
 </form>
 </td>
 <td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
+<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
 <input type=hidden name="importdetail" value="">
 <input type=button onClick=
-"javascript:groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
 <input type=button onClick=
-"javascript:groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
 </form>
 </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">