Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.74.2.3 -r1.74.2.4
--- openacs-4/packages/acs-subsite/acs-subsite.info	15 Jun 2005 17:57:05 -0000	1.74.2.3
+++ openacs-4/packages/acs-subsite/acs-subsite.info	21 Jun 2005 14:54:15 -0000	1.74.2.4
@@ -32,7 +32,6 @@
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePortraitMIMETypes"  default="image/gif image/jpeg" description="Enter a set of acceptable MIME types for portrait submissions." section_name="user-info"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AllowPersistentLoginP"  default="1" description="do we allow persistent logins?" section_name="user-login"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AsmForRegisterId"  default="1" description="Assessment used in the registration process." section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultFormStyle"  description="The default form template to use if a particular form doesn't have something more specific defined already."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListStyle"  description="The default list template to use if a particular list does not explicitly specify the list style to use."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultMaster"  default="/www/default-master" description="Path to the default master page (skin) for acs-templating.  Extensions .adp/.tcl are implied."/>
@@ -52,7 +51,9 @@
 3 - Show user email as an image (require ImageMagick). If ImageMagick not present then the @ symbol is replaced with an image.
 2 - Hide email, show a link that allows users to send a message.
 1 -  Shows nothing." section_name="user-info"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegImplName"  default="asm_url" description="Name of the implementation used in the registration process. " section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegImplNamet"  default="asm_url" description="Name of the implementation used in the registration process." section_name="user-login"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="RegistrationId"  default="0" description="Assessment_id for the assessment used in the registration process. If value = 0 the current registration form will be used." section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationImplName"  default="null" description="Name of the implementation used for the registration process. If value is null, the normal registration process will be used and the RegisterId parameter will be ignored." section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationProvidesRandomPasswordP"  default="0" description="have the system generate a random password instead of the user" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresApprovalP"  default="0" description="set this to 1 if user does not go live immediately" section_name="user-login"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresEmailVerificationP"  default="0" description="set this to 1 if the user has to receive and email and come back to the site" section_name="user-login"/>
Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	15 Jun 2005 17:57:34 -0000	1.10.2.2
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	21 Jun 2005 14:54:39 -0000	1.10.2.3
@@ -42,7 +42,7 @@
 # registration form.
 
 
-set implName [parameter::get -parameter "RegImplName" -package_id [subsite::main_site_id]]
+set implName [parameter::get -parameter "RegistrationImplName" -package_id [subsite::main_site_id]]
 
 set url [callback -catch -impl "$implName" user::registration]