--- loncom/publisher/loncfile.pm	2003/11/19 14:57:32	1.44
+++ loncom/publisher/loncfile.pm	2004/03/02 16:48:27	1.52
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.44 2003/11/19 14:57:32 taceyjo1 Exp $
+# $Id: loncfile.pm,v 1.52 2004/03/02 16:48:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,8 +72,9 @@ use Apache::loncacc;
 use Apache::Log ();
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonlocal;
 
-my $DEBUG=2;
+my $DEBUG=0;
 my $r;				# Needs to be global for some stuff RF.
 
 =pod
@@ -110,31 +111,12 @@ sub Debug {
   # Put out the indicated message butonly if DEBUG is true.
   
   if ($DEBUG) {
-   $r->log_reason($message);
+  $r->log_reason($message);
   }
 }
 
 =pod
 
-=item checksuffix($old, $new)
-        
-  Determine if a resource filename suffix (the stuff after the .) would change
-as a result of this operation.
-
- Parameters:
-
-=over 4
-
-=item  $old   = string [in]  Previous filename.
-
-=item  $new   = string [in]  Resultant filename.
-
-=back
-
-=cut
-
-=pod
-
 =item URLToPath($url)
 
   Convert a URL to a file system path.
@@ -191,6 +173,28 @@ sub display {
     return '<tt>'.$fn.'</tt>';
 }
 
+
+# see if the file is
+# a) published (return 0 if not)
+# b) if, so obsolete (return 0 if not)
+
+sub obsolete_unpub {
+    my ($user,$domain,$construct)=@_;
+    my $published=$construct;
+    $published=~
+	s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
+    if (-e $published) {
+	if (&Apache::lonnet::metadata($published,'obsolete')) {
+	    return 1;
+	}
+	return 0;
+    } else {
+	return 1;
+    }
+}
+
+
+
 =pod
 
 =item exists($user, $domain, $file)
@@ -230,12 +234,12 @@ sub exists {
 s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
   my $result='';    
   if ( -d $construct ) {
-      return 'Error: destination for operation is an existing directory.';
+      return &mt('Error: destination for operation is an existing directory.');
   }
   if ( -e $published) {
-      $result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';
+      $result.='<p><font color="red">'.&mt('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">'.&mt('Warning: target file exists!').'</font></p>';
   }
   return $result;
 
@@ -279,7 +283,7 @@ 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">'.&mt('Warning: change of MIME type!').'</font></p>';
     }
     return $result;
 }
@@ -288,7 +292,7 @@ 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>");
+	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
 	$dest=~s/[\#\?&]//g;
     }
     return $dest;
@@ -331,9 +335,9 @@ Parameters:
 
 sub CloseForm1 {
    my ($request,  $fn) = @_;
-   $request->print('<p><input type="submit" value="Continue" /></p></form>');
+   $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
    $request->print('<form action="'.&url($fn).
-     '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
+     '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
 }
 
 
@@ -363,7 +367,7 @@ Parameters:
 
 sub CloseForm2 {
   my ($request, $user, $fn) = @_;
-  $request->print('<h3><a href="'.&url($fn).'/">Done</a></h3>');
+  $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
 }
 
 =pod
@@ -402,13 +406,15 @@ new filename relative to the current dir
 =cut  
 
 sub Rename1 {
-    my ($request, $user, $domain, $fn, $newfilename) = @_;
+    my ($request, $user, $domain, $fn, $newfilename, $style) = @_;
 
     if(-e $fn) {
 	if($newfilename) {
 	    # is dest a dir
-	    if (-d $newfilename) {
-		if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
+	    if ($style eq 'move') {
+		if (-d $newfilename) {
+		    if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
+		}
 	    }
 	    if ($newfilename =~ m|/[^\.]+$|) {
 		#no extension add on original extension
@@ -429,20 +435,31 @@ sub Rename1 {
 	    my $return=&exists($user, $domain, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
-		$request->print('<br /><a href="'.&url($fn).'">Cancel</a>');
+		$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+		return;
+	    }
+	    unless (&obsolete_unpub($user,$domain,$fn)) {
+		$request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
+				'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 		return;
 	    }
+	    my $action;
+	    if ($style eq 'rename') {
+		$action=&mt('Rename');
+	    } else {
+		$action=&mt('Move');
+	    }
 	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '" /><p>Rename '.&display($fn).
+			    '" /><p>'.$action.' '.&display($fn).
 			    '</tt><br />to '.&display($newfilename).'?</p>');
 	    &CloseForm1($request, $fn);
 	} else {
-	    $request->print('<p>No new filename specified.</p></form>');
+	    $request->print('<p>'.&mt('No new filename specified.').'</p></form>');
 	    return;
 	}
     } else {
-	$request->print('<p> No such file: '.&display($fn).'</p></form>');
+	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
 	return;
     }
     
@@ -477,10 +494,15 @@ sub Delete1 {
   if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.
 		    $fn.'"/>');
-    $request->print('<p>Delete '.&display($fn).'?</p>');
+    unless (&obsolete_unpub($user,$domain,$fn)) {
+	$request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
+			'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+	return;
+    }
+    $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
     &CloseForm1($request, $fn);
   } else {
-    $request->print('<p>No such file: '.&display($fn).'</p></form>');
+    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
   }
 }
 
@@ -531,16 +553,16 @@ sub Copy1 {
 	my $return=&exists($user, $domain, $newfilename);
 	$request->print($return);
 	if ($return =~/^Error:/) {
-	    $request->print('<br /><a href="'.&url($fn).'">Cancel</a>');
+	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 	    return;
 	}
 	$request->print('<input type="hidden" name="newfilename" value="'.
 			$newfilename.
-			'" /><p>Copy '.&display($fn).'<br />to '.
+			'" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '.
 			&display($newfilename).'?</p>');
 	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>No such file: '.&display($fn).'</p></form>');
+	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
     }
 }
 
@@ -585,14 +607,19 @@ causes the newdir operation to transitio
 
 sub NewDir1
 {
-  my ($request, $username, $domain, $fn, $newfilename) = @_;
+  my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
 
   my $result=&exists($username,$domain,$newfilename);
   if ($result) {
     $request->print('<font color="red">'.$result.'</font></form>');
   } else {
+    if ($mode eq 'testbank') {
+        $request->print('<input type="hidden" name="callingmode" value="testbank">');
+    } elsif ($mode eq 'imsimport') {
+        $request->print('<input type="hidden" name="callingmode" value="imsimport">');
+    }
     $request->print('<input type="hidden" name="newfilename" value="'.
-		    $newfilename.'" /><p>Make new directory '.
+		    $newfilename.'" /><p>'.&mt('Make new directory').' '.
 		    &display($newfilename).'?</p>');
     &CloseForm1($request, $fn);
   }
@@ -603,10 +630,10 @@ sub Decompress1 {
    my ($request, $user, $domain, $fn) = @_;
    if( -e $fn) {
    	$request->print('<input type="hidden" name="newfilename" value="'.$fn.'"/>');
-   	$request->print('<p>Decompress '.&display($fn).'?</p>');
+   	$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
    	&CloseForm1($request, $fn);
    	} else {
-       		$request->print('<p>No such file: '.&display($fn).'</p></form>');
+       		$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
      	  }
 }
 =pod
@@ -659,8 +686,8 @@ sub NewFile1 {
         ##Informs User (name).(number).(extension) not allowed 
 	if($newfilename =~ /\.(\d+)\.(\w+)$/){
 	    $r->print('<font color="red">'.$newfilename.
-		      ' - Bad Filename<br />(name).(number).(extension)'.
-		      ' Not Allowed</font>');
+		      ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'.
+		      ' '.&mt('Not Allowed').'</font>');
 	    return;
 	}
 	if ($newfilename !~ /\Q.$extension\E$/) {
@@ -675,12 +702,12 @@ sub NewFile1 {
     if($result) {
 	$request->print('<font color="red">'.$result.'</font></form>');
     } else {
-	$request->print('<p>Make new file '.&display($newfilename).'?</p>');
+	$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
 	$request->print('</form>');
 	$request->print('<form action="'.&url($newfilename).
-			'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
+			'" method="POST"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
 	$request->print('<form action="'.&url($fn).
-			'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
+			'" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
     }
 }
 
@@ -717,27 +744,31 @@ sub phaseone {
   
   my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
   $newfilename=&relativeDest($fn,$newfilename,$uname);
-	&Debug($r, "Newfile: $newfilename");
   $r->print('<form action="/adm/cfile" method="post">'.
       '<input type="hidden" name="qualifiedfilename" value="'.$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, $uname, $udom, $fn, $newfilename);
+      &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
+  } elsif ($ENV{'form.action'} eq 'move') {
+      &Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
   } elsif ($ENV{'form.action'} eq 'delete') { 
       &Delete1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'decompress') {
-	&Apache::lonnet::appenv('cgi.path' => $newfilename); 
       &Decompress1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'copy') { 
       if($newfilename) {
 	  &Copy1($r, $uname, $udom, $fn, $newfilename);
       } else {
-	  $r->print('<p>No new filename specified.</p></form>');
+	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       }
   } elsif ($ENV{'form.action'} eq 'newdir') {
-      &NewDir1($r, $uname, $udom, $fn, $newfilename);
+      my $mode = '';
+      if (exists($ENV{'form.callingmode'}) ) {
+          $mode = $ENV{'form.callingmode'};
+      }   
+      &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
   }  elsif ($ENV{'form.action'} eq 'newfile' ||
 	    $ENV{'form.action'} eq 'newhtmlfile' ||
 	    $ENV{'form.action'} eq 'newproblemfile' ||
@@ -749,7 +780,7 @@ sub phaseone {
       if ($newfilename) {
 	  &NewFile1($r, $uname, $udom, $fn, $newfilename);
       } else {
-	  $r->print('<p>No new filename specified.</p></form>');
+	  $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       }
   }
 }
@@ -801,7 +832,7 @@ sub Rename2 {
       my $oRN=$oldfile;
       my $nRN=$newfile;
       unless (rename($oldfile,$newfile)) {
-	  $request->print('<font color="red">Error: '.$!.'</font>');
+	  $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
 	  return 0;
       }
       ## If old name.(extension) exits, move under new name.
@@ -836,7 +867,7 @@ sub Rename2 {
 	  unlink $tmp2;
       }
   } else {
-      $request->print("<p> No such file: ".&display($oldfile).'</p></form>');
+      $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
       return 0;
   }
   return 1;
@@ -872,16 +903,34 @@ Returns:
 
 sub Delete2 {
   my ($request, $user, $filename) = @_;
-
-  if(-e $filename) {
-    unless(unlink($filename)) {
-      $request->print('<font color="red">Error: '.$!.'</font>');
+  if(opendir DIR, $filename) { 
+    my @files=readdir(DIR);
+    shift @files; shift @files; # takes off . and ..
+    if(@files) { 
+      $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
+      return 0;
+    } else {   
+      if(-e $filename) {
+        unless(rmdir($filename)) {
+          $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+          return 0;
+        }
+      } else {
+        $request->print('<p> '.&mt('No such file').'. </p></form>');
+        return 0;
+      }
+     }
+   } else {
+    if(-e $filename) {
+      unless(unlink($filename)) {
+        $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
+        return 0;
+      }
+    } else {
+      $request->print('<p> '.&mt('No such file').'. </p></form>');
       return 0;
-    }
-  } else {
-    $request->print('<p> No such file. </p></form');
-    return 0;
   }
+	}
   return 1;
 }
 
@@ -918,17 +967,17 @@ 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"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
 	} else {
 	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color="red"> chmod error: '.$!.'</font>');
+		$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
 		return 0;
 	    }
 	    return 1;
 	}
     } else {
-	$request->print('<p> No such file </p>');
+	$request->print('<p> '.&mt('No such file').' </p>');
 	return 0;
     }
     return 1;
@@ -959,11 +1008,11 @@ sub NewDir2 {
   my ($request, $user, $newdirectory) = @_;
   
   unless(mkdir($newdirectory, 02770)) {
-    $request->print('<font color="red">Error: '.$!.'</font>');
+    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
     return 0;
   }
   unless(chmod(02770, ($newdirectory))) {
-      $request->print('<font color="red"> Error: '.$!.'</font>');
+      $request->print('<font color="red"> '.&mt('Error').': '.$!.'</font>');
       return 0;
   }
   return 1;
@@ -1020,13 +1069,14 @@ sub phasetwo {
     my $dir;		# Directory path
     my $main;		# Filename.
     my $suffix;		# Extension.
-
-    if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
+    if ($fn=~m:(.*)/([^/]+):) {
 	$dir=$1;		# Directory path
 	$main=$2;		# Filename.
-	$suffix=$3;		# Extension.
-    }
-        
+	}
+	if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions
+		$main=$`; #This is what is before the match (.) so it's just the main filename, yea it's nasty
+		$suffix=$1; #This is the actually filename extension if it exists
+	}
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r, 
@@ -1079,7 +1129,7 @@ sub phasetwo {
 	    $dest = $ENV{'form.newfilename'};
      
 	} else {
-	    $r->print('<p>No New filename specified</p></form>');
+	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
@@ -1090,7 +1140,11 @@ sub phasetwo {
 	}
 	$dest = $newdir."/"
     }
-    $r->print('<h3><a href="'.&url($dest).'">Done</a></h3>');
+    if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
+         $r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');
+    } else {
+         $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
+    }
 }
 
 sub handler {
@@ -1114,6 +1168,7 @@ sub handler {
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
       $fn=&URLToPath($fn);
   }  
+	#Just hijack the script only the first time around to inject the correct information for further processing
     elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {
 	  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']);
 	 $fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
@@ -1154,18 +1209,33 @@ sub handler {
   }
 
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
-  $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-  $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
+  if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
+      my $newdirname = $ENV{'form.newfilename'};
+      $r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">');
+      $r->print(qq|
+function writeDone() {
+    var winName = window.opener
+    window.focus();
+    winName.document.dataForm.newdir.value = "$newdirname"
+    setTimeout("self.close()",10000)
+}
+  </script>
+  </head>|);
+      my $loaditem = 'onLoad="writeDone()"';
+      $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem));
+  } else {
+      $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
+      $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
+  }
 
   
-  $r->print('<h3>Location: '.&display($fn).'</h3>');
+  $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
   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">'.&mt('Co-Author').': '.$uname.' at '.$udom.
                '</font></h3>');
   }
 
@@ -1173,15 +1243,17 @@ sub handler {
   &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
   if ($ENV{'form.action'} eq 'delete') {
       
-      $r->print('<h3>Delete</h3>');
+      $r->print('<h3>'.&mt('Delete').'</h3>');
   } elsif ($ENV{'form.action'} eq 'rename') {
-      $r->print('<h3>Rename</h3>');
+      $r->print('<h3>'.&mt('Rename').'</h3>');
+  } elsif ($ENV{'form.action'} eq 'move') {
+      $r->print('<h3>'.&mt('Move').'</h3>');
   } elsif ($ENV{'form.action'} eq 'newdir') {
-      $r->print('<h3>New Directory</h3>');
+      $r->print('<h3>'.&mt('New Directory').'</h3>');
   } elsif ($ENV{'form.action'} eq 'decompress') {
-      $r->print('<h3>Decompress</h3>');
+      $r->print('<h3>'.&mt('Decompress').'</h3>');
   } elsif ($ENV{'form.action'} eq 'copy') {
-      $r->print('<h3>Copy</h3>');
+      $r->print('<h3>'.&mt('Copy').'</h3>');
   } elsif ($ENV{'form.action'} eq 'newfile' ||
 	   $ENV{'form.action'} eq 'newhtmlfile' ||
 	   $ENV{'form.action'} eq 'newproblemfile' ||
@@ -1190,9 +1262,9 @@ sub handler {
 	   $ENV{'form.action'} eq 'newrightsfile' ||
 	   $ENV{'form.action'} eq 'newstyfile' ||
            $ENV{'form.action'} eq 'Select Action' ) {
-      $r->print('<h3>New Resource</h3>');
+      $r->print('<h3>'.&mt('New Resource').'</h3>');
   } else {
-     $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
+     $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {