Index: openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 29 Dec 2008 22:21:04 -0000 1.4 +++ openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml 27 Oct 2014 16:39:31 -0000 1.5 @@ -225,7 +225,7 @@ # Always register the user locally lappend authorities_list [auth::authority::local] # Default authority_id if none was provided - if { [empty_string_p $authority_id] } { + if { $authority_id eq "" } { # Pick the first authority that can create users set authority_id [db_string first_registering_authority { select authority_id @@ -236,7 +236,7 @@ where register_p = 't' ) } -default ""] - if { [empty_string_p $authority_id] } { + if { $authority_id eq "" } { error "No authority_id provided and could not find an authority that can create users" } lappend authorities_list $authority_id @@ -278,7 +278,7 @@ @secret_question Question to ask on forgotten password @secret_answer Answer to forgotten password question } { - if { [empty_string_p $authority_id] } { + if { $authority_id eq "" } { set authority_id [auth::authority::local] } # TODO: @@ -434,7 +434,7 @@ User is redirected to /register/index.tcl if login is required (i.e. auth::require is specified) and the login is taken care of by user-login.tcl. If user not registered (i.e. - $auth_info(account_status) == "no_account" + $auth_info(account_status) eq "no_account" ), user is redirected to user-register.tcl. @@ -1039,7 +1039,7 @@ @param authority_id The ID of the authority to ask to verify the user. Leave blank for local authority. } { - if { [empty_string_p $authority_id] } { + if { $authority_id eq "" } { set authority_id [auth::authority::local] } # TODO: @@ -1164,7 +1164,7 @@ Invoke the Register service contract operation for the given authority. } { - if { [empty_string_p $authority_id] } { + if { $authority_id eq "" } { set authority_id [auth::authority::local] } @@ -1243,11 +1243,11 @@ # Send email verification email to user set confirmation_url "[ad_url]/register/email-confirm?[export_vars { row_id }]" with_catch errmsg { - ns_sendmail \ - $email \ - $notification_address \ - "[_ acs-subsite.lt_Welcome_to_system_nam]" \ - "[_ acs-subsite.lt_To_confirm_your_regis]" + acs_mail_lite::send \ + -to_addr $email \ + -from_addr $notification_address \ + -subject "[_ acs-subsite.lt_Welcome_to_system_nam]" \ + -body "[_ acs-subsite.lt_To_confirm_your_regis]" } { ns_returnerror "500" "$errmsg" ns_log Warning "Error sending email verification email to $email. Error: $errmsg" @@ -1259,11 +1259,11 @@ if { [parameter::get -parameter RegistrationProvidesRandomPasswordP -default 0] || \ [parameter::get -parameter EmailRegistrationConfirmationToUserP -default 0] } { with_catch errmsg { - ns_sendmail \ - $email \ - $notification_address \ - "[_ acs-subsite.lt_Welcome_to_system_nam]" \ - "[_ acs-subsite.lt_Thank_you_for_visitin]" + acs_mail_lite::send \ + -to_addr $email \ + -from_addr $notification_address \ + -subject "[_ acs-subsite.lt_Welcome_to_system_nam]" \ + -body "[_ acs-subsite.lt_Thank_you_for_visitin]" } { ns_returnerror "500" "$errmsg" ns_log Warning "Error sending registration confirmation to $email. Error: $errmsg" @@ -1272,11 +1272,11 @@ # Notify admin on new registration if {[parameter::get -parameter NotifyAdminOfNewRegistrationsP -default 0]} { with_catch errmsg { - ns_sendmail \ - $notification_address \ - $email \ - "[_ acs-subsite.lt_New_registration_at_s]" \ - "[_ acs-subsite.lt_first_names_last_name]" + acs_mail_lite::send \ + -to_addr $notification_address \ + -from_addr $email \ + -subject "[_ acs-subsite.lt_New_registration_at_s]" \ + -body "[_ acs-subsite.lt_first_names_last_name]" } { ns_returnerror "500" "$errmsg" ns_log Warning "Error sending admin notification to $notification_address. Error: $errmsg" @@ -1654,7 +1654,7 @@ # Should make use of auth::password::RetrievePassword set body "[_ acs-subsite.lt_Please_follow_the_fol]" # Send email -if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] { +if {[catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg]} { ad_return_error \ "[_ acs-subsite.Error_sending_mail]" \ "[_ acs-subsite.lt_Now_were_really_in_tr] @@ -1852,7 +1852,7 @@ set subject "some other i18n key msg" set body "some other i18n key msg" # Send email -if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] { +if {[catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg]} { ad_return_error \ "[_ acs-subsite.Error_sending_mail]" \ "[_ acs-subsite.lt_Now_were_really_in_tr]