Dolibarr / dolibarr

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php

Indentation +181 added lines, -181 removed lines

@@ -16,185 +16,185 @@
  */
 class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
 {
-    /** The replacement map */
-    private $replacements;
-
-    /** The body as it was before replacements */
-    private $originalBody;
-
-    /** The original headers of the message, before replacements */
-    private $originalHeaders = [];
-
-    /** Bodies of children before they are replaced */
-    private $originalChildBodies = [];
-
-    /** The Message that was last replaced */
-    private $lastMessage;
-
-    /**
-     * Create a new DecoratorPlugin with $replacements.
-     *
-     * The $replacements can either be an associative array, or an implementation
-     * of {@link Swift_Plugins_Decorator_Replacements}.
-     *
-     * When using an array, it should be of the form:
-     * <code>
-     * $replacements = array(
-     *  "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
-     *  "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
-     * )
-     * </code>
-     *
-     * When using an instance of {@link Swift_Plugins_Decorator_Replacements},
-     * the object should return just the array of replacements for the address
-     * given to {@link Swift_Plugins_Decorator_Replacements::getReplacementsFor()}.
-     *
-     * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
-     */
-    public function __construct($replacements)
-    {
-        $this->setReplacements($replacements);
-    }
-
-    /**
-     * Sets replacements.
-     *
-     * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
-     *
-     * @see __construct()
-     */
-    public function setReplacements($replacements)
-    {
-        if (!($replacements instanceof Swift_Plugins_Decorator_Replacements)) {
-            $this->replacements = (array) $replacements;
-        } else {
-            $this->replacements = $replacements;
-        }
-    }
-
-    /**
-     * Invoked immediately before the Message is sent.
-     */
-    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-    {
-        $message = $evt->getMessage();
-        $this->restoreMessage($message);
-        $to = array_keys($message->getTo());
-        $address = array_shift($to);
-        if ($replacements = $this->getReplacementsFor($address)) {
-            $body = $message->getBody();
-            $search = array_keys($replacements);
-            $replace = array_values($replacements);
-            $bodyReplaced = str_replace(
-                $search, $replace, $body
-                );
-            if ($body != $bodyReplaced) {
-                $this->originalBody = $body;
-                $message->setBody($bodyReplaced);
-            }
-
-            foreach ($message->getHeaders()->getAll() as $header) {
-                $body = $header->getFieldBodyModel();
-                $count = 0;
-                if (\is_array($body)) {
-                    $bodyReplaced = [];
-                    foreach ($body as $key => $value) {
-                        $count1 = 0;
-                        $count2 = 0;
-                        $key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
-                        $value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
-                        $bodyReplaced[$key] = $value;
-
-                        if (!$count && ($count1 || $count2)) {
-                            $count = 1;
-                        }
-                    }
-                } elseif (\is_string($body)) {
-                    $bodyReplaced = str_replace($search, $replace, $body, $count);
-                }
-
-                if ($count) {
-                    $this->originalHeaders[$header->getFieldName()] = $body;
-                    $header->setFieldBodyModel($bodyReplaced);
-                }
-            }
-
-            $children = (array) $message->getChildren();
-            foreach ($children as $child) {
-                list($type) = sscanf($child->getContentType(), '%[^/]/%s');
-                if ('text' == $type) {
-                    $body = $child->getBody();
-                    $bodyReplaced = str_replace(
-                        $search, $replace, $body
-                        );
-                    if ($body != $bodyReplaced) {
-                        $child->setBody($bodyReplaced);
-                        $this->originalChildBodies[$child->getId()] = $body;
-                    }
-                }
-            }
-            $this->lastMessage = $message;
-        }
-    }
-
-    /**
-     * Find a map of replacements for the address.
-     *
-     * If this plugin was provided with a delegate instance of
-     * {@link Swift_Plugins_Decorator_Replacements} then the call will be
-     * delegated to it.  Otherwise, it will attempt to find the replacements
-     * from the array provided in the constructor.
-     *
-     * If no replacements can be found, an empty value (NULL) is returned.
-     *
-     * @param string $address
-     *
-     * @return array
-     */
-    public function getReplacementsFor($address)
-    {
-        if ($this->replacements instanceof Swift_Plugins_Decorator_Replacements) {
-            return $this->replacements->getReplacementsFor($address);
-        }
-
-        return $this->replacements[$address] ?? null;
-    }
-
-    /**
-     * Invoked immediately after the Message is sent.
-     */
-    public function sendPerformed(Swift_Events_SendEvent $evt)
-    {
-        $this->restoreMessage($evt->getMessage());
-    }
-
-    /** Restore a changed message back to its original state */
-    private function restoreMessage(Swift_Mime_SimpleMessage $message)
-    {
-        if ($this->lastMessage === $message) {
-            if (isset($this->originalBody)) {
-                $message->setBody($this->originalBody);
-                $this->originalBody = null;
-            }
-            if (!empty($this->originalHeaders)) {
-                foreach ($message->getHeaders()->getAll() as $header) {
-                    if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
-                        $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
-                    }
-                }
-                $this->originalHeaders = [];
-            }
-            if (!empty($this->originalChildBodies)) {
-                $children = (array) $message->getChildren();
-                foreach ($children as $child) {
-                    $id = $child->getId();
-                    if (\array_key_exists($id, $this->originalChildBodies)) {
-                        $child->setBody($this->originalChildBodies[$id]);
-                    }
-                }
-                $this->originalChildBodies = [];
-            }
-            $this->lastMessage = null;
-        }
-    }
+	/** The replacement map */
+	private $replacements;
+
+	/** The body as it was before replacements */
+	private $originalBody;
+
+	/** The original headers of the message, before replacements */
+	private $originalHeaders = [];
+
+	/** Bodies of children before they are replaced */
+	private $originalChildBodies = [];
+
+	/** The Message that was last replaced */
+	private $lastMessage;
+
+	/**
+	 * Create a new DecoratorPlugin with $replacements.
+	 *
+	 * The $replacements can either be an associative array, or an implementation
+	 * of {@link Swift_Plugins_Decorator_Replacements}.
+	 *
+	 * When using an array, it should be of the form:
+	 * <code>
+	 * $replacements = array(
+	 *  "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
+	 *  "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
+	 * )
+	 * </code>
+	 *
+	 * When using an instance of {@link Swift_Plugins_Decorator_Replacements},
+	 * the object should return just the array of replacements for the address
+	 * given to {@link Swift_Plugins_Decorator_Replacements::getReplacementsFor()}.
+	 *
+	 * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
+	 */
+	public function __construct($replacements)
+	{
+		$this->setReplacements($replacements);
+	}
+
+	/**
+	 * Sets replacements.
+	 *
+	 * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
+	 *
+	 * @see __construct()
+	 */
+	public function setReplacements($replacements)
+	{
+		if (!($replacements instanceof Swift_Plugins_Decorator_Replacements)) {
+			$this->replacements = (array) $replacements;
+		} else {
+			$this->replacements = $replacements;
+		}
+	}
+
+	/**
+	 * Invoked immediately before the Message is sent.
+	 */
+	public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+	{
+		$message = $evt->getMessage();
+		$this->restoreMessage($message);
+		$to = array_keys($message->getTo());
+		$address = array_shift($to);
+		if ($replacements = $this->getReplacementsFor($address)) {
+			$body = $message->getBody();
+			$search = array_keys($replacements);
+			$replace = array_values($replacements);
+			$bodyReplaced = str_replace(
+				$search, $replace, $body
+				);
+			if ($body != $bodyReplaced) {
+				$this->originalBody = $body;
+				$message->setBody($bodyReplaced);
+			}
+
+			foreach ($message->getHeaders()->getAll() as $header) {
+				$body = $header->getFieldBodyModel();
+				$count = 0;
+				if (\is_array($body)) {
+					$bodyReplaced = [];
+					foreach ($body as $key => $value) {
+						$count1 = 0;
+						$count2 = 0;
+						$key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+						$value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+						$bodyReplaced[$key] = $value;
+
+						if (!$count && ($count1 || $count2)) {
+							$count = 1;
+						}
+					}
+				} elseif (\is_string($body)) {
+					$bodyReplaced = str_replace($search, $replace, $body, $count);
+				}
+
+				if ($count) {
+					$this->originalHeaders[$header->getFieldName()] = $body;
+					$header->setFieldBodyModel($bodyReplaced);
+				}
+			}
+
+			$children = (array) $message->getChildren();
+			foreach ($children as $child) {
+				list($type) = sscanf($child->getContentType(), '%[^/]/%s');
+				if ('text' == $type) {
+					$body = $child->getBody();
+					$bodyReplaced = str_replace(
+						$search, $replace, $body
+						);
+					if ($body != $bodyReplaced) {
+						$child->setBody($bodyReplaced);
+						$this->originalChildBodies[$child->getId()] = $body;
+					}
+				}
+			}
+			$this->lastMessage = $message;
+		}
+	}
+
+	/**
+	 * Find a map of replacements for the address.
+	 *
+	 * If this plugin was provided with a delegate instance of
+	 * {@link Swift_Plugins_Decorator_Replacements} then the call will be
+	 * delegated to it.  Otherwise, it will attempt to find the replacements
+	 * from the array provided in the constructor.
+	 *
+	 * If no replacements can be found, an empty value (NULL) is returned.
+	 *
+	 * @param string $address
+	 *
+	 * @return array
+	 */
+	public function getReplacementsFor($address)
+	{
+		if ($this->replacements instanceof Swift_Plugins_Decorator_Replacements) {
+			return $this->replacements->getReplacementsFor($address);
+		}
+
+		return $this->replacements[$address] ?? null;
+	}
+
+	/**
+	 * Invoked immediately after the Message is sent.
+	 */
+	public function sendPerformed(Swift_Events_SendEvent $evt)
+	{
+		$this->restoreMessage($evt->getMessage());
+	}
+
+	/** Restore a changed message back to its original state */
+	private function restoreMessage(Swift_Mime_SimpleMessage $message)
+	{
+		if ($this->lastMessage === $message) {
+			if (isset($this->originalBody)) {
+				$message->setBody($this->originalBody);
+				$this->originalBody = null;
+			}
+			if (!empty($this->originalHeaders)) {
+				foreach ($message->getHeaders()->getAll() as $header) {
+					if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
+						$header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
+					}
+				}
+				$this->originalHeaders = [];
+			}
+			if (!empty($this->originalChildBodies)) {
+				$children = (array) $message->getChildren();
+				foreach ($children as $child) {
+					$id = $child->getId();
+					if (\array_key_exists($id, $this->originalChildBodies)) {
+						$child->setBody($this->originalChildBodies[$id]);
+					}
+				}
+				$this->originalChildBodies = [];
+			}
+			$this->lastMessage = null;
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php

Indentation +20 added lines, -20 removed lines

@@ -15,24 +15,24 @@
  */
 class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
 {
-    /**
-     * Notifies this ReportNotifier that $address failed or succeeded.
-     *
-     * @param string $address
-     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
-     */
-    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
-    {
-        if (self::RESULT_PASS == $result) {
-            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
-            echo 'PASS '.$address.PHP_EOL;
-            echo '</div>'.PHP_EOL;
-            flush();
-        } else {
-            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL;
-            echo 'FAIL '.$address.PHP_EOL;
-            echo '</div>'.PHP_EOL;
-            flush();
-        }
-    }
+	/**
+	 * Notifies this ReportNotifier that $address failed or succeeded.
+	 *
+	 * @param string $address
+	 * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
+	 */
+	public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
+	{
+		if (self::RESULT_PASS == $result) {
+			echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
+			echo 'PASS '.$address.PHP_EOL;
+			echo '</div>'.PHP_EOL;
+			flush();
+		} else {
+			echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL;
+			echo 'FAIL '.$address.PHP_EOL;
+			echo '</div>'.PHP_EOL;
+			flush();
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php

Indentation +36 added lines, -36 removed lines

@@ -15,44 +15,44 @@
  */
 class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
 {
-    /**
-     * The list of failures.
-     *
-     * @var array
-     */
-    private $failures = [];
+	/**
+	 * The list of failures.
+	 *
+	 * @var array
+	 */
+	private $failures = [];
 
-    private $failures_cache = [];
+	private $failures_cache = [];
 
-    /**
-     * Notifies this ReportNotifier that $address failed or succeeded.
-     *
-     * @param string $address
-     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
-     */
-    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
-    {
-        if (self::RESULT_FAIL == $result && !isset($this->failures_cache[$address])) {
-            $this->failures[] = $address;
-            $this->failures_cache[$address] = true;
-        }
-    }
+	/**
+	 * Notifies this ReportNotifier that $address failed or succeeded.
+	 *
+	 * @param string $address
+	 * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
+	 */
+	public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
+	{
+		if (self::RESULT_FAIL == $result && !isset($this->failures_cache[$address])) {
+			$this->failures[] = $address;
+			$this->failures_cache[$address] = true;
+		}
+	}
 
-    /**
-     * Get an array of addresses for which delivery failed.
-     *
-     * @return array
-     */
-    public function getFailedRecipients()
-    {
-        return $this->failures;
-    }
+	/**
+	 * Get an array of addresses for which delivery failed.
+	 *
+	 * @return array
+	 */
+	public function getFailedRecipients()
+	{
+		return $this->failures;
+	}
 
-    /**
-     * Clear the buffer (empty the list).
-     */
-    public function clear()
-    {
-        $this->failures = $this->failures_cache = [];
-    }
+	/**
+	 * Clear the buffer (empty the list).
+	 */
+	public function clear()
+	{
+		$this->failures = $this->failures_cache = [];
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php

Indentation +36 added lines, -36 removed lines

@@ -15,43 +15,43 @@
  */
 class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 {
-    /**
-     * The reporter backend which takes notifications.
-     *
-     * @var Swift_Plugins_Reporter
-     */
-    private $reporter;
+	/**
+	 * The reporter backend which takes notifications.
+	 *
+	 * @var Swift_Plugins_Reporter
+	 */
+	private $reporter;
 
-    /**
-     * Create a new ReporterPlugin using $reporter.
-     */
-    public function __construct(Swift_Plugins_Reporter $reporter)
-    {
-        $this->reporter = $reporter;
-    }
+	/**
+	 * Create a new ReporterPlugin using $reporter.
+	 */
+	public function __construct(Swift_Plugins_Reporter $reporter)
+	{
+		$this->reporter = $reporter;
+	}
 
-    /**
-     * Not used.
-     */
-    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-    {
-    }
+	/**
+	 * Not used.
+	 */
+	public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+	{
+	}
 
-    /**
-     * Invoked immediately after the Message is sent.
-     */
-    public function sendPerformed(Swift_Events_SendEvent $evt)
-    {
-        $message = $evt->getMessage();
-        $failures = array_flip($evt->getFailedRecipients());
-        foreach ((array) $message->getTo() as $address => $null) {
-            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
-        }
-        foreach ((array) $message->getCc() as $address => $null) {
-            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
-        }
-        foreach ((array) $message->getBcc() as $address => $null) {
-            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
-        }
-    }
+	/**
+	 * Invoked immediately after the Message is sent.
+	 */
+	public function sendPerformed(Swift_Events_SendEvent $evt)
+	{
+		$message = $evt->getMessage();
+		$failures = array_flip($evt->getFailedRecipients());
+		foreach ((array) $message->getTo() as $address => $null) {
+			$this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+		}
+		foreach ((array) $message->getCc() as $address => $null) {
+			$this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+		}
+		foreach ((array) $message->getBcc() as $address => $null) {
+			$this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php

Indentation +183 added lines, -183 removed lines

@@ -15,187 +15,187 @@
  */
 class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 {
-    /**
-     * The recipient who will receive all messages.
-     *
-     * @var mixed
-     */
-    private $recipient;
-
-    /**
-     * List of regular expression for recipient whitelisting.
-     *
-     * @var array
-     */
-    private $whitelist = [];
-
-    /**
-     * Create a new RedirectingPlugin.
-     *
-     * @param mixed $recipient
-     */
-    public function __construct($recipient, array $whitelist = [])
-    {
-        $this->recipient = $recipient;
-        $this->whitelist = $whitelist;
-    }
-
-    /**
-     * Set the recipient of all messages.
-     *
-     * @param mixed $recipient
-     */
-    public function setRecipient($recipient)
-    {
-        $this->recipient = $recipient;
-    }
-
-    /**
-     * Get the recipient of all messages.
-     *
-     * @return mixed
-     */
-    public function getRecipient()
-    {
-        return $this->recipient;
-    }
-
-    /**
-     * Set a list of regular expressions to whitelist certain recipients.
-     */
-    public function setWhitelist(array $whitelist)
-    {
-        $this->whitelist = $whitelist;
-    }
-
-    /**
-     * Get the whitelist.
-     *
-     * @return array
-     */
-    public function getWhitelist()
-    {
-        return $this->whitelist;
-    }
-
-    /**
-     * Invoked immediately before the Message is sent.
-     */
-    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-    {
-        $message = $evt->getMessage();
-        $headers = $message->getHeaders();
-
-        // conditionally save current recipients
-
-        if ($headers->has('to')) {
-            $headers->addMailboxHeader('X-Swift-To', $message->getTo());
-        }
-
-        if ($headers->has('cc')) {
-            $headers->addMailboxHeader('X-Swift-Cc', $message->getCc());
-        }
-
-        if ($headers->has('bcc')) {
-            $headers->addMailboxHeader('X-Swift-Bcc', $message->getBcc());
-        }
-
-        // Filter remaining headers against whitelist
-        $this->filterHeaderSet($headers, 'To');
-        $this->filterHeaderSet($headers, 'Cc');
-        $this->filterHeaderSet($headers, 'Bcc');
-
-        // Add each hard coded recipient
-        $to = $message->getTo();
-        if (null === $to) {
-            $to = [];
-        }
-
-        foreach ((array) $this->recipient as $recipient) {
-            if (!\array_key_exists($recipient, $to)) {
-                $message->addTo($recipient);
-            }
-        }
-    }
-
-    /**
-     * Filter header set against a whitelist of regular expressions.
-     *
-     * @param string $type
-     */
-    private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
-    {
-        foreach ($headerSet->getAll($type) as $headers) {
-            $headers->setNameAddresses($this->filterNameAddresses($headers->getNameAddresses()));
-        }
-    }
-
-    /**
-     * Filtered list of addresses => name pairs.
-     *
-     * @return array
-     */
-    private function filterNameAddresses(array $recipients)
-    {
-        $filtered = [];
-
-        foreach ($recipients as $address => $name) {
-            if ($this->isWhitelisted($address)) {
-                $filtered[$address] = $name;
-            }
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Matches address against whitelist of regular expressions.
-     *
-     * @return bool
-     */
-    protected function isWhitelisted($recipient)
-    {
-        if (\in_array($recipient, (array) $this->recipient)) {
-            return true;
-        }
-
-        foreach ($this->whitelist as $pattern) {
-            if (preg_match($pattern, $recipient)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Invoked immediately after the Message is sent.
-     */
-    public function sendPerformed(Swift_Events_SendEvent $evt)
-    {
-        $this->restoreMessage($evt->getMessage());
-    }
-
-    private function restoreMessage(Swift_Mime_SimpleMessage $message)
-    {
-        // restore original headers
-        $headers = $message->getHeaders();
-
-        if ($headers->has('X-Swift-To')) {
-            $message->setTo($headers->get('X-Swift-To')->getNameAddresses());
-            $headers->removeAll('X-Swift-To');
-        } else {
-            $message->setTo(null);
-        }
-
-        if ($headers->has('X-Swift-Cc')) {
-            $message->setCc($headers->get('X-Swift-Cc')->getNameAddresses());
-            $headers->removeAll('X-Swift-Cc');
-        }
-
-        if ($headers->has('X-Swift-Bcc')) {
-            $message->setBcc($headers->get('X-Swift-Bcc')->getNameAddresses());
-            $headers->removeAll('X-Swift-Bcc');
-        }
-    }
+	/**
+	 * The recipient who will receive all messages.
+	 *
+	 * @var mixed
+	 */
+	private $recipient;
+
+	/**
+	 * List of regular expression for recipient whitelisting.
+	 *
+	 * @var array
+	 */
+	private $whitelist = [];
+
+	/**
+	 * Create a new RedirectingPlugin.
+	 *
+	 * @param mixed $recipient
+	 */
+	public function __construct($recipient, array $whitelist = [])
+	{
+		$this->recipient = $recipient;
+		$this->whitelist = $whitelist;
+	}
+
+	/**
+	 * Set the recipient of all messages.
+	 *
+	 * @param mixed $recipient
+	 */
+	public function setRecipient($recipient)
+	{
+		$this->recipient = $recipient;
+	}
+
+	/**
+	 * Get the recipient of all messages.
+	 *
+	 * @return mixed
+	 */
+	public function getRecipient()
+	{
+		return $this->recipient;
+	}
+
+	/**
+	 * Set a list of regular expressions to whitelist certain recipients.
+	 */
+	public function setWhitelist(array $whitelist)
+	{
+		$this->whitelist = $whitelist;
+	}
+
+	/**
+	 * Get the whitelist.
+	 *
+	 * @return array
+	 */
+	public function getWhitelist()
+	{
+		return $this->whitelist;
+	}
+
+	/**
+	 * Invoked immediately before the Message is sent.
+	 */
+	public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+	{
+		$message = $evt->getMessage();
+		$headers = $message->getHeaders();
+
+		// conditionally save current recipients
+
+		if ($headers->has('to')) {
+			$headers->addMailboxHeader('X-Swift-To', $message->getTo());
+		}
+
+		if ($headers->has('cc')) {
+			$headers->addMailboxHeader('X-Swift-Cc', $message->getCc());
+		}
+
+		if ($headers->has('bcc')) {
+			$headers->addMailboxHeader('X-Swift-Bcc', $message->getBcc());
+		}
+
+		// Filter remaining headers against whitelist
+		$this->filterHeaderSet($headers, 'To');
+		$this->filterHeaderSet($headers, 'Cc');
+		$this->filterHeaderSet($headers, 'Bcc');
+
+		// Add each hard coded recipient
+		$to = $message->getTo();
+		if (null === $to) {
+			$to = [];
+		}
+
+		foreach ((array) $this->recipient as $recipient) {
+			if (!\array_key_exists($recipient, $to)) {
+				$message->addTo($recipient);
+			}
+		}
+	}
+
+	/**
+	 * Filter header set against a whitelist of regular expressions.
+	 *
+	 * @param string $type
+	 */
+	private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
+	{
+		foreach ($headerSet->getAll($type) as $headers) {
+			$headers->setNameAddresses($this->filterNameAddresses($headers->getNameAddresses()));
+		}
+	}
+
+	/**
+	 * Filtered list of addresses => name pairs.
+	 *
+	 * @return array
+	 */
+	private function filterNameAddresses(array $recipients)
+	{
+		$filtered = [];
+
+		foreach ($recipients as $address => $name) {
+			if ($this->isWhitelisted($address)) {
+				$filtered[$address] = $name;
+			}
+		}
+
+		return $filtered;
+	}
+
+	/**
+	 * Matches address against whitelist of regular expressions.
+	 *
+	 * @return bool
+	 */
+	protected function isWhitelisted($recipient)
+	{
+		if (\in_array($recipient, (array) $this->recipient)) {
+			return true;
+		}
+
+		foreach ($this->whitelist as $pattern) {
+			if (preg_match($pattern, $recipient)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Invoked immediately after the Message is sent.
+	 */
+	public function sendPerformed(Swift_Events_SendEvent $evt)
+	{
+		$this->restoreMessage($evt->getMessage());
+	}
+
+	private function restoreMessage(Swift_Mime_SimpleMessage $message)
+	{
+		// restore original headers
+		$headers = $message->getHeaders();
+
+		if ($headers->has('X-Swift-To')) {
+			$message->setTo($headers->get('X-Swift-To')->getNameAddresses());
+			$headers->removeAll('X-Swift-To');
+		} else {
+			$message->setTo(null);
+		}
+
+		if ($headers->has('X-Swift-Cc')) {
+			$message->setCc($headers->get('X-Swift-Cc')->getNameAddresses());
+			$headers->removeAll('X-Swift-Cc');
+		}
+
+		if ($headers->has('X-Swift-Bcc')) {
+			$message->setBcc($headers->get('X-Swift-Bcc')->getNameAddresses());
+			$headers->removeAll('X-Swift-Bcc');
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php

Indentation +108 added lines, -108 removed lines

@@ -15,123 +15,123 @@
  */
 class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_Plugins_Sleeper
 {
-    /**
-     * The number of emails to send before restarting Transport.
-     *
-     * @var int
-     */
-    private $threshold;
+	/**
+	 * The number of emails to send before restarting Transport.
+	 *
+	 * @var int
+	 */
+	private $threshold;
 
-    /**
-     * The number of seconds to sleep for during a restart.
-     *
-     * @var int
-     */
-    private $sleep;
+	/**
+	 * The number of seconds to sleep for during a restart.
+	 *
+	 * @var int
+	 */
+	private $sleep;
 
-    /**
-     * The internal counter.
-     *
-     * @var int
-     */
-    private $counter = 0;
+	/**
+	 * The internal counter.
+	 *
+	 * @var int
+	 */
+	private $counter = 0;
 
-    /**
-     * The Sleeper instance for sleeping.
-     *
-     * @var Swift_Plugins_Sleeper
-     */
-    private $sleeper;
+	/**
+	 * The Sleeper instance for sleeping.
+	 *
+	 * @var Swift_Plugins_Sleeper
+	 */
+	private $sleeper;
 
-    /**
-     * Create a new AntiFloodPlugin with $threshold and $sleep time.
-     *
-     * @param int                   $threshold
-     * @param int                   $sleep     time
-     * @param Swift_Plugins_Sleeper $sleeper   (not needed really)
-     */
-    public function __construct($threshold = 99, $sleep = 0, Swift_Plugins_Sleeper $sleeper = null)
-    {
-        $this->setThreshold($threshold);
-        $this->setSleepTime($sleep);
-        $this->sleeper = $sleeper;
-    }
+	/**
+	 * Create a new AntiFloodPlugin with $threshold and $sleep time.
+	 *
+	 * @param int                   $threshold
+	 * @param int                   $sleep     time
+	 * @param Swift_Plugins_Sleeper $sleeper   (not needed really)
+	 */
+	public function __construct($threshold = 99, $sleep = 0, Swift_Plugins_Sleeper $sleeper = null)
+	{
+		$this->setThreshold($threshold);
+		$this->setSleepTime($sleep);
+		$this->sleeper = $sleeper;
+	}
 
-    /**
-     * Set the number of emails to send before restarting.
-     *
-     * @param int $threshold
-     */
-    public function setThreshold($threshold)
-    {
-        $this->threshold = $threshold;
-    }
+	/**
+	 * Set the number of emails to send before restarting.
+	 *
+	 * @param int $threshold
+	 */
+	public function setThreshold($threshold)
+	{
+		$this->threshold = $threshold;
+	}
 
-    /**
-     * Get the number of emails to send before restarting.
-     *
-     * @return int
-     */
-    public function getThreshold()
-    {
-        return $this->threshold;
-    }
+	/**
+	 * Get the number of emails to send before restarting.
+	 *
+	 * @return int
+	 */
+	public function getThreshold()
+	{
+		return $this->threshold;
+	}
 
-    /**
-     * Set the number of seconds to sleep for during a restart.
-     *
-     * @param int $sleep time
-     */
-    public function setSleepTime($sleep)
-    {
-        $this->sleep = $sleep;
-    }
+	/**
+	 * Set the number of seconds to sleep for during a restart.
+	 *
+	 * @param int $sleep time
+	 */
+	public function setSleepTime($sleep)
+	{
+		$this->sleep = $sleep;
+	}
 
-    /**
-     * Get the number of seconds to sleep for during a restart.
-     *
-     * @return int
-     */
-    public function getSleepTime()
-    {
-        return $this->sleep;
-    }
+	/**
+	 * Get the number of seconds to sleep for during a restart.
+	 *
+	 * @return int
+	 */
+	public function getSleepTime()
+	{
+		return $this->sleep;
+	}
 
-    /**
-     * Invoked immediately before the Message is sent.
-     */
-    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-    {
-    }
+	/**
+	 * Invoked immediately before the Message is sent.
+	 */
+	public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+	{
+	}
 
-    /**
-     * Invoked immediately after the Message is sent.
-     */
-    public function sendPerformed(Swift_Events_SendEvent $evt)
-    {
-        ++$this->counter;
-        if ($this->counter >= $this->threshold) {
-            $transport = $evt->getTransport();
-            $transport->stop();
-            if ($this->sleep) {
-                $this->sleep($this->sleep);
-            }
-            $transport->start();
-            $this->counter = 0;
-        }
-    }
+	/**
+	 * Invoked immediately after the Message is sent.
+	 */
+	public function sendPerformed(Swift_Events_SendEvent $evt)
+	{
+		++$this->counter;
+		if ($this->counter >= $this->threshold) {
+			$transport = $evt->getTransport();
+			$transport->stop();
+			if ($this->sleep) {
+				$this->sleep($this->sleep);
+			}
+			$transport->start();
+			$this->counter = 0;
+		}
+	}
 
-    /**
-     * Sleep for $seconds.
-     *
-     * @param int $seconds
-     */
-    public function sleep($seconds)
-    {
-        if (isset($this->sleeper)) {
-            $this->sleeper->sleep($seconds);
-        } else {
-            sleep($seconds);
-        }
-    }
+	/**
+	 * Sleep for $seconds.
+	 *
+	 * @param int $seconds
+	 */
+	public function sleep($seconds)
+	{
+		if (isset($this->sleeper)) {
+			$this->sleeper->sleep($seconds);
+		} else {
+			sleep($seconds);
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php

Indentation +224 added lines, -224 removed lines

@@ -15,228 +15,228 @@
  */
 class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
 {
-    /** A delegate connection to use (mostly a test hook) */
-    private $connection;
-
-    /** Hostname of the POP3 server */
-    private $host;
-
-    /** Port number to connect on */
-    private $port;
-
-    /** Encryption type to use (if any) */
-    private $crypto;
-
-    /** Username to use (if any) */
-    private $username;
-
-    /** Password to use (if any) */
-    private $password;
-
-    /** Established connection via TCP socket */
-    private $socket;
-
-    /** Connect timeout in seconds */
-    private $timeout = 10;
-
-    /** SMTP Transport to bind to */
-    private $transport;
-
-    /**
-     * Create a new PopBeforeSmtpPlugin for $host and $port.
-     *
-     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
-     *                       wrapped in square brackets.
-     * @param int    $port
-     * @param string $crypto as "tls" or "ssl"
-     */
-    public function __construct($host, $port = 110, $crypto = null)
-    {
-        $this->host = $host;
-        $this->port = $port;
-        $this->crypto = $crypto;
-    }
-
-    /**
-     * Set a Pop3Connection to delegate to instead of connecting directly.
-     *
-     * @return $this
-     */
-    public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
-    {
-        $this->connection = $connection;
-
-        return $this;
-    }
-
-    /**
-     * Bind this plugin to a specific SMTP transport instance.
-     */
-    public function bindSmtp(Swift_Transport $smtp)
-    {
-        $this->transport = $smtp;
-    }
-
-    /**
-     * Set the connection timeout in seconds (default 10).
-     *
-     * @param int $timeout
-     *
-     * @return $this
-     */
-    public function setTimeout($timeout)
-    {
-        $this->timeout = (int) $timeout;
-
-        return $this;
-    }
-
-    /**
-     * Set the username to use when connecting (if needed).
-     *
-     * @param string $username
-     *
-     * @return $this
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    /**
-     * Set the password to use when connecting (if needed).
-     *
-     * @param string $password
-     *
-     * @return $this
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-
-        return $this;
-    }
-
-    /**
-     * Connect to the POP3 host and authenticate.
-     *
-     * @throws Swift_Plugins_Pop_Pop3Exception if connection fails
-     */
-    public function connect()
-    {
-        if (isset($this->connection)) {
-            $this->connection->connect();
-        } else {
-            if (!isset($this->socket)) {
-                if (!$socket = fsockopen(
-                    $this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
-                }
-                $this->socket = $socket;
-
-                if (false === $greeting = fgets($this->socket)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
-                }
-
-                $this->assertOk($greeting);
-
-                if ($this->username) {
-                    $this->command(sprintf("USER %s\r\n", $this->username));
-                    $this->command(sprintf("PASS %s\r\n", $this->password));
-                }
-            }
-        }
-    }
-
-    /**
-     * Disconnect from the POP3 host.
-     */
-    public function disconnect()
-    {
-        if (isset($this->connection)) {
-            $this->connection->disconnect();
-        } else {
-            $this->command("QUIT\r\n");
-            if (!fclose($this->socket)) {
-                throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
-            }
-            $this->socket = null;
-        }
-    }
-
-    /**
-     * Invoked just before a Transport is started.
-     */
-    public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
-    {
-        if (isset($this->transport)) {
-            if ($this->transport !== $evt->getTransport()) {
-                return;
-            }
-        }
-
-        $this->connect();
-        $this->disconnect();
-    }
-
-    /**
-     * Not used.
-     */
-    public function transportStarted(Swift_Events_TransportChangeEvent $evt)
-    {
-    }
-
-    /**
-     * Not used.
-     */
-    public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
-    {
-    }
-
-    /**
-     * Not used.
-     */
-    public function transportStopped(Swift_Events_TransportChangeEvent $evt)
-    {
-    }
-
-    private function command($command)
-    {
-        if (!fwrite($this->socket, $command)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
-        }
-
-        if (false === $response = fgets($this->socket)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
-        }
-
-        $this->assertOk($response);
-
-        return $response;
-    }
-
-    private function assertOk($response)
-    {
-        if ('+OK' != substr($response, 0, 3)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
-        }
-    }
-
-    private function getHostString()
-    {
-        $host = $this->host;
-        switch (strtolower($this->crypto ?? '')) {
-            case 'ssl':
-                $host = 'ssl://'.$host;
-                break;
-
-            case 'tls':
-                $host = 'tls://'.$host;
-                break;
-        }
-
-        return $host;
-    }
+	/** A delegate connection to use (mostly a test hook) */
+	private $connection;
+
+	/** Hostname of the POP3 server */
+	private $host;
+
+	/** Port number to connect on */
+	private $port;
+
+	/** Encryption type to use (if any) */
+	private $crypto;
+
+	/** Username to use (if any) */
+	private $username;
+
+	/** Password to use (if any) */
+	private $password;
+
+	/** Established connection via TCP socket */
+	private $socket;
+
+	/** Connect timeout in seconds */
+	private $timeout = 10;
+
+	/** SMTP Transport to bind to */
+	private $transport;
+
+	/**
+	 * Create a new PopBeforeSmtpPlugin for $host and $port.
+	 *
+	 * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+	 *                       wrapped in square brackets.
+	 * @param int    $port
+	 * @param string $crypto as "tls" or "ssl"
+	 */
+	public function __construct($host, $port = 110, $crypto = null)
+	{
+		$this->host = $host;
+		$this->port = $port;
+		$this->crypto = $crypto;
+	}
+
+	/**
+	 * Set a Pop3Connection to delegate to instead of connecting directly.
+	 *
+	 * @return $this
+	 */
+	public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
+	{
+		$this->connection = $connection;
+
+		return $this;
+	}
+
+	/**
+	 * Bind this plugin to a specific SMTP transport instance.
+	 */
+	public function bindSmtp(Swift_Transport $smtp)
+	{
+		$this->transport = $smtp;
+	}
+
+	/**
+	 * Set the connection timeout in seconds (default 10).
+	 *
+	 * @param int $timeout
+	 *
+	 * @return $this
+	 */
+	public function setTimeout($timeout)
+	{
+		$this->timeout = (int) $timeout;
+
+		return $this;
+	}
+
+	/**
+	 * Set the username to use when connecting (if needed).
+	 *
+	 * @param string $username
+	 *
+	 * @return $this
+	 */
+	public function setUsername($username)
+	{
+		$this->username = $username;
+
+		return $this;
+	}
+
+	/**
+	 * Set the password to use when connecting (if needed).
+	 *
+	 * @param string $password
+	 *
+	 * @return $this
+	 */
+	public function setPassword($password)
+	{
+		$this->password = $password;
+
+		return $this;
+	}
+
+	/**
+	 * Connect to the POP3 host and authenticate.
+	 *
+	 * @throws Swift_Plugins_Pop_Pop3Exception if connection fails
+	 */
+	public function connect()
+	{
+		if (isset($this->connection)) {
+			$this->connection->connect();
+		} else {
+			if (!isset($this->socket)) {
+				if (!$socket = fsockopen(
+					$this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
+					throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
+				}
+				$this->socket = $socket;
+
+				if (false === $greeting = fgets($this->socket)) {
+					throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
+				}
+
+				$this->assertOk($greeting);
+
+				if ($this->username) {
+					$this->command(sprintf("USER %s\r\n", $this->username));
+					$this->command(sprintf("PASS %s\r\n", $this->password));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Disconnect from the POP3 host.
+	 */
+	public function disconnect()
+	{
+		if (isset($this->connection)) {
+			$this->connection->disconnect();
+		} else {
+			$this->command("QUIT\r\n");
+			if (!fclose($this->socket)) {
+				throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
+			}
+			$this->socket = null;
+		}
+	}
+
+	/**
+	 * Invoked just before a Transport is started.
+	 */
+	public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
+	{
+		if (isset($this->transport)) {
+			if ($this->transport !== $evt->getTransport()) {
+				return;
+			}
+		}
+
+		$this->connect();
+		$this->disconnect();
+	}
+
+	/**
+	 * Not used.
+	 */
+	public function transportStarted(Swift_Events_TransportChangeEvent $evt)
+	{
+	}
+
+	/**
+	 * Not used.
+	 */
+	public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
+	{
+	}
+
+	/**
+	 * Not used.
+	 */
+	public function transportStopped(Swift_Events_TransportChangeEvent $evt)
+	{
+	}
+
+	private function command($command)
+	{
+		if (!fwrite($this->socket, $command)) {
+			throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
+		}
+
+		if (false === $response = fgets($this->socket)) {
+			throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
+		}
+
+		$this->assertOk($response);
+
+		return $response;
+	}
+
+	private function assertOk($response)
+	{
+		if ('+OK' != substr($response, 0, 3)) {
+			throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
+		}
+	}
+
+	private function getHostString()
+	{
+		$host = $this->host;
+		switch (strtolower($this->crypto ?? '')) {
+			case 'ssl':
+				$host = 'ssl://'.$host;
+				break;
+
+			case 'tls':
+				$host = 'tls://'.$host;
+				break;
+		}
+
+		return $host;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php

Indentation +11 added lines, -11 removed lines

@@ -15,17 +15,17 @@
  */
 interface Swift_Plugins_Reporter
 {
-    /** The recipient was accepted for delivery */
-    const RESULT_PASS = 0x01;
+	/** The recipient was accepted for delivery */
+	const RESULT_PASS = 0x01;
 
-    /** The recipient could not be accepted */
-    const RESULT_FAIL = 0x10;
+	/** The recipient could not be accepted */
+	const RESULT_FAIL = 0x10;
 
-    /**
-     * Notifies this ReportNotifier that $address failed or succeeded.
-     *
-     * @param string $address
-     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
-     */
-    public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
+	/**
+	 * Notifies this ReportNotifier that $address failed or succeeded.
+	 *
+	 * @param string $address
+	 * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
+	 */
+	public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
 }

htdocs/includes/swiftmailer/lib/classes/Swift/DependencyException.php

Indentation +9 added lines, -9 removed lines

@@ -15,13 +15,13 @@
  */
 class Swift_DependencyException extends Swift_SwiftException
 {
-    /**
-     * Create a new DependencyException with $message.
-     *
-     * @param string $message
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * Create a new DependencyException with $message.
+	 *
+	 * @param string $message
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }