Index: openacs-4/packages/photo-album/www/album-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-add.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/album-add.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/album-add.tcl	7 Aug 2014 07:59:49 -0000	1.8
@@ -8,7 +8,7 @@
     @creation-date 12/8/2000
     @cvs-id $Id$
 } {
-    parent_id:integer,notnull
+    parent_id:naturalnum,notnull
 } -validate {
     valid_parent_folder -requires {parent_id:integer} {
 	if [string equal [pa_is_folder_p $parent_id] "f"] {
Index: openacs-4/packages/photo-album/www/album-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/album-delete.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/album-delete.tcl	7 Aug 2014 07:59:50 -0000	1.8
@@ -8,7 +8,7 @@
     @creation-date 1/8/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
     {confirmed_p "f"}
 } -validate {
     valid_album -requires {album_id:integer} {
Index: openacs-4/packages/photo-album/www/album-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/album-edit.tcl	6 Sep 2013 17:17:43 -0000	1.6
+++ openacs-4/packages/photo-album/www/album-edit.tcl	7 Aug 2014 07:59:50 -0000	1.7
@@ -8,7 +8,7 @@
     @creation-date 12/11/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/album-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-export.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/album-export.tcl	14 Oct 2013 17:56:29 -0000	1.5
+++ openacs-4/packages/photo-album/www/album-export.tcl	7 Aug 2014 07:59:50 -0000	1.6
@@ -8,7 +8,7 @@
     @creation-date 12/8/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
     {path ""}
 } -validate {
 } -properties {
Index: openacs-4/packages/photo-album/www/album-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-move.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/album-move.tcl	14 Oct 2013 17:56:29 -0000	1.6
+++ openacs-4/packages/photo-album/www/album-move.tcl	7 Aug 2014 07:59:50 -0000	1.7
@@ -7,7 +7,7 @@
     @creation-date 1/8/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/album.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/album.tcl	14 Oct 2013 17:56:29 -0000	1.6
+++ openacs-4/packages/photo-album/www/album.tcl	7 Aug 2014 07:59:50 -0000	1.7
@@ -8,7 +8,7 @@
     @creation-date 12/10/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
     {page:integer,notnull "1"}
     {msg:integer,notnull "0"}
 } -validate {
Index: openacs-4/packages/photo-album/www/base-photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/base-photo.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/base-photo.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/base-photo.tcl	7 Aug 2014 07:59:50 -0000	1.8
@@ -9,7 +9,7 @@
     @creation-date 2/1/2000
     @cvs-id $Id$
 } {
-    photo_id:integer,notnull
+    photo_id:naturalnum,notnull
 } -validate {
     valid_photo -requires {photo_id:integer} {
 	if [string equal [pa_is_photo_p $photo_id] "f"] {
Index: openacs-4/packages/photo-album/www/clipboard-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-ae.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/clipboard-ae.tcl	14 Oct 2013 17:56:29 -0000	1.5
+++ openacs-4/packages/photo-album/www/clipboard-ae.tcl	7 Aug 2014 07:59:50 -0000	1.6
@@ -8,8 +8,8 @@
     @creation-date 10/30/2002
     @cvs-id $Id$
 } {
-    collection_id:optional
-    {photo_id:integer,optional {}}
+    collection_id:naturalnum,optional
+    {photo_id:naturalnum,optional {}}
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/photo-album/www/clipboard-attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-attach.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/clipboard-attach.tcl	1 Mar 2005 00:01:40 -0000	1.3
+++ openacs-4/packages/photo-album/www/clipboard-attach.tcl	7 Aug 2014 07:59:50 -0000	1.4
@@ -8,8 +8,8 @@
     @creation-date 10/30/2002
     @cvs-id $Id$
 } {
-    photo_id:integer,notnull
-    collection_id:integer,notnull
+    photo_id:naturalnum,notnull
+    collection_id:naturalnum,notnull
 }
 
 auth::require_login
Index: openacs-4/packages/photo-album/www/clipboard-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/photo-album/www/clipboard-delete.tcl	30 Jun 2003 07:50:59 -0000	1.1
+++ openacs-4/packages/photo-album/www/clipboard-delete.tcl	7 Aug 2014 07:59:50 -0000	1.2
@@ -6,7 +6,7 @@
     @creation-date 06/27/2003
     @cvs-id $Id$
 } {
-    collection_id
+    collection_id:naturalnum,notnull
 }
 
 permission::require_permission -object_id $collection_id -privilege delete
Index: openacs-4/packages/photo-album/www/clipboard-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-remove.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/clipboard-remove.tcl	1 Mar 2005 00:01:40 -0000	1.3
+++ openacs-4/packages/photo-album/www/clipboard-remove.tcl	7 Aug 2014 07:59:50 -0000	1.4
@@ -7,8 +7,8 @@
     @creation-date 10/30/2002
     @cvs-id $Id$
 } {
-    photo_id:integer,notnull
-    collection_id:integer,notnull
+    photo_id:naturalnum,notnull
+    collection_id:naturalnum,notnull
 }
 
 auth::require_login
Index: openacs-4/packages/photo-album/www/clipboard-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/clipboard-view.tcl	1 May 2004 08:27:36 -0000	1.7
+++ openacs-4/packages/photo-album/www/clipboard-view.tcl	7 Aug 2014 07:59:50 -0000	1.8
@@ -5,7 +5,7 @@
     @creation-date 2002-10-30
     @cvs-id $Id$
 } { 
-    collection_id:integer,notnull
+    collection_id:naturalnum,notnull
 } -properties { 
     context:onevalue
     title:onevalue
Index: openacs-4/packages/photo-album/www/folder-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/folder-add.tcl	14 Oct 2013 17:56:29 -0000	1.6
+++ openacs-4/packages/photo-album/www/folder-add.tcl	7 Aug 2014 07:59:50 -0000	1.7
@@ -8,7 +8,7 @@
     @creation-date 12/8/2000
     @cvs-id $Id$
 } {
-    parent_id:integer,notnull
+    parent_id:naturalnum,notnull
 } -validate {
     valid_parent -requires {parent_id:integer} {
 	if [string equal [pa_is_folder_p $parent_id] "f"] {
Index: openacs-4/packages/photo-album/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/folder-delete.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/folder-delete.tcl	7 Aug 2014 07:59:50 -0000	1.8
@@ -9,7 +9,7 @@
     @creation-date 1/8/2000
     @cvs-id $Id$
 } {
-    folder_id:integer,notnull
+    folder_id:naturalnum,notnull
     {confirmed_p "f"}
 } -validate {
     valid_folder -requires {folder_id:integer} {
Index: openacs-4/packages/photo-album/www/folder-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/folder-edit.tcl	6 Sep 2013 17:17:44 -0000	1.7
+++ openacs-4/packages/photo-album/www/folder-edit.tcl	7 Aug 2014 07:59:50 -0000	1.8
@@ -8,7 +8,7 @@
     @creation-date 12/8/2000
     @cvs-id $Id$
 } {
-    folder_id:integer,notnull
+    folder_id:naturalnum,notnull
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if [string equal [pa_is_folder_p $folder_id] "f"] {
Index: openacs-4/packages/photo-album/www/folder-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-move.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/folder-move.tcl	14 Oct 2013 17:56:29 -0000	1.6
+++ openacs-4/packages/photo-album/www/folder-move.tcl	7 Aug 2014 07:59:50 -0000	1.7
@@ -7,7 +7,7 @@
     @creation-date 1/8/2000
     @cvs-id $Id$
 } {
-    folder_id:integer,notnull
+    folder_id:naturalnum,notnull
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if [string equal [pa_is_folder_p $folder_id] "f"] {
Index: openacs-4/packages/photo-album/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/index.tcl	10 Sep 2013 07:05:55 -0000	1.8
+++ openacs-4/packages/photo-album/www/index.tcl	7 Aug 2014 07:59:50 -0000	1.9
@@ -7,7 +7,7 @@
     @creation-date 12/7/2000
     @cvs-id $Id$
 } {
-    {folder_id:integer [pa_get_root_folder]}
+    {folder_id:naturalnum,notnull [pa_get_root_folder]}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if [string equal [pa_is_folder_p $folder_id] "f"] {
Index: openacs-4/packages/photo-album/www/photo-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/photo-album/www/photo-add-2.tcl	14 Oct 2013 17:56:29 -0000	1.9
+++ openacs-4/packages/photo-album/www/photo-add-2.tcl	7 Aug 2014 07:59:50 -0000	1.10
@@ -10,8 +10,8 @@
 } {
     upload_file:notnull,trim
     upload_file.tmpfile:tmpfile
-    album_id:integer,notnull
-    photo_id:integer,notnull
+    album_id:naturalnum,notnull
+    photo_id:naturalnum,notnull
     {description [db_null]}
     {caption [db_null]}
     {story [db_null]}
Index: openacs-4/packages/photo-album/www/photo-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/photo-add.tcl	6 Sep 2013 17:17:44 -0000	1.8
+++ openacs-4/packages/photo-album/www/photo-add.tcl	7 Aug 2014 07:59:50 -0000	1.9
@@ -8,7 +8,7 @@
     @creation-date 12/10/2000
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/photo-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/photo-delete.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/photo-delete.tcl	7 Aug 2014 07:59:51 -0000	1.8
@@ -11,7 +11,7 @@
     @creation-date 12/21/2000
     @cvs-id $Id$
 } {
-    photo_id:integer,notnull
+    photo_id:naturalnum,notnull
     {confirmed_p "f"}
 } -validate {
     valid_photo -requires {photo_id:integer} {
Index: openacs-4/packages/photo-album/www/photo-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/photo-edit.tcl	14 Oct 2013 17:56:29 -0000	1.7
+++ openacs-4/packages/photo-album/www/photo-edit.tcl	7 Aug 2014 07:59:51 -0000	1.8
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     {hide:integer 0}
-    {photo_id:integer 0}
+    {photo_id:naturalnum,notnull 0}
     d:array,integer,optional
 } -properties {
     path:onevalue
Index: openacs-4/packages/photo-album/www/photo-iconic.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-iconic.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/photo-album/www/photo-iconic.tcl	14 Oct 2013 17:56:30 -0000	1.5
+++ openacs-4/packages/photo-album/www/photo-iconic.tcl	7 Aug 2014 07:59:51 -0000	1.6
@@ -1,7 +1,7 @@
 ad_page_contract { 
     Make a given photo the cover photo for the album.
 } { 
-    photo_id:integer,notnull
+    photo_id:naturalnum,notnull
 } -validate {
     valid_photo -requires {photo_id:integer} {
 	if {[pa_is_photo_p $photo_id] != "t" } {
Index: openacs-4/packages/photo-album/www/photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/photo-album/www/photo.tcl	14 Oct 2013 17:56:30 -0000	1.11
+++ openacs-4/packages/photo-album/www/photo.tcl	7 Aug 2014 07:59:51 -0000	1.12
@@ -9,8 +9,8 @@
     @cvs-id $Id$
 } {
     {latest_revision 0}
-    {photo_id:integer 0}
-    {collection_id:integer,optional {}}
+    {photo_id:naturalnum,notnull 0}
+    {collection_id:naturalnum,optional {}}
     {show_html_p 0}
 } -properties {
     context:onevalue
Index: openacs-4/packages/photo-album/www/photos-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/photo-album/www/photos-add-2.tcl	14 Oct 2013 17:56:30 -0000	1.10
+++ openacs-4/packages/photo-album/www/photos-add-2.tcl	7 Aug 2014 07:59:51 -0000	1.11
@@ -10,7 +10,7 @@
 } {
     {upload_file:optional,trim ""}
     upload_file.tmpfile:optional,tmpfile
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/photos-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/photos-add.tcl	6 Sep 2013 17:17:44 -0000	1.8
+++ openacs-4/packages/photo-album/www/photos-add.tcl	7 Aug 2014 07:59:51 -0000	1.9
@@ -8,7 +8,7 @@
     @creation-date 6/28/2002
     @cvs_id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/photos-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/photos-edit-2.tcl	12 Dec 2003 23:03:01 -0000	1.7
+++ openacs-4/packages/photo-album/www/photos-edit-2.tcl	7 Aug 2014 07:59:51 -0000	1.8
@@ -1,7 +1,7 @@
 ad_page_contract { 
     Bulk edit a set of images.
 } { 
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
     {page:integer,notnull "1"}
     d:array,integer,optional
     hide:array,optional
Index: openacs-4/packages/photo-album/www/photos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/www/photos-edit.tcl	14 Oct 2013 17:56:30 -0000	1.7
+++ openacs-4/packages/photo-album/www/photos-edit.tcl	7 Aug 2014 07:59:51 -0000	1.8
@@ -7,7 +7,7 @@
     @creation-date 7/1/2002
     @cvs-id $Id$
 } {
-    album_id:integer,notnull
+    album_id:naturalnum,notnull
     {page:integer,notnull "1"}
 } -validate {
     valid_album -requires {album_id:integer} {