From c173de393533ca2bdf3d6f7e47e38ebfdb437e2e Mon Sep 17 00:00:00 2001
From: leithoff <kl@stylite.de>
Date: Fri, 17 Jun 2016 11:49:09 +0200
Subject: [PATCH] fix for functional folders showing up multiple times

---
 api/src/Mail.php                  | 91 ++++++++++++++++++++++++-------
 mail/inc/class.mail_zpush.inc.php |  8 +--
 2 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/api/src/Mail.php b/api/src/Mail.php
index 4f65c5144d..114a0b7d8f 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -3548,9 +3548,10 @@ class Mail
 	 * isSentFolder is the given folder the sent folder or at least a subfolder of it
 	 * @param string $_folderName folder to perform the check on
 	 * @param boolean $_checkexistance trigger check for existance
+	 * @param boolean $_exactMatch make the check more strict. return false if folder is subfolder only
 	 * @return boolean
 	 */
-	function isSentFolder($_folderName, $_checkexistance=TRUE)
+	function isSentFolder($_folderName, $_checkexistance=TRUE, $_exactMatch=false)
 	{
 		$sentFolder = $this->getSentFolder($_checkexistance);
 		if(empty($sentFolder)) {
@@ -3561,10 +3562,19 @@ class Mail
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $sentFolder)) {
-			return true;
+		if ($_exactMatch)
+		{
+			if(false !== stripos($_folderName, $sentFolder)&& strlen($_folderName)==strlen($sentFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		} else {
-			return false;
+			if(false !== stripos($_folderName, $sentFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 	}
 
@@ -3572,9 +3582,10 @@ class Mail
 	 * checks if the Outbox folder exists and is part of the foldername to be checked
 	 * @param string $_folderName folder to perform the check on
 	 * @param boolean $_checkexistance trigger check for existance
+	 * @param boolean $_exactMatch make the check more strict. return false if folder is subfolder only
 	 * @return boolean
 	 */
-	function isOutbox($_folderName, $_checkexistance=TRUE)
+	function isOutbox($_folderName, $_checkexistance=TRUE, $_exactMatch=false)
 	{
 		if (stripos($_folderName, 'Outbox')===false) {
 			return false;
@@ -3582,10 +3593,19 @@ class Mail
 		// does the folder exist???
 		if ($_checkexistance && $GLOBALS['egw_info']['user']['apps']['activesync'] && !$this->folderExists($_folderName)) {
 			$outboxFolder = $this->getOutboxFolder($_checkexistance);
-			if(false !== stripos($_folderName, $outboxFolder)) {
-				return true;
+			if ($_exactMatch)
+			{
+				if(false !== stripos($_folderName, $outboxFolder)&& strlen($_folderName)==strlen($outboxFolder)) {
+					return true;
+				} else {
+					return false;
+				}
 			} else {
-				return false;
+				if(false !== stripos($_folderName, $outboxFolder)) {
+					return true;
+				} else {
+					return false;
+				}
 			}
 		}
 		return true;
@@ -3595,9 +3615,10 @@ class Mail
 	 * isDraftFolder is the given folder the sent folder or at least a subfolder of it
 	 * @param string $_folderName folder to perform the check on
 	 * @param boolean $_checkexistance trigger check for existance
+	 * @param boolean $_exactMatch make the check more strict. return false if folder is subfolder only
 	 * @return boolean
 	 */
-	function isDraftFolder($_folderName, $_checkexistance=TRUE)
+	function isDraftFolder($_folderName, $_checkexistance=TRUE, $_exactMatch=false)
 	{
 		$draftFolder = $this->getDraftFolder($_checkexistance);
 		if(empty($draftFolder)) {
@@ -3608,10 +3629,19 @@ class Mail
 			return false;
 		}
 		if (is_a($_folderName,"Horde_Imap_Client_Mailbox")) $_folderName = $_folderName->utf8;
-		if(false !== stripos($_folderName, $draftFolder)) {
-			return true;
+		if ($_exactMatch)
+		{
+			if(false !== stripos($_folderName, $draftFolder)&& strlen($_folderName)==strlen($draftFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		} else {
-			return false;
+			if(false !== stripos($_folderName, $draftFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 	}
 
@@ -3619,9 +3649,10 @@ class Mail
 	 * isTrashFolder is the given folder the sent folder or at least a subfolder of it
 	 * @param string $_folderName folder to perform the check on
 	 * @param boolean $_checkexistance trigger check for existance
+	 * @param boolean $_exactMatch make the check more strict. return false if folder is subfolder only
 	 * @return boolean
 	 */
-	function isTrashFolder($_folderName, $_checkexistance=TRUE)
+	function isTrashFolder($_folderName, $_checkexistance=TRUE, $_exactMatch=false)
 	{
 		$trashFolder = $this->getTrashFolder($_checkexistance);
 		if(empty($trashFolder)) {
@@ -3632,10 +3663,19 @@ class Mail
 			return false;
 		}
 
-		if(false !== stripos($_folderName, $trashFolder)) {
-			return true;
+		if ($_exactMatch)
+		{
+			if(false !== stripos($_folderName, $trashFolder)&& strlen($_folderName)==strlen($trashFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		} else {
-			return false;
+			if(false !== stripos($_folderName, $trashFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 	}
 
@@ -3643,9 +3683,10 @@ class Mail
 	 * isTemplateFolder is the given folder the sent folder or at least a subfolder of it
 	 * @param string $_folderName folder to perform the check on
 	 * @param boolean $_checkexistance trigger check for existance
+	 * @param boolean $_exactMatch make the check more strict. return false if folder is subfolder only
 	 * @return boolean
 	 */
-	function isTemplateFolder($_folderName, $_checkexistance=TRUE)
+	function isTemplateFolder($_folderName, $_checkexistance=TRUE, $_exactMatch=false)
 	{
 		$templateFolder = $this->getTemplateFolder($_checkexistance);
 		if(empty($templateFolder)) {
@@ -3655,11 +3696,19 @@ class Mail
 		if ($_checkexistance && !$this->folderExists($_folderName)) {
 			return false;
 		}
-
-		if(false !== stripos($_folderName, $templateFolder)) {
-			return true;
+		if ($_exactMatch)
+		{
+			if(false !== stripos($_folderName, $templateFolder)&& strlen($_folderName)==strlen($templateFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		} else {
-			return false;
+			if(false !== stripos($_folderName, $templateFolder)) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 	}
 
diff --git a/mail/inc/class.mail_zpush.inc.php b/mail/inc/class.mail_zpush.inc.php
index 090dc81760..7e1714f8c4 100644
--- a/mail/inc/class.mail_zpush.inc.php
+++ b/mail/inc/class.mail_zpush.inc.php
@@ -1643,27 +1643,27 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
 		}
-		elseif($this->mail->isDraftFolder($folder, false))
+		elseif($this->mail->isDraftFolder($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isTrashFolder($folder, false))
+		elseif($this->mail->isTrashFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_WASTEBASKET;
 			$this->_wasteID = $folder;
 			//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isSentFolder($folder, false))
+		elseif($this->mail->isSentFolder($folder, false, true))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_SENTMAIL;
 			$folderObj->parentid = 0; // required by devices
 			$this->_sentID = $folder;
 			//error_log(__METHOD__.__LINE__.' SentFolder:'.$this->_sentID);
 		}
-		elseif($this->mail->isOutbox($folder, false))
+		elseif($this->mail->isOutbox($folder, false, true))
 		{
 			//ZLog::Write(LOGLEVEL_DEBUG,__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;