Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp	10 Sep 2003 17:01:39 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp	29 May 2007 05:40:54 -0000	1.10
@@ -1,34 +1,4 @@
 <master>
   <property name="context">{#acs-subsite.Email_Confirmation#}</property>
 
-<if @user_info.email_verified_p@ true>
-
-  <property name="title">#acs-subsite.lt_Your_email_is_confirm#</property>
-
-  <if @user_info.member_state@ eq "approved">
-
-    #acs-subsite.lt_Your_email_has_been_c#
-    <p>
-    <form action="index" method=post>
-    @export_vars;noquote@
-    <input type=submit value="#acs-kernel.common_continue#">
-    </form>
-
-  </if>
-  <else>
-
-    <p> #acs-subsite.lt_Your_email_has_been_c_1# </p>
-
-  </else>
-
-</if>
-<else>
-
-  <property name="title">#acs-subsite.Email_not_Requested#</property>
-
-  <p> #acs-subsite.lt_We_were_not_awaiting_# </p>
-
-  <p> #acs-subsite.lt_Please_try_to_a_hrefi# </p>
-    
-</else>
-
+<include src="@email_confirm_template@" user_id="@user_id@" token="@token;noquote@" return_url="@return_url;noquote@" />