Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -N -r1.114 -r1.115
--- openacs-4/packages/dotlrn/dotlrn.info	28 Oct 2003 17:30:40 -0000	1.114
+++ openacs-4/packages/dotlrn/dotlrn.info	29 Oct 2003 14:25:01 -0000	1.115
@@ -23,10 +23,11 @@
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoAddUsersP"  default="0" description="Automatically add OpenACS users to .LRN. 1 = yes, 0 = no."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoUserAccessLevel"  default="1" description="The access level of auto-added users. 1 = Full access user, 0 = Limited access user"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoUserReadPrivateDataP"  default="1" description="Auto-added user's guest status. 1 = Not a guest , 0 = Guest."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AutoUserType"  default="student" description="The user type for auto-approved users."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoAddUsersP"  default="0" description="Automatically add OpenACS users to .LRN. 1 = yes, 0 = no. In order for users to be auto-added, this needs to be set to 1, and AutoAddAuthorities needs to be set to * or include the relevant authority short_names." section_name="Auto-Adding Users to .LRN"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AutoAddAuthorities"  default="*" description="A comma-separated list of short-names of authorities for which users should be automatically added to .LRN, or '*' for all. In order for users to be auto-added, AutoAddUsersP needs to be set to 1, and this needs to be set to * or include the relevant authority short_names. Example: 'local,ldap'." section_name="Auto-Adding Users to .LRN"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoUserAccessLevel"  default="1" description="The access level of auto-added users. 1 = Full access user, 0 = Limited access user" section_name="Auto-Adding Users to .LRN"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AutoUserReadPrivateDataP"  default="1" description="Auto-added user's guest status. 1 = Not a guest , 0 = Guest." section_name="Auto-Adding Users to .LRN"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AutoUserType"  default="student" description="The user type for auto-approved users." section_name="Auto-Adding Users to .LRN"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="admin_page_name"  default="#dotlrn.admin_page_name#" description="The name of the admin page"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_dotlrn_user_email_patterns"  description="Automatic dotLRN user email patterns"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="class_group_type_key"  default="dotlrn_class" description="Class Group Type"/>
Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/index-not-a-user.tcl	28 Oct 2003 17:30:40 -0000	1.13
+++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl	29 Oct 2003 14:25:01 -0000	1.14
@@ -22,7 +22,7 @@
     @version $Id$
 }
 
-if { [dotlrn::user_p -user_id $user_id] } {
+if { [dotlrn::user_p -user_id [ad_conn user_id]] } {
     # Already a user
     ad_returnredirect .
     ad_script_abort
@@ -33,8 +33,32 @@
     set self_approve_url [export_vars -base "[apm_package_url_from_key "acs-admin"]users/member-state-change" { { user_id {[ad_conn user_id]} } { member_state approved} return_url }]
     ad_returnredirect $self_approve_url
     ad_script_abort
-} elseif { [parameter::get -parameter AutoAddUsersP -package_id [dotlrn::get_package_id] -default 0] } {
+}
 
+set auto_add_p [parameter::get -parameter AutoAddUsersP -package_id [dotlrn::get_package_id] -default 0]
+
+if { $auto_add_p } {
+    # If auto-adding, check if we're auto-adding for this authority
+    set auth_add_auths [split [parameter::get \
+                                   -parameter AutoAddAuthorities \
+                                   -package_id [dotlrn::get_package_id] \
+                                   -default {}] ","]
+
+    # A star is enough
+    if { [lsearch -exact $auth_add_auths "*"] == -1 } {
+        # No star
+        set authority_id [acs_user::get_element -user_id [ad_conn user_id] -element authority_id]
+        set authority_short_name [auth::authority::get_element -authority_id $authority_id -element short_name]
+
+        # If not a star, then this user's authority needs to be named
+        if { [lsearch -exact $auth_add_auths $authority_short_name] == -1 } {
+            # Nope, authority not listed, either
+            set auto_add_p 0
+        }
+    }
+}
+
+if { $auto_add_p } {
     set user_id [auth::require_login]
 
     set type [parameter::get \