--- loncom/publisher/loncfile.pm	2003/02/04 21:54:17	1.22
+++ loncom/publisher/loncfile.pm	2003/06/20 15:30:13	1.33
@@ -7,10 +7,9 @@
 #  presents a page that describes the proposed action to the user
 #  and requests confirmation.  The second phase commits the action
 #  and displays a page showing the results of the action.
-# 
-
 #
-# $Id: loncfile.pm,v 1.22 2003/02/04 21:54:17 albertel Exp $
+#
+# $Id: loncfile.pm,v 1.33 2003/06/20 15:30:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,6 +92,7 @@ use Apache::Constants qw(:common :http :
 use Apache::loncacc;
 use Apache::Log ();
 use Apache::lonnet;
+use Apache::loncommon();
 
 my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
@@ -336,10 +336,10 @@ sub exists {
       return 'Error: destination for operation is a directory.';
   }
   if ( -e $published) {
-      $result.='<p><font color=red>Warning: target file exists, and has been published!</font></p>';
+      $result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';
   }
   elsif ( -e $construct) {
-      $result.='<p><font color=red>Warning: target file exists!</font></p>';
+      $result.='<p><font color="red">Warning: target file exists!</font></p>';
   }
 
   return $result;
@@ -384,10 +384,21 @@ sub checksuffix {
     if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
     if ($oldsuffix ne $newsuffix) {
 	$result.=
-            '<p><font color=red>Warning: change of MIME type!</font></p>';
+            '<p><font color="red">Warning: change of MIME type!</font></p>';
     }
     return $result;
 }
+
+sub cleanDest {
+    my ($request,$dest)=@_;
+    #remove bad characters
+    if  ($dest=~/[\#\?&]/) {
+	$request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");
+	$dest=~s/[\#\?&]//g;
+    }
+    return $dest;
+}
+
 =pod
 
 =item CloseForm1($request, $user, $file)
@@ -411,9 +422,9 @@ sub CloseForm1 {
 
 
    &Debug($request, "Cancel url is: ".$cancelurl);
-   $request->print('<p><input type=submit value=Continue></p></form>');
+   $request->print('<p><input type="submit" value="Continue" /></p></form>');
    $request->print('<form action="'.$cancelurl.
-		   '" method="GET"><p><input type=submit value=Cancel><p></form>');
+		   '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
 
 }
 
@@ -445,7 +456,7 @@ Parameters:
 sub CloseForm2 {
   my ($request, $user, $directory) = @_;
 
-  $request->print('<h3><a=href="/priv/'.$user.$directory.'/">Done </a> </h3>');
+  $request->print('<h3><a href="/priv/'.$user.$directory.'/">Done </a> </h3>');
 }
 
 =pod
@@ -495,7 +506,19 @@ sub Rename1 {
     if(-e $conspace) {
 	if($ENV{'form.newfilename'}) {
 	    my $newfilename = $ENV{'form.newfilename'};
+	    if ($newfilename =~ m|/[^\.]+$|) {
+		#no extension add on orignal extension
+		if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {
+		    $newfilename.='.'.$1;
+		}
+	    }
 	    $request->print(&checksuffix($filename, $newfilename));
+	    #renaming a dir, delete the trailing /
+            #remove last element for current dir
+	    if ($filename =~ m|/$|) {
+		$filename =~ s|/$||;
+		$dir =~ s|/[^/]*$||;
+	    }
 	    my $return=&exists($user, $domain, $dir, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
@@ -503,9 +526,10 @@ sub Rename1 {
 		return;
 	    }
 	    my $dest=&SimplifyDir($dir,$newfilename);
-	    $request->print('<input type=hidden name=newfilename value="'.
+	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '"><p>Rename <tt>'.$filename.'</tt><br /> to <tt>'.
+			    '" /><p>Rename <tt>'.$filename.
+			    '</tt><br /> to <tt>'.
 			    $dest.'</tt>?</p>');
 	    &CloseForm1($request, $cancelurl);
 	} else {
@@ -551,8 +575,8 @@ sub Delete1 {
   
 
   if( -e $filename) {
-    $request->print('<input type=hidden name=newfilename value="'.
-		    $filename.'">');
+    $request->print('<input type="hidden" name="newfilename" value="'.
+		    $filename.'"/>');
     $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);
   } else {
@@ -606,9 +630,9 @@ sub Copy1 {
 	return;
     }
     my $dest=&SimplifyDir($dir,$newfilename);
-    $request->print('<input type = hidden name = newfilename value = "'.
+    $request->print('<input type = "hidden" name = "newfilename" value = "'.
 		    $dir.'/'.$newfilename.
-		    '"><p>Copy <tt>'.$filename.'</tt><br />  to '.
+		    '" /><p>Copy <tt>'.$filename.'</tt><br />  to '.
 		    '<tt>'.$dest.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);
   } else {
@@ -696,8 +720,8 @@ sub NewDir1
     $request->print('<p>Directory exists.</p></form>');
   }
   else {
-    $request->print('<input type=hidden name=newfilename value="'.
-		    $newdir.'"><p>Make new directory <tt>'.
+    $request->print('<input type="hidden" name="newfilename" value="'.
+		    $newdir.'" /><p>Make new directory <tt>'.
 		    $path."/".$newdir.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);
 
@@ -758,6 +782,10 @@ sub NewFile1 {
     if ($ENV{'form.action'} =~ /new(.+)file/) {
 	my $extension=$1;
 	if ($newfilename !~ /\Q.$extension\E$/) {
+	    if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
+		#already has an extension strip it and add in expected one
+		$newfilename =~ s|.([^\.]+)$||;
+	    }
 	    $newfilename.=".$extension";
 	}
     }
@@ -770,15 +798,15 @@ sub NewFile1 {
 	$request->print('<p>File exists.</p></form>');
     }
     else {
-	$request->print('<p>Make new file <tt>'.$newfilename.'</tt>?</p>');
+	$request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');
 	my $dest=&MakeFinalUrl($request,$fullpath);
 	&Debug($request, "Cancel url is: ".$cancelurl);
 	&Debug($request, "Dest url is: ".$dest);
 	$request->print('</form>');
 	$request->print('<form action="'.$dest.
-			'" method="GET"><p><input type="submit" value="Continue" /></p></form>');
+			'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
 	$request->print('<form action="'.$cancelurl.
-			'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
+			'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
     }
 }
 
@@ -820,16 +848,19 @@ sub phaseone {
   
   #  my $conspace=ConstructionPathFromRelative($uname, $fn);
   
-  
-  $r->print('<form action=/adm/cfile method=post>'.
-	    '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.
-	    '<input type=hidden name=phase value=two>'.
-	    '<input type=hidden name=action value='.$ENV{'form.action'}.'>');
+  $ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});
+
+  $r->print('<form action="/adm/cfile" method="post">'.
+	    '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
+	    '<input type="hidden" name="phase" value="two" />'.
+	    '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
   
   if ($ENV{'form.action'} eq 'rename') {
-    
-    &Rename1($r, $fn, $uname, $udom, $dir);
-    
+      if (!defined($dir)) {
+	  $fn=~m:(.*)/:;
+	  $dir=$1;
+      }
+      &Rename1($r, $fn, $uname, $udom, $dir);
   } elsif ($ENV{'form.action'} eq 'delete') { 
     
     &Delete1($r, $uname, $fn);
@@ -845,17 +876,20 @@ sub phaseone {
     &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
   }  elsif ($ENV{'form.action'} eq 'newfile' ||
 	    $ENV{'form.action'} eq 'newhtmlfile' ||
-	    $ENV{'form.action'} eq 'newproblemfile') {
-    if($ENV{'form.newfilename'}) {
-      my $newfilename = $ENV{'form.newfilename'};
-      if (!defined($dir)) {
-	  $fn=~m:(.*)/:;
-	  $dir=$1;
+	    $ENV{'form.action'} eq 'newproblemfile' ||
+            $ENV{'form.action'} eq 'newpagefile' ||
+            $ENV{'form.action'} eq 'newsequencefile' ||
+            $ENV{'form.action'} eq 'Select Action') {
+      if($ENV{'form.newfilename'}) {
+	  my $newfilename = $ENV{'form.newfilename'};
+	  if (!defined($dir)) {
+	      $fn=~m:(.*)/:;
+	      $dir=$1;
+	  }
+	  &NewFile1($r, $uname, $udom, $dir, $newfilename);
+      } else {
+	  $r->print('<p>No new filename specified.</p></form>');
       }
-      &NewFile1($r, $uname, $udom, $dir, $fn, $newfilename);
-    }else {
-      $r->print('<p>No new filename specified.</p></form>');
-    }
   }
 }
 
@@ -903,9 +937,20 @@ sub Rename2 {
 	 $newfile);
 
   if(-e $oldfile) {
-      unless(rename($oldfile,
-		    $directory.'/'.$newfile)) {
-	  $request->print('<font color=red>Error: '.$!.'</font>');
+      my $dest;
+
+      if ($oldfile =~ m|/$|) {
+	  #renaming a dir
+	  $oldfile =~ s|/$||;
+	  $dest=$directory;
+	  $dest=~s|(/)([^/]*)$|$1|;
+	  $dest.='/'.$newfile;
+      } else {
+	  $dest=$directory.'/'.$newfile;
+      }
+
+      unless(rename($oldfile,$dest)) {
+	  $request->print('<font color="red">Error: '.$!.'</font>');
 	  return 0;
       } else {}
   } else {
@@ -949,11 +994,11 @@ sub Delete2 {
 
   if(-e $filename) {
     unless(unlink($filename)) {
-      $request->print('<font color=red>Error: '.$!.'</font>');
+      $request->print('<font color="red">Error: '.$!.'</font>');
       return 0;
     }
   } else {
-    $request->print('<p> No such file. </form');
+    $request->print('<p> No such file. </p></form');
     return 0;
   }
   return 1;
@@ -992,11 +1037,11 @@ sub Copy2 {
     &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {
 	unless (copy($oldfile, $newfile)) {
-	    $request->print('<font color=red> copy Error: '.$!.'</font>');
+	    $request->print('<font color="red"> copy Error: '.$!.'</font>');
 	    return 0;
 	} else {
 	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color=red> chmod error: '.$!.'</font>');
+		$request->print('<font color="red"> chmod error: '.$!.'</font>');
 		return 0;
 	    }
 	    return 1;
@@ -1033,11 +1078,11 @@ sub NewDir2 {
   my ($request, $user, $newdirectory) = @_;
   
   unless(mkdir($newdirectory, 02770)) {
-    $request->print('<font color=red>Error: '.$!.'</font>');
+    $request->print('<font color="red">Error: '.$!.'</font>');
     return 0;
   }
   unless(chmod(02770, ($newdirectory))) {
-      $request->print('<font color=red> Error: '.$!.'</font>');
+      $request->print('<font color="red"> Error: '.$!.'</font>');
       return 0;
   }
   return 1;
@@ -1082,11 +1127,16 @@ sub phasetwo {
     
     # Break down the file into it's component pieces.
     
-    $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
-    my $dir=$1;			# Directory path
-    my $main=$2;		# Filename.
-    my $suffix=$3;		# Extension.
-    
+    my $dir;		# Directory path
+    my $main;		# Filename.
+    my $suffix;		# Extension.
+
+    if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
+	$dir=$1;		# Directory path
+	$main=$2;		# Filename.
+	$suffix=$3;		# Extension.
+    }
+        
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r, 
@@ -1106,12 +1156,19 @@ sub phasetwo {
     
     if ($ENV{'form.action'} eq 'rename') { # Rename.
 	if($ENV{'form.newfilename'}) {
+	    if (!defined($dir)) {
+		$fn=~m:^(.*)/:;
+		$dir=$1;
+	    }
 	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
 		return;
 	    }
 	    # Prepend the directory to the new name to form the basis of the
 	    # url of the new resource.
 	    #
+	    #renaming a dir
+            #remove last element for current dir
+	    if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; }
 	    $dest = $dir."/".$ENV{'form.newfilename'};
 	}
     } elsif ($ENV{'form.action'} eq 'delete') { 
@@ -1130,7 +1187,7 @@ sub phasetwo {
 	    $dest = $ENV{'form.newfilename'};
      
 	} else {
-	    $r->print('<p>No New filename specified</form>');
+	    $r->print('<p>No New filename specified</p></form>');
 	    return;
 	}
 	
@@ -1226,14 +1283,13 @@ sub handler {
 
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
 
-  $r->print(
-   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
+  $r->print(&Apache::loncommon::bodytag('File Operation'));
 
   
   $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
   
   if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.
+          $r->print('<h3><font color="red">Co-Author: '.$uname.' at '.$udom.
                '</font></h3>');
   }
 
@@ -1250,10 +1306,13 @@ sub handler {
       $r->print('<h3>Copy</h3>');
   } elsif ($ENV{'form.action'} eq 'newfile' ||
 	   $ENV{'form.action'} eq 'newhtmlfile' ||
-	   $ENV{'form.action'} eq 'newproblemfile') {
+	   $ENV{'form.action'} eq 'newproblemfile' ||
+           $ENV{'form.action'} eq 'newpagefile' ||
+           $ENV{'form.action'} eq 'newsequencefile' ||
+           $ENV{'form.action'} eq 'Select Action' ) {
       $r->print('<h3>New Resource</h3>');
   } else {
-     $r->print('<p>Unknown Action</body></html>');
+     $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {