[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.155,1.156

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

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

Modified Files:
	sandweb.cgi 
Log Message:
renamed "remove" to "delete"


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.155
retrieving revision 1.156
diff -U2 -r1.155 -r1.156
--- sandweb.cgi	5 Feb 2002 07:54:44 -0000	1.155
+++ sandweb.cgi	10 Feb 2002 09:46:47 -0000	1.156
@@ -597,8 +597,8 @@
 
 	# Remove a file
-	if ( $file_command eq 'remove' ) {
+	if ( $file_command eq 'delete' ) {
 		unless (@filename) {
 			$log->debug("no files selected for removal");
-			set_error("Please select file(s) or folder(s) to remove.");
+			set_error("Please select file(s) or folder(s) to delete.");
 			browse_module_menu( 
 				ck_auth => $ck_auth,
@@ -619,10 +619,10 @@
 			if ($file) {
 				if ( $file->get_file_type() eq 'Directory' ) {
-					$file->remove_folder();
+					$file->delete_folder();
 				} else {
-					if ( $file->remove_file() ) {
-						set_error("$filename removed.");
+					if ( $file->delete_file() ) {
+						set_error("$filename deleted.");
 					} else {
-						set_error("Cannot remove $filename.");
+						set_error("Cannot delete $filename.");
 					}
 				}