--- loncom/interface/londocs.pm	2005/06/08 20:44:54	1.181
+++ loncom/interface/londocs.pm	2005/06/10 15:33:45	1.185
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.181 2005/06/08 20:44:54 www Exp $
+# $Id: londocs.pm,v 1.185 2005/06/10 15:33:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1077,7 +1077,9 @@ sub editor {
                 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/|) {
-			&Apache::lonnet::removeuploadedurl($url);
+			unless ($url=~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/) {
+			    &Apache::lonnet::removeuploadedurl($url);
+			}
 		    }
 		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
@@ -1865,15 +1867,15 @@ sub changewarning {
     if (!defined($message)) {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
-    $r->print(
-'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
-'<form method="post" action="/adm/roles" target="loncapaclient">'.
+    $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($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
     &mt('re-initializing course').'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</font></h3></form>');
+$help{'Caching'}.'</font></h3></form>'."\n\n");
 }
 
 # ================================================================ Main Handler
@@ -2266,7 +2268,7 @@ 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 />
@@ -2406,6 +2408,7 @@ $uploadtag
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />
 </nobr>
+</form>
 ENDFORM
        }
        if ($env{'form.pagepath'}) {
@@ -2426,8 +2429,8 @@ $uploadtag
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </nobr>
+</form>
 ENDBLOCK
-           $r->print('</form>');
        }
        $r->print('</td></tr>'."\n".
 '</table>');
@@ -2516,7 +2519,7 @@ 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 {