--- loncom/publisher/loncfile.pm	2005/05/25 22:27:17	1.68
+++ loncom/publisher/loncfile.pm	2006/04/10 22:47:18	1.75
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.68 2005/05/25 22:27:17 albertel Exp $
+# $Id: loncfile.pm,v 1.75 2006/04/10 22:47:18 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, .bak, 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|bak)$/,@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|bak)$/) {
+                            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 {
@@ -710,7 +736,13 @@ sub NewFile1 {
         ##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;
 	}
@@ -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;
@@ -1239,10 +1273,12 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
+    my (%loaditem,$js);
+
     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|
+	$js = qq|
+<script type="text/javascript">
 function writeDone() {
     var winName = window.opener
     window.focus();
@@ -1250,14 +1286,13 @@ function writeDone() {
     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'));
+|;
+	$loaditem{'onload'} => "writeDone()";
     }
-
+    
+    $r->print(&Apache::loncommon::start_page('Construction Space File Operation',
+					     $js,
+					     {'add_entries' => \%loaditem,}));
   
     $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
@@ -1291,7 +1326,8 @@ function writeDone() {
 	     $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>'.
+		  &Apache::loncommon::end_page());
 	return OK;  
     }
     if ($env{'form.phase'} eq 'two') {
@@ -1302,7 +1338,7 @@ function writeDone() {
 	&phaseone($r,$fn,$uname,$udom);
     }
 
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;  
 }