[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.248,1.249

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv3644

Modified Files:
	sandweb.cgi 
Log Message:
*delete produces sane output via popup
*deletes folders by recurse
*will NOT delete . recursively, this is the repository_menu's job


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.248
retrieving revision 1.249
diff -U2 -r1.248 -r1.249
--- sandweb.cgi	5 Mar 2002 07:07:57 -0000	1.248
+++ sandweb.cgi	5 Mar 2002 07:41:32 -0000	1.249
@@ -1312,15 +1312,27 @@
 	);
 
-	unless (@filename) {
+	unless ( @filename || @filename eq '.' ) {
 		$log->debug("no files selected for removal");
-		set_message("Please select file(s) or folder(s) to delete.");
-		browse_module_menu( 
-			ck_auth => $ck_auth,
-			location => $location,
-			module_name => $module_name,
-			repo_name => $repo_name,
+		my $content = $ui->get_menu(
+			MENU => 'output',
+			LOCATION => $location,
+			FILENAME => '',
+			PROGNAME => $progname,
+			OUTPUT => "Please select files or folders to delete",
+			ERROR => "No files selected",
+		);
+
+		print CGI::header( -cookie => $ck_auth );
+		$ui->print_popup(
+			TITLE=> "SandWeb : delete file",
+			MENU_TITLE => 'SandWeb',
+			SUBMENU_TITLE => "delete file",
+			FOOTER => '',
+			CONTENT => $content,
+			MESSAGE => $message,
 		);
 	}
 
+	my $error;
 	foreach my $entry (@filename) {
 		$log->debug("creating File object");
@@ -1331,13 +1343,17 @@
 		);
 
-		$log->debug("removing file");
+		$log->debug("attempting to delete @filename");
 		if ($file) {
 			if ( $file->get_file_type() eq 'Directory' ) {
-				$file->delete_folder();
+				if ( $file->delete_folder(recurse => "yes")) {
+					$error = "$filename deleted";
+				} else {
+					$error = "Cannot delete $filename";
+				}
 			} else {
 				if ( $file->delete_file() ) {
-					set_message("$filename deleted.");
+					$error = "$filename deleted.";
 				} else {
-					set_message("Cannot delete $filename.");
+					$error = "Cannot delete $filename.";
 				}
 			}
@@ -1345,9 +1361,20 @@
 	}
 
-	browse_module_menu( 
-		ck_auth => $ck_auth,
-		location => $location,
-		module_name => $module_name,
-		repo_name => $repo_name,
+	my $content = $ui->get_menu(
+		MENU => 'output',
+		LOCATION => $location,
+		FILENAME => "@filename",
+		PROGNAME => $progname,
+		OUTPUT => "Deleting file : @filename",
+		ERROR => "$error",
+	);
+
+	print CGI::header( -cookie => $ck_auth );
+	$ui->print_popup(
+		TITLE=> "SandWeb : delete file",
+		MENU_TITLE => 'SandWeb',
+		SUBMENU_TITLE => "delete file",
+		FOOTER => '',
+		CONTENT => $content,
 	);
 }
@@ -1658,5 +1685,4 @@
 				MESSAGE => $message,
 			);
-			exit 0;
 		}
 		my $content = $ui->get_menu(