Index: openacs-4/packages/acs-subsite/lib/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/message.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/lib/message.adp	25 Mar 2005 23:59:10 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+  <property name="title">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+  @message;noquote@
Index: openacs-4/packages/acs-subsite/lib/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/message.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/lib/message.tcl	25 Mar 2005 23:59:10 -0000	1.1
@@ -0,0 +1,11 @@
+ad_page_contract {
+    This include expects "message" to be set as html
+    and if no title is present uses "Message".  Used to inform of actions
+    in registration etc.
+
+    @cvs-id $Id: message.tcl,v 1.1 2005/03/25 23:59:10 jeffd Exp $
+}
+if {![exists_and_not_null title]} {
+    set page_title Message
+}
+set context [list $title]
Index: openacs-4/packages/acs-subsite/www/register/account-closed.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/account-closed.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/register/account-closed.tcl	12 Jul 2004 14:49:49 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/register/account-closed.tcl	25 Mar 2005 23:59:10 -0000	1.5
@@ -3,9 +3,9 @@
     
     @cvs-id $Id$
 } {
-    {message:allhtml ""}
+    {message:html ""}
 }
 
 set page_title [ad_convert_to_text -html_p t -- $message]
-set context [list $page_title]
+set context [list [_ "acs-kernel.common_Register"]]
 
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	19 Sep 2003 14:50:04 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	25 Mar 2005 23:59:10 -0000	1.9
@@ -6,16 +6,17 @@
     user_id:integer
 }
 
-if { ![string equal $token [auth::get_user_secret_token -user_id $user_id]] } {
-    set message "Bad token"
-    ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { message }]
-    ad_script_abort    
-} 
+if {![db_0or1row userp {select 1 from users where user_id = :user_id}]
+    || ![string equal $token [auth::get_user_secret_token -user_id $user_id]] } {
+    set title "Bad token"
+    set message "The link given to authenticate your email was invalid."
+    ad_return_template /packages/acs-subsite/lib/message
+} else {
+    auth::set_email_verified -user_id $user_id
 
-auth::set_email_verified -user_id $user_id
+    acs_user::get -user_id $user_id -array user_info
 
-acs_user::get -user_id $user_id -array user_info
-
-set export_vars [export_vars -form { { username $user_info(username) } }]
-set site_link [ad_site_home_link]
-set system_name [ad_system_name]
+    set export_vars [export_vars -form { { username $user_info(username) } }]
+    set site_link [ad_site_home_link]
+    set system_name [ad_system_name]
+}