--- loncom/publisher/loncfile.pm	2001/12/04 15:34:57	1.7
+++ loncom/publisher/loncfile.pm	2002/05/24 05:11:40	1.9
@@ -1,7 +1,16 @@
 # The LearningOnline Network with CAPA
 # Handler to rename files, etc, in construction space
 #
-# $Id: loncfile.pm,v 1.7 2001/12/04 15:34:57 albertel Exp $
+#  This file responds to the various buttons and events
+#  in the top frame of the construction space directory.
+#  Each event is processed in two phases.  The first phase
+#  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.9 2002/05/24 05:11:40 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +50,9 @@
 # 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
 #
 # 06/23 Gerd Kortemeyer
+# 05/07/02 Ron Fox:
+#           - Added Debug log output so that I can trace what the heck this
+#             undocumented thingy does.
 
 package Apache::loncfile;
 
@@ -49,11 +61,61 @@ use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
+use Apache::Log ();
+
+my $DEBUG=1;
+
+#
+#  Debug
+#    If debugging is enabled puts out a debuggin message determined by the
+#    caller.  The debug message goes to the Apache error log file.
+#
+#  Parameters:
+#     r       - Apache request [in]
+#     message - String [in] 
+# Returns:
+#    nothing.
+sub Debug {
+    my $r       = shift;
+    my $log     = $r->log;
+    my $message = shift;
+    if ($DEBUG) {
+	$log->debug($message);    
+    }
+}
+
+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;
@@ -64,88 +126,85 @@ 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 {
     my ($r,$fn,$uname,$udom)=@_;
 
+    &Debug($r, "loncfile - Entering phase 2 for $fn");
+
     $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
     my $dir=$1;
     my $main=$2;
     my $suffix=$3;
+    
+    
+    &Debug($r, "loncfile::phase2 dir = $dir main = $main suffix = $suffix");
 
-    my $conspace='/home/'.$uname.'/public_html'.$fn;
+    my $conspace=$fn;
+
+    &Debug($r, "loncfile::phase2 Full construction space name: $conspace");
+
+    &Debug($r, "loncfie::phase2 action is $ENV{'form.action'}");
 
     if ($ENV{'form.action'} eq 'rename') {
 	if (-e $conspace) {
@@ -184,12 +243,21 @@ sub phasetwo {
             return;
         }
     } elsif ($ENV{'form.action'} eq 'newdir') {
-        my $newdir='/home/'.$uname.'/public_html/'.
-                   $fn.$ENV{'form.newfilename'};
+        my $newdir= $fn.$ENV{'form.newfilename'};
+
+	&Debug($r, "loncfile::phasetwo - new directory name: $newdir");
+
         unless (mkdir($newdir,0770)) {
 	    $r->print('<font color=red>Error: '.$!.'</font>');
+	    &Debug($r, "loncfile::phasetwo - mkdir failed $!");
         }
-        $r->print('<h3><a href="/priv/'.$uname.$fn.'/">Done</a></h3>');
+	&Debug($r, "Done button: uname = $uname, dir = $dir, fn = $fn");
+	my $url = '/priv/'.$uname.$newdir.'/';
+	&Debug($r, "URL[1] = ".$url);
+	$url =~ s/\/home\/$uname\/public_html//o;
+        &Debug($r, "URL = ".$url);
+
+        $r->print('<h3><a href="'.$url.'">Done</a></h3>');
         return;
     }
     $r->print('<h3><a href="/priv/'.$uname.$dir.'/">Done</a></h3>');
@@ -199,18 +267,27 @@ sub handler {
 
   my $r=shift;
 
+
+  &Debug($r, "loncfile.pm - handler entered");
+
   my $fn;
 
   if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};
+      &Debug($r, "loncfile::handler - raw url: $fn");
+      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
       $fn=~s/^http\:\/\/[^\/]+//;
+      &Debug($r, "loncfile::handler - doctored url: $fn");
+
   } else {
+      &Debug($r, "loncfile::handler - no form.filename");
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
          ' unspecified filename for cfile', $r->filename); 
      return HTTP_NOT_FOUND;
   }
 
   unless ($fn) { 
+      &Debug($r, "loncfile::handler - doctored url is empty");
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
          ' trying to cfile non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;
@@ -222,6 +299,8 @@ sub handler {
 
   ($uname,$udom)=
     &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+  &Debug($r, 
+	 "loncfile::handler constructaccess uname = $uname domain = $udom");
   unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
          ' trying to manipulate file '.$ENV{'form.filename'}.
@@ -231,6 +310,7 @@ sub handler {
   }
 
   $fn=~s/\/\~(\w+)//;
+  &Debug($r, "loncfile::handler ~ removed filename: $fn");
 
   $r->content_type('text/html');
   $r->send_http_header;
@@ -248,7 +328,10 @@ sub handler {
                '</font></h3>');
   }
 
+
+  &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
   if ($ENV{'form.action'} eq 'delete') {
+      
       $r->print('<h3>Delete</h3>');
   } elsif ($ENV{'form.action'} eq 'rename') {
       $r->print('<h3>Rename</h3>');
@@ -261,8 +344,10 @@ sub handler {
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {
+      &Debug($r, "loncfile::handler  entering phase2");
       &phasetwo($r,$fn,$uname,$udom);
   } else {
+      &Debug($r, "loncfile::handler  entering phase1");
       &phaseone($r,$fn,$uname,$udom);
   }
 
@@ -272,3 +357,4 @@ sub handler {
 
 1;
 __END__
+