Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/acs-subsite/lib/login.tcl	27 Oct 2014 16:39:45 -0000	1.35
+++ openacs-4/packages/acs-subsite/lib/login.tcl	26 Jun 2015 20:47:40 -0000	1.36
@@ -91,12 +91,17 @@
 }
 
 set login_button [list [list [_ acs-subsite.Log_In] ok]]
-ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons $login_button -action "[subsite::get_url]register/" -form {
-    {return_url:text(hidden)}
-    {time:text(hidden)}
-    {token_id:text(hidden)}
-    {hash:text(hidden)}
-} 
+ad_form \
+    -name login \
+    -html { style "margin: 0px;" } \
+    -show_required_p 0 \
+    -edit_buttons $login_button \
+    -action "[subsite::get_url]register/" -form {
+	{return_url:text(hidden)}
+	{time:text(hidden)}
+	{token_id:integer(hidden)}
+	{hash:text(hidden)}
+    }
 
 set username_widget text
 if { [parameter::get -parameter UsePasswordWidgetForUsername -package_id [ad_acs_kernel_id]] } {
@@ -177,7 +182,7 @@
         set expiration_time 30
     }
 
-    if { $hash ne $computed_hash  || \
+    if { $hash ne $computed_hash  || 
              $time < [ns_time] - $expiration_time } {
         ad_returnredirect -message [_ acs-subsite.Login_has_expired] -- [export_vars -base [ad_conn url] { return_url }]
         ad_script_abort
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	9 Jun 2015 07:57:52 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	26 Jun 2015 20:47:40 -0000	1.12
@@ -8,7 +8,7 @@
 
 } {
     package_id:naturalnum,notnull
-    {orderby ""}
+    {orderby:token ""}
     {return_url "."}
 }
 
Index: openacs-4/packages/acs-subsite/www/members/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/www/members/index.tcl	27 Oct 2014 16:39:58 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/members/index.tcl	26 Jun 2015 20:47:40 -0000	1.20
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     {member_state "approved"}
-    {orderby "name,asc"}
+    {orderby:token "name,asc"}
     page:naturalnum,optional
 } -validate {
     member_state_valid -requires { member_state } {
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl	27 Oct 2014 16:40:52 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/fullscreen.tcl	26 Jun 2015 20:47:40 -0000	1.3
@@ -1,7 +1,7 @@
 ad_page_contract {
 	
 } {
-	textarea_id:notnull
+	textarea_id:naturalnum,notnull
 	community_id:naturalnum,notnull
 } 
 
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	27 Oct 2014 16:40:52 -0000	1.5
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/popups/file-selector.tcl	26 Jun 2015 20:47:40 -0000	1.6
@@ -6,7 +6,7 @@
 } {	
   {fs_package_id:naturalnum,notnull,optional}
   {folder_id:naturalnum,optional}
-  {orderby:optional}
+  {orderby:token,optional}
   {selector_type "image"}
   {file_types "*"}
 } 
Index: openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl	10 Jun 2015 12:09:59 -0000	1.4
+++ openacs-4/packages/acs-templating/www/scripts/xinha/file-selector.tcl	26 Jun 2015 20:47:40 -0000	1.5
@@ -6,7 +6,7 @@
 } {	
   {fs_package_id:naturalnum,notnull,optional}
   {folder_id:naturalnum,optional}
-  {orderby:optional}
+  {orderby:token,optional}
   {selector_type "image"}
   {file_types "*"}
 } 
Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/xowiki/www/xinha/file-selector.tcl	27 Apr 2015 15:29:05 -0000	1.17
+++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl	26 Jun 2015 20:47:40 -0000	1.18
@@ -6,7 +6,7 @@
 } {     
   {fs_package_id:naturalnum,notnull,optional}
   {folder_id:naturalnum,optional}
-  {orderby:optional}
+  {orderby:token,optional}
   {selector_type "image"}
   {file_types "*"}
 }