Index: openacs-4/packages/acs-admin/www/apm/file-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/file-watch.tcl,v
diff -u -N -r1.11 -r1.11.22.1
--- openacs-4/packages/acs-admin/www/apm/file-watch.tcl	4 Apr 2003 09:19:59 -0000	1.11
+++ openacs-4/packages/acs-admin/www/apm/file-watch.tcl	5 Aug 2014 10:08:54 -0000	1.11.22.1
@@ -7,7 +7,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    version_id:integer
+    version_id:naturalnum,notnull
     paths:multiple
     {return_url ""}
 } 
Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -N -r1.7.4.3 -r1.7.4.4
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	11 Oct 2013 11:43:47 -0000	1.7.4.3
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	5 Aug 2014 10:08:54 -0000	1.7.4.4
@@ -4,7 +4,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 
 db_1row apm_package_info_by_version_id {}
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v
diff -u -N -r1.11.6.1 -r1.11.6.2
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	9 Sep 2013 16:44:17 -0000	1.11.6.1
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	5 Aug 2014 10:08:54 -0000	1.11.6.2
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 } {
     {dependency_id:naturalnum}
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
     dependency_type
     service:notnull
     our_package_key:notnull
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl,v
diff -u -N -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	28 Sep 2013 12:10:00 -0000	1.4.6.1
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	5 Aug 2014 10:08:54 -0000	1.4.6.2
@@ -4,7 +4,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
     dependency_type
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -N -r1.5.4.2 -r1.5.4.3
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	7 Oct 2013 16:48:16 -0000	1.5.4.2
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	5 Aug 2014 10:08:54 -0000	1.5.4.3
@@ -4,8 +4,8 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
-    {dependency_id:integer}
+    {version_id:naturalnum,notnull}
+    {dependency_id:naturalnum,notnull}
     dependency_type:notnull
     package_key:notnull
 }
Index: openacs-4/packages/acs-admin/www/apm/version-disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-disable.tcl,v
diff -u -N -r1.3 -r1.3.26.1
--- openacs-4/packages/acs-admin/www/apm/version-disable.tcl	18 Sep 2002 11:54:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-disable.tcl	5 Aug 2014 10:08:54 -0000	1.3.26.1
@@ -4,7 +4,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    version_id:integer
+    version_id:naturalnum,notnull
 }
 
 apm_version_disable -callback apm_dummy_callback $version_id
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -N -r1.10.8.6 -r1.10.8.7
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	28 Sep 2013 12:10:00 -0000	1.10.8.6
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	5 Aug 2014 10:08:54 -0000	1.10.8.7
@@ -7,7 +7,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 
 db_1row apm_all_version_info {
Index: openacs-4/packages/acs-admin/www/apm/version-enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-enable.tcl,v
diff -u -N -r1.3 -r1.3.26.1
--- openacs-4/packages/acs-admin/www/apm/version-enable.tcl	18 Sep 2002 11:54:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-enable.tcl	5 Aug 2014 10:08:54 -0000	1.3.26.1
@@ -6,7 +6,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v
diff -u -N -r1.16.8.3 -r1.16.8.4
--- openacs-4/packages/acs-admin/www/apm/version-files.tcl	11 Oct 2013 11:43:47 -0000	1.16.8.3
+++ openacs-4/packages/acs-admin/www/apm/version-files.tcl	5 Aug 2014 10:08:54 -0000	1.16.8.4
@@ -5,7 +5,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 
 apm_version_info $version_id
Index: openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl,v
diff -u -N -r1.3 -r1.3.26.1
--- openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	18 Sep 2002 11:54:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	5 Aug 2014 10:08:54 -0000	1.3.26.1
@@ -7,7 +7,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
     {write_p 0}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl,v
diff -u -N -r1.4 -r1.4.20.1
--- openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl	11 Dec 2003 21:39:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-generate-tarball.tcl	5 Aug 2014 10:08:54 -0000	1.4.20.1
@@ -6,7 +6,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 db_transaction {
     apm_generate_tarball $version_id
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl,v
diff -u -N -r1.7 -r1.7.22.1
--- openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	22 Oct 2003 11:39:21 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	5 Aug 2014 10:08:55 -0000	1.7.22.1
@@ -5,7 +5,7 @@
     @creation-date 23 October 2002
     @cvs-id $Id$  
 } {
-    version_id:integer
+    version_id:naturalnum,notnull
     {return_url {[export_vars -base "version-i18n-index" { version_id }]}}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v
diff -u -N -r1.8.4.5 -r1.8.4.6
--- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	11 Oct 2013 11:43:47 -0000	1.8.4.5
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	5 Aug 2014 10:08:55 -0000	1.8.4.6
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } {
     {orderby "parameter_name"}
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
     {section_name ""}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -N -r1.9.20.2 -r1.9.20.3
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	29 Sep 2013 18:26:24 -0000	1.9.20.2
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	5 Aug 2014 10:08:55 -0000	1.9.20.3
@@ -6,7 +6,7 @@
     @creation-date 9 May 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
     {return_url "index"}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl,v
diff -u -N -r1.1.1.1.28.1 -r1.1.1.1.28.2
--- openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl	28 Sep 2013 12:10:01 -0000	1.1.1.1.28.1
+++ openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl	5 Aug 2014 10:08:55 -0000	1.1.1.1.28.2
@@ -7,7 +7,7 @@
     @creation-date Thu Oct 12 17:45:38 2000
     @cvs-id $Id$
 } {
-    version_id
+    version_id:naturalnum,notnull
 }
 apm_version_info $version_id
 
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -N -r1.20.8.3 -r1.20.8.4
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	11 Oct 2013 11:43:47 -0000	1.20.8.3
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	5 Aug 2014 10:08:55 -0000	1.20.8.4
@@ -4,7 +4,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    {version_id:integer}
+    {version_id:naturalnum,notnull}
 }
 
 db_1row apm_all_version_info {
Index: openacs-4/packages/acs-admin/www/auth/authority-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-delete.tcl,v
diff -u -N -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-admin/www/auth/authority-delete.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/auth/authority-delete.tcl	5 Aug 2014 10:08:55 -0000	1.3.10.1
@@ -4,7 +4,7 @@
     @author Peter Marklund
     @creation-date 2003-09-08
 } {
-    authority_id:integer
+    authority_id:naturalnum,notnull
 }
 
 # Cannot delete local authority
Index: openacs-4/packages/acs-admin/www/auth/authority-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-parameters.tcl,v
diff -u -N -r1.4.22.1 -r1.4.22.2
--- openacs-4/packages/acs-admin/www/auth/authority-parameters.tcl	2 Oct 2013 08:56:25 -0000	1.4.22.1
+++ openacs-4/packages/acs-admin/www/auth/authority-parameters.tcl	5 Aug 2014 10:08:55 -0000	1.4.22.2
@@ -4,7 +4,7 @@
 
     @author Peter Marklund
 } {
-    authority_id:integer
+    authority_id:naturalnum,notnull
 }
 
 auth::authority::get -authority_id $authority_id -array authority
Index: openacs-4/packages/acs-admin/www/auth/authority-registration-select.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-registration-select.tcl,v
diff -u -N -r1.2 -r1.2.10.1
--- openacs-4/packages/acs-admin/www/auth/authority-registration-select.tcl	10 Jan 2007 21:22:00 -0000	1.2
+++ openacs-4/packages/acs-admin/www/auth/authority-registration-select.tcl	5 Aug 2014 10:08:55 -0000	1.2.10.1
@@ -4,7 +4,7 @@
 
     @author Peter Marklund
 } {
-    authority_id:integer
+    authority_id:naturalnum,notnull
 }
 
 # Check that the authority has a register implementation
Index: openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl,v
diff -u -N -r1.3.10.1 -r1.3.10.2
--- openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl	11 Oct 2013 11:43:47 -0000	1.3.10.1
+++ openacs-4/packages/acs-admin/www/auth/authority-set-enabled-p.tcl	5 Aug 2014 10:08:55 -0000	1.3.10.2
@@ -6,7 +6,7 @@
 
     @creation-date 2003-09-09
 } {
-    authority_id
+    authority_id:naturalnum,notnull
     enabled_p:boolean
 }
 
Index: openacs-4/packages/acs-admin/www/auth/authority-set-sort-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/authority-set-sort-order.tcl,v
diff -u -N -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-admin/www/auth/authority-set-sort-order.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/auth/authority-set-sort-order.tcl	5 Aug 2014 10:08:55 -0000	1.3.10.1
@@ -5,7 +5,7 @@
     @creation-date 2003-09-09
     @cvs-id $Id$
 } {
-    authority_id:integer
+    authority_id:naturalnum,notnull
     direction
 }
 
Index: openacs-4/packages/acs-admin/www/auth/batch-action.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-action.tcl,v
diff -u -N -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-admin/www/auth/batch-action.tcl	10 Jan 2007 21:22:00 -0000	1.5
+++ openacs-4/packages/acs-admin/www/auth/batch-action.tcl	5 Aug 2014 10:08:55 -0000	1.5.10.1
@@ -4,7 +4,7 @@
     @author Peter marklund (peter@collaboraid.biz)
     @creation-date 2003-09-10
 } {
-    entry_id:integer
+    entry_id:naturalnum,notnull
 }
 
 auth::sync::job::get_entry -entry_id $entry_id -array batch_action
Index: openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl,v
diff -u -N -r1.1 -r1.1.22.1
--- openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl	10 Sep 2003 14:32:47 -0000	1.1
+++ openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl	5 Aug 2014 10:08:55 -0000	1.1.22.1
@@ -3,7 +3,7 @@
 
     @author Peter Marklund
 } {
-    job_id:integer
+    job_id:naturalnum,notnull
 }
 
 set document [db_string select_document {
Index: openacs-4/packages/acs-admin/www/auth/batch-job-run.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job-run.tcl,v
diff -u -N -r1.2 -r1.2.22.1
--- openacs-4/packages/acs-admin/www/auth/batch-job-run.tcl	16 Sep 2003 13:04:12 -0000	1.2
+++ openacs-4/packages/acs-admin/www/auth/batch-job-run.tcl	5 Aug 2014 10:08:56 -0000	1.2.22.1
@@ -4,7 +4,7 @@
     @author Peter Marklund
     @creation-date 2003-09-11
 } {
-    authority_id:integer
+    authority_id:naturalnum,notnull
 }
 
 auth::authority::get -authority_id $authority_id -array authority
Index: openacs-4/packages/acs-admin/www/auth/batch-job.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.tcl,v
diff -u -N -r1.12.10.2 -r1.12.10.3
--- openacs-4/packages/acs-admin/www/auth/batch-job.tcl	29 Jul 2014 10:56:35 -0000	1.12.10.2
+++ openacs-4/packages/acs-admin/www/auth/batch-job.tcl	5 Aug 2014 10:08:56 -0000	1.12.10.3
@@ -4,7 +4,7 @@
     @author Peter Marklund
     @creation-date 2003-09-09
 } {
-    job_id
+    job_id:naturalnum,notnull
     page:naturalnum,optional
     success_p:boolean,optional
 }
Index: openacs-4/packages/acs-admin/www/users/become.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/become.tcl,v
diff -u -N -r1.3 -r1.3.16.1
--- openacs-4/packages/acs-admin/www/users/become.tcl	13 Jan 2005 13:54:41 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/become.tcl	5 Aug 2014 10:08:56 -0000	1.3.16.1
@@ -5,6 +5,6 @@
     @creation-date 27 Jan 2000
 
 } {
-    user_id
+    user_id:naturalnum,notnull
 }
 
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -N -r1.11.10.4 -r1.11.10.5
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	1 Oct 2013 08:16:47 -0000	1.11.10.4
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	5 Aug 2014 10:08:56 -0000	1.11.10.5
@@ -28,15 +28,15 @@
 
     @author Mark Thomas (mthomas@arsdigita.com)
 } {
-    {authority_id:integer ""}
+    {authority_id:naturalnum ""}
     {email ""}
     {ip ""}
     {last_name_starts_with ""}
     {first_names ""}
     keyword:optional
     target
     {passthrough ""}
-    {limit_to_users_in_group_id ""}
+    {limit_to_users_in_group_id:naturalnum ""}
     {only_authorized_p:integer 1}
     {only_needs_approval_p:naturalnum 0}
     {registration_before_days:integer -1}
Index: openacs-4/packages/acs-admin/www/users/delete-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/delete-user.tcl,v
diff -u -N -r1.1 -r1.1.8.1
--- openacs-4/packages/acs-admin/www/users/delete-user.tcl	23 Dec 2008 08:31:46 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/delete-user.tcl	5 Aug 2014 10:08:56 -0000	1.1.8.1
@@ -5,7 +5,7 @@
 
     @cvs-id $Id$
 } {
-  user_id:integer
+  user_id:naturalnum,notnull
   {return_url .}
   {permanent:boolean f}
 }
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -N -r1.14.4.1 -r1.14.4.2
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	9 Sep 2013 16:44:17 -0000	1.14.4.1
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	5 Aug 2014 10:08:56 -0000	1.14.4.2
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 
 } {
-    user_id
+    user_id:naturalnum,notnull
     {member_state "no_change"}
     {email_verified_p "no_change"}
     {return_url ""}
Index: openacs-4/packages/acs-admin/www/users/merge-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.tcl,v
diff -u -N -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	5 Aug 2014 10:08:56 -0000	1.3.10.1
@@ -5,8 +5,8 @@
 
     @cvs-id $Id$
 } {
-    to_user_id:integer
-    from_user_id:integer
+    to_user_id:naturalnum,notnull
+    from_user_id:naturalnum,notnull
     merge_action
 } -properties {
     context:onevalue
Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -N -r1.4 -r1.4.10.1
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	10 Jan 2007 21:22:00 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	5 Aug 2014 10:08:56 -0000	1.4.10.1
@@ -5,8 +5,8 @@
 
     @cvs-id $Id$
 } {
-    to_user_id:integer
-    from_user_id:integer
+    to_user_id:naturalnum,notnull
+    from_user_id:naturalnum,notnull
     merge_p
 } -properties {
     context:onevalue
Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -N -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-admin/www/users/merge.tcl	30 Nov 2007 18:16:42 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	5 Aug 2014 10:08:56 -0000	1.5.10.1
@@ -5,7 +5,7 @@
 
     @cvs-id $Id$
 } {
-    user_id
+    user_id:naturalnum,notnull
     user_id_from_search
 } -properties {
     context:onevalue
Index: openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl,v
diff -u -N -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl	5 Aug 2014 10:08:56 -0000	1.3.10.1
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 
 } {
-    user_id:notnull
+    user_id:naturalnum,notnull
     action:notnull
     confirmed_p:optional
 }
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -N -r1.16.8.2 -r1.16.8.3
--- openacs-4/packages/acs-admin/www/users/one.tcl	2 Oct 2013 07:23:44 -0000	1.16.8.2
+++ openacs-4/packages/acs-admin/www/users/one.tcl	5 Aug 2014 10:08:57 -0000	1.16.8.3
@@ -6,7 +6,7 @@
     
     @cvs-id $Id$
 } {
-    user_id:integer
+    user_id:naturalnum,notnull
 }
 
 with_catch errmsg {
Index: openacs-4/packages/acs-admin/www/users/password-reset.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-reset.tcl,v
diff -u -N -r1.2 -r1.2.20.1
--- openacs-4/packages/acs-admin/www/users/password-reset.tcl	26 Jan 2004 15:39:41 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/password-reset.tcl	5 Aug 2014 10:08:57 -0000	1.2.20.1
@@ -1,7 +1,7 @@
 ad_page_contract {
     Reset a user's password.
 } {
-    user_id:integer
+    user_id:naturalnum,notnull
     {return_url .}
 }
 
Index: openacs-4/packages/acs-admin/www/users/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/password-update.tcl,v
diff -u -N -r1.3 -r1.3.16.1
--- openacs-4/packages/acs-admin/www/users/password-update.tcl	24 Feb 2005 13:32:58 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/password-update.tcl	5 Aug 2014 10:08:57 -0000	1.3.16.1
@@ -3,7 +3,7 @@
 
     @version $Id$
 } {
-    {user_id:integer}
+    {user_id:naturalnum,notnull}
     {return_url ""}
     {password_old ""}
 }
Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -N -r1.6.10.5 -r1.6.10.6
--- openacs-4/packages/acs-admin/www/users/search.tcl	1 Oct 2013 08:09:25 -0000	1.6.10.5
+++ openacs-4/packages/acs-admin/www/users/search.tcl	5 Aug 2014 10:08:57 -0000	1.6.10.6
@@ -13,7 +13,7 @@
     @param target URL to return to
     @param passthrough Form variables to pass along from caller
     @param limit_to_users_in_group_id Limits search to users in the specified group id.  This can be a comma separated list to allow searches within multiple groups. (optional)
-    @param limit_to_user_id. This is useful is you don't want to show a list of user_ids. This could be a comma separated list. (optional)
+    @param limit_to_user_id This is useful is you don't want to show a list of user_ids. This could be a comma separated list. (optional)
     @param from_user_id is used if you want to merge the user_id with user_id_from_search (optional)
 
     @author Jin Choi (jsc@arsdigita.com)
@@ -23,10 +23,10 @@
     keyword:optional
     target
     {passthrough ""}
-    {limit_to_users_in_group_id ""}
+    {limit_to_users_in_group_id:naturalnum ""}
     {only_authorized_p:integer 1}
-    {limit_to_user_id ""}
-    {from_user_id ""}
+    {limit_to_user_id:naturalnum ""}
+    {from_user_id:naturalnum ""}
 } -properties {
     group_name:onevalue
     search_type:onevalue