Fixed: FS#3357 - Wrong SMTP HELO for Microsoft Exchange (ispcmail.inc.php)

Marius Cramer · Marius Cramer · commit 4dfacaa478fc · 2014-03-10T11:28:01.000+01:00
diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
@@ -219,7 +219,7 @@ public function setOption($key, $value) {
 	 *
 	 */
 	private function detectHelo() {
-		if(isset($_SERVER['HTTP_HOST'])) $this->smtp_helo = $_SERVER['HTTP_HOST'];
+		if(isset($_SERVER['HTTP_HOST'])) $this->smtp_helo = (strpos($_SERVER['HTTP_HOST'], ':') !== false ? substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')) : $_SERVER['HTTP_HOST']);
 		elseif(isset($_SERVER['SERVER_NAME'])) $this->smtp_helo = $_SERVER['SERVER_NAME'];
 		else $this->smtp_helo = php_uname('n');
 		if($this->smtp_helo == '') $this->smtp_helo = 'localhost';

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public function setOption($key, $value) {`
`219`	`219`	`*`
`220`	`220`	`*/`
`221`	`221`	`private function detectHelo() {`
`222`		`- if(isset($_SERVER['HTTP_HOST'])) $this->smtp_helo = $_SERVER['HTTP_HOST'];`
	`222`	`+ if(isset($_SERVER['HTTP_HOST'])) $this->smtp_helo = (strpos($_SERVER['HTTP_HOST'], ':') !== false ? substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':')) : $_SERVER['HTTP_HOST']);`
`223`	`223`	`elseif(isset($_SERVER['SERVER_NAME'])) $this->smtp_helo = $_SERVER['SERVER_NAME'];`
`224`	`224`	`else $this->smtp_helo = php_uname('n');`
`225`	`225`	`if($this->smtp_helo == '') $this->smtp_helo = 'localhost';`