From 40c9fb51c7c7d90eee50ad26d897d0c5ae4083d3 Mon Sep 17 00:00:00 2001 From: teo_sarca Date: Tue, 22 May 2007 09:55:46 +0000 Subject: [PATCH] [ 1723309 ] EMail password is required even if not IsSTMPAuthorization http://sourceforge.net/tracker/index.php?func=detail&aid=1723309&group_id=176962&atid=879332 --- base/src/org/compiere/model/MClient.java | 3 ++- base/src/org/compiere/model/MUser.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/base/src/org/compiere/model/MClient.java b/base/src/org/compiere/model/MClient.java index c6d4b92876..7387fd1f89 100644 --- a/base/src/org/compiere/model/MClient.java +++ b/base/src/org/compiere/model/MClient.java @@ -751,7 +751,8 @@ public class MClient extends X_AD_Client return createEMail (to, subject, message); // No From details - Error if (from.getEMail() == null - || from.getEMailUser() == null || from.getEMailUserPW() == null) + || from.getEMailUser() == null + || (isSmtpAuthorization() && from.getEMailUserPW() == null) ) // is SMTP authorization and password is null - teo_sarca [ 1723309 ] { log.warning("From EMail incomplete: " + from + " (" + getName() + ")"); return null; diff --git a/base/src/org/compiere/model/MUser.java b/base/src/org/compiere/model/MUser.java index 60def21224..ed89abb611 100644 --- a/base/src/org/compiere/model/MUser.java +++ b/base/src/org/compiere/model/MUser.java @@ -574,6 +574,9 @@ public class MUser extends X_AD_User String s = getEMailUser(); if (s == null || s.length() == 0) return false; + // If SMTP authorization is not required, then don't check password - teo_sarca [ 1723309 ] + if (!MClient.get(getCtx()).isSmtpAuthorization()) + return true; s = getEMailUserPW(); return s != null && s.length() > 0; } // isCanSendEMail