Cleanup Collections

snappymail/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php

@@ -34,17 +34,6 @@ class AttachmentCollection extends \MailSo\Base\Collection
 		return $iCount;
 	}
 
-	public function NonInlineCount() : int
-	{
-		$iCount = 0;
-		foreach ($this as $oAttachment) {
-			if ($oAttachment && !$oAttachment->IsInline()) {
-				++$iCount;
-			}
-		}
-		return $iCount;
-	}
-
 	public function SpecData() : array
 	{
 		$aResult = array();

snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php

@@ -678,7 +678,7 @@ class Message implements \JsonSerializable
 			'UnsubsribeLinks' => $this->aUnsubsribeLinks,
 			'ReadReceipt' => '',
 
-			'HasAttachments' => $this->oAttachments && 0 < $this->oAttachments->Count(),
+			'HasAttachments' => $this->oAttachments && 0 < $this->oAttachments->count(),
 			'AttachmentsSpecData' => $this->oAttachments ? $this->oAttachments->SpecData() : array(),
 
 			// Flags

snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php

@@ -20,69 +20,62 @@ class MessageCollection extends \MailSo\Base\Collection
 	/**
 	 * @var string
 	 */
-	public $FolderHash;
+	public $FolderHash = '';
 
 	/**
 	 * @var int
 	 */
-	public $MessageCount;
+	public $MessageCount = 0;
 
 	/**
 	 * @var int
 	 */
-	public $MessageUnseenCount;
+	public $MessageUnseenCount = 0;
 
 	/**
 	 * @var int
 	 */
-	public $MessageResultCount;
+	public $MessageResultCount = 0;
 
 	/**
 	 * @var string
 	 */
-	public $FolderName;
+	public $FolderName = '';
 
 	/**
 	 * @var int
 	 */
-	public $Offset;
+	public $Offset = 0;
 
 	/**
 	 * @var int
 	 */
-	public $Limit;
+	public $Limit = 0;
 
 	/**
 	 * @var string
 	 */
-	public $Search;
+	public $Search = '';
 
 	/**
 	 * @var int
 	 */
-	public $UidNext;
+	public $UidNext = 0;
 
 	/**
 	 * @var int
 	 */
-	public $ThreadUid;
+	public $ThreadUid = 0;
 
 	/**
 	 * @var array
 	 */
-	public $NewMessages;
+	public $NewMessages = array();
 
 	/**
 	 * @var bool
 	 */
-	public $Filtered;
+	public $Filtered = false;
-
-	function __construct()
-	{
-		parent::__construct();
-
-		$this->Clear();
-	}
 
 	public function append($oMessage, bool $bToTop = false) : void
 	{
@@ -92,23 +85,7 @@ class MessageCollection extends \MailSo\Base\Collection
 
 	public function Clear() : void
 	{
-		parent::Clear();
+		throw new \BadMethodCallException('disallowed');
-
-		$this->FolderHash = '';
-
-		$this->MessageCount = 0;
-		$this->MessageUnseenCount = 0;
-		$this->MessageResultCount = 0;
-
-		$this->FolderName = '';
-		$this->Offset = 0;
-		$this->Limit = 0;
-		$this->Search = '';
-		$this->UidNext = 0;
-		$this->ThreadUid = 0;
-		$this->NewMessages = array();
-
-		$this->Filtered = false;
 	}
 
 	public function jsonSerialize()

snappymail/v/0.0.0/app/libraries/MailSo/Mime/AttachmentCollection.php

@@ -22,35 +22,4 @@ class AttachmentCollection extends \MailSo\Base\Collection
 		assert($oAttachment instanceof Attachment);
 		parent::append($oAttachment, $bToTop);
 	}
-
-	public function LinkedAttachments() : array
-	{
-		$aResult = array();
-		foreach ($this as $oAttachment) {
-			if ($oAttachment->IsLinked()) {
-				$aResult[] = $oAttachment;
-			}
-		}
-		return $aResult;
-	}
-
-	public function UnlinkedAttachments() : array
-	{
-		$aResult = array();
-		foreach ($this as $oAttachment) {
-			if (!$oAttachment->IsLinked()) {
-				$aResult[] = $oAttachment;
-			}
-		}
-		return $aResult;
-	}
-
-	public function SizeOfAttachments() : int
-	{
-		$iResult = 0;
-		foreach ($this as $oAttachment) {
-			$iResult += $oAttachment->FileSize();
-		}
-		return $iResult;
-	}
 }

snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php

@@ -593,68 +593,54 @@ class Message
 	{
 		$oResultPart = null;
 
-		$aAttachments = $this->oAttachmentCollection->LinkedAttachments();
+		foreach ($this->oAttachmentCollection as $oAttachment) {
-		if (\count($aAttachments))
+			if ($oAttachment->IsLinked()) {
-		{
+				if (!$oResultPart) {
-			$oResultPart = new Part;
+					$oResultPart = new Part;
+					$oResultPart->Headers->append(
+						new Header(Enumerations\Header::CONTENT_TYPE,
+							Enumerations\MimeType::MULTIPART_RELATED.'; '.
+							(new ParameterCollection)->Add(
+								new Parameter(
+									Enumerations\Parameter::BOUNDARY,
+									$this->generateNewBoundary())
+							)->ToString()
+						)
+					);
+					$oResultPart->SubParts->append($oIncPart);
+				}
 
-			$oResultPart->Headers->append(
-				new Header(Enumerations\Header::CONTENT_TYPE,
-					Enumerations\MimeType::MULTIPART_RELATED.'; '.
-					(new ParameterCollection)->Add(
-						new Parameter(
-							Enumerations\Parameter::BOUNDARY,
-							$this->generateNewBoundary())
-					)->ToString()
-				)
-			);
-
-			$oResultPart->SubParts->append($oIncPart);
-
-			foreach ($aAttachments as $oAttachment)
-			{
 				$oResultPart->SubParts->append($this->createNewMessageAttachmentBody($oAttachment));
 			}
 		}
-		else
-		{
-			$oResultPart = $oIncPart;
-		}
 
-		return $oResultPart;
+		return $oResultPart ?: $oIncPart;
 	}
 
 	private function createNewMessageMixedBody(Part $oIncPart) : Part
 	{
 		$oResultPart = null;
 
-		$aAttachments = $this->oAttachmentCollection->UnlinkedAttachments();
+		foreach ($this->oAttachmentCollection as $oAttachment) {
-		if (\count($aAttachments))
+			if (!$oAttachment->IsLinked()) {
-		{
+				if (!$oResultPart) {
-			$oResultPart = new Part;
+					$oResultPart = new Part;
+					$oResultPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE,
+						Enumerations\MimeType::MULTIPART_MIXED.'; '.
+						(new ParameterCollection)->Add(
+							new Parameter(
+								Enumerations\Parameter::BOUNDARY,
+								$this->generateNewBoundary())
+						)->ToString()
+					);
+					$oResultPart->SubParts->append($oIncPart);
+				}
 
-			$oResultPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE,
-				Enumerations\MimeType::MULTIPART_MIXED.'; '.
-				(new ParameterCollection)->Add(
-					new Parameter(
-						Enumerations\Parameter::BOUNDARY,
-						$this->generateNewBoundary())
-				)->ToString()
-			);
-
-			$oResultPart->SubParts->append($oIncPart);
-
-			foreach ($aAttachments as $oAttachment)
-			{
 				$oResultPart->SubParts->append($this->createNewMessageAttachmentBody($oAttachment));
 			}
 		}
-		else
-		{
-			$oResultPart = $oIncPart;
-		}
 
-		return $oResultPart;
+		return $oResultPart ?: $oIncPart;
 	}
 
 	private function setDefaultHeaders(Part $oIncPart, bool $bWithoutBcc = false) : Part

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php

@@ -221,7 +221,7 @@ trait Response
 				$aContentLocationUrls = array();
 				$mFoundedContentLocationUrls = array();
 
-				if ($oAttachments && 0 < $oAttachments->Count())
+				if ($oAttachments && 0 < $oAttachments->count())
 				{
 					foreach ($oAttachments as /* @var \MailSo\Mail\Attachment */ $oAttachment)
 					{