--- loncom/publisher/loncfile.pm	2001/06/24 18:09:38	1.5
+++ loncom/publisher/loncfile.pm	2002/01/21 17:13:49	1.8
@@ -1,6 +1,31 @@
 # The LearningOnline Network with CAPA
 # Handler to rename files, etc, in construction space
 #
+# $Id: loncfile.pm,v 1.8 2002/01/21 17:13:49 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+#
 # (Handler to retrieve an old version of a file
 #
 # (Publication Handler
@@ -25,10 +50,38 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 
+sub exists {
+    my ($uname,$udom,$dir,$newfile)=@_;
+    my $published='/home/httpd/html/res/'.$udom.'/'.$uname.'/'.$dir.'/'.
+	$ENV{'form.newfilename'};
+    my $construct='/home/'.$uname.'/public_html/'.$dir.'/'.
+	$ENV{'form.newfilename'};
+    my $result;
+    if (-e $published) {
+	$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>';
+    }
+    return $result;
+}
+
+sub checksuffix {
+    my ($old,$new) = @_;
+    my $result;
+    my $oldsuffix;
+    my $newsuffix;
+    if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; }
+    if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
+    if ($oldsuffix ne $newsuffix) {
+	$result.='<p><font color=red>Warning: change of MIME type!</font></p>';
+    }
+    return $result;
+}
+
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
 
-    $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
+    $fn=~m:(.*)/([^/]+)\.(\w+)$:;
     my $dir=$1;
     my $main=$2;
     my $suffix=$3;
@@ -39,77 +92,65 @@ sub phaseone {
 	      '<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') {
 	if (-e $conspace) {
 	    if ($ENV{'form.newfilename'}) {
-               $ENV{'form.newfilename'}=~/(.*)\/([^\/]+)\.(\w+)$/;
-               if ($3 ne $suffix) {
-		   $r->print(
-                    '<p><font color=red>Warning: change of MIME type!</font>');
-               }
-               if (-e 
-       	         '/home/httpd/'.$uname.'/'.$dir.'/'.$ENV{'form.newfilename'}) {
-		   $r->print(
-                    '<p><font color=red>Warning: target file exists!</font>');
-               }
+		$r->print(&checksuffix($fn,$ENV{'form.newfilename'}));
+		$r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'}));
 	       $r->print('<input type=hidden name=newfilename value="'.
                          $ENV{'form.newfilename'}.
                          '"><p>Rename <tt>'.$fn.'</tt> to <tt>'.
-                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?');
+                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?</p>');
 	    } else {
-	       $r->print('<p>No new filename specified.</form>');
+	       $r->print('<p>No new filename specified.</p></form>');
                return;
 	    }
         } else {
-	    $r->print('<p>No such file.</form>');
+	    $r->print('<p>No such file.</p></form>');
             return;
         }
     } elsif ($ENV{'form.action'} eq 'delete') { 
 	if (-e $conspace) {
-            $r->print('<p>Delete <tt>'.$fn.'</tt>?');
+            $r->print('<p>Delete <tt>'.$fn.'</tt>?</p>');
         } else {
-	    $r->print('<p>No such file.</form>');
+	    $r->print('<p>No such file.</p></form>');
             return;
         }
     } elsif ($ENV{'form.action'} eq 'copy') { 
 	if (-e $conspace) {
 	    if ($ENV{'form.newfilename'}) {
-               $ENV{'form.newfilename'}=~/(.*)\/([^\/]+)\.(\w+)$/;
-               if ($3 ne $suffix) {
-		   $r->print(
-                    '<p><font color=red>Warning: change of MIME type!</font>');
-               }
-               if (-e 
-       	         '/home/httpd/'.$uname.'/'.$dir.'/'.$ENV{'form.newfilename'}) {
-		   $r->print(
-                    '<p><font color=red>Warning: target file exists!</font>');
-               }
+		$r->print(&checksuffix($fn,$ENV{'form.newfilename'}));
+		$r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'}));
 	       $r->print('<input type=hidden name=newfilename value="'.
                          $ENV{'form.newfilename'}.
                          '"><p>Copy <tt>'.$fn.'</tt> to <tt>'.
-                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?');
+                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?</p>');
 	    } else {
-	       $r->print('<p>No new filename specified.</form>');
+	       $r->print('<p>No new filename specified.</p></form>');
                return;
 	    }
         } else {
-	    $r->print('<p>No such file.</form>');
+	    $r->print('<p>No such file.</p></form>');
             return;
         }
     } elsif ($ENV{'form.action'} eq 'newdir') {
         my $newdir='/home/'.$uname.'/public_html/'.
                    $fn.$ENV{'form.newfilename'};
 	if (-e $newdir) {
-            $r->print('<p>Directory exists.</form>');
+            $r->print('<p>Directory exists.</p></form>');
             return;
         }
 	$r->print('<input type=hidden name=newfilename value="'.
                   $ENV{'form.newfilename'}.
                   '"><p>Make new directory <tt>'.
-                  $fn.$ENV{'form.newfilename'}.'</tt>?');
+                  $fn.$ENV{'form.newfilename'}.'</tt>?</p>');
        
     }
-    $r->print('<p><input type=submit value=Continue></form>'); 
+    $r->print('<p><input type=submit value=Continue></p></form>');
+    $r->print('<form action="/priv/'.$uname.$fn.
+	      '" method="GET"><p><input type=submit value=Cancel></p></form>');
+
 }
 
 sub phasetwo {
@@ -164,6 +205,8 @@ sub phasetwo {
         unless (mkdir($newdir,0770)) {
 	    $r->print('<font color=red>Error: '.$!.'</font>');
         }
+        $r->print('<h3><a href="/priv/'.$uname.$fn.'/">Done</a></h3>');
+        return;
     }
     $r->print('<h3><a href="/priv/'.$uname.$dir.'/">Done</a></h3>');
 }