Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl	20 Sep 2001 22:44:46 -0000	1.2
@@ -27,7 +27,7 @@
 	}
     }
 
-    version_name_ck -requires {version_uri} {	
+    version_name_ck -requires {version_name} {	
 	if {![regexp {^[0-9]+((\.[0-9]+)+((d|a|b|)[0-9]?)?)$} $version_name match]} {
 	    ad_complain
 	} 
@@ -50,7 +50,6 @@
 }
 
 db_transaction {
-    ns_log Notice "$version_name"
     set version_id [apm_version_update $version_id $version_name $version_uri \
 	    $summary $description $description_format $vendor $vendor_uri $release_date]
     apm_package_install_owners [apm_package_install_owners_prepare $owner_name $owner_uri] $version_id
Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	1 Sep 2001 16:06:54 -0000	1.21
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	20 Sep 2001 22:44:46 -0000	1.22
@@ -1946,13 +1946,14 @@
 
 
 -- function copy
-create function apm_package_version__copy (integer,integer,varchar,varchar)
+create function apm_package_version__copy (integer,integer,varchar,varchar,boolean)
 returns integer as '
 declare
   copy__version_id             alias for $1;  
   copy__new_version_id         alias for $2;  -- default null  
   copy__new_version_name       alias for $3;  
   copy__new_version_uri        alias for $4;  
+  copy__copy_owners_p          alias for $5;
   v_version_id                 integer;       
 begin
 	v_version_id := acs_object__new(
@@ -1983,10 +1984,12 @@
 	    from apm_package_files
 	    where version_id = copy__version_id;
     
-	insert into apm_package_owners(version_id, owner_uri, owner_name, sort_key)
-	    select v_version_id, owner_uri, owner_name, sort_key
-	    from apm_package_owners
-	    where version_id = copy__version_id;
+        if copy__copy_owners_p then
+            insert into apm_package_owners(version_id, owner_uri, owner_name, sort_key)
+                select v_version_id, owner_uri, owner_name, sort_key
+                from apm_package_owners
+                where version_id = copy__version_id;
+        end if;
     
 	return v_version_id;
    
@@ -2022,7 +2025,8 @@
 			 edit__version_id,
 			 edit__new_version_id,
 			 edit__version_name,
-			 edit__version_uri
+			 edit__version_uri,
+                         ''f''
 			);
          else 
 	   v_version_id := edit__version_id;			
Index: openacs-4/packages/acs-subsite/www/register/restore-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/restore-user.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl	20 Sep 2001 22:44:46 -0000	1.2
@@ -6,7 +6,6 @@
 } -properties {
     site_link:onevalue
     export_vars:onevalue
-    user_id:onevalue
     email:onevalue
 }
 
@@ -34,6 +33,17 @@
 }
 
 set site_link [ad_site_home_link]
-set export_vars [export_form_vars user_id email]
 
+# One common problem with login is that people can hit the back button
+# after a user logs out and relogin by using the cached password in
+# the browser. We generate a unique hashed timestamp so that users
+# cannot use the back button.
+
+set time [ns_time]
+set token_id [sec_get_random_cached_token_id]
+set token [sec_get_token $token_id]
+set hash [ns_sha1 "$time$token_id$token"]
+
+set export_vars [export_form_vars return_url time token_id hash email]
+
 ad_return_template