Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl	26 Nov 2007 12:52:45 -0000	1.1
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/delete-fsitem.tcl	13 Dec 2007 05:33:42 -0000	1.2
@@ -28,10 +28,21 @@
             if { [permission::permission_p -party_id $viewing_user_id -object_id $fs_object_id -privilege "delete"] } {
                 if { [fs::folder_p -object_id $fs_object_id] } {
                     fs::delete_folder -folder_id $fs_object_id -parent_id [fs::get_parent -item_id $fs_object_id]
+                    # db_exec_plsql folder_delete "select file_storage__delete_folder(:fs_object_id,'t');"
                     # ns_log notice "HAM : delete folder *******"
                 } else {
-                    fs::delete_file -item_id $fs_object_id
+                    # fs::delete_file -item_id $fs_object_id
                     # ns_log notice "HAM : delete file *******"
+                    # if { [content::symlink::is_symlink -item_id $fs_object_id] == "t" } {
+                        fs::delete_file -item_id $fs_object_id
+                        # db_exec_plsql file_delete "select file_storage__delete_file(:fs_object_id);"
+                    # } else {
+                        # HAM : we want admins to be able to request undeleting a file
+                        # to prevent name clashes, we need to prepend the name with "deleted_"
+                        # before we unpublish the item
+                    #    db_dml "update_name" "update cr_items set name='deleted_$fs_object_id', deleted_p='t' where item_id = :fs_object_id"
+                    #    item::unpublish -item_id $fs_object_id
+                    #}
                 }
             } else {
                 set errmsg "You do not have permission to delete this file."