Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

Conflicts: htdocs/core/class/smtps.class.php
Dolibarr · Jan 23, 2020 · 8030558 · 8030558
2 parents be34451 + 42769e2
commit 8030558
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
@@ -505,8 +505,9 @@ private function _server_authenticate()
 
             // The error here just means the ID/password combo doesn't work.
             // There is not a method to determine which is the problem, ID or password
-            if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
-            $this->_setErr(130, 'Invalid Authentication Credentials.');
+            if (! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235')) {
+            	$this->_setErr(130, 'Invalid Authentication Credentials.');
+            }
         }
         else
         {
@@ -574,7 +575,11 @@ public function sendMsg($_bolTestMsg = false, $_bolDebug = false)
                 // From this point onward most server response codes should be 250
                 // Specify who the mail is from....
                 // This has to be the raw email address, strip the "name" off
-                $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+                $resultmailfrom = $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+			    if (! $resultmailfrom) {
+			        fclose($this->socket);
+			        return false;
+			    }
 
                 // 'RCPT TO:' must be given a single address, so this has to loop
                 // through the list of addresses, regardless of TO, CC or BCC
@@ -1785,6 +1790,7 @@ public function server_parse($socket, $response)
                 $_retVal = false;
                 break;
             }
+			$this->log .= $server_response;
             $limit++;
         }