Index: openacs-4/packages/acs-authentication/acs-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-authentication/acs-authentication.info	17 May 2004 15:14:42 -0000	1.17
+++ openacs-4/packages/acs-authentication/acs-authentication.info	10 Jun 2004 17:06:32 -0000	1.18
@@ -34,6 +34,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnReadPrivateDataP"  default="1" description=".LRN user is guest (if .LRN is installed). 1 = Not a guest , 0 = Guest" section_name="Batch Synchronization"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SyncDotLrnUserType"  default="student" description=".LRN user type for new user (if .LRN is installed)" section_name="Batch Synchronization"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SyncEmailConfirmationP"  default="0" description="Send out email confirmation when batch sync is complete. 1 = Yes, 0 = No." section_name="Batch Synchronization"/>
+             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowSelfRegister"  default="1" description="Does the user can self register? 1 = Yes, 0 = No." section_name="acs-authentication"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.65 -r1.66
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	17 May 2004 15:14:42 -0000	1.65
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	10 Jun 2004 17:06:34 -0000	1.66
@@ -73,6 +73,15 @@
     ad_script_abort
 }
 
+ad_proc -public auth::self_registration {} {
+   #Check AllowSelfRegister parameter
+
+    if { ![parameter::get_from_package_key -package_key acs-authentication  -parameter AllowS\elfRegister] } {
+         ad_maybe_redirect_for_registration
+    }
+}
+
+
 ad_proc -public auth::get_user_id {
     {-level ok}
     {-account_status ok}
Index: openacs-4/packages/acs-subsite/lib/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/lib/login.adp	17 May 2004 15:14:52 -0000	1.5
+++ openacs-4/packages/acs-subsite/lib/login.adp	10 Jun 2004 17:06:47 -0000	1.6
@@ -6,8 +6,11 @@
   <a href="@forgotten_pwd_url@">#acs-subsite.Forgot_your_password#</a> <br />
 </if>
 
-<if @register_url@ not nil>
-  <a href="@register_url@">#acs-subsite.Register#</a>
-</if>
+<if @self_registration@ true>
 
+   <if @register_url@ not nil>
+      <a href="@register_url@">#acs-subsite.Register#</a>
+   </if>
 
+</if>
+
Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/lib/login.tcl	8 Feb 2004 17:20:48 -0000	1.21
+++ openacs-4/packages/acs-subsite/lib/login.tcl	10 Jun 2004 17:06:47 -0000	1.22
@@ -14,6 +14,12 @@
     security::require_secure_conn
 }
 
+
+set self_registration [parameter::get_from_package_key \
+                                  -package_key acs-authentication \
+                                -parameter AllowSelfRegister]   
+
+
 if { ![exists_and_not_null package_id] } {
     set subsite_id [subsite::get_element -element object_id]
 }
@@ -36,6 +42,9 @@
     }
 }
 
+
+
+
 # Persistent login
 # The logic is: 
 #  1. Allowed if allowed both site-wide (on acs-kernel) and on the subsite
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.6 -r1.7
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	20 Apr 2004 21:12:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	10 Jun 2004 17:06:47 -0000	1.7
@@ -11,6 +11,9 @@
 #                   rel-types for the group.
 
 
+# Check if user can self register
+auth::self_registration
+
 # Set default parameter values
 array set parameter_defaults {
     self_register_p 1