Add domainSplitter: check if replace is still necessary

Peter Vanpoucke · peter-vanpoucke · commit 96b712f9fcd7 · 2020-05-24T18:23:12.000+02:00
Signed-off-by: Peter Vanpoucke &lt;peter.vanpoucke@rw3.be&gt;
diff --git a/lib/imap.php b/lib/imap.php
@@ -61,7 +61,9 @@ public function checkPassword($uid, $password) {
 
 		// Replace escaped splitter in uid
 		// but only if there is no splitter symbol and if there is a escaped splitter inside the uid
-		if (!(strpos($uid, $this->domainSplitter) !== false) && (strpos($uid, $domainSplitterEncoded) !== false)) {
+		if (($this->domainSplitter != $domainSplitterEncoded) 
+				&& !(strpos($uid, $this->domainSplitter) !== false) 
+				&& (strpos($uid, $domainSplitterEncoded) !== false)) {
 			$uid = str_replace($domainSplitterEncoded,$this->domainSplitter,$uid);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ public function checkPassword($uid, $password) {`
`61`	`61`
`62`	`62`	`// Replace escaped splitter in uid`
`63`	`63`	`// but only if there is no splitter symbol and if there is a escaped splitter inside the uid`
`64`		`- if (!(strpos($uid, $this->domainSplitter) !== false) && (strpos($uid, $domainSplitterEncoded) !== false)) {`
	`64`	`+ if (($this->domainSplitter != $domainSplitterEncoded)`
	`65`	`+ && !(strpos($uid, $this->domainSplitter) !== false)`
	`66`	`+ && (strpos($uid, $domainSplitterEncoded) !== false)) {`
`65`	`67`	`$uid = str_replace($domainSplitterEncoded,$this->domainSplitter,$uid);`
`66`	`68`	`}`
`67`	`69`