From 6efc08cc0a6b27fe25d117c31d16fede1a898998 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 5 Jun 2014 10:36:13 +0000
Subject: [PATCH] * Notifications: fixed not used SMTP authentication and
 selection of mail account

---
 notifications/templates/default/config.tpl | 5 +++--
 phpgwapi/inc/class.send.inc.php            | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/notifications/templates/default/config.tpl b/notifications/templates/default/config.tpl
index 167d2c806c..fdc712aa11 100644
--- a/notifications/templates/default/config.tpl
+++ b/notifications/templates/default/config.tpl
@@ -10,6 +10,7 @@
    </tr>
 <!-- END header -->
 <!-- BEGIN body -->
+   <!-- currently not used, might be reactived later
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_Mail_backend}</b></td>
    </tr>
@@ -21,9 +22,9 @@
       <option value="True"{selected_dontUseUserDefinedProfiles_True}>{lang_Emailadmin_Profile_only_(Do_not_use_User_defined_(active)_Mail_Profiles_for_Notification)}</option>
      </select>
     </td>
-   </tr>
+   </tr -->
    <tr class="th">
-    <td colspan="2">&nbsp;<b>{lang_eGroupWare-Popup_backend}</b></td>
+    <td colspan="2">&nbsp;<b>{lang_EGroupware-Popup_backend}</b></td>
    </tr>
    <tr class="row_on">
     <td>{lang_Poll_interval}</td>
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index f774633dd1..4606fd9ec7 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -13,7 +13,7 @@
 /**
  * New eGW send-class. It implements the old interface (msg-method) on top of PHPMailer.
  *
- * The configuration is read from Admin >> Site configuration and it does NOT depend on one of the email-apps anymore.
+ * The configuration is read via emailadmin_account::get_default_acc_id(true);	// true=SMTP
  */
 class send extends egw_mailer
 {
@@ -42,7 +42,7 @@ class send extends egw_mailer
 		$this->IsSmtp();
 
 		// smtp settings from default account of current user
-		$account = emailadmin_account::read(emailadmin_account::get_default_acc_id());
+		$account = emailadmin_account::read(emailadmin_account::get_default_acc_id(true));	// true=SMTP
 		$this->Host = $account->acc_smtp_host;
 		$this->Port = $account->acc_smtp_port;
 		switch($account->acc_smtp_ssl)
@@ -56,7 +56,7 @@ class send extends egw_mailer
 			case emailadmin_account::SSL_STARTTLS:	// PHPMailer uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 				$this->Host = 'tls://'.$this->Host;
 		}
-		$this->smtpAuth = !empty($account->acc_smtp_username);
+		$this->SMTPAuth = !empty($account->acc_smtp_username);
 		$this->Username = $account->acc_smtp_username;
 		$this->Password = $account->acc_smtp_password;
 		$this->defaultDomain = $account->acc_domain;