Index: openacs-4/packages/dotlrn/www/not-allowed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/not-allowed.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/not-allowed.adp	11 Jan 2002 21:51:51 -0000	1.1
+++ openacs-4/packages/dotlrn/www/not-allowed.adp	20 Jan 2002 21:10:12 -0000	1.2
@@ -1 +1,6 @@
-<h3>not allowed</h3>
+<master src="master">
+<property name="title">Not Allowed</property>
+
+<p>
+  You are not allowed to perform that action.
+</p>
Index: openacs-4/packages/dotlrn/www/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/user-add-2.adp	20 Jan 2002 21:10:12 -0000	1.1
@@ -0,0 +1,35 @@
+<master src="master">
+<property name="title">Add A User</property>
+<property name="context_bar">@context_bar@</property>
+
+@first_names@ @last_name@ has been added to @system_name@.
+Edit the message below and hit "Send Email" to 
+notify this user.
+
+<p></p>
+
+<form method="post" action="user-add-3">
+  @export_vars@
+  Message:
+
+  <p></p>
+
+  <textarea name="message" rows="10" cols="70" wrap="hard">
+@first_names@ @last_name@, 
+
+You have been added as a user to @system_name@
+at @system_url@
+
+Login information:
+Email: @email@
+Password: @password@
+(you may change your password after you log in)
+
+Thank you,
+@administration_name@
+  </textarea>
+
+  <p></p>
+
+  <input type="submit" value="Send Email">
+</form>
Index: openacs-4/packages/dotlrn/www/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/user-add-2.tcl	20 Jan 2002 21:10:12 -0000	1.1
@@ -0,0 +1,39 @@
+ad_page_contract {
+    Processes a new user created by an admin
+
+    @author yon (yon@openforce.net)
+    @creation-date 2002-01-20
+    @version $Id: user-add-2.tcl,v 1.1 2002/01/20 21:10:12 yon Exp $
+} -query {
+    user_id
+    email
+    password
+    first_names
+    last_name
+    {referer "/acs-admin/users"}
+} -properties {
+    context_bar:onevalue
+    export_vars:onevalue
+    system_name:onevalue
+    system_url:onevalue
+    first_names:onevalue
+    last_name:onevalue
+    email:onevalue
+    password:onevalue
+    administration_name:onevalue
+}
+
+set context_bar {{"one-community-admin" Admin} {Add User}}
+
+set admin_user_id [ad_verify_and_get_user_id]
+set administration_name [db_string select_admin_name {
+    select first_names || ' ' || last_name
+    from persons
+    where person_id = :admin_user_id
+}]
+
+set system_name [ad_system_name]
+set export_vars [export_vars -form {email referer}]
+set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""]
+
+ad_return_template
Index: openacs-4/packages/dotlrn/www/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/user-add-3.tcl	20 Jan 2002 21:10:12 -0000	1.1
@@ -0,0 +1,28 @@
+ad_page_contract {
+    Sends email confirmation to user after they've been created
+
+    @author yon (yon@openforce.net)
+    @creation-date 2002-01-20
+    @version $Id: user-add-3.tcl,v 1.1 2002/01/20 21:10:12 yon Exp $
+} -query {
+    email
+    message
+    {referer "/acs-admin/users"}
+}
+    
+set admin_user_id [ad_verify_and_get_user_id]
+set admin_email [db_string select_admin_email {
+    select email
+    from parties
+    where party_id = :admin_user_id
+}]
+
+if [catch {ns_sendmail "$email" "$admin_email" "You have been added as a user to [ad_system_name] at [ad_parameter SystemUrl]" "$message"} errmsg] {
+    ad_return_error "Mail Failed" "The system was unable to send email. Please notify the user personally. This problem is probably caused by a misconfiguration of your email system. Here is the error:
+<blockquote><pre>
+[ad_quotehtml $errmsg]
+</pre></blockquote>"
+    ad_script_abort
+}
+
+ad_returnredirect $referer
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/user-add.tcl	20 Jan 2002 17:20:45 -0000	1.2
+++ openacs-4/packages/dotlrn/www/user-add.tcl	20 Jan 2002 21:10:12 -0000	1.3
@@ -61,16 +61,18 @@
 
     db_transaction {
         # create the ACS user
-        set target_user_id [ad_user_new $email $first_names $last_name [ad_generate_random_string] "" "" "" "t" "approved" $target_user_id]
+        set password [ad_generate_random_string]
+        set target_user_id [ad_user_new $email $first_names $last_name $password "" "" "" "t" "approved" $target_user_id]
 
         # make the user a dotLRN user
-        dotlrn::user_add -rel_type $rel_type -user_id $target_user_id -type_id [dotrln::get_user_type_id_from_type -type $type]
+        dotlrn::user_add -rel_type $rel_type -user_id $target_user_id -type_id [dotlrn::get_user_type_id_from_type -type $type]
 
         # can this user read private data?
         acs_privacy::set_user_read_private_data -user_id $target_user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p
     }
 
-    ad_returnredirect "member-add-2?user_id=$target_user_id"
+    set redirect "user-add-2?[export_vars {{user_id $target_user_id} email password first_names last_name referer}]"
+    ad_returnredirect "member-add-2?[export_vars {{user_id $target_user_id} {referer $redirect}}]"
     ad_script_abort
 }