- joined b3-0-0-patches

catalog/acs-authentication.de_DE.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.1.4" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" package_version="5.1.5" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Benutzeridentifikation oder Passwort ist falsch</msg>
 </message_catalog>

catalog/acs-authentication.en_US.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.1.4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" package_version="5.1.5" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Invalid username or password</msg>
 </message_catalog>

catalog/acs-authentication.es_ES.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.1.4" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" package_version="5.1.5" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Usuario o contrasea erroneo</msg>
 </message_catalog>

catalog/acs-authentication.pt_BR.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-authentication" package_version="5.1.2d2" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-authentication" package_version="5.1.5" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="Invalid_username_or_password">Nome ou senha invlidos</msg>
 </message_catalog>

tcl/local-procs.tcl

@@ -451,12 +451,12 @@ ad_proc -private auth::local::registration::Register {
     # LARS TODO: Move this out of the local driver and into the auth framework
     # Send password confirmation email to user
 
-    # Fraber: 051123: remove the "$generated_pwd_p || \" and
-    #  [parameter::get -parameter RegistrationProvidesRandomPasswordP -package_id [ad_conn subsite_id] -default 0] || 
-    # Because we don't want to send people a mail if we register them
-    # for CRM
-    if { [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 0] } {
+    # Fraber: 051123: Removed parts of OR clause to avoid sending out
+    # passwords for users registered for CRM:
+    # $generated_pwd_p ||
+    # [parameter::get -parameter RegistrationProvidesRandomPasswordP -package_id [ad_conn subsite_id] -default 0] ||
 
+    if { [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 0] } {
 	with_catch errmsg {
             auth::password::email_password \
                 -username $username \