Index: openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql,v
diff -u -N -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql	16 Nov 2019 15:45:55 -0000	1.9.2.1
+++ openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql	8 Jan 2020 17:24:47 -0000	1.9.2.2
@@ -3,56 +3,56 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="sec_populate_secret_tokens_db.insert_random_token">      
+<fullquery name="sec_populate_secret_tokens_db.insert_random_token">
       <querytext>
-      
+
 	    insert /*+ APPEND */ into secret_tokens(token_id, token, token_timestamp)
 	    values(sec_security_token_id_seq.nextval, :random_token, sysdate)
-	
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="sec_populate_secret_tokens_cache.get_secret_tokens">      
+
+<fullquery name="sec_populate_secret_tokens_cache.get_secret_tokens">
       <querytext>
-      
+
 	    select * from (
 	    select token_id, token
 	    from secret_tokens
 	    sample(15)
 	    ) where rownum < :num_tokens
-	
+
       </querytext>
 </fullquery>
 
-<fullquery name="ad_set_client_property.prop_update_dml_clob">      
+<fullquery name="ad_set_client_property.prop_update_dml_clob">
       <querytext>
          update sec_session_properties
          set property_value = null,
            property_clob = empty_clob(),
            secure_p = :secure,
-           last_hit = :last_hit 
+           last_hit = :last_hit
          where session_id = :session_id and
            module = :module and
            property_name = :name
          returning property_clob into :1
       </querytext>
 </fullquery>
- 
-<fullquery name="ad_set_client_property.prop_update_dml">      
+
+<fullquery name="ad_set_client_property.prop_update_dml">
       <querytext>
          update sec_session_properties
          set property_value = :value,
            property_clob = null,
            secure_p = :secure,
-           last_hit = :last_hit 
+           last_hit = :last_hit
          where session_id = :session_id and
            module = :module and
            property_name = :name
       </querytext>
 </fullquery>
 
-<fullquery name="ad_set_client_property.prop_upsert">      
+<fullquery name="ad_set_client_property.prop_upsert">
   <querytext>
       begin
          sec_session_property.upsert(:session_id, :module, :name, :value, :secure, :last_hit);
Index: openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql,v
diff -u -N -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	8 Jan 2020 11:28:30 -0000	1.14.2.2
+++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql	8 Jan 2020 17:24:47 -0000	1.14.2.3
@@ -2,45 +2,45 @@
 
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
- 
-<fullquery name="ad_set_client_property.prop_update_dml">      
+
+<fullquery name="ad_set_client_property.prop_update_dml">
       <querytext>
         update sec_session_properties
         set property_value = :value,
           secure_p = :secure,
-          last_hit = :last_hit 
+          last_hit = :last_hit
         where session_id = :session_id and
           module = :module and
           property_name = :name
       </querytext>
 </fullquery>
 
-<fullquery name="ad_set_client_property.prop_upsert">      
+<fullquery name="ad_set_client_property.prop_upsert">
   <querytext>
     select sec_session_property__upsert(:session_id, :module, :name, :value, :secure, :last_hit) from dual
   </querytext>
-</fullquery> 
+</fullquery>
 
-<fullquery name="sec_populate_secret_tokens_db.insert_random_token">      
+<fullquery name="sec_populate_secret_tokens_db.insert_random_token">
       <querytext>
 
 	    insert into secret_tokens(token_id, token, token_timestamp)
 	    values(nextval('t_sec_security_token_id_seq'), :random_token, now())
-	
+
       </querytext>
 </fullquery>
 
-  
-<fullquery name="sec_populate_secret_tokens_cache.get_secret_tokens">      
+
+<fullquery name="sec_populate_secret_tokens_cache.get_secret_tokens">
       <querytext>
-      
+
     select token_id, token
     from secret_tokens,
          (select cast(random() * count(*) - :num_tokens as integer) as first
             from secret_tokens) r
     where token_id >= r.first and r.first + :num_tokens > token_id
-	
+
       </querytext>
 </fullquery>
- 
+
 </queryset>
Index: openacs-4/packages/acs-tcl/tcl/security-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.xql,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-tcl/tcl/security-procs.xql	20 Nov 2017 15:36:44 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/security-procs.xql	8 Jan 2020 17:24:47 -0000	1.10.2.1
@@ -1,55 +1,55 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="sec_update_user_session_info.update_last_visit">      
+<fullquery name="sec_update_user_session_info.update_last_visit">
       <querytext>
 
         update users
         set second_to_last_visit = last_visit,
             last_visit = current_timestamp,
             n_sessions = n_sessions + 1
         where user_id = :user_id
-    
+
       </querytext>
 </fullquery>
 
-  
-<fullquery name="sec_sweep_sessions.sessions_sweep">      
+
+<fullquery name="sec_sweep_sessions.sessions_sweep">
       <querytext>
-      
+
 	delete from sec_session_properties
 	where last_hit < :expires
-    
+
       </querytext>
 </fullquery>
 
- 
-<fullquery name="ad_check_password.password_select">      
+
+<fullquery name="ad_check_password.password_select">
       <querytext>
       select password, salt from users where user_id = :user_id
       </querytext>
 </fullquery>
 
- 
-<fullquery name="sec_lookup_property.property_lookup_sec">      
+
+<fullquery name="sec_lookup_property.property_lookup_sec">
       <querytext>
-      
+
 	    select property_value, secure_p
 	    from sec_session_properties
 	    where session_id = :id
 	    and module = :module
 	    and property_name = :name
-	
+
       </querytext>
 </fullquery>
 
-<fullquery name="sec_get_token.get_token">      
+<fullquery name="sec_get_token.get_token">
       <querytext>
       select token from secret_tokens where token_id = :token_id
       </querytext>
 </fullquery>
- 
-<fullquery name="ad_set_client_property.prop_insert_dml">      
+
+<fullquery name="ad_set_client_property.prop_insert_dml">
       <querytext>
 	insert into sec_session_properties
 	  (session_id, module, property_name, secure_p, last_hit)
@@ -72,10 +72,10 @@
       </querytext>
 </fullquery>
 
-<fullquery name="ad_change_password.password_update">      
+<fullquery name="ad_change_password.password_update">
       <querytext>
-        update users 
-        set    password = :new_password, 
+        update users
+        set    password = :new_password,
                salt = :salt,
                password_changed_date = current_timestamp
         where  user_id = :user_id