Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl,v
diff -u -N -r1.10.8.2 -r1.10.8.3
--- openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl	29 Jul 2014 10:56:36 -0000	1.10.8.2
+++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl	5 Aug 2014 17:46:34 -0000	1.10.8.3
@@ -9,7 +9,7 @@
 } {
     faq_id:naturalnum,notnull
     entry_id:naturalnum,optional
-    {prev_entry_id 0}
+    {prev_entry_id:naturalnum,notnull 0}
 }  -properties { 
     context:onevalue 
     title:onevalue 
Index: openacs-4/packages/faq/www/categories/categorize.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/categorize.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/faq/www/categories/categorize.tcl	15 May 2007 20:14:35 -0000	1.2
+++ openacs-4/packages/faq/www/categories/categorize.tcl	5 Aug 2014 17:46:34 -0000	1.2.6.1
@@ -1,8 +1,8 @@
 ad_page_contract {
 
 } {
-    object_id:integer
-    faq_id:integer
+    object_id:naturalnum,notnull
+    faq_id:naturalnum,notnull
 }
 
 set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
Index: openacs-4/packages/file-storage/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v
diff -u -N -r1.7.6.1 -r1.7.6.2
--- openacs-4/packages/file-storage/www/delete.tcl	15 Sep 2013 21:03:26 -0000	1.7.6.1
+++ openacs-4/packages/file-storage/www/delete.tcl	5 Aug 2014 17:46:33 -0000	1.7.6.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     delete items
 } {
-    object_id:notnull,multiple
+    object_id:naturalnum,notnull,multiple
     {confirm_p:optional,boolean 0}
     {return_url ""}
 } -errors {object_id:,notnull,integer,multiple {Please select at least one item to delete.}
Index: openacs-4/packages/file-storage/www/download-zip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-zip.tcl,v
diff -u -N -r1.6.6.2 -r1.6.6.3
--- openacs-4/packages/file-storage/www/download-zip.tcl	1 Apr 2014 18:37:32 -0000	1.6.6.2
+++ openacs-4/packages/file-storage/www/download-zip.tcl	5 Aug 2014 17:46:33 -0000	1.6.6.3
@@ -1,7 +1,7 @@
 ad_page_contract {
     delete items
 } {
-    object_id:notnull,multiple
+    object_id:naturalnum,notnull,multiple
     {confirm_p:optional,boolean 0}
     {return_url ""}
 } -errors {object_id:,notnull,integer,multiple {Please select at least one item to download.}
Index: openacs-4/packages/file-storage/www/file-upload-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-upload-confirm.tcl,v
diff -u -N -r1.2 -r1.2.8.1
--- openacs-4/packages/file-storage/www/file-upload-confirm.tcl	8 Aug 2006 21:26:49 -0000	1.2
+++ openacs-4/packages/file-storage/www/file-upload-confirm.tcl	5 Aug 2014 17:46:33 -0000	1.2.8.1
@@ -4,7 +4,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @creation-date 2006-05-15
 } {
-    folder_id:integer
+    folder_id:naturalnum,notnull
     cancel_url
     return_url
 }
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -N -r1.30.6.6 -r1.30.6.7
--- openacs-4/packages/file-storage/www/index.tcl	11 Oct 2013 18:22:25 -0000	1.30.6.6
+++ openacs-4/packages/file-storage/www/index.tcl	5 Aug 2014 17:46:33 -0000	1.30.6.7
@@ -6,10 +6,10 @@
     @creation-date 6 Nov 2000
     @cvs-id $Id$
 } {
-    {folder_id:integer [fs_get_root_folder]}
+    {folder_id:naturalnum,notnull [fs_get_root_folder]}
     {n_past_days:integer "99999"}
     {orderby:optional}
-    {category_id:integer ""}
+    {category_id:naturalnum ""}
     {return_url ""}
 } -validate {
     valid_folder -requires {folder_id:integer} {
Index: openacs-4/packages/file-storage/www/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/permissions.tcl,v
diff -u -N -r1.2 -r1.2.8.1
--- openacs-4/packages/file-storage/www/permissions.tcl	26 May 2005 08:28:46 -0000	1.2
+++ openacs-4/packages/file-storage/www/permissions.tcl	5 Aug 2014 17:46:34 -0000	1.2.8.1
@@ -5,7 +5,7 @@
     @creation-date 2005-03-05
     @cvs-id $Id$
 } {
-    {object_id:integer}
+    {object_id:naturalnum,notnull}
 }
 set user_id [ad_conn user_id]
 
Index: openacs-4/packages/file-storage/www/simple-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-delete.tcl,v
diff -u -N -r1.8.4.2 -r1.8.4.3
--- openacs-4/packages/file-storage/www/simple-delete.tcl	29 Jul 2014 11:24:04 -0000	1.8.4.2
+++ openacs-4/packages/file-storage/www/simple-delete.tcl	5 Aug 2014 17:46:34 -0000	1.8.4.3
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     object_id:naturalnum,notnull
-    folder_id:notnull
+    folder_id:naturalnum,notnull
 }
 
 # check for delete permission on the file
Index: openacs-4/packages/file-storage/www/simple-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.tcl,v
diff -u -N -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/file-storage/www/simple-edit.tcl	6 Sep 2013 16:01:49 -0000	1.10.4.1
+++ openacs-4/packages/file-storage/www/simple-edit.tcl	5 Aug 2014 17:46:34 -0000	1.10.4.2
@@ -5,7 +5,7 @@
     @creation-date 01 April 2002
     @cvs-id $Id$
 } {
-    object_id:notnull
+    object_id:naturalnum,notnull
 }
 
 # check for write permission on the item
Index: openacs-4/packages/file-storage/www/simple.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple.tcl,v
diff -u -N -r1.3.6.1 -r1.3.6.2
--- openacs-4/packages/file-storage/www/simple.tcl	6 Sep 2013 16:01:49 -0000	1.3.6.1
+++ openacs-4/packages/file-storage/www/simple.tcl	5 Aug 2014 17:46:34 -0000	1.3.6.2
@@ -5,7 +5,7 @@
     @creation-date 2004-04-27
     @cvs-id $Id$
 } {
-    object_id:notnull
+    object_id:naturalnum,notnull
 }
 
 # check for write permission on the item
Index: openacs-4/packages/file-storage/www/url-goto.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/url-goto.tcl,v
diff -u -N -r1.6.8.2 -r1.6.8.3
--- openacs-4/packages/file-storage/www/url-goto.tcl	3 Oct 2013 08:33:58 -0000	1.6.8.2
+++ openacs-4/packages/file-storage/www/url-goto.tcl	5 Aug 2014 17:46:34 -0000	1.6.8.3
@@ -5,7 +5,7 @@
     @creation-date 01 April 2002
     @cvs-id $Id$
 } {
-    url_id:notnull
+    url_id:naturalnum,notnull
 } 
 
 # Check for read permission on this url