nextcloud / server

lib/public/Mail/IAttachment.php

Indentation +18 added lines, -18 removed lines

@@ -29,25 +29,25 @@
  */
 interface IAttachment {
 
-	/**
-	 * @param string $filename
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setFilename($filename);
+    /**
+     * @param string $filename
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setFilename($filename);
 
-	/**
-	 * @param string $contentType
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setContentType($contentType);
+    /**
+     * @param string $contentType
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setContentType($contentType);
 
-	/**
-	 * @param string $body
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setBody($body);
+    /**
+     * @param string $body
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setBody($body);
 
 }

lib/private/Mail/Attachment.php

Indentation +38 added lines, -38 removed lines

@@ -31,48 +31,48 @@
  */
 class Attachment implements IAttachment {
 
-	/** @var \Swift_Mime_Attachment */
-	protected $swiftAttachment;
+    /** @var \Swift_Mime_Attachment */
+    protected $swiftAttachment;
 
-	public function __construct(\Swift_Mime_Attachment $attachment) {
-		$this->swiftAttachment = $attachment;
-	}
+    public function __construct(\Swift_Mime_Attachment $attachment) {
+        $this->swiftAttachment = $attachment;
+    }
 
-	/**
-	 * @param string $filename
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setFilename($filename) {
-		$this->swiftAttachment->setFilename($filename);
-		return $this;
-	}
+    /**
+     * @param string $filename
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setFilename($filename) {
+        $this->swiftAttachment->setFilename($filename);
+        return $this;
+    }
 
-	/**
-	 * @param string $contentType
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setContentType($contentType) {
-		$this->swiftAttachment->setContentType($contentType);
-		return $this;
-	}
+    /**
+     * @param string $contentType
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setContentType($contentType) {
+        $this->swiftAttachment->setContentType($contentType);
+        return $this;
+    }
 
-	/**
-	 * @param string $body
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setBody($body) {
-		$this->swiftAttachment->setBody($body);
-		return $this;
-	}
+    /**
+     * @param string $body
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setBody($body) {
+        $this->swiftAttachment->setBody($body);
+        return $this;
+    }
 
-	/**
-	 * @return \Swift_Mime_Attachment
-	 */
-	public function getSwiftAttachment() {
-		return $this->swiftAttachment;
-	}
+    /**
+     * @return \Swift_Mime_Attachment
+     */
+    public function getSwiftAttachment() {
+        return $this->swiftAttachment;
+    }
 
 }

lib/public/Mail/IMessage.php

Indentation +69 added lines, -69 removed lines

@@ -29,81 +29,81 @@
  */
 interface IMessage {
 
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null);
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null);
 
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath($path, $contentType = null);
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath($path, $contentType = null);
 
-	/**
-	 * @param IAttachment $attachment
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment);
+    /**
+     * @param IAttachment $attachment
+     * @return $this
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment);
 
-	/**
-	 * Set the from address of this message.
-	 *
-	 * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
-	 *
-	 * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setFrom(array $addresses);
+    /**
+     * Set the from address of this message.
+     *
+     * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
+     *
+     * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setFrom(array $addresses);
 
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setReplyTo(array $addresses);
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setReplyTo(array $addresses);
 
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setTo(array $recipients);
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setTo(array $recipients);
 
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setCc(array $recipients);
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setCc(array $recipients);
 
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setBcc(array $recipients);
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setBcc(array $recipients);
 
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate);
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @return $this
+     * @since 13.0.0
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate);
 }

lib/private/Mail/Message.php

Indentation +262 added lines, -262 removed lines

@@ -34,266 +34,266 @@
  * @package OC\Mail
  */
 class Message implements IMessage {
-	/** @var Swift_Message */
-	private $swiftMessage;
-
-	/**
-	 * @param Swift_Message $swiftMessage
-	 */
-	public function __construct(Swift_Message $swiftMessage) {
-		$this->swiftMessage = $swiftMessage;
-	}
-
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null) {
-		return new Attachment(\Swift_Attachment::newInstance($data, $filename, $contentType));
-	}
-
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath($path, $contentType = null) {
-		return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
-	}
-
-	/**
-	 * @param IAttachment $attachment
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment) {
-		/** @var Attachment $attachment */
-		$this->swiftMessage->attach($attachment->getSwiftAttachment());
-		return $this;
-	}
-
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param array $addresses Array of mail addresses, key will get converted
-	 * @return array Converted addresses if `idn_to_ascii` exists
-	 */
-	protected function convertAddresses($addresses) {
-		if (!function_exists('idn_to_ascii')) {
-			return $addresses;
-		}
-
-		$convertedAddresses = array();
-
-		foreach($addresses as $email => $readableName) {
-			if(!is_numeric($email)) {
-				list($name, $domain) = explode('@', $email, 2);
-				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
-				$convertedAddresses[$name.'@'.$domain] = $readableName;
-			} else {
-				list($name, $domain) = explode('@', $readableName, 2);
-				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
-				$convertedAddresses[$email] = $name.'@'.$domain;
-			}
-		}
-
-		return $convertedAddresses;
-	}
-
-	/**
-	 * Set the from address of this message.
-	 *
-	 * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
-	 *
-	 * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setFrom(array $addresses) {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setFrom($addresses);
-		return $this;
-	}
-
-	/**
-	 * Get the from address of this message.
-	 *
-	 * @return array
-	 */
-	public function getFrom() {
-		return $this->swiftMessage->getFrom();
-	}
-
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return $this
-	 */
-	public function setReplyTo(array $addresses) {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setReplyTo($addresses);
-		return $this;
-	}
-
-	/**
-	 * Returns the Reply-To address of this message
-	 *
-	 * @return array
-	 */
-	public function getReplyTo() {
-		return $this->swiftMessage->getReplyTo();
-	}
-
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setTo(array $recipients) {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setTo($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the to address of this message.
-	 *
-	 * @return array
-	 */
-	public function getTo() {
-		return $this->swiftMessage->getTo();
-	}
-
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setCc(array $recipients) {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setCc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the cc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getCc() {
-		return $this->swiftMessage->getCc();
-	}
-
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setBcc(array $recipients) {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setBcc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the Bcc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getBcc() {
-		return $this->swiftMessage->getBcc();
-	}
-
-	/**
-	 * Set the subject of this message.
-	 *
-	 * @param $subject
-	 * @return $this
-	 */
-	public function setSubject($subject) {
-		$this->swiftMessage->setSubject($subject);
-		return $this;
-	}
-
-	/**
-	 * Get the from subject of this message.
-	 *
-	 * @return string
-	 */
-	public function getSubject() {
-		return $this->swiftMessage->getSubject();
-	}
-
-	/**
-	 * Set the plain-text body of this message.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setPlainBody($body) {
-		$this->swiftMessage->setBody($body);
-		return $this;
-	}
-
-	/**
-	 * Get the plain body of this message.
-	 *
-	 * @return string
-	 */
-	public function getPlainBody() {
-		return $this->swiftMessage->getBody();
-	}
-
-	/**
-	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setHtmlBody($body) {
-		$this->swiftMessage->addPart($body, 'text/html');
-		return $this;
-	}
-
-	/**
-	 * Get's the underlying SwiftMessage
-	 * @return Swift_Message
-	 */
-	public function getSwiftMessage() {
-		return $this->swiftMessage;
-	}
-
-	/**
-	 * @param string $body
-	 * @param string $contentType
-	 * @return $this
-	 */
-	public function setBody($body, $contentType) {
-		$this->swiftMessage->setBody($body, $contentType);
-		return $this;
-	}
-
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @return $this
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate) {
-		$this->setSubject($emailTemplate->renderSubject());
-		$this->setPlainBody($emailTemplate->renderText());
-		$this->setHtmlBody($emailTemplate->renderHtml());
-		return $this;
-	}
+    /** @var Swift_Message */
+    private $swiftMessage;
+
+    /**
+     * @param Swift_Message $swiftMessage
+     */
+    public function __construct(Swift_Message $swiftMessage) {
+        $this->swiftMessage = $swiftMessage;
+    }
+
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null) {
+        return new Attachment(\Swift_Attachment::newInstance($data, $filename, $contentType));
+    }
+
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath($path, $contentType = null) {
+        return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
+    }
+
+    /**
+     * @param IAttachment $attachment
+     * @return $this
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment) {
+        /** @var Attachment $attachment */
+        $this->swiftMessage->attach($attachment->getSwiftAttachment());
+        return $this;
+    }
+
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param array $addresses Array of mail addresses, key will get converted
+     * @return array Converted addresses if `idn_to_ascii` exists
+     */
+    protected function convertAddresses($addresses) {
+        if (!function_exists('idn_to_ascii')) {
+            return $addresses;
+        }
+
+        $convertedAddresses = array();
+
+        foreach($addresses as $email => $readableName) {
+            if(!is_numeric($email)) {
+                list($name, $domain) = explode('@', $email, 2);
+                $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+                $convertedAddresses[$name.'@'.$domain] = $readableName;
+            } else {
+                list($name, $domain) = explode('@', $readableName, 2);
+                $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+                $convertedAddresses[$email] = $name.'@'.$domain;
+            }
+        }
+
+        return $convertedAddresses;
+    }
+
+    /**
+     * Set the from address of this message.
+     *
+     * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
+     *
+     * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setFrom(array $addresses) {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setFrom($addresses);
+        return $this;
+    }
+
+    /**
+     * Get the from address of this message.
+     *
+     * @return array
+     */
+    public function getFrom() {
+        return $this->swiftMessage->getFrom();
+    }
+
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return $this
+     */
+    public function setReplyTo(array $addresses) {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setReplyTo($addresses);
+        return $this;
+    }
+
+    /**
+     * Returns the Reply-To address of this message
+     *
+     * @return array
+     */
+    public function getReplyTo() {
+        return $this->swiftMessage->getReplyTo();
+    }
+
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setTo(array $recipients) {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setTo($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the to address of this message.
+     *
+     * @return array
+     */
+    public function getTo() {
+        return $this->swiftMessage->getTo();
+    }
+
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setCc(array $recipients) {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setCc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the cc address of this message.
+     *
+     * @return array
+     */
+    public function getCc() {
+        return $this->swiftMessage->getCc();
+    }
+
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setBcc(array $recipients) {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setBcc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the Bcc address of this message.
+     *
+     * @return array
+     */
+    public function getBcc() {
+        return $this->swiftMessage->getBcc();
+    }
+
+    /**
+     * Set the subject of this message.
+     *
+     * @param $subject
+     * @return $this
+     */
+    public function setSubject($subject) {
+        $this->swiftMessage->setSubject($subject);
+        return $this;
+    }
+
+    /**
+     * Get the from subject of this message.
+     *
+     * @return string
+     */
+    public function getSubject() {
+        return $this->swiftMessage->getSubject();
+    }
+
+    /**
+     * Set the plain-text body of this message.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setPlainBody($body) {
+        $this->swiftMessage->setBody($body);
+        return $this;
+    }
+
+    /**
+     * Get the plain body of this message.
+     *
+     * @return string
+     */
+    public function getPlainBody() {
+        return $this->swiftMessage->getBody();
+    }
+
+    /**
+     * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setHtmlBody($body) {
+        $this->swiftMessage->addPart($body, 'text/html');
+        return $this;
+    }
+
+    /**
+     * Get's the underlying SwiftMessage
+     * @return Swift_Message
+     */
+    public function getSwiftMessage() {
+        return $this->swiftMessage;
+    }
+
+    /**
+     * @param string $body
+     * @param string $contentType
+     * @return $this
+     */
+    public function setBody($body, $contentType) {
+        $this->swiftMessage->setBody($body, $contentType);
+        return $this;
+    }
+
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @return $this
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate) {
+        $this->setSubject($emailTemplate->renderSubject());
+        $this->setPlainBody($emailTemplate->renderText());
+        $this->setHtmlBody($emailTemplate->renderHtml());
+        return $this;
+    }
 }