Index: openacs-4/packages/acs-subsite/www/group-leave.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-leave.tcl,v
diff -u -r1.2.20.1 -r1.2.20.2
--- openacs-4/packages/acs-subsite/www/group-leave.tcl	27 Aug 2013 12:20:37 -0000	1.2.20.1
+++ openacs-4/packages/acs-subsite/www/group-leave.tcl	5 Aug 2014 09:49:23 -0000	1.2.20.2
@@ -5,7 +5,7 @@
     @creation-date 2003-08-07
     @cvs-id $Id$
 } {
-    {group_id:integer {[application_group::group_id_from_package_id]}}
+    {group_id:naturalnum,notnull {[application_group::group_id_from_package_id]}}
     return_url:optional
 }
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.tcl,v
diff -u -r1.1 -r1.1.22.1
--- openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.tcl	29 Sep 2003 11:53:35 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/permissions-user-add.tcl	5 Aug 2014 09:49:23 -0000	1.1.22.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/acs-subsite/www/admin/applications/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/permissions.tcl,v
diff -u -r1.1 -r1.1.22.1
--- openacs-4/packages/acs-subsite/www/admin/applications/permissions.tcl	29 Sep 2003 11:53:35 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/permissions.tcl	5 Aug 2014 09:49:23 -0000	1.1.22.1
@@ -5,7 +5,7 @@
     @creation-date 2003-06-13
     @cvs-id $Id$
 } {
-    package_id:integer
+    package_id:naturalnum,notnull
 }
 
 set page_title "[apm_instance_name_from_id $package_id] Permissions"
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl,v
diff -u -r1.2.10.4 -r1.2.10.5
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	9 Sep 2013 16:44:20 -0000	1.2.10.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create-2.tcl	5 Aug 2014 09:49:23 -0000	1.2.10.5
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:notnull,integer
+    group_id:notnull,naturalnum
     rel_type:notnull
     { operation "" }
     { return_url "" }
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v
diff -u -r1.3.26.4 -r1.3.26.5
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	9 Sep 2013 16:44:20 -0000	1.3.26.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	5 Aug 2014 09:49:23 -0000	1.3.26.5
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 
 } {
-    group_id:notnull,integer
+    group_id:notnull,naturalnum
     rel_type:notnull
     { return_url "" }
 } -properties {
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -r1.6.10.6 -r1.6.10.7
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	27 Oct 2013 14:26:46 -0000	1.6.10.6
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	5 Aug 2014 09:49:23 -0000	1.6.10.7
@@ -13,7 +13,7 @@
     { group_type_exact_p t }
     { group_name "" }
     { group_id:naturalnum "" }
-    {add_to_group_id ""}
+    {add_to_group_id:naturalnum ""}
     {add_with_rel_type "composition_rel"}
     { return_url "" }
     {group_rel_type_list ""}
Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl,v
diff -u -r1.3 -r1.3.22.1
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl	17 May 2003 10:00:22 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/delete.tcl	5 Aug 2014 09:49:24 -0000	1.3.22.1
@@ -4,7 +4,7 @@
     @cvs-id $Id$
 } {
     host
-    node_id:integer
+    node_id:naturalnum,notnull
 }
 
 # Flush the cache
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v
diff -u -r1.6.10.6 -r1.6.10.7
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	27 Oct 2013 14:26:47 -0000	1.6.10.6
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	5 Aug 2014 09:49:24 -0000	1.6.10.7
@@ -14,7 +14,7 @@
     { party_id:naturalnum "" }
     { party.email ""}
     { return_url "" }
-    {add_to_group_id ""}
+    {add_to_group_id:naturalnum ""}
     {add_with_rel_type "membership_rel"}
     {group_rel_type_list ""}
 } -properties {
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl,v
diff -u -r1.4 -r1.4.10.1
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	10 Jan 2007 21:22:07 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	5 Aug 2014 09:49:24 -0000	1.4.10.1
@@ -10,8 +10,8 @@
     @cvs-id $Id$
 
 } {
-    { group_rel_id:integer "" }
-    { group_type_rel_id "" }
+    { group_rel_id:naturalnum "" }
+    { group_type_rel_id:naturalnum "" }
     { return_url "" }
 } -properties {
     context:onevalue
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -r1.10.10.6 -r1.10.10.7
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	29 Jul 2014 11:23:57 -0000	1.10.10.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	5 Aug 2014 09:49:24 -0000	1.10.10.7
@@ -11,7 +11,7 @@
 } {
     group_id:naturalnum,notnull
     rel_type:notnull
-    {party_id:integer ""}
+    {party_id:naturalnum ""}
     { exact_p "f" }
     { return_url "" }
     { allow_out_of_scope_p "f" }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v
diff -u -r1.4.26.2 -r1.4.26.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	29 Jul 2014 11:23:58 -0000	1.4.26.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl	5 Aug 2014 09:49:24 -0000	1.4.26.3
@@ -9,7 +9,7 @@
 } {
     expand:integer,multiple
     node_id:naturalnum,notnull
-    {root_id:integer ""}
+    {root_id:naturalnum ""}
 }
 
 if {$root_id == $node_id} {
Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -r1.27.4.8 -r1.27.4.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	10 Oct 2013 21:00:46 -0000	1.27.4.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	5 Aug 2014 09:49:24 -0000	1.27.4.9
@@ -9,7 +9,7 @@
     {expand:integer,multiple ""}
     {new_parent:integer ""}
     {new_type ""}
-    {root_id:integer ""}
+    {root_id:naturalnum ""}
     {new_application:integer ""}
     {rename_application:integer {}}
 }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v
diff -u -r1.9 -r1.9.10.1
--- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	10 Jan 2007 21:22:08 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl	5 Aug 2014 09:49:25 -0000	1.9.10.1
@@ -10,7 +10,7 @@
 
 } {
     package_id:naturalnum
-    {root_id ""}
+    {root_id:naturalnum ""}
 }
 db_transaction {
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v
diff -u -r1.5.16.2 -r1.5.16.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	29 Jul 2014 11:23:58 -0000	1.5.16.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl	5 Aug 2014 09:49:25 -0000	1.5.16.3
@@ -9,7 +9,7 @@
     name:notnull
     node_type:notnull
     {expand:integer,multiple {}}
-    {root_id:integer {}}
+    {root_id:naturalnum,notnull {}}
 } -validate {
     name_root_ck -requires name:notnull {
         if {[string match "*/*" $name]} {
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -r1.12.10.3 -r1.12.10.4
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	29 Jul 2014 11:23:58 -0000	1.12.10.3
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	5 Aug 2014 09:49:25 -0000	1.12.10.4
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 
 } {
-    {new_package_id:integer ""}
+    {new_package_id:naturalnum ""}
     node_id:naturalnum,notnull
     {new_node_p f}
     {node_name:trim ""}
Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.6.8.7 -r1.6.8.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	10 Oct 2013 21:00:46 -0000	1.6.8.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	5 Aug 2014 09:49:25 -0000	1.6.8.8
@@ -9,7 +9,7 @@
     {expand:integer,multiple ""}
     {new_parent:integer ""}
     {new_type ""}
-    {root_id:integer ""}
+    {root_id:naturalnum ""}
     {new_application:integer ""}
     {rename_application:integer {}}
 }
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -r1.12.6.7 -r1.12.6.8
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	2 Dec 2013 08:14:30 -0000	1.12.6.7
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	5 Aug 2014 09:49:25 -0000	1.12.6.8
@@ -13,7 +13,7 @@
     { user_type_exact_p t }
     { user_id:naturalnum "" }
     { return_url "" }
-    {add_to_group_id ""}
+    {add_to_group_id:naturalnum ""}
     {add_with_rel_type "user_profile"}
     {group_rel_type_list ""}
 } -properties {
Index: openacs-4/packages/acs-subsite/www/members/make-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/make-admin.tcl,v
diff -u -r1.4 -r1.4.20.1
--- openacs-4/packages/acs-subsite/www/members/make-admin.tcl	5 Dec 2003 00:23:05 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/members/make-admin.tcl	5 Aug 2014 09:49:25 -0000	1.4.20.1
@@ -1,7 +1,7 @@
 ad_page_contract {
     Make administrators.
 } {
-    {user_id:multiple ""}
+    {user_id:naturalnum,multiple ""}
 }
 
 set group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-subsite/www/members/make-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/make-member.tcl,v
diff -u -r1.3 -r1.3.20.1
--- openacs-4/packages/acs-subsite/www/members/make-member.tcl	3 Dec 2003 23:38:27 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/members/make-member.tcl	5 Aug 2014 09:49:25 -0000	1.3.20.1
@@ -1,7 +1,7 @@
 ad_page_contract {
     Make ordinary members.
 } {
-    {user_id:multiple ""}
+    {user_id:naturalnum,multiple ""}
 }
 
 set group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-subsite/www/members/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-state-change.tcl,v
diff -u -r1.1.22.1 -r1.1.22.2
--- openacs-4/packages/acs-subsite/www/members/member-state-change.tcl	6 Sep 2013 16:01:46 -0000	1.1.22.1
+++ openacs-4/packages/acs-subsite/www/members/member-state-change.tcl	5 Aug 2014 09:49:25 -0000	1.1.22.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     Change member state
 } {
-    {rel_id:multiple ""}
+    {rel_id:naturalnum,multiple ""}
     {member_state:notnull}
 }
 
Index: openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl,v
diff -u -r1.3.10.1 -r1.3.10.2
--- openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl	6 Sep 2013 16:01:47 -0000	1.3.10.1
+++ openacs-4/packages/acs-subsite/www/permissions/perm-modify.tcl	5 Aug 2014 09:49:25 -0000	1.3.10.2
@@ -1,5 +1,5 @@
 ad_page_contract {} {
-    object_id:integer
+    object_id:naturalnum,notnull
     {perm:multiple {[list]}}
     {privs:optional}
     return_url
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl,v
diff -u -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl	6 Sep 2013 16:01:47 -0000	1.2.22.1
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-2.tcl	5 Aug 2014 09:49:26 -0000	1.2.22.2
@@ -1,6 +1,6 @@
 ad_page_contract {} {
-    object_id
-    user_id:multiple,integer
+    object_id:naturalnum,notnull
+    user_id:multiple,naturalnum
     return_url
 }
 
Index: openacs-4/packages/acs-subsite/www/pvt/hide-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/hide-email.tcl,v
diff -u -r1.2 -r1.2.16.1
--- openacs-4/packages/acs-subsite/www/pvt/hide-email.tcl	13 Jan 2005 13:55:50 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/hide-email.tcl	5 Aug 2014 09:49:26 -0000	1.2.16.1
@@ -4,7 +4,7 @@
     changes show_email field in user's table
 } {
     hide:notnull
-    user_id:notnull
+    user_id:naturalnum,notnull
 }
 
 db_dml update_show_email { }
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v
diff -u -r1.11 -r1.11.10.1
--- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	29 May 2007 05:40:54 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	5 Aug 2014 09:49:26 -0000	1.11.10.1
@@ -4,7 +4,7 @@
     @cvs-id $Id$
 } {
     token:notnull,trim
-    user_id:integer
+    user_id:naturalnum,notnull
     
     {return_url ""}
 }
Index: openacs-4/packages/acs-subsite/www/register/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v
diff -u -r1.13 -r1.13.10.1
--- openacs-4/packages/acs-subsite/www/register/index.tcl	30 Nov 2007 18:16:43 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/register/index.tcl	5 Aug 2014 09:49:26 -0000	1.13.10.1
@@ -2,7 +2,7 @@
     Prompt the user for email and password.
     @cvs-id $Id$
 } {
-    {authority_id ""}
+    {authority_id:naturalnum ""}
     {username ""}
     {email ""}
     {return_url ""}
Index: openacs-4/packages/acs-subsite/www/register/recover-password.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.tcl,v
diff -u -r1.12.6.2 -r1.12.6.3
--- openacs-4/packages/acs-subsite/www/register/recover-password.tcl	11 Oct 2013 11:11:17 -0000	1.12.6.2
+++ openacs-4/packages/acs-subsite/www/register/recover-password.tcl	5 Aug 2014 09:49:26 -0000	1.12.6.3
@@ -5,7 +5,7 @@
     @creation-date 2003-08-29
     @cvs-id $Id$
 } {
-    {authority_id:integer ""}
+    {authority_id:naturalnum ""}
     {username ""}
     {email ""}
 }
Index: openacs-4/packages/acs-subsite/www/register/user-join.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.tcl,v
diff -u -r1.12.10.1 -r1.12.10.2
--- openacs-4/packages/acs-subsite/www/register/user-join.tcl	27 Aug 2013 12:20:38 -0000	1.12.10.1
+++ openacs-4/packages/acs-subsite/www/register/user-join.tcl	5 Aug 2014 09:49:26 -0000	1.12.10.2
@@ -9,7 +9,7 @@
     @creation-date 2000-2-28
     @cvs-id $Id$
 } {
-    {group_id:integer {[application_group::group_id_from_package_id]}}
+    {group_id:naturalnum,notnull {[application_group::group_id_from_package_id]}}
     {rel_type:notnull "membership_rel"}
     {return_url {}}
 } -properties {
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	31 Oct 2013 09:08:45 -0000	1.19.2.3
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	5 Aug 2014 09:49:26 -0000	1.19.2.4
@@ -4,7 +4,7 @@
     @param user_id defaults to currently logged in user if there is one
     @cvs-id $Id$
 } {
-    {user_id:integer ""}
+    {user_id:naturalnum ""}
 } -properties {
     context:onevalue
     member_state:onevalue
Index: openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl,v
diff -u -r1.1 -r1.1.16.1
--- openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl	14 Jan 2005 14:46:40 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl	5 Aug 2014 09:49:26 -0000	1.1.16.1
@@ -3,7 +3,7 @@
 
     @author Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net)
 } {
-    revision_id:integer
+    revision_id:naturalnum,notnull
 }
 
 cr_write_content -revision_id $revision_id
Index: openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl,v
diff -u -r1.9.8.1 -r1.9.8.2
--- openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	28 Sep 2013 15:14:52 -0000	1.9.8.1
+++ openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	5 Aug 2014 09:49:26 -0000	1.9.8.2
@@ -5,8 +5,8 @@
     @creation-date 26 Sept 1999
     @cvs-id $Id$
 } {
-    user_id:integer
-    {item_id ""}
+    user_id:naturalnum,notnull
+    {item_id:naturalnum ""}
     {size ""}
 }
 
Index: openacs-4/packages/acs-subsite/www/shared/portrait-thumbnail-bits.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/Attic/portrait-thumbnail-bits.tcl,v
diff -u -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-subsite/www/shared/portrait-thumbnail-bits.tcl	10 Jan 2007 21:22:10 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/portrait-thumbnail-bits.tcl	5 Aug 2014 09:49:27 -0000	1.3.10.1
@@ -5,7 +5,7 @@
     @creation-date 26 Sept 1999
     @cvs-id $Id$
 } {
-    user_id:integer
+    user_id:naturalnum,notnull
 }
 
 # NB: this really doesn't work! You can now pass a &size= parameter
Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v
diff -u -r1.8.8.2 -r1.8.8.3
--- openacs-4/packages/acs-subsite/www/shared/portrait.tcl	27 Nov 2013 07:39:12 -0000	1.8.8.2
+++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl	5 Aug 2014 09:49:27 -0000	1.8.8.3
@@ -4,7 +4,7 @@
     @creation-date 26 Sept 1999
     @cvs-id $Id$
 } {
-    user_id:integer
+    user_id:naturalnum,notnull
 } -properties {
     context:onevalue
     first_names:onevalue
Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v
diff -u -r1.7.8.6 -r1.7.8.7
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl	10 Oct 2013 21:00:47 -0000	1.7.8.6
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl	5 Aug 2014 09:49:27 -0000	1.7.8.7
@@ -9,7 +9,7 @@
     {expand:integer,multiple ""}
     {new_parent:integer ""}
     {new_type ""}
-    {root_id:integer ""}
+    {root_id:naturalnum ""}
     {new_application:integer ""}
     {rename_application:integer {}}
 }
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -r1.14 -r1.14.8.1
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	31 Mar 2009 14:27:35 -0000	1.14
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	5 Aug 2014 09:49:27 -0000	1.14.8.1
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
     {return_url ""}
-    {user_id ""}
+    {user_id:naturalnum ""}
     {edit_p 0}
     {message ""}
 }
Index: openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl,v
diff -u -r1.3 -r1.3.8.1
--- openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl	31 Mar 2009 14:43:06 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/email-privacy-level.tcl	5 Aug 2014 09:49:27 -0000	1.3.8.1
@@ -3,7 +3,7 @@
     
     @author Miguel Marin (miguelmarin@viaro.net) Viaro Networks (www.viaro.net)
 } {
-    {user_id ""}
+    {user_id:naturalnum ""}
     {return_url ""}
 }
 
Index: openacs-4/packages/acs-subsite/www/user/password-reset.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-reset.tcl,v
diff -u -r1.2 -r1.2.10.1
--- openacs-4/packages/acs-subsite/www/user/password-reset.tcl	10 Jan 2007 21:22:11 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/password-reset.tcl	5 Aug 2014 09:49:27 -0000	1.2.10.1
@@ -3,7 +3,7 @@
 
     @cvs-id $Id$
 } {
-    {user_id {[ad_conn untrusted_user_id]}}
+    {user_id:naturalnum,notnull {[ad_conn untrusted_user_id]}}
     {return_url ""}
     {password_hash ""}
     {message ""}
Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -r1.22.8.1 -r1.22.8.2
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	27 Aug 2013 12:20:38 -0000	1.22.8.1
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	5 Aug 2014 09:49:27 -0000	1.22.8.2
@@ -4,7 +4,7 @@
     
     @cvs-id $Id$
 } {
-    {user_id {[ad_conn untrusted_user_id]}}
+    {user_id:naturalnum,notnull {[ad_conn untrusted_user_id]}}
     {return_url ""}
     {old_password ""}
     {message ""}
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v
diff -u -r1.8.8.1 -r1.8.8.2
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	6 Sep 2013 16:01:47 -0000	1.8.8.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	5 Aug 2014 09:49:27 -0000	1.8.8.2
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     {return_url "" }
-    {user_id ""}
+    {user_id:naturalnum ""}
 } -properties {
     context:onevalue
     export_vars:onevalue
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl,v
diff -u -r1.7.8.1 -r1.7.8.2
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl	6 Sep 2013 16:01:47 -0000	1.7.8.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl	5 Aug 2014 09:49:27 -0000	1.7.8.2
@@ -4,7 +4,7 @@
     @cvs-id $Id$
 } {
     {return_url "" }
-    {user_id ""}
+    {user_id:naturalnum ""}
 } -properties {
     context:onevalue
     export_vars:onevalue
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -r1.10.8.2 -r1.10.8.3
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	9 Sep 2013 16:44:26 -0000	1.10.8.2
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	5 Aug 2014 09:49:27 -0000	1.10.8.3
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
     {return_url "" }
-    {user_id ""}
+    {user_id:naturalnum ""}
 } -properties {
     first_names:onevalue
     last_name:onevalue
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.15.8.1 -r1.15.8.2
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	6 Sep 2013 16:01:47 -0000	1.15.8.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	5 Aug 2014 09:49:28 -0000	1.15.8.2
@@ -3,7 +3,7 @@
 
     @cvs-id $Id$
 } {
-    {user_id ""}
+    {user_id:naturalnum ""}
     {return_url ""}
 } -properties {
     first_names:onevalue