Index: openacs-4/packages/acs-templating/www/doc/demo/bind.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/bind.tcl,v
diff -u -r1.2 -r1.2.26.1
--- openacs-4/packages/acs-templating/www/doc/demo/bind.tcl	10 Sep 2002 22:22:16 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/bind.tcl	5 Aug 2014 12:57:20 -0000	1.2.26.1
@@ -1,7 +1,7 @@
 ad_page_contract {
   @cvs-id $Id$
 } {
-  user_id:integer
+  user_id:naturalnum,notnull
 } -properties {
   users:onerow
 }
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v
diff -u -r1.17.6.3 -r1.17.6.4
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	29 Jul 2014 11:14:16 -0000	1.17.6.3
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	5 Aug 2014 12:57:20 -0000	1.17.6.4
@@ -1,14 +1,15 @@
 ad_page_contract {
     Simple file upload, attach image to object_id passed in, if no
     object_id, use the current package_id
+
     @author Guenter Ernst guenter.ernst@wu-wien.ac.at, 
     @author Gustaf Neumann neumann@wu-wien.ac.at
     @author Dave Bauer (dave@solutiongrove.com)
     @creation-date 13.07.2004
     @cvs-id $Id$
 } {
     {parent_id:naturalnum,optional}
-    {package_id ""}
+    {package_id:naturalnum ""}
     {selector_type "file"}
     {f_href ""}
 }
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl,v
diff -u -r1.11.8.2 -r1.11.8.3
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	29 Jul 2014 11:14:16 -0000	1.11.8.2
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	5 Aug 2014 12:57:20 -0000	1.11.8.3
@@ -1,14 +1,15 @@
 ad_page_contract {
     Simple image upload, attach image to object_id passed in, if no
     object_id, use the current package_id
+
     @author Guenter Ernst guenter.ernst@wu-wien.ac.at, 
     @author Gustaf Neumann neumann@wu-wien.ac.at
     @author Dave Bauer (dave@solutiongrove.com)
     @creation-date 13.07.2004
     @cvs-id $Id$
 } {
     {parent_id:naturalnum,optional}
-    {package_id ""}
+    {package_id:naturalnum ""}
     {selector_type "image"}
 }
 
Index: openacs-4/packages/attachments/www/detach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/detach.tcl,v
diff -u -r1.3.6.1 -r1.3.6.2
--- openacs-4/packages/attachments/www/detach.tcl	2 Oct 2013 23:08:45 -0000	1.3.6.1
+++ openacs-4/packages/attachments/www/detach.tcl	5 Aug 2014 13:05:44 -0000	1.3.6.2
@@ -8,8 +8,8 @@
     @creation-date 2006-07-13
     @cvs-id $Id$
 } {
-    object_id:notnull
-    attachment_id:notnull
+    object_id:naturalnum,notnull
+    attachment_id:naturalnum,notnull
     {return_url ""}
 } -properties {
 } -validate {
Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v
diff -u -r1.8.4.2 -r1.8.4.3
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	3 Oct 2013 07:39:45 -0000	1.8.4.2
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	5 Aug 2014 13:06:59 -0000	1.8.4.3
@@ -9,7 +9,7 @@
     @creation-date 10 Mar 2002
     @cvs-id $Id$
 } {
-    cal_item_id
+    cal_item_id:naturalnum,notnull
     {return_url "./"}
     {days_of_week:multiple ""}
 } 
Index: openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl,v
diff -u -r1.4 -r1.4.16.1
--- openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl	9 Jan 2004 22:55:52 -0000	1.4
+++ openacs-4/packages/calendar/www/cal-item-delete-all-occurrences.tcl	5 Aug 2014 13:06:59 -0000	1.4.16.1
@@ -5,7 +5,7 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date April 25, 2002
 } {
-    recurrence_id
+    recurrence_id:naturalnum,notnull
     {return_url "./"}
 }
 
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u -r1.11 -r1.11.4.1
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	30 Aug 2008 19:51:23 -0000	1.11
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	5 Aug 2014 13:06:59 -0000	1.11.4.1
@@ -1,7 +1,7 @@
 #
 # A script that assumes
 #
-# cal_item_id
+# cal_item_id:naturalnum,notnull
 #
 # This will pull out information about the event and 
 # display it with some options.
@@ -10,7 +10,7 @@
 ad_page_contract {
     Confirm Deletion
 } {
-    cal_item_id
+    cal_item_id:naturalnum,notnull
 }
 
 auth::require_login
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.38.4.3 -r1.38.4.4
--- openacs-4/packages/calendar/www/cal-item-new.tcl	29 Jul 2014 11:14:17 -0000	1.38.4.3
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	5 Aug 2014 13:07:00 -0000	1.38.4.4
@@ -7,7 +7,7 @@
     @creation-date May 29, 2002
     @cvs-id $Id$
 } {
-    {calendar_id:integer ""}
+    {calendar_id:naturalnum ""}
     cal_item_id:naturalnum,optional
     item_type_id:naturalnum,optional
     {date ""}
Index: openacs-4/packages/calendar/www/cal-item-outlook.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-outlook.tcl,v
diff -u -r1.4 -r1.4.8.1
--- openacs-4/packages/calendar/www/cal-item-outlook.tcl	8 Aug 2006 21:26:18 -0000	1.4
+++ openacs-4/packages/calendar/www/cal-item-outlook.tcl	5 Aug 2014 13:07:00 -0000	1.4.8.1
@@ -8,7 +8,7 @@
     @creation-date May 28, 2002
     @cvs-id $Id$
 } {
-    cal_item_id:integer
+    cal_item_id:naturalnum,notnull
 }
 
 ad_returnredirect "ics/${cal_item_id}.ics"
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.24.4.1 -r1.24.4.2
--- openacs-4/packages/calendar/www/cal-item-view.tcl	26 Oct 2013 09:33:21 -0000	1.24.4.1
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	5 Aug 2014 13:07:00 -0000	1.24.4.2
@@ -5,7 +5,7 @@
     @creation-date April 09, 2002
     @cvs-id $Id$
 } {
-    cal_item_id:integer
+    cal_item_id:naturalnum,notnull
     {return_url [ad_return_url]}
 }
 
Index: openacs-4/packages/calendar/www/calendar-item-types.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/calendar/www/calendar-item-types.tcl	3 Oct 2013 07:39:46 -0000	1.5.2.2
+++ openacs-4/packages/calendar/www/calendar-item-types.tcl	5 Aug 2014 13:07:00 -0000	1.5.2.3
@@ -7,7 +7,7 @@
     @creation-date Mar 16, 2002
     @cvs-id $Id$
 } {
-    calendar_id:notnull
+    calendar_id:naturalnum,notnull
 }
 
 # Permission check
Index: openacs-4/packages/calendar/www/item-type-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-delete.tcl,v
diff -u -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/calendar/www/item-type-delete.tcl	7 Sep 2013 09:30:37 -0000	1.2.22.1
+++ openacs-4/packages/calendar/www/item-type-delete.tcl	5 Aug 2014 13:07:00 -0000	1.2.22.2
@@ -8,8 +8,8 @@
     @creation-date Mar 16, 2002
     @cvs-id $Id$
 } {
-    calendar_id:notnull
-    item_type_id:notnull
+    calendar_id:naturalnum,notnull
+    item_type_id:naturalnum,notnull
 }
 
 # Permission check
Index: openacs-4/packages/calendar/www/item-type-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-new.tcl,v
diff -u -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/calendar/www/item-type-new.tcl	7 Sep 2013 09:30:37 -0000	1.2.22.1
+++ openacs-4/packages/calendar/www/item-type-new.tcl	5 Aug 2014 13:07:00 -0000	1.2.22.2
@@ -8,7 +8,7 @@
     @creation-date Mar 16, 2002
     @cvs-id $Id$
 } {
-    calendar_id:notnull
+    calendar_id:naturalnum,notnull
     type:notnull
 }
 
Index: openacs-4/packages/calendar/www/admin/calendar-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-create.tcl,v
diff -u -r1.1.1.1.24.1 -r1.1.1.1.24.2
--- openacs-4/packages/calendar/www/admin/calendar-create.tcl	3 Oct 2013 07:39:46 -0000	1.1.1.1.24.1
+++ openacs-4/packages/calendar/www/admin/calendar-create.tcl	5 Aug 2014 13:07:00 -0000	1.1.1.1.24.2
@@ -15,7 +15,7 @@
     @creation-date Dec 14, 2000
     @cvs-id $Id$
 } {
-    {party_id:notnull}
+    {party_id:naturalnum,notnull}
     {calendar_name:notnull}
     {calendar_permission "private"}
 }
Index: openacs-4/packages/calendar/www/admin/calendar-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-delete.tcl,v
diff -u -r1.2 -r1.2.16.1
--- openacs-4/packages/calendar/www/admin/calendar-delete.tcl	11 Dec 2003 21:39:59 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/calendar-delete.tcl	5 Aug 2014 13:07:00 -0000	1.2.16.1
@@ -1,7 +1,7 @@
 ad_page_contract {
     Delete calendar
 } {
-    calendar_id:integer
+    calendar_id:naturalnum,notnull
 }
 
 # We know we have admin privs here
Index: openacs-4/packages/calendar/www/admin/permissions-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions-user-add.tcl,v
diff -u -r1.3 -r1.3.12.1
--- openacs-4/packages/calendar/www/admin/permissions-user-add.tcl	13 Jan 2005 13:56:31 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/permissions-user-add.tcl	5 Aug 2014 13:07:00 -0000	1.3.12.1
@@ -5,7 +5,7 @@
     @creation-date 2003-06-13
     @cvs-id $Id$
 } {
-    object_id:integer
+    object_id:naturalnum,notnull
 }
 
 set page_title "Add User"
Index: openacs-4/packages/calendar/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions.tcl,v
diff -u -r1.2 -r1.2.16.1
--- openacs-4/packages/calendar/www/admin/permissions.tcl	11 Dec 2003 21:39:59 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/permissions.tcl	5 Aug 2014 13:07:00 -0000	1.2.16.1
@@ -5,7 +5,7 @@
     @creation-date 2003-06-13
     @cvs-id $Id$
 } {
-    object_id:integer
+    object_id:naturalnum,notnull
 }
 
 set page_title "Permissions"