--- loncom/publisher/loncfile.pm	2005/03/10 03:50:49	1.65
+++ loncom/publisher/loncfile.pm	2005/11/08 17:58:35	1.73
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.65 2005/03/10 03:50:49 www Exp $
+# $Id: loncfile.pm,v 1.73 2005/11/08 17:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,6 @@ use File::Copy;
 use HTML::Entities();
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
-use Apache::Log ();
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
@@ -101,16 +100,9 @@ my $r;				# Needs to be global for some
 =cut
 
 sub Debug {
-  
-    # Marshall the parameters.
-  
-    my $r       = shift;
-    my $log     = $r->log;
-    my $message = shift;
-  
     # Put out the indicated message butonly if DEBUG is true.
-  
     if ($DEBUG) {
+	my ($r,$message) = @_;
 	$r->log_reason($message);
     }
 }
@@ -194,7 +186,32 @@ sub obsolete_unpub {
     }
 }
 
-
+# see if directory is empty
+# ignores any .meta, .save and .log files created for a previously
+# published file, which has since been marked obsolete and deleted.
+sub empty_directory {
+    my ($dirname,$phase) = @_;
+    if (opendir DIR, $dirname) {
+        my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
+        if (@files) { 
+            my @orphans = grep(/\.(meta|save|log)$/,@files);
+            if (scalar(@files) - scalar(@orphans) > 0) { 
+                return 0;
+            } else {
+                if (($phase eq 'Delete2') && (@orphans > 0)) {
+                    foreach my $file (@orphans) {
+                        if ($file =~ /\.(meta|save|log)$/) {
+                            unlink($dirname.$file);
+                        }
+                    }
+                }
+            }
+        }
+        closedir(DIR);
+        return 1;
+    }
+    return 0;
+}
 
 =pod
 
@@ -296,9 +313,9 @@ sub cleanDest {
 	$foundbad=1;
 	$dest=~s/\.//g;
     }
-    if  ($dest=~/[\#\?&%\"]/) {
+    if  ($dest=~/[\#\?&%\":]/) {
 	$foundbad=1;
-	$dest=~s/[\#\?&%\"]//g;
+	$dest=~s/[\#\?&%\":]//g;
     }
     if ($dest=~m|/|) {
 	my ($newpath)=($dest=~m|(.*)/|);
@@ -519,11 +536,20 @@ sub Delete1 {
     if( -e $fn) {
 	$request->print('<input type="hidden" name="newfilename" value="'.
 			$fn.'"/>');
-	unless (&obsolete_unpub($user,$domain,$fn)) {
-	    $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
+        if (-d $fn) {
+            unless (&empty_directory($fn,'Delete1')) {
+                $request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
+                            'You must delete the contents of the directory first.<br />'.
+                            '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                return;
+            }
+        } else { 
+	    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;
-	}
+	        return;
+	    }
+        }
 	$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
 	&CloseForm1($request, $fn);
     } else {
@@ -704,13 +730,19 @@ button which returns you to the driector
 sub NewFile1 {
     my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-    if ($ENV{'form.action'} =~ /new(.+)file/) {
+    if ($env{'form.action'} =~ /new(.+)file/) {
 	my $extension=$1;
 
         ##Informs User (name).(number).(extension) not allowed 
 	if($newfilename =~ /\.(\d+)\.(\w+)$/){
 	    $r->print('<font color="red">'.$newfilename.
-		      ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'.
+		      ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').') '.
+		      ' '.&mt('Not Allowed').'</font>');
+	    return;
+	}
+	if($newfilename =~ /(\:\:\:|\&\&\&|\_\_\_)/){
+	    $r->print('<font color="red">'.$newfilename.
+		      ' - '.&mt('Bad Filename').'<br />('.&mt('Must not include').' '.$1.') '.
 		      ' '.&mt('Not Allowed').'</font>');
 	    return;
 	}
@@ -767,43 +799,43 @@ sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
   
     my $doingdir=0;
-    if ($ENV{'form.action'} eq 'newdir') { $doingdir=1; }
-    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'},$doingdir,$fn,$uname);
+    if ($env{'form.action'} eq 'newdir') { $doingdir=1; }
+    my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname);
     $newfilename=&relativeDest($fn,$newfilename,$uname);
     $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'}.'" />');
+	      '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
   
-    if ($ENV{'form.action'} eq 'rename') {
+    if ($env{'form.action'} eq 'rename') {
 	&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
-    } elsif ($ENV{'form.action'} eq 'move') {
+    } elsif ($env{'form.action'} eq 'move') {
 	&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
-    } elsif ($ENV{'form.action'} eq 'delete') { 
+    } elsif ($env{'form.action'} eq 'delete') { 
 	&Delete1($r, $uname, $udom, $fn);
-    } elsif ($ENV{'form.action'} eq 'decompress') {
+    } elsif ($env{'form.action'} eq 'decompress') {
 	&Decompress1($r, $uname, $udom, $fn);
-    } elsif ($ENV{'form.action'} eq 'copy') { 
+    } elsif ($env{'form.action'} eq 'copy') { 
 	if($newfilename) {
 	    &Copy1($r, $uname, $udom, $fn, $newfilename);
 	} else {
 	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
 	}
-    } elsif ($ENV{'form.action'} eq 'newdir') {
+    } elsif ($env{'form.action'} eq 'newdir') {
 	my $mode = '';
-	if (exists($ENV{'form.callingmode'}) ) {
-	    $mode = $ENV{'form.callingmode'};
+	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' ||
-	      $ENV{'form.action'} eq 'newpagefile' ||
-	      $ENV{'form.action'} eq 'newsequencefile' ||
-	      $ENV{'form.action'} eq 'newrightsfile' ||
-	      $ENV{'form.action'} eq 'newstyfile' ||
-              $ENV{'form.action'} eq 'newlibraryfile' ||
-	      $ENV{'form.action'} eq 'Select Action') {
+    }  elsif ($env{'form.action'} eq 'newfile' ||
+	      $env{'form.action'} eq 'newhtmlfile' ||
+	      $env{'form.action'} eq 'newproblemfile' ||
+	      $env{'form.action'} eq 'newpagefile' ||
+	      $env{'form.action'} eq 'newsequencefile' ||
+	      $env{'form.action'} eq 'newrightsfile' ||
+	      $env{'form.action'} eq 'newstyfile' ||
+              $env{'form.action'} eq 'newlibraryfile' ||
+	      $env{'form.action'} eq 'Select Action') {
         my $empty=&mt('Type Name Here');
 	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
 	    &NewFile1($r, $uname, $udom, $fn, $newfilename);
@@ -932,10 +964,8 @@ Returns:
 
 sub Delete2 {
     my ($request, $user, $filename) = @_;
-    if(opendir DIR, $filename) { 
-	my @files=readdir(DIR);
-	shift @files; shift @files; # takes off . and ..
-	if(@files) { 
+    if (-d $filename) { 
+	unless (&empty_directory($filename,'Delete2')) { 
 	    $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
 	    return 0;
 	} else {   
@@ -987,7 +1017,7 @@ sub Delete2 {
 
 =back
 
-Returns 0 failure, and 0 successs.
+Returns 0 failure, and 1 successs.
 
 =cut
 
@@ -995,6 +1025,10 @@ sub Copy2 {
     my ($request, $username, $dir, $oldfile, $newfile) = @_;
     &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {
+        if ($oldfile eq $newfile) {
+            $request->print('<font color="red"> '.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.</font>');
+            return 1;
+        }
 	unless (copy($oldfile, $newfile)) {
 	    $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
@@ -1111,67 +1145,66 @@ sub phasetwo {
 	$main=$2;		# Filename.
     }
     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
+	$main=~s/\.\w+$//; #strip the extension
     }
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix");
-    &Debug($r,"    newfilename = ".$ENV{'form.newfilename'});
+    &Debug($r,"    newfilename = ".$env{'form.newfilename'});
 
     my $conspace=$fn;
     
     &Debug($r,"loncfile::phase2 Full construction space name: $conspace");
     
-    &Debug($r,"loncfie::phase2 action is $ENV{'form.action'}");
+    &Debug($r,"loncfie::phase2 action is $env{'form.action'}");
     
     # Select the appropriate processing sub.
-    if ($ENV{'form.action'} eq 'decompress') { 
-	$main .= '.';
-	$main .= $suffix;
+    if ($env{'form.action'} eq 'decompress') { 
+	$main .= '.'.$suffix;
 	if(!&decompress2($r, $uname, $dir, $main)) {
 	    return ;
 	}
 	$dest = $dir."/.";
-    } elsif ($ENV{'form.action'} eq 'rename' ||
-	     $ENV{'form.action'} eq 'move') {
-	if($ENV{'form.newfilename'}) {
+    } elsif ($env{'form.action'} eq 'rename' ||
+	     $env{'form.action'} eq 'move') {
+	if($env{'form.newfilename'}) {
 	    if (!defined($dir)) {
 		$fn=~m:^(.*)/:;
 		$dir=$1; 
 	    }
-	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
+	    if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
 		return;
 	    }
-	    $dest = $ENV{'form.newfilename'};
+	    $dest = $env{'form.newfilename'};
 	}
-    } elsif ($ENV{'form.action'} eq 'delete') { 
-	if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) {
+    } elsif ($env{'form.action'} eq 'delete') { 
+	if(!&Delete2($r, $uname, $env{'form.newfilename'})) {
 	    return ;
 	}
 	# Once a resource is deleted, we just list the directory that
 	# previously held it.
 	#
 	$dest = $dir."/.";		# Parent dir.
-    } elsif ($ENV{'form.action'} eq 'copy') { 
-	if($ENV{'form.newfilename'}) {
-	    if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
+    } elsif ($env{'form.action'} eq 'copy') { 
+	if($env{'form.newfilename'}) {
+	    if(!&Copy2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
 		return ;
 	    }
-	    $dest = $ENV{'form.newfilename'};
+	    $dest = $env{'form.newfilename'};
      	} else {
 	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
-    } elsif ($ENV{'form.action'} eq 'newdir') {
-        my $newdir= $ENV{'form.newfilename'};
+    } elsif ($env{'form.action'} eq 'newdir') {
+        my $newdir= $env{'form.newfilename'};
 	if(!&NewDir2($r, $uname, $newdir)) {
 	    return;
 	}
 	$dest = $newdir."/";
     }
-    if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
+    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>');
@@ -1185,8 +1218,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
 
     &Debug($r, "loncfile.pm - handler entered");
-    &Debug($r, " filename: ".$ENV{'form.filename'});
-    &Debug($r, " newfilename: ".$ENV{'form.newfilename'});
+    &Debug($r, " filename: ".$env{'form.filename'});
+    &Debug($r, " newfilename: ".$env{'form.newfilename'});
 #
 # Determine the root filename
 # This could come in as "filename", which actually is a URL, or
@@ -1194,28 +1227,28 @@ sub handler {
 #
     my $fn;
 
-    if ($ENV{'form.filename'}) {
-	&Debug($r, "test: $ENV{'form.filename'}");
-	$fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+    if ($env{'form.filename'}) {
+	&Debug($r, "test: $env{'form.filename'}");
+	$fn=&Apache::lonnet::unescape($env{'form.filename'});
 	$fn=&URLToPath($fn);
-    }  elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {  
+    }  elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') {  
 	#Just hijack the script only the first time around to inject the
 	#correct information for further processing
-	$fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
+	$fn=&Apache::lonnet::unescape($env{'form.decompress'});
 	$fn=&URLToPath($fn);
-	$ENV{'form.action'}="decompress";
-    } elsif ($ENV{'form.qualifiedfilename'}) {
-	$fn=$ENV{'form.qualifiedfilename'};
+	$env{'form.action'}="decompress";
+    } elsif ($env{'form.qualifiedfilename'}) {
+	$fn=$env{'form.qualifiedfilename'};
     } else {
 	&Debug($r, "loncfile::handler - no form.filename");
-	$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+	$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'}.
+	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
 		       ' trying to cfile non-existing file', $r->filename); 
 	return HTTP_NOT_FOUND;
     } 
@@ -1230,7 +1263,7 @@ sub handler {
 	   "loncfile::handler constructaccess uname = $uname domain = $udom");
     unless (($uname) && ($udom)) {
 	$r->log_reason($uname.' at '.$udom.
-		       ' trying to manipulate file '.$ENV{'form.filename'}.
+		       ' trying to manipulate file '.$env{'form.filename'}.
 		       ' ('.$fn.') - not authorized', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
@@ -1240,8 +1273,8 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    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'};
+    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() {
@@ -1262,40 +1295,40 @@ function writeDone() {
   
     $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
-    if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
 	$r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
 		  '</font></h3>');
     }
 
 
-    &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
-    if ($ENV{'form.action'} eq 'delete') {
+    &Debug($r, "loncfile::handler Form action is $env{'form.action'} ");
+    if ($env{'form.action'} eq 'delete') {
       	$r->print('<h3>'.&mt('Delete').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'rename') {
+    } elsif ($env{'form.action'} eq 'rename') {
 	$r->print('<h3>'.&mt('Rename').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'move') {
+    } elsif ($env{'form.action'} eq 'move') {
 	$r->print('<h3>'.&mt('Move').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'newdir') {
+    } elsif ($env{'form.action'} eq 'newdir') {
 	$r->print('<h3>'.&mt('New Directory').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'decompress') {
+    } elsif ($env{'form.action'} eq 'decompress') {
 	$r->print('<h3>'.&mt('Decompress').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'copy') {
+    } elsif ($env{'form.action'} eq 'copy') {
 	$r->print('<h3>'.&mt('Copy').'</h3>');
-    } elsif ($ENV{'form.action'} eq 'newfile' ||
-	     $ENV{'form.action'} eq 'newhtmlfile' ||
-	     $ENV{'form.action'} eq 'newproblemfile' ||
-	     $ENV{'form.action'} eq 'newpagefile' ||
-	     $ENV{'form.action'} eq 'newsequencefile' ||
-	     $ENV{'form.action'} eq 'newrightsfile' ||
-	     $ENV{'form.action'} eq 'newstyfile' ||
-             $ENV{'form.action'} eq 'newlibraryfile' ||
-	     $ENV{'form.action'} eq 'Select Action' ) {
+    } elsif ($env{'form.action'} eq 'newfile' ||
+	     $env{'form.action'} eq 'newhtmlfile' ||
+	     $env{'form.action'} eq 'newproblemfile' ||
+	     $env{'form.action'} eq 'newpagefile' ||
+	     $env{'form.action'} eq 'newsequencefile' ||
+	     $env{'form.action'} eq 'newrightsfile' ||
+	     $env{'form.action'} eq 'newstyfile' ||
+             $env{'form.action'} eq 'newlibraryfile' ||
+	     $env{'form.action'} eq 'Select Action' ) {
 	$r->print('<h3>'.&mt('New Resource').'</h3>');
     } else {
-	$r->print('<p>'.&mt('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') {
+    if ($env{'form.phase'} eq 'two') {
 	&Debug($r, "loncfile::handler  entering phase2");
 	&phasetwo($r,$fn,$uname,$udom);
     } else {