Index: openacs-4/packages/file-storage/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/file-storage/www/folder-delete.tcl	26 May 2005 08:28:46 -0000	1.10
+++ openacs-4/packages/file-storage/www/folder-delete.tcl	27 Oct 2014 16:41:33 -0000	1.11
@@ -6,11 +6,11 @@
     @creation-date 10 November 2000
     @cvs-id $Id$
 } {
-    folder_id:integer,notnull
+    folder_id:naturalnum,notnull
     {confirmed_p "f"}
 } -validate {
     valid_folder -requires {folder_id:integer} {
-	if ![fs_folder_p $folder_id] {
+	if {![fs_folder_p $folder_id]} {
 	    ad_complain "[_ file-storage.lt_The_specified_folder__1]"
 	}
     }
@@ -30,7 +30,7 @@
 
 # check for delete permission on the folder
 
-ad_require_permission $folder_id delete
+permission::require_permission -object_id $folder_id -privilege delete
 
 # Check if there are child items they don't have permission to delete
 # (Irrelevant at this point because they can't delete folders with
@@ -58,7 +58,7 @@
     } -on_request {
 
     } -on_submit {
-	if {[string equal $blocked_p "f"] } {
+	if {$blocked_p == "f"} {
 	    # they have confirmed that they want to delete the folder
 	    
 	    callback fs::folder_delete -package_id [ad_conn package_id] -folder_id $folder_id
@@ -73,7 +73,7 @@
     -export {folder_id}
    
 
-if { [string equal $confirmed_p "t"] && [string equal $blocked_p "f"] } {
+if { $confirmed_p == "t" && $blocked_p == "f" } {
     # they have confirmed that they want to delete the folder
 
     db_1row parent_id "