Index: openacs-4/packages/bookmarks/www/bookmark-access.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-access.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/bookmark-access.tcl 18 Apr 2014 06:45:02 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-access.tcl 7 Aug 2014 07:36:54 -0000 1.6 @@ -15,7 +15,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - bookmark_id:integer + bookmark_id:naturalnum,notnull url } Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl 18 Apr 2014 06:49:49 -0000 1.11 +++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl 7 Aug 2014 07:36:54 -0000 1.12 @@ -23,7 +23,7 @@ @cvs-id $Id$ } { return_url - {viewed_user_id:integer ""} + {viewed_user_id:naturalnum ""} {local_title ""} {complete_url ""} Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl 18 Apr 2014 06:49:49 -0000 1.8 +++ openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl 7 Aug 2014 07:36:54 -0000 1.9 @@ -18,11 +18,11 @@ @cvs-id $Id$ } { return_url - viewed_user_id:integer - parent_id:integer + viewed_user_id:naturalnum,notnull + parent_id:naturalnum,notnull complete_url local_title - bookmark_id:integer + bookmark_id:naturalnum,notnull url_title meta_description meta_keywords Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl 18 Apr 2014 06:49:49 -0000 1.10 +++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl 7 Aug 2014 07:36:54 -0000 1.11 @@ -17,12 +17,12 @@ @creation-date December 2000 @cvs-id $Id$ } { - {viewed_user_id:integer ""} + {viewed_user_id:naturalnum ""} {complete_url:trim ""} {local_title ""} return_url - {bookmark_id:integer ""} - parent_id:integer + {bookmark_id:naturalnum ""} + parent_id:naturalnum,notnull } -validate { Index: openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 18 Apr 2014 06:38:29 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-delete-2.tcl 7 Aug 2014 07:36:54 -0000 1.6 @@ -14,7 +14,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - bookmark_id:integer + bookmark_id:naturalnum,notnull return_url } Index: openacs-4/packages/bookmarks/www/bookmark-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/bookmark-delete.tcl 10 Sep 2002 22:22:26 -0000 1.3 +++ openacs-4/packages/bookmarks/www/bookmark-delete.tcl 7 Aug 2014 07:36:54 -0000 1.4 @@ -14,8 +14,8 @@ @creation-date December 2000 @cvs-id $Id$ } { - bookmark_id:integer - viewed_user_id:integer + bookmark_id:naturalnum,notnull + viewed_user_id:naturalnum,notnull return_url } -properties { Index: openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl 18 Apr 2014 06:49:49 -0000 1.6 +++ openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl 7 Aug 2014 07:36:54 -0000 1.7 @@ -16,11 +16,11 @@ } { folder_p return_url - bookmark_id:integer - viewed_user_id:integer + bookmark_id:naturalnum,notnull + viewed_user_id:naturalnum,notnull {complete_url:trim ""} local_title - parent_id:integer + parent_id:naturalnum,notnull {private_p "f"} old_private_p } -validate { Index: openacs-4/packages/bookmarks/www/bookmark-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/bookmarks/www/bookmark-edit.tcl 18 Apr 2014 06:38:29 -0000 1.8 +++ openacs-4/packages/bookmarks/www/bookmark-edit.tcl 7 Aug 2014 07:36:54 -0000 1.9 @@ -14,8 +14,8 @@ @creation-date December 2000 @cvs-id $Id$ } { - bookmark_id:integer - {viewed_user_id:integer ""} + bookmark_id:naturalnum,notnull + {viewed_user_id:naturalnum ""} {return_url "."} } -validate { Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/bookmarks/www/bookmark-header.tcl 18 Apr 2014 06:49:49 -0000 1.6 +++ openacs-4/packages/bookmarks/www/bookmark-header.tcl 7 Aug 2014 07:36:54 -0000 1.7 @@ -13,7 +13,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer,optional + viewed_user_id:naturalnum,optional {sort_by "name"} } -validate { Index: openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl 18 Apr 2014 06:38:29 -0000 1.4 +++ openacs-4/packages/bookmarks/www/bookmark-permissions-2.tcl 7 Aug 2014 07:36:54 -0000 1.5 @@ -15,8 +15,8 @@ @creation-date December 2000 @cvs-id $Id$ } { - root_folder_id:integer - viewed_user_id:integer + root_folder_id:naturalnum,notnull + viewed_user_id:naturalnum,notnull {private_p "f"} reset_all_individual_p:optional } Index: openacs-4/packages/bookmarks/www/bookmark-permissions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/bookmarks/www/bookmark-permissions.tcl 9 Sep 2013 12:19:57 -0000 1.6 +++ openacs-4/packages/bookmarks/www/bookmark-permissions.tcl 7 Aug 2014 07:36:54 -0000 1.7 @@ -13,7 +13,7 @@ @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } -properties { page_title:onevalue Index: openacs-4/packages/bookmarks/www/bookmark-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/bookmark-view.tcl 9 Sep 2013 12:19:57 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmark-view.tcl 7 Aug 2014 07:36:54 -0000 1.6 @@ -12,7 +12,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - bookmark_id:integer + bookmark_id:naturalnum,notnull } -properties { page_title:onevalue Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/bookmarks/www/bookmarks-check.tcl 18 Apr 2014 06:38:29 -0000 1.8 +++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl 7 Aug 2014 07:36:54 -0000 1.9 @@ -20,7 +20,7 @@ @cvs-id $Id$ } { return_url - {viewed_user_id:integer ""} + {viewed_user_id:naturalnum ""} } set page_title "Checking Bookmarks" Index: openacs-4/packages/bookmarks/www/bookmarks-export.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/bookmarks-export.tcl 18 Apr 2014 06:38:29 -0000 1.5 +++ openacs-4/packages/bookmarks/www/bookmarks-export.tcl 7 Aug 2014 07:36:54 -0000 1.6 @@ -12,7 +12,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } -properties { page_title:onevalue Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/bookmarks/www/bookmarks-import.tcl 18 Apr 2014 06:38:29 -0000 1.11 +++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl 7 Aug 2014 07:36:54 -0000 1.12 @@ -15,9 +15,9 @@ upload_file upload_file.tmpfile:tmpfile - bookmark_id:integer + bookmark_id:naturalnum,notnull return_url - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } -validate { non_empty_file { Index: openacs-4/packages/bookmarks/www/delete-dead-links.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/delete-dead-links.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/delete-dead-links.tcl 18 Apr 2014 06:38:29 -0000 1.5 +++ openacs-4/packages/bookmarks/www/delete-dead-links.tcl 7 Aug 2014 07:36:55 -0000 1.6 @@ -17,7 +17,7 @@ } { deleteable_link:integer,notnull,multiple {return_url:trim ""} - {viewed_user_id:integer ""} + {viewed_user_id:naturalnum ""} } -return_errors error_list if { [info exists error_list] } { Index: openacs-4/packages/bookmarks/www/folder-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bookmarks/www/folder-add-2.tcl 18 Apr 2014 06:38:29 -0000 1.4 +++ openacs-4/packages/bookmarks/www/folder-add-2.tcl 7 Aug 2014 07:36:55 -0000 1.5 @@ -14,9 +14,9 @@ } { return_url local_title:notnull - bookmark_id:integer - parent_id:integer - viewed_user_id:integer + bookmark_id:naturalnum,notnull + parent_id:naturalnum,notnull + viewed_user_id:naturalnum,notnull } Index: openacs-4/packages/bookmarks/www/folder-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/folder-add.tcl 18 Apr 2014 06:38:29 -0000 1.5 +++ openacs-4/packages/bookmarks/www/folder-add.tcl 7 Aug 2014 07:36:55 -0000 1.6 @@ -13,7 +13,7 @@ @cvs-id $Id$ } { return_url - {viewed_user_id:integer ""} + {viewed_user_id:naturalnum ""} } -properties { page_title:onevalue Index: openacs-4/packages/bookmarks/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/bookmarks/www/index.tcl 18 Apr 2014 06:49:49 -0000 1.12 +++ openacs-4/packages/bookmarks/www/index.tcl 7 Aug 2014 07:36:55 -0000 1.13 @@ -13,7 +13,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer,optional + viewed_user_id:naturalnum,optional {sort_by "name"} } -validate { Index: openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl 9 Sep 2013 12:19:57 -0000 1.3 +++ openacs-4/packages/bookmarks/www/permissions-reset-all-2.tcl 7 Aug 2014 07:36:55 -0000 1.4 @@ -13,8 +13,8 @@ @creation-date December 2000 @cvs-id $Id$ } { - root_folder_id:integer - viewed_user_id:integer + root_folder_id:naturalnum,notnull + viewed_user_id:naturalnum,notnull } permission::require_permission -object_id $root_folder_id -privilege admin Index: openacs-4/packages/bookmarks/www/permissions-reset-all.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bookmarks/www/permissions-reset-all.tcl 9 Sep 2013 12:19:57 -0000 1.4 +++ openacs-4/packages/bookmarks/www/permissions-reset-all.tcl 7 Aug 2014 07:36:55 -0000 1.5 @@ -14,9 +14,9 @@ @creation-date December 2000 @cvs-id $Id$ } { - root_folder_id:integer + root_folder_id:naturalnum,notnull public_p - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } -properties { page_title:onevalue Index: openacs-4/packages/bookmarks/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/bookmarks/www/search.tcl 18 Apr 2014 06:38:29 -0000 1.9 +++ openacs-4/packages/bookmarks/www/search.tcl 7 Aug 2014 07:36:55 -0000 1.10 @@ -12,7 +12,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull return_url search_text:notnull Index: openacs-4/packages/bookmarks/www/toggle-open-close.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/toggle-open-close.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/bookmarks/www/toggle-open-close.tcl 18 Apr 2014 06:38:29 -0000 1.4 +++ openacs-4/packages/bookmarks/www/toggle-open-close.tcl 7 Aug 2014 07:36:55 -0000 1.5 @@ -23,9 +23,9 @@ @creation-date December 2000 @cvs-id $Id$ } { - {bookmark_id:integer ""} + {bookmark_id:naturalnum ""} {action ""} - viewed_user_id:integer + viewed_user_id:naturalnum,notnull sort_by } Index: openacs-4/packages/bookmarks/www/top-frame.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/top-frame.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/top-frame.tcl 9 Sep 2013 12:19:57 -0000 1.5 +++ openacs-4/packages/bookmarks/www/top-frame.tcl 7 Aug 2014 07:36:55 -0000 1.6 @@ -11,7 +11,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull write_p } Index: openacs-4/packages/bookmarks/www/tree-dynamic.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-dynamic.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/bookmarks/www/tree-dynamic.tcl 9 Sep 2013 12:19:57 -0000 1.7 +++ openacs-4/packages/bookmarks/www/tree-dynamic.tcl 7 Aug 2014 07:36:55 -0000 1.8 @@ -16,7 +16,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } set user_id [ad_conn user_id] Index: openacs-4/packages/bookmarks/www/tree-frame.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-frame.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/tree-frame.tcl 29 Jun 2004 10:17:48 -0000 1.3 +++ openacs-4/packages/bookmarks/www/tree-frame.tcl 7 Aug 2014 07:36:55 -0000 1.4 @@ -11,7 +11,7 @@ @creation-date December 2000 @cvs-id $Id$ } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull } set return_url [ad_urlencode "tree-frame?viewed_user_id=$viewed_user_id"] Index: openacs-4/packages/bookmarks/www/tree.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/bookmarks/www/tree.tcl 22 Sep 2003 16:21:36 -0000 1.3 +++ openacs-4/packages/bookmarks/www/tree.tcl 7 Aug 2014 07:36:55 -0000 1.4 @@ -1,7 +1,7 @@ ad_page_contract { } { - viewed_user_id:integer + viewed_user_id:naturalnum,notnull user_name write_p } Index: openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 13 Oct 2013 14:31:27 -0000 1.5 +++ openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl 7 Aug 2014 07:39:18 -0000 1.6 @@ -7,7 +7,7 @@ } { { url "" } { title "" } - { item_id "" } + { item_id:naturalnum "" } { confirmed "f" } } -properties { page_title:onevalue Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/edit-this-page/www/etp-extlink.tcl 13 Oct 2013 14:31:27 -0000 1.7 +++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl 7 Aug 2014 07:39:18 -0000 1.8 @@ -8,7 +8,7 @@ { url "" } { label "" } { description "" } - { item_id "" } + { item_id:naturalnum "" } { confirmed "f" } } -properties { page_title:onevalue Index: openacs-4/packages/edit-this-page/www/etp-revert.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-revert.tcl 13 Oct 2013 14:31:27 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-revert.tcl 7 Aug 2014 07:39:18 -0000 1.5 @@ -8,7 +8,7 @@ } { name - revision_id:integer + revision_id:naturalnum,notnull version_number:integer { confirmed "f" } } -properties { Index: openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 13 Oct 2013 14:31:27 -0000 1.5 +++ openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl 7 Aug 2014 07:39:18 -0000 1.6 @@ -7,7 +7,7 @@ Asks for confirmation before deleting an unpublished revision } { name - revision_id:integer + revision_id:naturalnum,notnull version_number:integer {confirmed "f"} } -properties { Index: openacs-4/packages/edit-this-page/www/etp-symlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/edit-this-page/www/etp-symlink.tcl 7 Sep 2013 12:50:58 -0000 1.5 +++ openacs-4/packages/edit-this-page/www/etp-symlink.tcl 7 Aug 2014 07:39:18 -0000 1.6 @@ -6,8 +6,8 @@ (which is a link to another page or folder in the CMS) } { - { target_id "" } - { item_id "" } + { target_id:naturalnum "" } + { item_id:naturalnum "" } } -properties { page_title:onevalue context:onevalue Index: openacs-4/packages/edit-this-page/www/etp-trash.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-trash.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/edit-this-page/www/etp-trash.tcl 7 Sep 2013 12:50:58 -0000 1.4 +++ openacs-4/packages/edit-this-page/www/etp-trash.tcl 7 Aug 2014 07:39:18 -0000 1.5 @@ -9,7 +9,7 @@ confirmation message. } { - item_id:integer + item_id:naturalnum,notnull } etp::check_write_access Index: openacs-4/packages/oct-election/www/candidate-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/candidate-add.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/oct-election/www/candidate-add.tcl 14 May 2005 19:49:49 -0000 1.1 +++ openacs-4/packages/oct-election/www/candidate-add.tcl 7 Aug 2014 07:32:17 -0000 1.2 @@ -1,7 +1,7 @@ ad_page_contract { @cvs-id $Id$ } { - election_id:integer + election_id:naturalnum,notnull candidate } Index: openacs-4/packages/oct-election/www/candidate-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/candidate-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/oct-election/www/candidate-delete.tcl 12 Sep 2013 10:59:03 -0000 1.3 +++ openacs-4/packages/oct-election/www/candidate-delete.tcl 7 Aug 2014 07:32:17 -0000 1.4 @@ -1,8 +1,8 @@ ad_page_contract { @cvs-id $Id$ } { - candidate_id:integer - election_id:integer + candidate_id:naturalnum,notnull + election_id:naturalnum,notnull } auth::require_login Index: openacs-4/packages/oct-election/www/election-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/oct-election/www/election-edit.tcl 12 Sep 2013 10:59:03 -0000 1.3 +++ openacs-4/packages/oct-election/www/election-edit.tcl 7 Aug 2014 07:32:17 -0000 1.4 @@ -1,7 +1,7 @@ ad_page_contract { @cvs-id $Id$ } { - election_id:integer,optional + election_id:naturalnum,optional } permission::require_permission -object_id [ad_conn package_id] -privilege admin Index: openacs-4/packages/oct-election/www/election.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/oct-election/www/election.tcl 12 Sep 2013 10:59:03 -0000 1.4 +++ openacs-4/packages/oct-election/www/election.tcl 7 Aug 2014 07:32:18 -0000 1.5 @@ -1,7 +1,7 @@ ad_page_contract { @cvs-id $Id$ } { - election_id:integer + election_id:naturalnum,notnull } set user_id [auth::require_login] Index: openacs-4/packages/oct-election/www/match-cvs-users-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/match-cvs-users-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/oct-election/www/match-cvs-users-2.tcl 12 Sep 2013 10:59:04 -0000 1.2 +++ openacs-4/packages/oct-election/www/match-cvs-users-2.tcl 7 Aug 2014 07:32:18 -0000 1.3 @@ -9,7 +9,7 @@ @arch-tag: ba6f1ea5-8703-4ff3-8f17-9e0b5f3aeae3 @cvs-id $Id$ } { - user_id:integer,notnull + user_id:naturalnum,notnull cvs_user:notnull } -properties { } -validate { Index: openacs-4/packages/oct-election/www/vote-process.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/vote-process.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/oct-election/www/vote-process.tcl 14 May 2005 19:49:49 -0000 1.1 +++ openacs-4/packages/oct-election/www/vote-process.tcl 7 Aug 2014 07:32:18 -0000 1.2 @@ -1,7 +1,7 @@ ad_page_contract { @cvs-id $Id$ } { - election_id:integer + election_id:naturalnum,notnull q:integer,array,optional } Index: openacs-4/packages/oct-election/www/vote.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/vote.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/oct-election/www/vote.tcl 14 May 2005 19:49:49 -0000 1.1 +++ openacs-4/packages/oct-election/www/vote.tcl 7 Aug 2014 07:32:18 -0000 1.2 @@ -1,7 +1,7 @@ ad_page_contract { @cvs-id $Id$ } { - election_id:integer + election_id:naturalnum,notnull } #TODO: add javascript to prevent people from voting too many times Index: openacs-4/packages/static-pages/www/page-visit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/page-visit.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/static-pages/www/page-visit.tcl 16 Jan 2003 14:02:32 -0000 1.5 +++ openacs-4/packages/static-pages/www/page-visit.tcl 7 Aug 2014 07:30:29 -0000 1.6 @@ -7,7 +7,7 @@ @creation-date 2001-03-05 @cvs-id $Id$ } { - page_id:integer + page_id:naturalnum,notnull } if { ![db_0or1row sp_path { select filename from static_pages where static_page_id = :page_id }] } { Index: openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl 12 Sep 2013 20:43:19 -0000 1.2 +++ openacs-4/packages/static-pages/www/admin/commentability-toggle.tcl 7 Aug 2014 07:30:29 -0000 1.3 @@ -6,7 +6,7 @@ @creation-date 2001-02-20 @cvs-id $Id$ } { - item_id:integer + item_id:naturalnum,notnull recurse:boolean } Index: openacs-4/packages/static-pages/www/admin/display-policy-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/display-policy-toggle.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/static-pages/www/admin/display-policy-toggle.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/static-pages/www/admin/display-policy-toggle.tcl 7 Aug 2014 07:30:29 -0000 1.2 @@ -6,7 +6,7 @@ @creation-date 2001-02-23 @cvs-id $Id$ } { - item_id:integer + item_id:naturalnum,notnull } db_dml toggle_display_policy {