--- loncom/publisher/loncfile.pm	2001/06/23 18:26:40	1.1
+++ loncom/publisher/loncfile.pm	2001/06/23 20:09:06	1.3
@@ -27,114 +27,88 @@ use Apache::loncacc;
 
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
-    my $docroot=$r->dir_config('lonDocRoot');
 
-    my $urldir='/res/'.$udom.'/'.$uname.$fn;
-    $urldir=~s/\/[^\/]+$/\//;
+    $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
+    my $dir=$1;
+    my $main=$2;
+    my $suffix=$3;
 
-    my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
-    my $resdir=$resfn;
-    $resdir=~s/\/[^\/]+$/\//;
+    my $conspace='/home/'.$uname.'/public_html'.$fn;
 
-    $fn=~/\/([^\/]+)\.(\w+)$/;
-    my $main=$1;
-    my $suffix=$2;
-
-    if (-e $resfn) {  
-    $r->print('<form action=/adm/retrieve method=post>'.
+    $r->print('<form action=/adm/cfile method=post>'.
 	      '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.
               '<input type=hidden name=phase value=two>'.
-              '<table border=2><tr><th>Select</th><th>Version</th>'.
-              '<th>Became this version on ...</th>'.
-              '<th>Metadata</th></tr>');
-    my $filename;
-    opendir(DIR,$resdir);
-    while ($filename=readdir(DIR)) {
-        if ($filename=~/^$main\.(\d+)\.$suffix$/) {
-	   my $version=$1;
-           my ($rdev,$rino,$rmode,$rnlink,
-                $ruid,$rgid,$rrdev,$rsize,
-                $ratime,$rmtime,$rctime,
-                $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-           $r->print('<tr><td><input type=radio name=version value="'.
-                     $version.'"></td><th>'.$version.'</th><td>'.
-                     localtime($rmtime).'</td><td>'.
-                     '<a href="'.$urldir.$filename.'.meta" target=cat>'.
-                     'Metadata Version '.$version.'</a>');
-           if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versionone=priv&versiontwo='.$version.
-                        '">Diffs with Version '.$version.'</a>');
-           }
-           $r->print('</a></td></tr>');
-        }
-    }
-    closedir(DIR);
-    my ($rdev,$rino,$rmode,$rnlink,
-        $ruid,$rgid,$rrdev,$rsize,
-        $ratime,$rmtime,$rctime,
-        $rblksize,$rblocks)=stat($resfn);
-    $r->print('<tr><td><input type=radio name=version value="new"></td>'.
-              '<th>Current</th><td>'.localtime($rmtime).
-           '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
-              'Metadata current version</a>');           
-           if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versionone=priv'.
-                        '">Diffs with current Version</a>');
-           }
-           $r->print('</td></tr></table><p>'.
-           '<font size=+1 color=red>Retrieval of an old version will '.
-           'overwrite the file currently in construction space</font><p>'.
-           '<input type=submit value="Retrieve version"></form>');
-} else {
-    $r->print('<h3>No previous versions published.</h3>');
-}
-}
-
-sub phasetwo {
-    my ($r,$fn,$uname,$udom)=@_;
-    if ($ENV{'form.version'}) {
-        my $version=$ENV{'form.version'};
-	if ($version eq 'new') {
-	    $r->print('<h3>Retrieving current (most recent) version</h3>');
+              '<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('<p>Rename <tt>'.$fn.'</tt> to <tt>'.
+                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?');
+	    } else {
+	       $r->print('<p>No new filename specified.</form>');
+               return;
+	    }
         } else {
-            $r->print('<h3>Retrieving old version '.$version.'</h3>');
-        }
-        my $logfile;
-        my $ctarget='/home/'.$uname.'/public_html'.$fn;
-        my $vfn=$fn;
-        if ($version ne 'new') {
-	    $vfn=~s/\.(\w+)$/\.$version\.$1/;
+	    $r->print('<p>No such file.</form>');
+            return;
         }
-        my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
-        unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {
-	  $r->print(
-         '<font color=red>No write permission to user directory, FAIL</font>');
+    } elsif ($ENV{'form.action'} eq 'delete') { 
+	if (-e $conspace) {
+            $r->print('<p>Delete <tt>'.$fn.'</tt>?');
+        } else {
+	    $r->print('<p>No such file.</form>');
+            return;
         }
-        print $logfile 
-"\n\n================= Retrieve ".localtime()." ================\n".
-"Version: $version\nSource: $csource\nTarget: $ctarget\n";
-        $r->print('<p>Copying file: ');
-        if (copy($csource,$ctarget)) {
-	    $r->print('ok<p>');
-            print $logfile "Copied sucessfully.\n\n";
+    } 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('<p>Copy <tt>'.$fn.'</tt> to <tt>'.
+                         $dir.'/'.$ENV{'form.newfilename'}.'</tt>?');
+	    } else {
+	       $r->print('<p>No new filename specified.</form>');
+               return;
+	    }
         } else {
-            my $error=$!;
-	    $r->print('fail, '.$error.'<p>');
-            print $logfile "Copy failed: $error\n\n";
+	    $r->print('<p>No such file.</form>');
+            return;
+        }
+    } elsif ($ENV{'form.action'} eq 'newdir') {
+	if (-e $conspace) {
+            $r->print('<p>Directory exists.</form>');
+            return;
         }
-        $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
-                  '">Back to '.$fn.'</a></font>'); 
-    } else {
-       $r->print(
-   '<font size=+1 color=red>Please pick a version to retrieve</font><p>');
-       &phaseone($r,$fn,$uname,$udom);
+       
     }
+    $r->print('<p><input type=submit value=Continue></form>'); 
+}
+
+sub phasetwo {
+    my ($r,$fn,$uname,$udom)=@_;
+    if ($ENV{'form.action'} eq 'rename') {
+    } elsif ($ENV{'form.action'} eq 'delete') { 
+    } elsif ($ENV{'form.action'} eq 'copy') { 
+    } elsif ($ENV{'form.action'} eq 'newdir') {
+    } 
 }
 
 sub handler {
@@ -190,11 +164,22 @@ sub handler {
                '</font></h3>');
   }
 
-
+  if ($ENV{'form.action'} eq 'delete') {
+      $r->print('<h3>Delete</h3>');
+  } elsif ($ENV{'form.action'} eq 'rename') {
+      $r->print('<h3>Rename</h3>');
+  } elsif ($ENV{'form.action'} eq 'newdir') {
+      $r->print('<h3>New Directory</h3>');
+  } elsif ($ENV{'form.action'} eq 'copy') {
+      $r->print('<h3>Copy</h3>');
+  } else {
+     $r->print('<p>Unknown Action</body></html>');
+     return OK;  
+  }
   if ($ENV{'form.phase'} eq 'two') {
 #      &phasetwo($r,$fn,$uname,$udom);
   } else {
-#      &phaseone($r,$fn,$uname,$udom);
+      &phaseone($r,$fn,$uname,$udom);
   }
 
   $r->print('</body></html>');