Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.132 -r1.133
--- openacs-4/packages/dotlrn/dotlrn.info	13 Dec 2008 13:36:44 -0000	1.132
+++ openacs-4/packages/dotlrn/dotlrn.info	15 May 2009 22:38:13 -0000	1.133
@@ -16,6 +16,7 @@
 
         <provides url="dotlrn" version="2.5.0d2"/>
         <requires url="acs-kernel" version="5.5.0d1"/>
+        <requires url="acs-mail-lite" version="5.5.0d1"/>
         <requires url="acs-lang" version="5.4.2"/>
         <requires url="attachments" version="0.10"/>
         <requires url="new-portal" version="2.5.0d1"/>
Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/tcl/spam-procs.tcl	9 Nov 2008 23:29:23 -0000	1.7
+++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl	15 May 2009 22:38:13 -0000	1.8
@@ -84,7 +84,7 @@
             set message [interpolate -values $values -text $message]
 
             # send the email
-            if {[catch {ns_sendmail $email $from $subject $message} errmsg]} {
+            if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $from -subject $subject -body $message} errmsg]} {
                 append errors "
 <p>
 Failed to deliver to $email because:
@@ -129,7 +129,7 @@
 </p>
             "
 
-            if {[catch {ns_sendmail $real_from $real_from $error_subject $error_message} errmsg]} {
+            if {[catch {acs_mail_lite::send -send_immediately -to_addr $real_from -from_addr $real_from -subject $error_subject -body $error_message} errmsg]} {
                 ad_return_error $error_subject $error_message
                 ad_script_abort
             }
Index: openacs-4/packages/dotlrn/www/member-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/member-add-2.adp	15 May 2009 21:35:41 -0000	1.23
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	15 May 2009 22:38:13 -0000	1.24
@@ -44,7 +44,7 @@
   <label for="rel_type">
     #dotlrn.Role#
 
-    <select id="rel_type">
+    <select name="rel_type" id="rel_type">
  
     <if @allowed_to_add_student@ false and @dotlrn_admin@ false>
       <multiple name="roles">
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/dotlrn/www/spam.tcl	16 Aug 2008 22:30:57 -0000	1.28
+++ openacs-4/packages/dotlrn/www/spam.tcl	15 May 2009 22:38:13 -0000	1.29
@@ -125,8 +125,7 @@
     -widget textarea \
     -html {rows 10 cols 80}
 
-set format_options [list [list "[_ dotlrn.Preformatted_Text]" "pre"] \
-                         [list "[_ dotlrn.Plain_Text]" "plain"] \
+set format_options [list [list "[_ dotlrn.Plain_Text]" "plain"] \
                          [list "[_ dotlrn.HTML]" "html"]]
 
 element create spam_message format \
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 -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/user-add-3.tcl	9 Nov 2008 23:29:23 -0000	1.10
+++ openacs-4/packages/dotlrn/www/user-add-3.tcl	15 May 2009 22:38:13 -0000	1.11
@@ -40,7 +40,7 @@
 
 set msg_subst_values [list system_name [ad_system_name] system_url [ad_parameter SystemUrl]]
 set email_subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_values]
-if [catch {ns_sendmail "$email" "$admin_email" "$email_subject" "$message"} errmsg] {
+if [catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $admin_email -subject $email_subject -body $message} errmsg] {
     ad_return_error "[_ dotlrn.Mail_Failed]" "[_ dotlrn.lt_The_system_was_unable]
 <pre>
 [ad_quotehtml $errmsg]
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	8 Aug 2006 21:26:28 -0000	1.33
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	15 May 2009 22:38:13 -0000	1.34
@@ -32,8 +32,8 @@
 
 db_1row select_user_info {
     select email,
-           first_names,
-           last_name
+    first_names,
+    last_name
     from registered_users
     where user_id = :user_id
 }
@@ -103,31 +103,31 @@
     }
     
     
-    if [catch {ns_sendmail $email $email_from $subject $message} errmsg] {
-	
-	ns_log Error "Error sending email from user-new-2.tcl" $errmsg
-	ad_return_error \
-        "Error sending mail" \
-        "There was an error sending email to $email."
+    if [catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg] {
+        
+        ns_log Error "Error sending email from user-new-2.tcl" $errmsg
+        ad_return_error \
+            "Error sending mail" \
+            "There was an error sending email to $email."
     } else {
 
-	set admin_subject "The following email was just sent from [ad_system_name]"
+        set admin_subject "The following email was just sent from [ad_system_name]"
 
-	set admin_message "The following email was just sent from [ad_system_name]
+        set admin_message "The following email was just sent from [ad_system_name]
 
 Sent by: $email_from
 Sent to: $email
 Subject: $subject
 Message: $message"
 
 
-        if [catch {ns_sendmail $email_from $email_from $admin_subject $admin_message} errmsg] {
-	
-	    ns_log Error "Error sending email from user-new-2.tcl" $errmsg
-	    ad_return_error \
-		    "Error sending mail" \
-		    "There was an error sending email to $email."
-	}
+        if [catch {acs_mail_lite::send -send_immediately -to_addr $email_from -from_addr $email_from -subject $admin_subject -body $admin_message} errmsg] {
+            
+            ns_log Error "Error sending email from user-new-2.tcl" $errmsg
+            ad_return_error \
+                "Error sending mail" \
+                "There was an error sending email to $email."
+        }
 
     }
 
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/dotlrn/www/admin/user.tcl	15 Apr 2009 18:01:16 -0000	1.25
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	15 May 2009 22:38:13 -0000	1.26
@@ -79,6 +79,10 @@
 }
 
 # dotlrn Guest status
+if { ![info exists guest_p] } {
+    set guest_p 0
+}
+
 if { $guest_p } {
     set guest_label [_ dotlrn.Yes]
     set guest_toggle_url [export_vars -base "guest-toggle" {user_id {guest_p f} {referer $return_url}}]
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl	13 Jan 2005 13:57:22 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-approve.tcl	15 May 2009 22:38:13 -0000	1.3
@@ -79,9 +79,9 @@
 	} else {
 
 	    # notify user of approval
-	    if [catch {ns_sendmail $email $email_from $subject $message} errmsg] {
+	    if [catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg] {
 	    
-		ns_log Error "Error sending email from user-new-2.tcl" $errmsg
+		ns_log Error "Error sending email from users-bulk-approve" $errmsg
 		ns_write "Error sending mail<br>"
 	    } else {
 		ns_write "Ok<br>"
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	8 Aug 2006 21:26:28 -0000	1.21
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	15 May 2009 22:38:13 -0000	1.22
@@ -137,7 +137,7 @@
             # Send note to new user
             if { $row(notify) == "t" } {
                 # Send note to new user
-                if [catch {ns_sendmail "$row(email)" "$admin_email" "$subject" "$message"} errmsg] {
+                if [catch {acs_mail_lite::send -send_immediately -to_addr $row(email) -from_addr $admin_email -subject $subject -body $message} errmsg] {
                     doc_body_append "[_ dotlrn.lt_emailing_this_user_fa]"
                 set fail_p 1
                 } else {