Commit 25d4d663 authored by Frank Bergmann's avatar Frank Bergmann

-- Disable notification when registering users because it's handled in

   /packages/intranet-core/www/users/user-add-3.tcl
parent f6cb3799
...@@ -499,28 +499,32 @@ ad_proc -private auth::local::registration::Register { ...@@ -499,28 +499,32 @@ ad_proc -private auth::local::registration::Register {
set system_name [ad_system_name] set system_name [ad_system_name]
set system_url [ad_url] set system_url [ad_url]
# --------------------------------------------------------------------------------------
# PO Patch: notification is handled in /packages/intranet-core/www/users/user-add-3.tcl
# --------------------------------------------------------------------------------------
# LARS TODO: Move this out of the local driver and into the auth framework # LARS TODO: Move this out of the local driver and into the auth framework
# Send password confirmation email to user # Send password confirmation email to user
if { [set email_reg_confirm_p [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 0]] != -1 } { #if { [set email_reg_confirm_p [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 0]] != -1 } {
if { $generated_pwd_p || \ #if { $generated_pwd_p || \
[parameter::get -parameter RegistrationProvidesRandomPasswordP -package_id [ad_conn subsite_id] -default 0] || \ # [parameter::get -parameter RegistrationProvidesRandomPasswordP -package_id [ad_conn subsite_id] -default 0] || \
$email_reg_confirm_p } { # $email_reg_confirm_p } {
with_catch errmsg { # with_catch errmsg {
auth::password::email_password \ # auth::password::email_password \
-username $username \ # -username $username \
-authority_id $authority_id \ # -authority_id $authority_id \
-password $password \ # -password $password \
-from [parameter::get -parameter NewRegistrationEmailAddress -package_id [ad_conn subsite_id] -default [ad_system_owner]] \ # -from [parameter::get -parameter NewRegistrationEmailAddress -package_id [ad_conn subsite_id] -default [ad_system_owner]] \
-subject_msg_key "acs-subsite.email_subject_Registration_password" \ # -subject_msg_key "acs-subsite.email_subject_Registration_password" \
-body_msg_key "acs-subsite.email_body_Registration_password" # -body_msg_key "acs-subsite.email_body_Registration_password"
} { # } {
# We don't fail hard here, just log an error # We don't fail hard here, just log an error
global errorInfo # global errorInfo
ns_log Error "Error sending registration confirmation to $email.\n$errorInfo" # ns_log Error "Error sending registration confirmation to $email.\n$errorInfo"
} # }
} #}
} #}
# LARS TODO: Move this out of the local driver and into the auth framework # LARS TODO: Move this out of the local driver and into the auth framework
# Notify admin on new registration # Notify admin on new registration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment