- */
-class Swift_KeyCache_DummyKeyCache implements Swift_KeyCache
-{
- /**
- * Set a string into the cache under $itemKey for the namespace $nsKey.
- * @param string $nsKey
- * @param string $itemKey
- * @param string $string
- * @param int $mode
- * @see MODE_WRITE, MODE_APPEND
- */
- public function setString($nsKey, $itemKey, $string, $mode)
- {}
-
- /**
- * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
- * @param string $nsKey
- * @param string $itemKey
- * @param Swift_OutputByteStream $os
- * @param int $mode
- * @see MODE_WRITE, MODE_APPEND
- */
- public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
- $mode)
- {}
-
- /**
- * Provides a ByteStream which when written to, writes data to $itemKey.
- * NOTE: The stream will always write in append mode.
- * @param string $nsKey
- * @param string $itemKey
- * @return Swift_InputByteStream
- */
- public function getInputByteStream($nsKey, $itemKey,
- Swift_InputByteStream $writeThrough = null)
- {
- return false;
- }
-
- /**
- * Get data back out of the cache as a string.
- * @param string $nsKey
- * @param string $itemKey
- * @return string
- */
- public function getString($nsKey, $itemKey)
- {
- return false;
- }
-
- /**
- * Get data back out of the cache as a ByteStream.
- * @param string $nsKey
- * @param string $itemKey
- * @param Swift_InputByteStream $is to write the data to
- */
- public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
- {
- return false;
- }
-
- /**
- * Check if the given $itemKey exists in the namespace $nsKey.
- * @param string $nsKey
- * @param string $itemKey
- * @return boolean
- */
- public function hasKey($nsKey, $itemKey)
- {
- return false;
- }
-
- /**
- * Clear data for $itemKey in the namespace $nsKey if it exists.
- * @param string $nsKey
- * @param string $itemKey
- */
- public function clearKey($nsKey, $itemKey)
- {}
-
- /**
- * Clear all data in the namespace $nsKey if it exists.
- * @param string $nsKey
- */
- public function clearAll($nsKey)
- {}
-}
diff --git a/lib/swift/classes/Swift/KeyCache/KeyCacheInputStream.php b/lib/swift/classes/Swift/KeyCache/KeyCacheInputStream.php
deleted file mode 100644
index f4a3f4761..000000000
--- a/lib/swift/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ /dev/null
@@ -1,51 +0,0 @@
-_keyCache = $keyCache;
- }
-
- /**
- * Specify a stream to write through for each write().
- * @param Swift_InputByteStream $is
- */
- public function setWriteThroughStream(Swift_InputByteStream $is)
- {
- $this->_writeThrough = $is;
- }
-
- /**
- * Writes $bytes to the end of the stream.
- * @param string $bytes
- * @param Swift_InputByteStream $is, optional
- */
- public function write($bytes, Swift_InputByteStream $is = null)
- {
- $this->_keyCache->setString(
- $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
- );
- if (isset($is))
- {
- $is->write($bytes);
- }
- if (isset($this->_writeThrough))
- {
- $this->_writeThrough->write($bytes);
- }
- }
-
- /**
- * Not used.
- */
- public function commit()
- {
- }
-
- /**
- * Not used.
- */
- public function bind(Swift_InputByteStream $is)
- {
- }
-
- /**
- * Not used.
- */
- public function unbind(Swift_InputByteStream $is)
- {
- }
-
- /**
- * Flush the contents of the stream (empty it) and set the internal pointer
- * to the beginning.
- */
- public function flushBuffers()
- {
- $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
- }
-
- /**
- * Set the nsKey which will be written to.
- * @param string $nsKey
- */
- public function setNsKey($nsKey)
- {
- $this->_nsKey = $nsKey;
- }
-
- /**
- * Set the itemKey which will be written to.
- * @param string $itemKey
- */
- public function setItemKey($itemKey)
- {
- $this->_itemKey = $itemKey;
- }
-
- /**
- * Any implementation should be cloneable, allowing the clone to access a
- * separate $nsKey and $itemKey.
- */
- public function __clone()
- {
- $this->_writeThrough = null;
- }
-
-}
diff --git a/lib/swift/classes/Swift/LoadBalancedTransport.php b/lib/swift/classes/Swift/LoadBalancedTransport.php
deleted file mode 100644
index de3045ad6..000000000
--- a/lib/swift/classes/Swift/LoadBalancedTransport.php
+++ /dev/null
@@ -1,46 +0,0 @@
-createDependenciesFor('transport.loadbalanced')
- );
-
- $this->setTransports($transports);
- }
-
- /**
- * Create a new LoadBalancedTransport instance.
- * @param string $transports
- * @return Swift_LoadBalancedTransport
- */
- public static function newInstance($transports = array())
- {
- return new self($transports);
- }
-
-}
diff --git a/lib/swift/classes/Swift/MailTransport.php b/lib/swift/classes/Swift/MailTransport.php
deleted file mode 100644
index dd8ccacc8..000000000
--- a/lib/swift/classes/Swift/MailTransport.php
+++ /dev/null
@@ -1,46 +0,0 @@
-createDependenciesFor('transport.mail')
- );
-
- $this->setExtraParams($extraParams);
- }
-
- /**
- * Create a new MailTransport instance.
- * @param string $extraParams To be passed to mail()
- * @return Swift_MailTransport
- */
- public static function newInstance($extraParams = '-f%s')
- {
- return new self($extraParams);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mailer.php b/lib/swift/classes/Swift/Mailer.php
deleted file mode 100644
index a0561d3d2..000000000
--- a/lib/swift/classes/Swift/Mailer.php
+++ /dev/null
@@ -1,118 +0,0 @@
-_transport = $transport;
- }
-
- /**
- * Create a new Mailer instance.
- *
- * @param Swift_Transport $transport
- * @return Swift_Mailer
- */
- public static function newInstance(Swift_Transport $transport)
- {
- return new self($transport);
- }
-
- /**
- * Create a new class instance of one if the message services
- * For example 'mimepart' would create a 'message.mimepart' instance
- *
- * @param string $service
- * @return object
- */
- public function createMessage($service = 'message')
- {
- return Swift_DependencyContainer::getInstance()
- ->lookup('message.'.$service);
- }
-
- /**
- * Send the given Message like it would be sent in a mail client.
- *
- * All recipients (with the exception of Bcc) will be able to see the other
- * recipients this message was sent to.
- *
- * Recipient/sender data will be retrieved from the Message object.
- *
- * The return value is the number of recipients who were accepted for
- * delivery.
- *
- * @param Swift_Mime_Message $message
- * @param array &$failedRecipients, optional
- * @return int
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $failedRecipients = (array) $failedRecipients;
-
- if (!$this->_transport->isStarted())
- {
- $this->_transport->start();
- }
-
- $sent = 0;
-
- try
- {
- $sent = $this->_transport->send($message, $failedRecipients);
- }
- catch (Swift_RfcComplianceException $e)
- {
- foreach ($message->getTo() as $address => $name)
- {
- $failedRecipients[] = $address;
- }
- }
-
- return $sent;
- }
-
- /**
- * Register a plugin using a known unique key (e.g. myPlugin).
- *
- * @param Swift_Events_EventListener $plugin
- * @param string $key
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- $this->_transport->registerPlugin($plugin);
- }
-
- /**
- * The Transport used to send messages.
- * @return Swift_Transport
- */
- public function getTransport()
- {
- return $this->_transport;
- }
-}
diff --git a/lib/swift/classes/Swift/Mailer/ArrayRecipientIterator.php b/lib/swift/classes/Swift/Mailer/ArrayRecipientIterator.php
deleted file mode 100644
index c732ebb91..000000000
--- a/lib/swift/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-_recipients = $recipients;
- }
-
- /**
- * Returns true only if there are more recipients to send to.
- * @return boolean
- */
- public function hasNext()
- {
- return !empty($this->_recipients);
- }
-
- /**
- * Returns an array where the keys are the addresses of recipients and the
- * values are the names.
- * e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL)
- * @return array
- */
- public function nextRecipient()
- {
- return array_splice($this->_recipients, 0, 1);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mailer/RecipientIterator.php b/lib/swift/classes/Swift/Mailer/RecipientIterator.php
deleted file mode 100644
index 271384166..000000000
--- a/lib/swift/classes/Swift/Mailer/RecipientIterator.php
+++ /dev/null
@@ -1,34 +0,0 @@
- 'Foo') or ('foo@bar' => NULL)
- * @return array
- */
- public function nextRecipient();
-
-}
diff --git a/lib/swift/classes/Swift/MemorySpool.php b/lib/swift/classes/Swift/MemorySpool.php
deleted file mode 100644
index 6a64c52f2..000000000
--- a/lib/swift/classes/Swift/MemorySpool.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages in memory.
- * @package Swift
- * @author Fabien Potencier
- */
-class Swift_MemorySpool implements Swift_Spool
-{
- protected $messages = array();
-
- /**
- * Tests if this Transport mechanism has started.
- * @return boolean
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * Starts this Transport mechanism.
- */
- public function start()
- {
- }
-
- /**
- * Stops this Transport mechanism.
- */
- public function stop()
- {
- }
-
- /**
- * Stores a message in the queue.
- *
- * @param Swift_Mime_Message $message The message to store
- *
- * @return boolean Whether the operation has succeeded
- */
- public function queueMessage(Swift_Mime_Message $message)
- {
- $this->messages[] = $message;
- return true;
- }
-
- /**
- * Sends messages using the given transport instance.
- *
- * @param Swift_Transport $transport A transport instance
- * @param string[] &$failedRecipients An array of failures by-reference
- *
- * @return int The number of sent emails
- */
- public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
- {
- if (!$this->messages)
- {
- return 0;
- }
-
- if (!$transport->isStarted())
- {
- $transport->start();
- }
-
- $count = 0;
- while ($message = array_pop($this->messages))
- {
- $count += $transport->send($message, $failedRecipients);
- }
-
- return $count;
- }
-}
diff --git a/lib/swift/classes/Swift/Message.php b/lib/swift/classes/Swift/Message.php
deleted file mode 100644
index 2f12ede3f..000000000
--- a/lib/swift/classes/Swift/Message.php
+++ /dev/null
@@ -1,84 +0,0 @@
-createDependenciesFor('mime.message')
- );
-
- if (!isset($charset))
- {
- $charset = Swift_DependencyContainer::getInstance()
- ->lookup('properties.charset');
- }
- $this->setSubject($subject);
- $this->setBody($body);
- $this->setCharset($charset);
- if ($contentType)
- {
- $this->setContentType($contentType);
- }
- }
-
- /**
- * Create a new Message.
- * @param string $subject
- * @param string $body
- * @param string $contentType
- * @param string $charset
- * @return Swift_Mime_Message
- */
- public static function newInstance($subject = null, $body = null,
- $contentType = null, $charset = null)
- {
- return new self($subject, $body, $contentType, $charset);
- }
-
- /**
- * Add a MimePart to this Message.
- * @param string|Swift_OutputByteStream $body
- * @param string $contentType
- * @param string $charset
- */
- public function addPart($body, $contentType = null, $charset = null)
- {
- return $this->attach(Swift_MimePart::newInstance(
- $body, $contentType, $charset
- ));
- }
-
- public function __wakeup()
- {
- Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Attachment.php b/lib/swift/classes/Swift/Mime/Attachment.php
deleted file mode 100644
index e1c28f406..000000000
--- a/lib/swift/classes/Swift/Mime/Attachment.php
+++ /dev/null
@@ -1,143 +0,0 @@
-setDisposition('attachment');
- $this->setContentType('application/octet-stream');
- $this->_mimeTypes = $mimeTypes;
- }
-
- /**
- * Get the nesting level used for this attachment.
- * Always returns {@link LEVEL_MIXED}.
- * @return int
- */
- public function getNestingLevel()
- {
- return self::LEVEL_MIXED;
- }
-
- /**
- * Get the Content-Disposition of this attachment.
- * By default attachments have a disposition of "attachment".
- * @return string
- */
- public function getDisposition()
- {
- return $this->_getHeaderFieldModel('Content-Disposition');
- }
-
- /**
- * Set the Content-Disposition of this attachment.
- * @param string $disposition
- * @return Swift_Mime_Attachment
- */
- public function setDisposition($disposition)
- {
- if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition))
- {
- $this->getHeaders()->addParameterizedHeader(
- 'Content-Disposition', $disposition
- );
- }
- return $this;
- }
-
- /**
- * Get the filename of this attachment when downloaded.
- * @return string
- */
- public function getFilename()
- {
- return $this->_getHeaderParameter('Content-Disposition', 'filename');
- }
-
- /**
- * Set the filename of this attachment.
- * @param string $filename
- * @return Swift_Mime_Attachment
- */
- public function setFilename($filename)
- {
- $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
- $this->_setHeaderParameter('Content-Type', 'name', $filename);
- return $this;
- }
-
- /**
- * Get the file size of this attachment.
- * @return int
- */
- public function getSize()
- {
- return $this->_getHeaderParameter('Content-Disposition', 'size');
- }
-
- /**
- * Set the file size of this attachment.
- * @param int $size
- * @return Swift_Mime_Attachment
- */
- public function setSize($size)
- {
- $this->_setHeaderParameter('Content-Disposition', 'size', $size);
- return $this;
- }
-
- /**
- * Set the file that this attachment is for.
- * @param Swift_FileStream $file
- * @param string $contentType optional
- * @return Swift_Mime_Attachment
- */
- public function setFile(Swift_FileStream $file, $contentType = null)
- {
- $this->setFilename(basename($file->getPath()));
- $this->setBody($file, $contentType);
- if (!isset($contentType))
- {
- $extension = strtolower(substr(
- $file->getPath(), strrpos($file->getPath(), '.') + 1
- ));
-
- if (array_key_exists($extension, $this->_mimeTypes))
- {
- $this->setContentType($this->_mimeTypes[$extension]);
- }
- }
- return $this;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/CharsetObserver.php b/lib/swift/classes/Swift/Mime/CharsetObserver.php
deleted file mode 100644
index c26009f73..000000000
--- a/lib/swift/classes/Swift/Mime/CharsetObserver.php
+++ /dev/null
@@ -1,26 +0,0 @@
-= $maxLineLength || 76 < $maxLineLength)
- {
- $maxLineLength = 76;
- }
-
- $remainder = 0;
-
- while (false !== $bytes = $os->read(8190))
- {
- $encoded = base64_encode($bytes);
- $encodedTransformed = '';
- $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
-
- while ($thisMaxLineLength < strlen($encoded))
- {
- $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength) . "\r\n";
- $firstLineOffset = 0;
- $encoded = substr($encoded, $thisMaxLineLength);
- $thisMaxLineLength = $maxLineLength;
- $remainder = 0;
- }
-
- if (0 < $remainingLength = strlen($encoded))
- {
- $remainder += $remainingLength;
- $encodedTransformed .= $encoded;
- $encoded = null;
- }
-
- $is->write($encodedTransformed);
- }
- }
-
- /**
- * Get the name of this encoding scheme.
- * Returns the string 'base64'.
- * @return string
- */
- public function getName()
- {
- return 'base64';
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/lib/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
deleted file mode 100644
index 7f5ad0826..000000000
--- a/lib/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ /dev/null
@@ -1,172 +0,0 @@
-_name = $name;
- $this->_canonical = $canonical;
- }
-
- /**
- * Encode a given string to produce an encoded string.
- * @param string $string
- * @param int $firstLineOffset, ignored
- * @param int $maxLineLength - 0 means no wrapping will occur
- * @return string
- */
- public function encodeString($string, $firstLineOffset = 0,
- $maxLineLength = 0)
- {
- if ($this->_canonical)
- {
- $string = $this->_canonicalize($string);
- }
- return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
- }
-
- /**
- * Encode stream $in to stream $out.
- * @param Swift_OutputByteStream $in
- * @param Swift_InputByteStream $out
- * @param int $firstLineOffset, ignored
- * @param int $maxLineLength, optional, 0 means no wrapping will occur
- */
- public function encodeByteStream(
- Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
- $maxLineLength = 0)
- {
- $leftOver = '';
- while (false !== $bytes = $os->read(8192))
- {
- $toencode = $leftOver . $bytes;
- if ($this->_canonical)
- {
- $toencode = $this->_canonicalize($toencode);
- }
- $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
- $lastLinePos = strrpos($wrapped, "\r\n");
- $leftOver = substr($wrapped, $lastLinePos);
- $wrapped = substr($wrapped, 0, $lastLinePos);
-
- $is->write($wrapped);
- }
- if (strlen($leftOver))
- {
- $is->write($leftOver);
- }
- }
-
- /**
- * Get the name of this encoding scheme.
- * @return string
- */
- public function getName()
- {
- return $this->_name;
- }
-
- /**
- * Not used.
- */
- public function charsetChanged($charset)
- {
- }
-
- // -- Private methods
-
- /**
- * A safer (but weaker) wordwrap for unicode.
- * @param string $string
- * @param int $length
- * @param string $le
- * @return string
- * @access private
- */
- private function _safeWordwrap($string, $length = 75, $le = "\r\n")
- {
- if (0 >= $length)
- {
- return $string;
- }
-
- $originalLines = explode($le, $string);
-
- $lines = array();
- $lineCount = 0;
-
- foreach ($originalLines as $originalLine)
- {
- $lines[] = '';
- $currentLine =& $lines[$lineCount++];
-
- //$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
- $chunks = preg_split('/(?<=\s)/', $originalLine);
-
- foreach ($chunks as $chunk)
- {
- if (0 != strlen($currentLine)
- && strlen($currentLine . $chunk) > $length)
- {
- $lines[] = '';
- $currentLine =& $lines[$lineCount++];
- }
- $currentLine .= $chunk;
- }
- }
-
- return implode("\r\n", $lines);
- }
-
- /**
- * Canonicalize string input (fix CRLF).
- * @param string $string
- * @return string
- * @access private
- */
- private function _canonicalize($string)
- {
- return str_replace(
- array("\r\n", "\r", "\n"),
- array("\n", "\n", "\r\n"),
- $string
- );
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/lib/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
deleted file mode 100644
index 87bcefc47..000000000
--- a/lib/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ /dev/null
@@ -1,117 +0,0 @@
-_safeMap[0x2e]);
- }
- }
-
- /**
- * Encode stream $in to stream $out.
- * QP encoded strings have a maximum line length of 76 characters.
- * If the first line needs to be shorter, indicate the difference with
- * $firstLineOffset.
- * @param Swift_OutputByteStream $os output stream
- * @param Swift_InputByteStream $is input stream
- * @param int $firstLineOffset
- * @param int $maxLineLength
- */
- public function encodeByteStream(
- Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
- $maxLineLength = 0)
- {
- if ($maxLineLength > 76 || $maxLineLength <= 0)
- {
- $maxLineLength = 76;
- }
-
- $thisLineLength = $maxLineLength - $firstLineOffset;
-
- $this->_charStream->flushContents();
- $this->_charStream->importByteStream($os);
-
- $currentLine = '';
- $prepend = '';
- $size=$lineLen=0;
-
- while (false !== $bytes = $this->_nextSequence())
- {
- //If we're filtering the input
- if (isset($this->_filter))
- {
- //If we can't filter because we need more bytes
- while ($this->_filter->shouldBuffer($bytes))
- {
- //Then collect bytes into the buffer
- if (false === $moreBytes = $this->_nextSequence(1))
- {
- break;
- }
-
- foreach ($moreBytes as $b)
- {
- $bytes[] = $b;
- }
- }
- //And filter them
- $bytes = $this->_filter->filter($bytes);
- }
-
- $enc = $this->_encodeByteSequence($bytes, $size);
- if ($currentLine && $lineLen+$size >= $thisLineLength)
- {
- $is->write($prepend . $this->_standardize($currentLine));
- $currentLine = '';
- $prepend = "=\r\n";
- $thisLineLength = $maxLineLength;
- $lineLen=0;
- }
- $lineLen+=$size;
- $currentLine .= $enc;
- }
- if (strlen($currentLine))
- {
- $is->write($prepend . $this->_standardize($currentLine));
- }
- }
-
- /**
- * Get the name of this encoding scheme.
- * Returns the string 'quoted-printable'.
- * @return string
- */
- public function getName()
- {
- return 'quoted-printable';
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/EmbeddedFile.php b/lib/swift/classes/Swift/Mime/EmbeddedFile.php
deleted file mode 100644
index 529de7f91..000000000
--- a/lib/swift/classes/Swift/Mime/EmbeddedFile.php
+++ /dev/null
@@ -1,48 +0,0 @@
-setDisposition('inline');
- $this->setId($this->getId());
- }
-
- /**
- * Get the nesting level of this EmbeddedFile.
- * Returns {@link LEVEL_RELATED}.
- * @return int
- */
- public function getNestingLevel()
- {
- return self::LEVEL_RELATED;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/EncodingObserver.php b/lib/swift/classes/Swift/Mime/EncodingObserver.php
deleted file mode 100644
index 021cabd0f..000000000
--- a/lib/swift/classes/Swift/Mime/EncodingObserver.php
+++ /dev/null
@@ -1,27 +0,0 @@
-_specials = array(
- '(', ')', '<', '>', '[', ']',
- ':', ';', '@', ',', '.', '"'
- );
-
- /*** Refer to RFC 2822 for ABNF grammar ***/
-
- //All basic building blocks
- $this->_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
- $this->_grammar['WSP'] = '[ \t]';
- $this->_grammar['CRLF'] = '(?:\r\n)';
- $this->_grammar['FWS'] = '(?:(?:' . $this->_grammar['WSP'] . '*' .
- $this->_grammar['CRLF'] . ')?' . $this->_grammar['WSP'] . ')';
- $this->_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
- $this->_grammar['quoted-pair'] = '(?:\\\\' . $this->_grammar['text'] . ')';
- $this->_grammar['ctext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
- '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
- //Uses recursive PCRE (?1) -- could be a weak point??
- $this->_grammar['ccontent'] = '(?:' . $this->_grammar['ctext'] . '|' .
- $this->_grammar['quoted-pair'] . '|(?1))';
- $this->_grammar['comment'] = '(\((?:' . $this->_grammar['FWS'] . '|' .
- $this->_grammar['ccontent']. ')*' . $this->_grammar['FWS'] . '?\))';
- $this->_grammar['CFWS'] = '(?:(?:' . $this->_grammar['FWS'] . '?' .
- $this->_grammar['comment'] . ')*(?:(?:' . $this->_grammar['FWS'] . '?' .
- $this->_grammar['comment'] . ')|' . $this->_grammar['FWS'] . '))';
- $this->_grammar['qtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
- '|[\x21\x23-\x5B\x5D-\x7E])';
- $this->_grammar['qcontent'] = '(?:' . $this->_grammar['qtext'] . '|' .
- $this->_grammar['quoted-pair'] . ')';
- $this->_grammar['quoted-string'] = '(?:' . $this->_grammar['CFWS'] . '?"' .
- '(' . $this->_grammar['FWS'] . '?' . $this->_grammar['qcontent'] . ')*' .
- $this->_grammar['FWS'] . '?"' . $this->_grammar['CFWS'] . '?)';
- $this->_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
- $this->_grammar['atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
- $this->_grammar['atext'] . '+' . $this->_grammar['CFWS'] . '?)';
- $this->_grammar['dot-atom-text'] = '(?:' . $this->_grammar['atext'] . '+' .
- '(\.' . $this->_grammar['atext'] . '+)*)';
- $this->_grammar['dot-atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
- $this->_grammar['dot-atom-text'] . '+' . $this->_grammar['CFWS'] . '?)';
- $this->_grammar['word'] = '(?:' . $this->_grammar['atom'] . '|' .
- $this->_grammar['quoted-string'] . ')';
- $this->_grammar['phrase'] = '(?:' . $this->_grammar['word'] . '+?)';
- $this->_grammar['no-fold-quote'] = '(?:"(?:' . $this->_grammar['qtext'] .
- '|' . $this->_grammar['quoted-pair'] . ')*")';
- $this->_grammar['dtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
- '|[\x21-\x5A\x5E-\x7E])';
- $this->_grammar['no-fold-literal'] = '(?:\[(?:' . $this->_grammar['dtext'] .
- '|' . $this->_grammar['quoted-pair'] . ')*\])';
-
- //Message IDs
- $this->_grammar['id-left'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
- $this->_grammar['no-fold-quote'] . ')';
- $this->_grammar['id-right'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
- $this->_grammar['no-fold-literal'] . ')';
-
- //Addresses, mailboxes and paths
- $this->_grammar['local-part'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
- $this->_grammar['quoted-string'] . ')';
- $this->_grammar['dcontent'] = '(?:' . $this->_grammar['dtext'] . '|' .
- $this->_grammar['quoted-pair'] . ')';
- $this->_grammar['domain-literal'] = '(?:' . $this->_grammar['CFWS'] . '?\[(' .
- $this->_grammar['FWS'] . '?' . $this->_grammar['dcontent'] . ')*?' .
- $this->_grammar['FWS'] . '?\]' . $this->_grammar['CFWS'] . '?)';
- $this->_grammar['domain'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
- $this->_grammar['domain-literal'] . ')';
- $this->_grammar['addr-spec'] = '(?:' . $this->_grammar['local-part'] . '@' .
- $this->_grammar['domain'] . ')';
- }
-
- /**
- * Get the grammar defined for $name token.
- * @param string $name execatly as written in the RFC
- * @return string
- */
- public function getDefinition($name)
- {
- if (array_key_exists($name, $this->_grammar))
- {
- return $this->_grammar[$name];
- }
- else
- {
- throw new Swift_RfcComplianceException(
- "No such grammar '" . $name . "' defined."
- );
- }
- }
-
- /**
- * Returns the tokens defined in RFC 2822 (and some related RFCs).
- * @return array
- */
- public function getGrammarDefinitions()
- {
- return $this->_grammar;
- }
-
- /**
- * Returns the current special characters used in the syntax which need to be escaped.
- * @return array
- */
- public function getSpecials()
- {
- return $this->_specials;
- }
-
- /**
- * Escape special characters in a string (convert to quoted-pairs).
- * @param string $token
- * @param string[] $include additonal chars to escape
- * @param string[] $exclude chars from escaping
- * @return string
- */
- public function escapeSpecials($token, $include = array(),
- $exclude = array())
- {
- foreach (
- array_merge(array('\\'), array_diff($this->_specials, $exclude), $include) as $char)
- {
- $token = str_replace($char, '\\' . $char, $token);
- }
- return $token;
- }
-}
diff --git a/lib/swift/classes/Swift/Mime/Header.php b/lib/swift/classes/Swift/Mime/Header.php
deleted file mode 100644
index 38fc40cde..000000000
--- a/lib/swift/classes/Swift/Mime/Header.php
+++ /dev/null
@@ -1,85 +0,0 @@
-_safeMap=array();
- foreach (array_merge(
- range(0x61, 0x7A), range(0x41, 0x5A),
- range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
- ) as $byte)
- {
- $this->_safeMap[$byte] = chr($byte);
- }
- }
-
- /**
- * Get the name of this encoding scheme.
- * Returns the string 'Q'.
- * @return string
- */
- public function getName()
- {
- return 'Q';
- }
-
- /**
- * Takes an unencoded string and produces a Q encoded string from it.
- * @param string $string to encode
- * @param int $firstLineOffset, optional
- * @param int $maxLineLength, optional, 0 indicates the default of 76 chars
- * @return string
- */
- public function encodeString($string, $firstLineOffset = 0,
- $maxLineLength = 0)
- {
- return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
- parent::encodeString($string, $firstLineOffset, $maxLineLength)
- );
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/HeaderFactory.php b/lib/swift/classes/Swift/Mime/HeaderFactory.php
deleted file mode 100644
index 13083bb0a..000000000
--- a/lib/swift/classes/Swift/Mime/HeaderFactory.php
+++ /dev/null
@@ -1,71 +0,0 @@
-setGrammar($grammar);
- }
-
- /**
- * Set the character set used in this Header.
- * @param string $charset
- */
- public function setCharset($charset)
- {
- $this->clearCachedValueIf($charset != $this->_charset);
- $this->_charset = $charset;
- if (isset($this->_encoder))
- {
- $this->_encoder->charsetChanged($charset);
- }
- }
-
- /**
- * Get the character set used in this Header.
- * @return string
- */
- public function getCharset()
- {
- return $this->_charset;
- }
-
- /**
- * Set the language used in this Header.
- * For example, for US English, 'en-us'.
- * This can be unspecified.
- * @param string $lang
- */
- public function setLanguage($lang)
- {
- $this->clearCachedValueIf($this->_lang != $lang);
- $this->_lang = $lang;
- }
-
- /**
- * Get the language used in this Header.
- * @return string
- */
- public function getLanguage()
- {
- return $this->_lang;
- }
-
- /**
- * Set the encoder used for encoding the header.
- * @param Swift_Mime_HeaderEncoder $encoder
- */
- public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
- {
- $this->_encoder = $encoder;
- $this->setCachedValue(null);
- }
-
- /**
- * Get the encoder used for encoding this Header.
- * @return Swift_Mime_HeaderEncoder
- */
- public function getEncoder()
- {
- return $this->_encoder;
- }
-
- /**
- * Set the grammar used for the header.
- * @param Swift_Mime_Grammar $grammar
- */
- public function setGrammar(Swift_Mime_Grammar $grammar)
- {
- $this->_grammar = $grammar;
- $this->setCachedValue(null);
- }
-
- /**
- * Get the grammar used for this Header.
- * @return Swift_Mime_Grammar
- */
- public function getGrammar()
- {
- return $this->_grammar;
- }
-
- /**
- * Get the name of this header (e.g. charset).
- * @return string
- */
- public function getFieldName()
- {
- return $this->_name;
- }
-
- /**
- * Set the maximum length of lines in the header (excluding EOL).
- * @param int $lineLength
- */
- public function setMaxLineLength($lineLength)
- {
- $this->clearCachedValueIf($this->_lineLength != $lineLength);
- $this->_lineLength = $lineLength;
- }
-
- /**
- * Get the maximum permitted length of lines in this Header.
- * @return int
- */
- public function getMaxLineLength()
- {
- return $this->_lineLength;
- }
-
- /**
- * Get this Header rendered as a RFC 2822 compliant string.
- * @return string
- * @throws Swift_RfcComplianceException
- */
- public function toString()
- {
- return $this->_tokensToString($this->toTokens());
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return string
- *
- * @see toString()
- */
- public function __toString()
- {
- return $this->toString();
- }
-
- // -- Points of extension
-
- /**
- * Set the name of this Header field.
- * @param string $name
- * @access protected
- */
- protected function setFieldName($name)
- {
- $this->_name = $name;
- }
-
- /**
- * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
- * @param Swift_Mime_Header $header
- * @param string $string as displayed
- * @param string $charset of the text
- * @param Swift_Mime_HeaderEncoder $encoder
- * @param boolean $shorten the first line to make remove for header name
- * @return string
- */
- protected function createPhrase(Swift_Mime_Header $header, $string, $charset,
- Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
- {
- //Treat token as exactly what was given
- $phraseStr = $string;
- //If it's not valid
- if (!preg_match('/^' . $this->getGrammar()->getDefinition('phrase') . '$/D', $phraseStr))
- {
- // .. but it is just ascii text, try escaping some characters
- // and make it a quoted-string
- if (preg_match('/^' . $this->getGrammar()->getDefinition('text') . '*$/D', $phraseStr))
- {
- $phraseStr = $this->getGrammar()->escapeSpecials(
- $phraseStr, array('"'), $this->getGrammar()->getSpecials()
- );
- $phraseStr = '"' . $phraseStr . '"';
- }
- else // ... otherwise it needs encoding
- {
- //Determine space remaining on line if first line
- if ($shorten)
- {
- $usedLength = strlen($header->getFieldName() . ': ');
- }
- else
- {
- $usedLength = 0;
- }
- $phraseStr = $this->encodeWords($header, $string, $usedLength);
- }
- }
-
- return $phraseStr;
- }
-
- /**
- * Encode needed word tokens within a string of input.
- * @param string $input
- * @param string $usedLength, optional
- * @return string
- */
- protected function encodeWords(Swift_Mime_Header $header, $input,
- $usedLength = -1)
- {
- $value = '';
-
- $tokens = $this->getEncodableWordTokens($input);
-
- foreach ($tokens as $token)
- {
- //See RFC 2822, Sect 2.2 (really 2.2 ??)
- if ($this->tokenNeedsEncoding($token))
- {
- //Don't encode starting WSP
- $firstChar = substr($token, 0, 1);
- switch($firstChar)
- {
- case ' ':
- case "\t":
- $value .= $firstChar;
- $token = substr($token, 1);
- }
-
- if (-1 == $usedLength)
- {
- $usedLength = strlen($header->getFieldName() . ': ') + strlen($value);
- }
- $value .= $this->getTokenAsEncodedWord($token, $usedLength);
-
- $header->setMaxLineLength(76); //Forefully override
- }
- else
- {
- $value .= $token;
- }
- }
-
- return $value;
- }
-
- /**
- * Test if a token needs to be encoded or not.
- * @param string $token
- * @return boolean
- */
- protected function tokenNeedsEncoding($token)
- {
- return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
- }
-
- /**
- * Splits a string into tokens in blocks of words which can be encoded quickly.
- * @param string $string
- * @return string[]
- */
- protected function getEncodableWordTokens($string)
- {
- $tokens = array();
-
- $encodedToken = '';
- //Split at all whitespace boundaries
- foreach (preg_split('~(?=[\t ])~', $string) as $token)
- {
- if ($this->tokenNeedsEncoding($token))
- {
- $encodedToken .= $token;
- }
- else
- {
- if (strlen($encodedToken) > 0)
- {
- $tokens[] = $encodedToken;
- $encodedToken = '';
- }
- $tokens[] = $token;
- }
- }
- if (strlen($encodedToken))
- {
- $tokens[] = $encodedToken;
- }
-
- return $tokens;
- }
-
- /**
- * Get a token as an encoded word for safe insertion into headers.
- * @param string $token to encode
- * @param int $firstLineOffset, optional
- * @return string
- */
- protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
- {
- //Adjust $firstLineOffset to account for space needed for syntax
- $charsetDecl = $this->_charset;
- if (isset($this->_lang))
- {
- $charsetDecl .= '*' . $this->_lang;
- }
- $encodingWrapperLength = strlen(
- '=?' . $charsetDecl . '?' . $this->_encoder->getName() . '??='
- );
-
- if ($firstLineOffset >= 75) //Does this logic need to be here?
- {
- $firstLineOffset = 0;
- }
-
- $encodedTextLines = explode("\r\n",
- $this->_encoder->encodeString(
- $token, $firstLineOffset, 75 - $encodingWrapperLength
- )
- );
-
- foreach ($encodedTextLines as $lineNum => $line)
- {
- $encodedTextLines[$lineNum] = '=?' . $charsetDecl .
- '?' . $this->_encoder->getName() .
- '?' . $line . '?=';
- }
-
- return implode("\r\n ", $encodedTextLines);
- }
-
- /**
- * Generates tokens from the given string which include CRLF as individual tokens.
- * @param string $token
- * @return string[]
- * @access protected
- */
- protected function generateTokenLines($token)
- {
- return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
- }
-
- /**
- * Set a value into the cache.
- * @param string $value
- * @access protected
- */
- protected function setCachedValue($value)
- {
- $this->_cachedValue = $value;
- }
-
- /**
- * Get the value in the cache.
- * @return string
- * @access protected
- */
- protected function getCachedValue()
- {
- return $this->_cachedValue;
- }
-
- /**
- * Clear the cached value if $condition is met.
- * @param boolean $condition
- * @access protected
- */
- protected function clearCachedValueIf($condition)
- {
- if ($condition)
- {
- $this->setCachedValue(null);
- }
- }
-
- // -- Private methods
-
- /**
- * Generate a list of all tokens in the final header.
- * @param string $string input, optional
- * @return string[]
- * @access private
- */
- protected function toTokens($string = null)
- {
- if (is_null($string))
- {
- $string = $this->getFieldBody();
- }
-
- $tokens = array();
-
- //Generate atoms; split at all invisible boundaries followed by WSP
- foreach (preg_split('~(?=[ \t])~', $string) as $token)
- {
- $tokens = array_merge($tokens, $this->generateTokenLines($token));
- }
-
- return $tokens;
- }
-
- /**
- * Takes an array of tokens which appear in the header and turns them into
- * an RFC 2822 compliant string, adding FWSP where needed.
- * @param string[] $tokens
- * @return string
- * @access private
- */
- private function _tokensToString(array $tokens)
- {
- $lineCount = 0;
- $headerLines = array();
- $headerLines[] = $this->_name . ': ';
- $currentLine =& $headerLines[$lineCount++];
-
- //Build all tokens back into compliant header
- foreach ($tokens as $i => $token)
- {
- //Line longer than specified maximum or token was just a new line
- if (("\r\n" == $token) ||
- ($i > 0 && strlen($currentLine . $token) > $this->_lineLength)
- && 0 < strlen($currentLine))
- {
- $headerLines[] = '';
- $currentLine =& $headerLines[$lineCount++];
- }
-
- //Append token to the line
- if ("\r\n" != $token)
- {
- $currentLine .= $token;
- }
- }
-
- //Implode with FWS (RFC 2822, 2.2.3)
- return implode("\r\n", $headerLines) . "\r\n";
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/DateHeader.php b/lib/swift/classes/Swift/Mime/Headers/DateHeader.php
deleted file mode 100644
index bb345fdc8..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/DateHeader.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *
- *
- * @param string $name of Header
- * @param Swift_Mime_Grammar $grammar
- */
- public function __construct($name, Swift_Mime_Grammar $grammar)
- {
- $this->setFieldName($name);
- parent::__construct($grammar);
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_DATE;
- }
-
- /**
- * Set the model for the field body.
- * This method takes a UNIX timestamp.
- * @param int $model
- */
- public function setFieldBodyModel($model)
- {
- $this->setTimestamp($model);
- }
-
- /**
- * Get the model for the field body.
- * This method returns a UNIX timestamp.
- * @return mixed
- */
- public function getFieldBodyModel()
- {
- return $this->getTimestamp();
- }
-
- /**
- * Get the UNIX timestamp of the Date in this Header.
- * @return int
- */
- public function getTimestamp()
- {
- return $this->_timestamp;
- }
-
- /**
- * Set the UNIX timestamp of the Date in this Header.
- * @param int $timestamp
- */
- public function setTimestamp($timestamp)
- {
- if (!is_null($timestamp))
- {
- $timestamp = (int) $timestamp;
- }
- $this->clearCachedValueIf($this->_timestamp != $timestamp);
- $this->_timestamp = $timestamp;
- }
-
- /**
- * Get the string value of the body in this Header.
- * This is not necessarily RFC 2822 compliant since folding white space will
- * not be added at this stage (see {@link toString()} for that).
- * @return string
- * @see toString()
- */
- public function getFieldBody()
- {
- if (!$this->getCachedValue())
- {
- if (isset($this->_timestamp))
- {
- $this->setCachedValue(date('r', $this->_timestamp));
- }
- }
- return $this->getCachedValue();
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/swift/classes/Swift/Mime/Headers/IdentificationHeader.php
deleted file mode 100644
index df978f0e3..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ /dev/null
@@ -1,166 +0,0 @@
-setFieldName($name);
- parent::__construct($grammar);
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_ID;
- }
-
- /**
- * Set the model for the field body.
- * This method takes a string ID, or an array of IDs
- * @param mixed $model
- * @throws Swift_RfcComplianceException
- */
- public function setFieldBodyModel($model)
- {
- $this->setId($model);
- }
-
- /**
- * Get the model for the field body.
- * This method returns an array of IDs
- * @return array
- */
- public function getFieldBodyModel()
- {
- return $this->getIds();
- }
-
- /**
- * Set the ID used in the value of this header.
- * @param string $id
- * @throws Swift_RfcComplianceException
- */
- public function setId($id)
- {
- $this->setIds(array($id));
- }
-
- /**
- * Get the ID used in the value of this Header.
- * If multiple IDs are set only the first is returned.
- * @return string
- */
- public function getId()
- {
- if (count($this->_ids) > 0)
- {
- return $this->_ids[0];
- }
- }
-
- /**
- * Set a collection of IDs to use in the value of this Header.
- * @param string[] $ids
- * @throws Swift_RfcComplianceException
- */
- public function setIds(array $ids)
- {
- $actualIds = array();
-
- foreach ($ids as $k => $id)
- {
- $this->_assertValidId($id);
- $actualIds[] = $id;
- }
-
- $this->clearCachedValueIf($this->_ids != $actualIds);
- $this->_ids = $actualIds;
- }
-
- /**
- * Get the list of IDs used in this Header.
- * @return string[]
- */
- public function getIds()
- {
- return $this->_ids;
- }
-
- /**
- * Get the string value of the body in this Header.
- * This is not necessarily RFC 2822 compliant since folding white space will
- * not be added at this stage (see {@link toString()} for that).
- * @return string
- * @see toString()
- * @throws Swift_RfcComplianceException
- */
- public function getFieldBody()
- {
- if (!$this->getCachedValue())
- {
- $angleAddrs = array();
-
- foreach ($this->_ids as $id)
- {
- $angleAddrs[] = '<' . $id . '>';
- }
-
- $this->setCachedValue(implode(' ', $angleAddrs));
- }
- return $this->getCachedValue();
- }
-
- /**
- * Throws an Exception if the id passed does not comply with RFC 2822.
- * @param string $id
- * @throws Swift_RfcComplianceException
- */
- private function _assertValidId($id)
- {
- if (!preg_match(
- '/^' . $this->getGrammar()->getDefinition('id-left') . '@' .
- $this->getGrammar()->getDefinition('id-right') . '$/D',
- $id
- ))
- {
- throw new Swift_RfcComplianceException(
- 'Invalid ID given <' . $id . '>'
- );
- }
- }
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/swift/classes/Swift/Mime/Headers/MailboxHeader.php
deleted file mode 100644
index 67551c86d..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/MailboxHeader.php
+++ /dev/null
@@ -1,315 +0,0 @@
-setFieldName($name);
- $this->setEncoder($encoder);
- parent::__construct($grammar);
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_MAILBOX;
- }
-
- /**
- * Set the model for the field body.
- * This method takes a string, or an array of addresses.
- * @param mixed $model
- * @throws Swift_RfcComplianceException
- */
- public function setFieldBodyModel($model)
- {
- $this->setNameAddresses($model);
- }
-
- /**
- * Get the model for the field body.
- * This method returns an associative array like {@link getNameAddresses()}
- * @return array
- * @throws Swift_RfcComplianceException
- */
- public function getFieldBodyModel()
- {
- return $this->getNameAddresses();
- }
-
- /**
- * Set a list of mailboxes to be shown in this Header.
- * The mailboxes can be a simple array of addresses, or an array of
- * key=>value pairs where (email => personalName).
- * Example:
- *
- * setNameAddresses(array(
- * 'chris@swiftmailer.org' => 'Chris Corbyn',
- * 'mark@swiftmailer.org' //No associated personal name
- * ));
- * ?>
- *
- * @param string|string[] $mailboxes
- * @throws Swift_RfcComplianceException
- * @see __construct()
- * @see setAddresses()
- * @see setValue()
- */
- public function setNameAddresses($mailboxes)
- {
- $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
- $this->setCachedValue(null); //Clear any cached value
- }
-
- /**
- * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
- * Example:
- *
- * 'Chris Corbyn',
- * 'mark@swiftmailer.org' => 'Mark Corbyn')
- * );
- * print_r($header->getNameAddressStrings());
- * // array (
- * // 0 => Chris Corbyn ,
- * // 1 => Mark Corbyn
- * // )
- * ?>
- *
- * @return string[]
- * @throws Swift_RfcComplianceException
- * @see getNameAddresses()
- * @see toString()
- */
- public function getNameAddressStrings()
- {
- return $this->_createNameAddressStrings($this->getNameAddresses());
- }
-
- /**
- * Get all mailboxes in this Header as key=>value pairs.
- * The key is the address and the value is the name (or null if none set).
- * Example:
- *
- * 'Chris Corbyn',
- * 'mark@swiftmailer.org' => 'Mark Corbyn')
- * );
- * print_r($header->getNameAddresses());
- * // array (
- * // chris@swiftmailer.org => Chris Corbyn,
- * // mark@swiftmailer.org => Mark Corbyn
- * // )
- * ?>
- *
- * @return string[]
- * @see getAddresses()
- * @see getNameAddressStrings()
- */
- public function getNameAddresses()
- {
- return $this->_mailboxes;
- }
-
- /**
- * Makes this Header represent a list of plain email addresses with no names.
- * Example:
- *
- * setAddresses(
- * array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
- * );
- * ?>
- *
- * @param string[] $addresses
- * @throws Swift_RfcComplianceException
- * @see setNameAddresses()
- * @see setValue()
- */
- public function setAddresses($addresses)
- {
- $this->setNameAddresses(array_values((array) $addresses));
- }
-
- /**
- * Get all email addresses in this Header.
- * @return string[]
- * @see getNameAddresses()
- */
- public function getAddresses()
- {
- return array_keys($this->_mailboxes);
- }
-
- /**
- * Remove one or more addresses from this Header.
- * @param string|string[] $addresses
- */
- public function removeAddresses($addresses)
- {
- $this->setCachedValue(null);
- foreach ((array) $addresses as $address)
- {
- unset($this->_mailboxes[$address]);
- }
- }
-
- /**
- * Get the string value of the body in this Header.
- * This is not necessarily RFC 2822 compliant since folding white space will
- * not be added at this stage (see {@link toString()} for that).
- * @return string
- * @throws Swift_RfcComplianceException
- * @see toString()
- */
- public function getFieldBody()
- {
- //Compute the string value of the header only if needed
- if (is_null($this->getCachedValue()))
- {
- $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
- }
- return $this->getCachedValue();
- }
-
- // -- Points of extension
-
- /**
- * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
- * @param string[] $mailboxes
- * @return string[]
- * @access protected
- */
- protected function normalizeMailboxes(array $mailboxes)
- {
- $actualMailboxes = array();
-
- foreach ($mailboxes as $key => $value)
- {
- if (is_string($key)) //key is email addr
- {
- $address = $key;
- $name = $value;
- }
- else
- {
- $address = $value;
- $name = null;
- }
- $this->_assertValidAddress($address);
- $actualMailboxes[$address] = $name;
- }
-
- return $actualMailboxes;
- }
-
- /**
- * Produces a compliant, formatted display-name based on the string given.
- * @param string $displayName as displayed
- * @param boolean $shorten the first line to make remove for header name
- * @return string
- * @access protected
- */
- protected function createDisplayNameString($displayName, $shorten = false)
- {
- return $this->createPhrase($this, $displayName,
- $this->getCharset(), $this->getEncoder(), $shorten
- );
- }
-
- /**
- * Creates a string form of all the mailboxes in the passed array.
- * @param string[] $mailboxes
- * @return string
- * @throws Swift_RfcComplianceException
- * @access protected
- */
- protected function createMailboxListString(array $mailboxes)
- {
- return implode(', ', $this->_createNameAddressStrings($mailboxes));
- }
-
- // -- Private methods
-
- /**
- * Return an array of strings conforming the the name-addr spec of RFC 2822.
- * @param string[] $mailboxes
- * @return string[]
- * @access private
- */
- private function _createNameAddressStrings(array $mailboxes)
- {
- $strings = array();
-
- foreach ($mailboxes as $email => $name)
- {
- $mailboxStr = $email;
- if (!is_null($name))
- {
- $nameStr = $this->createDisplayNameString($name, empty($strings));
- $mailboxStr = $nameStr . ' <' . $mailboxStr . '>';
- }
- $strings[] = $mailboxStr;
- }
-
- return $strings;
- }
-
- /**
- * Throws an Exception if the address passed does not comply with RFC 2822.
- * @param string $address
- * @throws Swift_RfcComplianceException If invalid.
- * @access private
- */
- private function _assertValidAddress($address)
- {
- if (!preg_match('/^' . $this->getGrammar()->getDefinition('addr-spec') . '$/D',
- $address))
- {
- throw new Swift_RfcComplianceException(
- 'Address in mailbox given [' . $address .
- '] does not comply with RFC 2822, 3.6.2.'
- );
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php b/lib/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php
deleted file mode 100644
index 08ebce4f2..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ /dev/null
@@ -1,269 +0,0 @@
-_paramEncoder = $paramEncoder;
- $this->_tokenRe = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_PARAMETERIZED;
- }
-
- /**
- * Set the character set used in this Header.
- * @param string $charset
- */
- public function setCharset($charset)
- {
- parent::setCharset($charset);
- if (isset($this->_paramEncoder))
- {
- $this->_paramEncoder->charsetChanged($charset);
- }
- }
-
- /**
- * Set the value of $parameter.
- * @param string $parameter
- * @param string $value
- */
- public function setParameter($parameter, $value)
- {
- $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
- }
-
- /**
- * Get the value of $parameter.
- * @return string
- */
- public function getParameter($parameter)
- {
- $params = $this->getParameters();
- return array_key_exists($parameter, $params)
- ? $params[$parameter]
- : null;
- }
-
- /**
- * Set an associative array of parameter names mapped to values.
- * @param string[]
- */
- public function setParameters(array $parameters)
- {
- $this->clearCachedValueIf($this->_params != $parameters);
- $this->_params = $parameters;
- }
-
- /**
- * Returns an associative array of parameter names mapped to values.
- * @return string[]
- */
- public function getParameters()
- {
- return $this->_params;
- }
-
- /**
- * Get the value of this header prepared for rendering.
- * @return string
- */
- public function getFieldBody() //TODO: Check caching here
- {
- $body = parent::getFieldBody();
- foreach ($this->_params as $name => $value)
- {
- if (!is_null($value))
- {
- //Add the parameter
- $body .= '; ' . $this->_createParameter($name, $value);
- }
- }
- return $body;
- }
-
- // -- Protected methods
-
- /**
- * Generate a list of all tokens in the final header.
- * This doesn't need to be overridden in theory, but it is for implementation
- * reasons to prevent potential breakage of attributes.
- * @return string[]
- * @access protected
- */
- protected function toTokens($string = null)
- {
- $tokens = parent::toTokens(parent::getFieldBody());
-
- //Try creating any parameters
- foreach ($this->_params as $name => $value)
- {
- if (!is_null($value))
- {
- //Add the semi-colon separator
- $tokens[count($tokens)-1] .= ';';
- $tokens = array_merge($tokens, $this->generateTokenLines(
- ' ' . $this->_createParameter($name, $value)
- ));
- }
- }
-
- return $tokens;
- }
-
- // -- Private methods
-
- /**
- * Render a RFC 2047 compliant header parameter from the $name and $value.
- * @param string $name
- * @param string $value
- * @return string
- * @access private
- */
- private function _createParameter($name, $value)
- {
- $origValue = $value;
-
- $encoded = false;
- //Allow room for parameter name, indices, "=" and DQUOTEs
- $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1;
- $firstLineOffset = 0;
-
- //If it's not already a valid parameter value...
- if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
- {
- //TODO: text, or something else??
- //... and it's not ascii
- if (!preg_match('/^' . $this->getGrammar()->getDefinition('text') . '*$/D', $value))
- {
- $encoded = true;
- //Allow space for the indices, charset and language
- $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1;
- $firstLineOffset = strlen(
- $this->getCharset() . "'" . $this->getLanguage() . "'"
- );
- }
- }
-
- //Encode if we need to
- if ($encoded || strlen($value) > $maxValueLength)
- {
- if (isset($this->_paramEncoder))
- {
- $value = $this->_paramEncoder->encodeString(
- $origValue, $firstLineOffset, $maxValueLength
- );
- }
- else //We have to go against RFC 2183/2231 in some areas for interoperability
- {
- $value = $this->getTokenAsEncodedWord($origValue);
- $encoded = false;
- }
- }
-
- $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
-
- //Need to add indices
- if (count($valueLines) > 1)
- {
- $paramLines = array();
- foreach ($valueLines as $i => $line)
- {
- $paramLines[] = $name . '*' . $i .
- $this->_getEndOfParameterValue($line, true, $i == 0);
- }
- return implode(";\r\n ", $paramLines);
- }
- else
- {
- return $name . $this->_getEndOfParameterValue(
- $valueLines[0], $encoded, true
- );
- }
- }
-
- /**
- * Returns the parameter value from the "=" and beyond.
- * @param string $value to append
- * @param boolean $encoded
- * @param boolean $firstLine
- * @return string
- * @access private
- */
- private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
- {
- if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
- {
- $value = '"' . $value . '"';
- }
- $prepend = '=';
- if ($encoded)
- {
- $prepend = '*=';
- if ($firstLine)
- {
- $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() .
- "'";
- }
- }
- return $prepend . $value;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/PathHeader.php b/lib/swift/classes/Swift/Mime/Headers/PathHeader.php
deleted file mode 100644
index 7f1252d92..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/PathHeader.php
+++ /dev/null
@@ -1,140 +0,0 @@
-setFieldName($name);
- parent::__construct($grammar);
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_PATH;
- }
-
- /**
- * Set the model for the field body.
- * This method takes a string for an address.
- * @param string $model
- * @throws Swift_RfcComplianceException
- */
- public function setFieldBodyModel($model)
- {
- $this->setAddress($model);
- }
-
- /**
- * Get the model for the field body.
- * This method returns a string email address.
- * @return mixed
- */
- public function getFieldBodyModel()
- {
- return $this->getAddress();
- }
-
- /**
- * Set the Address which should appear in this Header.
- * @param string $address
- * @throws Swift_RfcComplianceException
- */
- public function setAddress($address)
- {
- if (is_null($address))
- {
- $this->_address = null;
- }
- elseif ('' == $address)
- {
- $this->_address = '';
- }
- else
- {
- $this->_assertValidAddress($address);
- $this->_address = $address;
- }
- $this->setCachedValue(null);
- }
-
- /**
- * Get the address which is used in this Header (if any).
- * Null is returned if no address is set.
- * @return string
- */
- public function getAddress()
- {
- return $this->_address;
- }
-
- /**
- * Get the string value of the body in this Header.
- * This is not necessarily RFC 2822 compliant since folding white space will
- * not be added at this stage (see {@link toString()} for that).
- * @return string
- * @see toString()
- */
- public function getFieldBody()
- {
- if (!$this->getCachedValue())
- {
- if (isset($this->_address))
- {
- $this->setCachedValue('<' . $this->_address . '>');
- }
- }
- return $this->getCachedValue();
- }
-
- /**
- * Throws an Exception if the address passed does not comply with RFC 2822.
- * @param string $address
- * @throws Swift_RfcComplianceException If invalid.
- * @access private
- */
- private function _assertValidAddress($address)
- {
- if (!preg_match('/^' . $this->getGrammar()->getDefinition('addr-spec') . '$/D',
- $address))
- {
- throw new Swift_RfcComplianceException(
- 'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
- );
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php
deleted file mode 100644
index 491d7eb4a..000000000
--- a/lib/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ /dev/null
@@ -1,107 +0,0 @@
-setFieldName($name);
- $this->setEncoder($encoder);
- parent::__construct($grammar);
- }
-
- /**
- * Get the type of Header that this instance represents.
- * @return int
- * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
- * @see TYPE_DATE, TYPE_ID, TYPE_PATH
- */
- public function getFieldType()
- {
- return self::TYPE_TEXT;
- }
-
- /**
- * Set the model for the field body.
- * This method takes a string for the field value.
- * @param string $model
- */
- public function setFieldBodyModel($model)
- {
- $this->setValue($model);
- }
-
- /**
- * Get the model for the field body.
- * This method returns a string.
- * @return string
- */
- public function getFieldBodyModel()
- {
- return $this->getValue();
- }
-
- /**
- * Get the (unencoded) value of this header.
- * @return string
- */
- public function getValue()
- {
- return $this->_value;
- }
-
- /**
- * Set the (unencoded) value of this header.
- * @param string $value
- */
- public function setValue($value)
- {
- $this->clearCachedValueIf($this->_value != $value);
- $this->_value = $value;
- }
-
- /**
- * Get the value of this header prepared for rendering.
- * @return string
- */
- public function getFieldBody()
- {
- if (!$this->getCachedValue())
- {
- $this->setCachedValue(
- $this->encodeWords($this, $this->_value)
- );
- }
- return $this->getCachedValue();
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/Message.php b/lib/swift/classes/Swift/Mime/Message.php
deleted file mode 100644
index 497f36eaa..000000000
--- a/lib/swift/classes/Swift/Mime/Message.php
+++ /dev/null
@@ -1,229 +0,0 @@
- 'Real Name').
- *
- * If the second parameter is provided and the first is a string, then $name
- * is associated with the address.
- *
- * @param mixed $address
- * @param string $name optional
- */
- public function setSender($address, $name = null);
-
- /**
- * Get the sender address for this message.
- *
- * This has a higher significance than the From address.
- *
- * @return string
- */
- public function getSender();
-
- /**
- * Set the From address of this message.
- *
- * It is permissible for multiple From addresses to be set using an array.
- *
- * If multiple From addresses are used, you SHOULD set the Sender address and
- * according to RFC 2822, MUST set the sender address.
- *
- * An array can be used if display names are to be provided: i.e.
- * array('email@address.com' => 'Real Name').
- *
- * If the second parameter is provided and the first is a string, then $name
- * is associated with the address.
- *
- * @param mixed $addresses
- * @param string $name optional
- */
- public function setFrom($addresses, $name = null);
-
- /**
- * Get the From address(es) of this message.
- *
- * This method always returns an associative array where the keys are the
- * addresses.
- *
- * @return string[]
- */
- public function getFrom();
-
- /**
- * Set the Reply-To address(es).
- *
- * Any replies from the receiver will be sent to this address.
- *
- * It is permissible for multiple reply-to addresses to be set using an array.
- *
- * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
- *
- * If the second parameter is provided and the first is a string, then $name
- * is associated with the address.
- *
- * @param mixed $addresses
- * @param string $name optional
- */
- public function setReplyTo($addresses, $name = null);
-
- /**
- * Get the Reply-To addresses for this message.
- *
- * This method always returns an associative array where the keys provide the
- * email addresses.
- *
- * @return string[]
- */
- public function getReplyTo();
-
- /**
- * Set the To address(es).
- *
- * Recipients set in this field will receive a copy of this message.
- *
- * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
- *
- * If the second parameter is provided and the first is a string, then $name
- * is associated with the address.
- *
- * @param mixed $addresses
- * @param string $name optional
- */
- public function setTo($addresses, $name = null);
-
- /**
- * Get the To addresses for this message.
- *
- * This method always returns an associative array, whereby the keys provide
- * the actual email addresses.
- *
- * @return string[]
- */
- public function getTo();
-
- /**
- * Set the Cc address(es).
- *
- * Recipients set in this field will receive a 'carbon-copy' of this message.
- *
- * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
- *
- * @param mixed $addresses
- * @param string $name optional
- */
- public function setCc($addresses, $name = null);
-
- /**
- * Get the Cc addresses for this message.
- *
- * This method always returns an associative array, whereby the keys provide
- * the actual email addresses.
- *
- * @return string[]
- */
- public function getCc();
-
- /**
- * Set the Bcc address(es).
- *
- * Recipients set in this field will receive a 'blind-carbon-copy' of this
- * message.
- *
- * In other words, they will get the message, but any other recipients of the
- * message will have no such knowledge of their receipt of it.
- *
- * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
- *
- * @param mixed $addresses
- * @param string $name optional
- */
- public function setBcc($addresses, $name = null);
-
- /**
- * Get the Bcc addresses for this message.
- *
- * This method always returns an associative array, whereby the keys provide
- * the actual email addresses.
- *
- * @return string[]
- */
- public function getBcc();
-
-}
diff --git a/lib/swift/classes/Swift/Mime/MimeEntity.php b/lib/swift/classes/Swift/Mime/MimeEntity.php
deleted file mode 100644
index b46c296d6..000000000
--- a/lib/swift/classes/Swift/Mime/MimeEntity.php
+++ /dev/null
@@ -1,105 +0,0 @@
-setContentType('text/plain');
- if (!is_null($charset))
- {
- $this->setCharset($charset);
- }
- }
-
- /**
- * Set the body of this entity, either as a string, or as an instance of
- * {@link Swift_OutputByteStream}.
- *
- * @param mixed $body
- * @param string $contentType optional
- * @param string $charset optional
- * @param Swift_Mime_MimePart
- */
- public function setBody($body, $contentType = null, $charset = null)
- {
- parent::setBody($body, $contentType);
- if (isset($charset))
- {
- $this->setCharset($charset);
- }
- return $this;
- }
-
- /**
- * Get the character set of this entity.
- *
- * @return string
- */
- public function getCharset()
- {
- return $this->_getHeaderParameter('Content-Type', 'charset');
- }
-
- /**
- * Set the character set of this entity.
- *
- * @param string $charset
- * @param Swift_Mime_MimePart
- */
- public function setCharset($charset)
- {
- $this->_setHeaderParameter('Content-Type', 'charset', $charset);
- if ($charset !== $this->_userCharset)
- {
- $this->_clearCache();
- }
- $this->_userCharset = $charset;
- parent::charsetChanged($charset);
- return $this;
- }
-
- /**
- * Get the format of this entity (i.e. flowed or fixed).
- *
- * @return string
- */
- public function getFormat()
- {
- return $this->_getHeaderParameter('Content-Type', 'format');
- }
-
- /**
- * Set the format of this entity (flowed or fixed).
- *
- * @param string $format
- * @param Swift_Mime_MimePart
- */
- public function setFormat($format)
- {
- $this->_setHeaderParameter('Content-Type', 'format', $format);
- $this->_userFormat = $format;
- return $this;
- }
-
- /**
- * Test if delsp is being used for this entity.
- *
- * @return boolean
- */
- public function getDelSp()
- {
- return ($this->_getHeaderParameter('Content-Type', 'delsp') == 'yes')
- ? true
- : false;
- }
-
- /**
- * Turn delsp on or off for this entity.
- *
- * @param boolean $delsp
- * @param Swift_Mime_MimePart
- */
- public function setDelSp($delsp = true)
- {
- $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
- $this->_userDelSp = $delsp;
- return $this;
- }
-
- /**
- * Get the nesting level of this entity.
- *
- * @return int
- * @see LEVEL_TOP, LEVEL_ALTERNATIVE, LEVEL_MIXED, LEVEL_RELATED
- */
- public function getNestingLevel()
- {
- return $this->_nestingLevel;
- }
-
- /**
- * Receive notification that the charset has changed on this document, or a
- * parent document.
- *
- * @param string $charset
- */
- public function charsetChanged($charset)
- {
- $this->setCharset($charset);
- }
-
- // -- Protected methods
-
- /** Fix the content-type and encoding of this entity */
- protected function _fixHeaders()
- {
- parent::_fixHeaders();
- if (count($this->getChildren()))
- {
- $this->_setHeaderParameter('Content-Type', 'charset', null);
- $this->_setHeaderParameter('Content-Type', 'format', null);
- $this->_setHeaderParameter('Content-Type', 'delsp', null);
- }
- else
- {
- $this->setCharset($this->_userCharset);
- $this->setFormat($this->_userFormat);
- $this->setDelSp($this->_userDelSp);
- }
- }
-
- /** Set the nesting level of this entity */
- protected function _setNestingLevel($level)
- {
- $this->_nestingLevel = $level;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/ParameterizedHeader.php b/lib/swift/classes/Swift/Mime/ParameterizedHeader.php
deleted file mode 100644
index 12e3586cc..000000000
--- a/lib/swift/classes/Swift/Mime/ParameterizedHeader.php
+++ /dev/null
@@ -1,34 +0,0 @@
-_encoder = $encoder;
- $this->_paramEncoder = $paramEncoder;
- $this->_grammar = $grammar;
- $this->_charset = $charset;
- }
-
- /**
- * Create a new Mailbox Header with a list of $addresses.
- * @param string $name
- * @param array|string $addresses
- * @return Swift_Mime_Header
- */
- public function createMailboxHeader($name, $addresses = null)
- {
- $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder, $this->_grammar);
- if (isset($addresses))
- {
- $header->setFieldBodyModel($addresses);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Create a new Date header using $timestamp (UNIX time).
- * @param string $name
- * @param int $timestamp
- * @return Swift_Mime_Header
- */
- public function createDateHeader($name, $timestamp = null)
- {
- $header = new Swift_Mime_Headers_DateHeader($name, $this->_grammar);
- if (isset($timestamp))
- {
- $header->setFieldBodyModel($timestamp);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Create a new basic text header with $name and $value.
- * @param string $name
- * @param string $value
- * @return Swift_Mime_Header
- */
- public function createTextHeader($name, $value = null)
- {
- $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder, $this->_grammar);
- if (isset($value))
- {
- $header->setFieldBodyModel($value);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Create a new ParameterizedHeader with $name, $value and $params.
- * @param string $name
- * @param string $value
- * @param array $params
- * @return Swift_Mime_ParameterizedHeader
- */
- public function createParameterizedHeader($name, $value = null,
- $params = array())
- {
- $header = new Swift_Mime_Headers_ParameterizedHeader($name,
- $this->_encoder, (strtolower($name) == 'content-disposition')
- ? $this->_paramEncoder
- : null,
- $this->_grammar
- );
- if (isset($value))
- {
- $header->setFieldBodyModel($value);
- }
- foreach ($params as $k => $v)
- {
- $header->setParameter($k, $v);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Create a new ID header for Message-ID or Content-ID.
- * @param string $name
- * @param string|array $ids
- * @return Swift_Mime_Header
- */
- public function createIdHeader($name, $ids = null)
- {
- $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->_grammar);
- if (isset($ids))
- {
- $header->setFieldBodyModel($ids);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Create a new Path header with an address (path) in it.
- * @param string $name
- * @param string $path
- * @return Swift_Mime_Header
- */
- public function createPathHeader($name, $path = null)
- {
- $header = new Swift_Mime_Headers_PathHeader($name, $this->_grammar);
- if (isset($path))
- {
- $header->setFieldBodyModel($path);
- }
- $this->_setHeaderCharset($header);
- return $header;
- }
-
- /**
- * Notify this observer that the entity's charset has changed.
- * @param string $charset
- */
- public function charsetChanged($charset)
- {
- $this->_charset = $charset;
- $this->_encoder->charsetChanged($charset);
- $this->_paramEncoder->charsetChanged($charset);
- }
-
- // -- Private methods
-
- /** Apply the charset to the Header */
- private function _setHeaderCharset(Swift_Mime_Header $header)
- {
- if (isset($this->_charset))
- {
- $header->setCharset($this->_charset);
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/SimpleHeaderSet.php b/lib/swift/classes/Swift/Mime/SimpleHeaderSet.php
deleted file mode 100644
index e3435ad8d..000000000
--- a/lib/swift/classes/Swift/Mime/SimpleHeaderSet.php
+++ /dev/null
@@ -1,394 +0,0 @@
-_factory = $factory;
- if (isset($charset))
- {
- $this->setCharset($charset);
- }
- }
-
- /**
- * Set the charset used by these headers.
- *
- * @param string $charset
- */
- public function setCharset($charset)
- {
- $this->_charset = $charset;
- $this->_factory->charsetChanged($charset);
- $this->_notifyHeadersOfCharset($charset);
- }
-
- /**
- * Add a new Mailbox Header with a list of $addresses.
- *
- * @param string $name
- * @param array|string $addresses
- */
- public function addMailboxHeader($name, $addresses = null)
- {
- $this->_storeHeader($name,
- $this->_factory->createMailboxHeader($name, $addresses));
- }
-
- /**
- * Add a new Date header using $timestamp (UNIX time).
- *
- * @param string $name
- * @param int $timestamp
- */
- public function addDateHeader($name, $timestamp = null)
- {
- $this->_storeHeader($name,
- $this->_factory->createDateHeader($name, $timestamp));
- }
-
- /**
- * Add a new basic text header with $name and $value.
- *
- * @param string $name
- * @param string $value
- */
- public function addTextHeader($name, $value = null)
- {
- $this->_storeHeader($name,
- $this->_factory->createTextHeader($name, $value));
- }
-
- /**
- * Add a new ParameterizedHeader with $name, $value and $params.
- *
- * @param string $name
- * @param string $value
- * @param array $params
- */
- public function addParameterizedHeader($name, $value = null,
- $params = array())
- {
- $this->_storeHeader($name,
- $this->_factory->createParameterizedHeader($name, $value,
- $params));
- }
-
- /**
- * Add a new ID header for Message-ID or Content-ID.
- *
- * @param string $name
- * @param string|array $ids
- */
- public function addIdHeader($name, $ids = null)
- {
- $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
- }
-
- /**
- * Add a new Path header with an address (path) in it.
- *
- * @param string $name
- * @param string $path
- */
- public function addPathHeader($name, $path = null)
- {
- $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
- }
-
- /**
- * Returns true if at least one header with the given $name exists.
- *
- * If multiple headers match, the actual one may be specified by $index.
- *
- * @param string $name
- * @param int $index
- *
- * @return boolean
- */
- public function has($name, $index = 0)
- {
- $lowerName = strtolower($name);
- return array_key_exists($lowerName, $this->_headers)
- && array_key_exists($index, $this->_headers[$lowerName]);
- }
-
- /**
- * Set a header in the HeaderSet.
- *
- * The header may be a previously fetched header via {@link get()} or it may
- * be one that has been created separately.
- *
- * If $index is specified, the header will be inserted into the set at this
- * offset.
- *
- * @param Swift_Mime_Header $header
- * @param int $index
- */
- public function set(Swift_Mime_Header $header, $index = 0)
- {
- $this->_storeHeader($header->getFieldName(), $header, $index);
- }
-
- /**
- * Get the header with the given $name.
- *
- * If multiple headers match, the actual one may be specified by $index.
- * Returns NULL if none present.
- *
- * @param string $name
- * @param int $index
- *
- * @return Swift_Mime_Header
- */
- public function get($name, $index = 0)
- {
- if ($this->has($name, $index))
- {
- $lowerName = strtolower($name);
- return $this->_headers[$lowerName][$index];
- }
- }
-
- /**
- * Get all headers with the given $name.
- *
- * @param string $name
- *
- * @return array
- */
- public function getAll($name = null)
- {
- if (!isset($name))
- {
- $headers = array();
- foreach ($this->_headers as $collection)
- {
- $headers = array_merge($headers, $collection);
- }
- return $headers;
- }
-
- $lowerName = strtolower($name);
- if (!array_key_exists($lowerName, $this->_headers))
- {
- return array();
- }
- return $this->_headers[$lowerName];
- }
-
- /**
- * Remove the header with the given $name if it's set.
- *
- * If multiple headers match, the actual one may be specified by $index.
- *
- * @param string $name
- * @param int $index
- */
- public function remove($name, $index = 0)
- {
- $lowerName = strtolower($name);
- unset($this->_headers[$lowerName][$index]);
- }
-
- /**
- * Remove all headers with the given $name.
- *
- * @param string $name
- */
- public function removeAll($name)
- {
- $lowerName = strtolower($name);
- unset($this->_headers[$lowerName]);
- }
-
- /**
- * Create a new instance of this HeaderSet.
- *
- * @return Swift_Mime_HeaderSet
- */
- public function newInstance()
- {
- return new self($this->_factory);
- }
-
- /**
- * Define a list of Header names as an array in the correct order.
- *
- * These Headers will be output in the given order where present.
- *
- * @param array $sequence
- */
- public function defineOrdering(array $sequence)
- {
- $this->_order = array_flip(array_map('strtolower', $sequence));
- }
-
- /**
- * Set a list of header names which must always be displayed when set.
- *
- * Usually headers without a field value won't be output unless set here.
- *
- * @param array $names
- */
- public function setAlwaysDisplayed(array $names)
- {
- $this->_required = array_flip(array_map('strtolower', $names));
- }
-
- /**
- * Notify this observer that the entity's charset has changed.
- *
- * @param string $charset
- */
- public function charsetChanged($charset)
- {
- $this->setCharset($charset);
- }
-
- /**
- * Returns a string with a representation of all headers.
- *
- * @return string
- */
- public function toString()
- {
- $string = '';
- $headers = $this->_headers;
- if ($this->_canSort())
- {
- uksort($headers, array($this, '_sortHeaders'));
- }
- foreach ($headers as $collection)
- {
- foreach ($collection as $header)
- {
- if ($this->_isDisplayed($header) || $header->getFieldBody() != '')
- {
- $string .= $header->toString();
- }
- }
- }
- return $string;
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return string
- *
- * @see toString()
- */
- public function __toString()
- {
- return $this->toString();
- }
-
- // -- Private methods
-
- /** Save a Header to the internal collection */
- private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
- {
- if (!isset($this->_headers[strtolower($name)]))
- {
- $this->_headers[strtolower($name)] = array();
- }
- if (!isset($offset))
- {
- $this->_headers[strtolower($name)][] = $header;
- }
- else
- {
- $this->_headers[strtolower($name)][$offset] = $header;
- }
- }
-
- /** Test if the headers can be sorted */
- private function _canSort()
- {
- return count($this->_order) > 0;
- }
-
- /** uksort() algorithm for Header ordering */
- private function _sortHeaders($a, $b)
- {
- $lowerA = strtolower($a);
- $lowerB = strtolower($b);
- $aPos = array_key_exists($lowerA, $this->_order)
- ? $this->_order[$lowerA]
- : -1;
- $bPos = array_key_exists($lowerB, $this->_order)
- ? $this->_order[$lowerB]
- : -1;
-
- if ($aPos == -1)
- {
- return 1;
- }
- elseif ($bPos == -1)
- {
- return -1;
- }
-
- return ($aPos < $bPos) ? -1 : 1;
- }
-
- /** Test if the given Header is always displayed */
- private function _isDisplayed(Swift_Mime_Header $header)
- {
- return array_key_exists(strtolower($header->getFieldName()), $this->_required);
- }
-
- /** Notify all Headers of the new charset */
- private function _notifyHeadersOfCharset($charset)
- {
- foreach ($this->_headers as $headerGroup)
- {
- foreach ($headerGroup as $header)
- {
- $header->setCharset($charset);
- }
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/SimpleMessage.php b/lib/swift/classes/Swift/Mime/SimpleMessage.php
deleted file mode 100644
index c8fdb34fc..000000000
--- a/lib/swift/classes/Swift/Mime/SimpleMessage.php
+++ /dev/null
@@ -1,622 +0,0 @@
-getHeaders()->defineOrdering(array(
- 'Return-Path',
- 'Sender',
- 'Message-ID',
- 'Date',
- 'Subject',
- 'From',
- 'Reply-To',
- 'To',
- 'Cc',
- 'Bcc',
- 'MIME-Version',
- 'Content-Type',
- 'Content-Transfer-Encoding'
- ));
- $this->getHeaders()->setAlwaysDisplayed(
- array('Date', 'Message-ID', 'From')
- );
- $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
- $this->setDate(time());
- $this->setId($this->getId());
- $this->getHeaders()->addMailboxHeader('From');
- }
-
- /**
- * Always returns {@link LEVEL_TOP} for a message instance.
- * @return int
- */
- public function getNestingLevel()
- {
- return self::LEVEL_TOP;
- }
-
- /**
- * Set the subject of this message.
- * @param string $subject
- * @return Swift_Mime_SimpleMessage
- */
- public function setSubject($subject)
- {
- if (!$this->_setHeaderFieldModel('Subject', $subject))
- {
- $this->getHeaders()->addTextHeader('Subject', $subject);
- }
- return $this;
- }
-
- /**
- * Get the subject of this message.
- * @return string
- */
- public function getSubject()
- {
- return $this->_getHeaderFieldModel('Subject');
- }
-
- /**
- * Set the date at which this message was created.
- * @param int $date
- * @return Swift_Mime_SimpleMessage
- */
- public function setDate($date)
- {
- if (!$this->_setHeaderFieldModel('Date', $date))
- {
- $this->getHeaders()->addDateHeader('Date', $date);
- }
- return $this;
- }
-
- /**
- * Get the date at which this message was created.
- * @return int
- */
- public function getDate()
- {
- return $this->_getHeaderFieldModel('Date');
- }
-
- /**
- * Set the return-path (the bounce address) of this message.
- * @param string $address
- * @return Swift_Mime_SimpleMessage
- */
- public function setReturnPath($address)
- {
- if (!$this->_setHeaderFieldModel('Return-Path', $address))
- {
- $this->getHeaders()->addPathHeader('Return-Path', $address);
- }
- return $this;
- }
-
- /**
- * Get the return-path (bounce address) of this message.
- * @return string
- */
- public function getReturnPath()
- {
- return $this->_getHeaderFieldModel('Return-Path');
- }
-
- /**
- * Set the sender of this message.
- * This does not override the From field, but it has a higher significance.
- * @param string $sender
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setSender($address, $name = null)
- {
- if (!is_array($address) && isset($name))
- {
- $address = array($address => $name);
- }
-
- if (!$this->_setHeaderFieldModel('Sender', (array) $address))
- {
- $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
- }
- return $this;
- }
-
- /**
- * Get the sender of this message.
- * @return string
- */
- public function getSender()
- {
- return $this->_getHeaderFieldModel('Sender');
- }
-
- /**
- * Add a From: address to this message.
- *
- * If $name is passed this name will be associated with the address.
- *
- * @param string $address
- * @param string $name optional
- */
- public function addFrom($address, $name = null)
- {
- $current = $this->getFrom();
- $current[$address] = $name;
- return $this->setFrom($current);
- }
-
- /**
- * Set the from address of this message.
- *
- * You may pass an array of addresses if this message is from multiple people.
- *
- * If $name is passed and the first parameter is a string, this name will be
- * associated with the address.
- *
- * @param string $addresses
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setFrom($addresses, $name = null)
- {
- if (!is_array($addresses) && isset($name))
- {
- $addresses = array($addresses => $name);
- }
-
- if (!$this->_setHeaderFieldModel('From', (array) $addresses))
- {
- $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
- }
- return $this;
- }
-
- /**
- * Get the from address of this message.
- *
- * @return string
- */
- public function getFrom()
- {
- return $this->_getHeaderFieldModel('From');
- }
-
- /**
- * Add a Reply-To: address to this message.
- *
- * If $name is passed this name will be associated with the address.
- *
- * @param string $address
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function addReplyTo($address, $name = null)
- {
- $current = $this->getReplyTo();
- $current[$address] = $name;
- return $this->setReplyTo($current);
- }
-
- /**
- * Set the reply-to address of this message.
- *
- * You may pass an array of addresses if replies will go to multiple people.
- *
- * If $name is passed and the first parameter is a string, this name will be
- * associated with the address.
- *
- * @param string $addresses
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setReplyTo($addresses, $name = null)
- {
- if (!is_array($addresses) && isset($name))
- {
- $addresses = array($addresses => $name);
- }
-
- if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses))
- {
- $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
- }
- return $this;
- }
-
- /**
- * Get the reply-to address of this message.
- *
- * @return string
- */
- public function getReplyTo()
- {
- return $this->_getHeaderFieldModel('Reply-To');
- }
-
- /**
- * Add a To: address to this message.
- *
- * If $name is passed this name will be associated with the address.
- *
- * @param string $address
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function addTo($address, $name = null)
- {
- $current = $this->getTo();
- $current[$address] = $name;
- return $this->setTo($current);
- }
-
- /**
- * Set the to addresses of this message.
- *
- * If multiple recipients will receive the message and array should be used.
- *
- * If $name is passed and the first parameter is a string, this name will be
- * associated with the address.
- *
- * @param array $addresses
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setTo($addresses, $name = null)
- {
- if (!is_array($addresses) && isset($name))
- {
- $addresses = array($addresses => $name);
- }
-
- if (!$this->_setHeaderFieldModel('To', (array) $addresses))
- {
- $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
- }
- return $this;
- }
-
- /**
- * Get the To addresses of this message.
- *
- * @return array
- */
- public function getTo()
- {
- return $this->_getHeaderFieldModel('To');
- }
-
- /**
- * Add a Cc: address to this message.
- *
- * If $name is passed this name will be associated with the address.
- *
- * @param string $address
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function addCc($address, $name = null)
- {
- $current = $this->getCc();
- $current[$address] = $name;
- return $this->setCc($current);
- }
-
- /**
- * Set the Cc addresses of this message.
- *
- * If $name is passed and the first parameter is a string, this name will be
- * associated with the address.
- *
- * @param array $addresses
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setCc($addresses, $name = null)
- {
- if (!is_array($addresses) && isset($name))
- {
- $addresses = array($addresses => $name);
- }
-
- if (!$this->_setHeaderFieldModel('Cc', (array) $addresses))
- {
- $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
- }
- return $this;
- }
-
- /**
- * Get the Cc address of this message.
- *
- * @return array
- */
- public function getCc()
- {
- return $this->_getHeaderFieldModel('Cc');
- }
-
- /**
- * Add a Bcc: address to this message.
- *
- * If $name is passed this name will be associated with the address.
- *
- * @param string $address
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function addBcc($address, $name = null)
- {
- $current = $this->getBcc();
- $current[$address] = $name;
- return $this->setBcc($current);
- }
-
- /**
- * Set the Bcc addresses of this message.
- *
- * If $name is passed and the first parameter is a string, this name will be
- * associated with the address.
- *
- * @param array $addresses
- * @param string $name optional
- * @return Swift_Mime_SimpleMessage
- */
- public function setBcc($addresses, $name = null)
- {
- if (!is_array($addresses) && isset($name))
- {
- $addresses = array($addresses => $name);
- }
-
- if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses))
- {
- $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
- }
- return $this;
- }
-
- /**
- * Get the Bcc addresses of this message.
- *
- * @return array
- */
- public function getBcc()
- {
- return $this->_getHeaderFieldModel('Bcc');
- }
-
- /**
- * Set the priority of this message.
- * The value is an integer where 1 is the highest priority and 5 is the lowest.
- * @param int $priority
- * @return Swift_Mime_SimpleMessage
- */
- public function setPriority($priority)
- {
- $priorityMap = array(
- 1 => 'Highest',
- 2 => 'High',
- 3 => 'Normal',
- 4 => 'Low',
- 5 => 'Lowest'
- );
- $pMapKeys = array_keys($priorityMap);
- if ($priority > max($pMapKeys))
- {
- $priority = max($pMapKeys);
- }
- elseif ($priority < min($pMapKeys))
- {
- $priority = min($pMapKeys);
- }
- if (!$this->_setHeaderFieldModel('X-Priority',
- sprintf('%d (%s)', $priority, $priorityMap[$priority])))
- {
- $this->getHeaders()->addTextHeader('X-Priority',
- sprintf('%d (%s)', $priority, $priorityMap[$priority]));
- }
- return $this;
- }
-
- /**
- * Get the priority of this message.
- * The returned value is an integer where 1 is the highest priority and 5
- * is the lowest.
- * @return int
- */
- public function getPriority()
- {
- list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
- '%[1-5]'
- );
- return isset($priority) ? $priority : 3;
- }
-
- /**
- * Ask for a delivery receipt from the recipient to be sent to $addresses
- * @param array $addresses
- * @return Swift_Mime_SimpleMessage
- */
- public function setReadReceiptTo($addresses)
- {
- if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses))
- {
- $this->getHeaders()
- ->addMailboxHeader('Disposition-Notification-To', $addresses);
- }
- return $this;
- }
-
- /**
- * Get the addresses to which a read-receipt will be sent.
- * @return string
- */
- public function getReadReceiptTo()
- {
- return $this->_getHeaderFieldModel('Disposition-Notification-To');
- }
-
- /**
- * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
- * @param Swift_Mime_MimeEntity $entity
- * @return Swift_Mime_SimpleMessage
- */
- public function attach(Swift_Mime_MimeEntity $entity)
- {
- $this->setChildren(array_merge($this->getChildren(), array($entity)));
- return $this;
- }
-
- /**
- * Remove an already attached entity.
- * @param Swift_Mime_MimeEntity $entity
- * @return Swift_Mime_SimpleMessage
- */
- public function detach(Swift_Mime_MimeEntity $entity)
- {
- $newChildren = array();
- foreach ($this->getChildren() as $child)
- {
- if ($entity !== $child)
- {
- $newChildren[] = $child;
- }
- }
- $this->setChildren($newChildren);
- return $this;
- }
-
- /**
- * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
- * This method should be used when embedding images or other data in a message.
- * @param Swift_Mime_MimeEntity $entity
- * @return string
- */
- public function embed(Swift_Mime_MimeEntity $entity)
- {
- $this->attach($entity);
- return 'cid:' . $entity->getId();
- }
-
- /**
- * Get this message as a complete string.
- * @return string
- */
- public function toString()
- {
- if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
- {
- $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
- $string = parent::toString();
- $this->setChildren($children);
- }
- else
- {
- $string = parent::toString();
- }
- return $string;
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return string
- *
- * @see toString()
- */
- public function __toString()
- {
- return $this->toString();
- }
-
- /**
- * Write this message to a {@link Swift_InputByteStream}.
- * @param Swift_InputByteStream $is
- */
- public function toByteStream(Swift_InputByteStream $is)
- {
- if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
- {
- $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
- parent::toByteStream($is);
- $this->setChildren($children);
- }
- else
- {
- parent::toByteStream($is);
- }
- }
-
- // -- Protected methods
-
- /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
- protected function _getIdField()
- {
- return 'Message-ID';
- }
-
- // -- Private methods
-
- /** Turn the body of this message into a child of itself if needed */
- private function _becomeMimePart()
- {
- $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
- $this->_getCache(), $this->_getGrammar(), $this->_userCharset
- );
- $part->setContentType($this->_userContentType);
- $part->setBody($this->getBody());
- $part->setFormat($this->_userFormat);
- $part->setDelSp($this->_userDelSp);
- $part->_setNestingLevel($this->_getTopNestingLevel());
- return $part;
- }
-
- /** Get the highest nesting level nested inside this message */
- private function _getTopNestingLevel()
- {
- $highestLevel = $this->getNestingLevel();
- foreach ($this->getChildren() as $child)
- {
- $childLevel = $child->getNestingLevel();
- if ($highestLevel < $childLevel)
- {
- $highestLevel = $childLevel;
- }
- }
- return $highestLevel;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Mime/SimpleMimeEntity.php b/lib/swift/classes/Swift/Mime/SimpleMimeEntity.php
deleted file mode 100644
index 6c5766d46..000000000
--- a/lib/swift/classes/Swift/Mime/SimpleMimeEntity.php
+++ /dev/null
@@ -1,852 +0,0 @@
- array(self::LEVEL_TOP, self::LEVEL_MIXED),
- 'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
- 'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED)
- );
-
- /** A set of filter rules to define what level an entity should be nested at */
- private $_compoundLevelFilters = array();
-
- /** The nesting level of this entity */
- private $_nestingLevel = self::LEVEL_ALTERNATIVE;
-
- /** A KeyCache instance used during encoding and streaming */
- private $_cache;
-
- /** Direct descendants of this entity */
- private $_immediateChildren = array();
-
- /** All descendants of this entity */
- private $_children = array();
-
- /** The maximum line length of the body of this entity */
- private $_maxLineLength = 78;
-
- /** The order in which alternative mime types should appear */
- private $_alternativePartOrder = array(
- 'text/plain' => 1,
- 'text/html' => 2,
- 'multipart/related' => 3
- );
-
- /** The CID of this entity */
- private $_id;
-
- /** The key used for accessing the cache */
- private $_cacheKey;
-
- protected $_userContentType;
-
- /**
- * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
- * @param Swift_Mime_HeaderSet $headers
- * @param Swift_Mime_ContentEncoder $encoder
- * @param Swift_KeyCache $cache
- * @param Swift_Mime_Grammar $grammar
- */
- public function __construct(Swift_Mime_HeaderSet $headers,
- Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache,
- Swift_Mime_Grammar $grammar)
- {
- $this->_cacheKey = uniqid();
- $this->_cache = $cache;
- $this->_headers = $headers;
- $this->_grammar = $grammar;
- $this->setEncoder($encoder);
- $this->_headers->defineOrdering(
- array('Content-Type', 'Content-Transfer-Encoding')
- );
-
- // This array specifies that, when the entire MIME document contains
- // $compoundLevel, then for each child within $level, if its Content-Type
- // is $contentType then it should be treated as if it's level is
- // $neededLevel instead. I tried to write that unambiguously! :-\
- // Data Structure:
- // array (
- // $compoundLevel => array(
- // $level => array(
- // $contentType => $neededLevel
- // )
- // )
- // )
-
- $this->_compoundLevelFilters = array(
- (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
- self::LEVEL_ALTERNATIVE => array(
- 'text/plain' => self::LEVEL_ALTERNATIVE,
- 'text/html' => self::LEVEL_RELATED
- )
- )
- );
-
- $this->_id = $this->getRandomId();
- }
-
- /**
- * Generate a new Content-ID or Message-ID for this MIME entity.
- * @return string
- */
- public function generateId()
- {
- $this->setId($this->getRandomId());
- return $this->_id;
- }
-
- /**
- * Get the {@link Swift_Mime_HeaderSet} for this entity.
- * @return Swift_Mime_HeaderSet
- */
- public function getHeaders()
- {
- return $this->_headers;
- }
-
- /**
- * Get the nesting level of this entity.
- * @return int
- * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
- */
- public function getNestingLevel()
- {
- return $this->_nestingLevel;
- }
-
- /**
- * Get the Content-type of this entity.
- * @return string
- */
- public function getContentType()
- {
- return $this->_getHeaderFieldModel('Content-Type');
- }
-
- /**
- * Set the Content-type of this entity.
- * @param string $type
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setContentType($type)
- {
- $this->_setContentTypeInHeaders($type);
- // Keep track of the value so that if the content-type changes automatically
- // due to added child entities, it can be restored if they are later removed
- $this->_userContentType = $type;
- return $this;
- }
-
- /**
- * Get the CID of this entity.
- * The CID will only be present in headers if a Content-ID header is present.
- * @return string
- */
- public function getId()
- {
- return $this->_headers->has($this->_getIdField())
- ? current((array) $this->_getHeaderFieldModel($this->_getIdField()))
- : $this->_id;
- }
-
- /**
- * Set the CID of this entity.
- * @param string $id
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setId($id)
- {
- if (!$this->_setHeaderFieldModel($this->_getIdField(), $id))
- {
- $this->_headers->addIdHeader($this->_getIdField(), $id);
- }
- $this->_id = $id;
- return $this;
- }
-
- /**
- * Get the description of this entity.
- * This value comes from the Content-Description header if set.
- * @return string
- */
- public function getDescription()
- {
- return $this->_getHeaderFieldModel('Content-Description');
- }
-
- /**
- * Set the description of this entity.
- * This method sets a value in the Content-ID header.
- * @param string $description
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setDescription($description)
- {
- if (!$this->_setHeaderFieldModel('Content-Description', $description))
- {
- $this->_headers->addTextHeader('Content-Description', $description);
- }
- return $this;
- }
-
- /**
- * Get the maximum line length of the body of this entity.
- * @return int
- */
- public function getMaxLineLength()
- {
- return $this->_maxLineLength;
- }
-
- /**
- * Set the maximum line length of lines in this body.
- * Though not enforced by the library, lines should not exceed 1000 chars.
- * @param int $length
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setMaxLineLength($length)
- {
- $this->_maxLineLength = $length;
- return $this;
- }
-
- /**
- * Get all children added to this entity.
- * @return array of Swift_Mime_Entity
- */
- public function getChildren()
- {
- return $this->_children;
- }
-
- /**
- * Set all children of this entity.
- * @param array $children Swiift_Mime_Entity instances
- * @param int $compoundLevel For internal use only
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setChildren(array $children, $compoundLevel = null)
- {
- //TODO: Try to refactor this logic
-
- $compoundLevel = isset($compoundLevel)
- ? $compoundLevel
- : $this->_getCompoundLevel($children)
- ;
-
- $immediateChildren = array();
- $grandchildren = array();
- $newContentType = $this->_userContentType;
-
- foreach ($children as $child)
- {
- $level = $this->_getNeededChildLevel($child, $compoundLevel);
- if (empty($immediateChildren)) //first iteration
- {
- $immediateChildren = array($child);
- }
- else
- {
- $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
- if ($nextLevel == $level)
- {
- $immediateChildren[] = $child;
- }
- elseif ($level < $nextLevel)
- {
- //Re-assign immediateChildren to grandchilden
- $grandchildren = array_merge($grandchildren, $immediateChildren);
- //Set new children
- $immediateChildren = array($child);
- }
- else
- {
- $grandchildren[] = $child;
- }
- }
- }
-
- if (!empty($immediateChildren))
- {
- $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
-
- //Determine which composite media type is needed to accomodate the
- // immediate children
- foreach ($this->_compositeRanges as $mediaType => $range)
- {
- if ($lowestLevel > $range[0]
- && $lowestLevel <= $range[1])
- {
- $newContentType = $mediaType;
- break;
- }
- }
-
- //Put any grandchildren in a subpart
- if (!empty($grandchildren))
- {
- $subentity = $this->_createChild();
- $subentity->_setNestingLevel($lowestLevel);
- $subentity->setChildren($grandchildren, $compoundLevel);
- array_unshift($immediateChildren, $subentity);
- }
- }
-
- $this->_immediateChildren = $immediateChildren;
- $this->_children = $children;
- $this->_setContentTypeInHeaders($newContentType);
- $this->_fixHeaders();
- $this->_sortChildren();
-
- return $this;
- }
-
- /**
- * Get the body of this entity as a string.
- * @return string
- */
- public function getBody()
- {
- return ($this->_body instanceof Swift_OutputByteStream)
- ? $this->_readStream($this->_body)
- : $this->_body;
- }
-
- /**
- * Set the body of this entity, either as a string, or as an instance of
- * {@link Swift_OutputByteStream}.
- * @param mixed $body
- * @param string $contentType optional
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setBody($body, $contentType = null)
- {
- if ($body !== $this->_body)
- {
- $this->_clearCache();
- }
-
- $this->_body = $body;
- if (isset($contentType))
- {
- $this->setContentType($contentType);
- }
- return $this;
- }
-
- /**
- * Get the encoder used for the body of this entity.
- * @return Swift_Mime_ContentEncoder
- */
- public function getEncoder()
- {
- return $this->_encoder;
- }
-
- /**
- * Set the encoder used for the body of this entity.
- * @param Swift_Mime_ContentEncoder $encoder
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setEncoder(Swift_Mime_ContentEncoder $encoder)
- {
- if ($encoder !== $this->_encoder)
- {
- $this->_clearCache();
- }
-
- $this->_encoder = $encoder;
- $this->_setEncoding($encoder->getName());
- $this->_notifyEncoderChanged($encoder);
- return $this;
- }
-
- /**
- * Get the boundary used to separate children in this entity.
- * @return string
- */
- public function getBoundary()
- {
- if (!isset($this->_boundary))
- {
- $this->_boundary = '_=_swift_v4_' . time() . uniqid() . '_=_';
- }
- return $this->_boundary;
- }
-
- /**
- * Set the boundary used to separate children in this entity.
- * @param string $boundary
- * @throws Swift_RfcComplianceException
- * @return Swift_Mime_SimpleMimeEntity
- */
- public function setBoundary($boundary)
- {
- $this->_assertValidBoundary($boundary);
- $this->_boundary = $boundary;
- return $this;
- }
-
- /**
- * Receive notification that the charset of this entity, or a parent entity
- * has changed.
- * @param string $charset
- */
- public function charsetChanged($charset)
- {
- $this->_notifyCharsetChanged($charset);
- }
-
- /**
- * Receive notification that the encoder of this entity or a parent entity
- * has changed.
- * @param Swift_Mime_ContentEncoder $encoder
- */
- public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
- {
- $this->_notifyEncoderChanged($encoder);
- }
-
- /**
- * Get this entire entity as a string.
- * @return string
- */
- public function toString()
- {
- $string = $this->_headers->toString();
- if (isset($this->_body) && empty($this->_immediateChildren))
- {
- if ($this->_cache->hasKey($this->_cacheKey, 'body'))
- {
- $body = $this->_cache->getString($this->_cacheKey, 'body');
- }
- else
- {
- $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0,
- $this->getMaxLineLength()
- );
- $this->_cache->setString($this->_cacheKey, 'body', $body,
- Swift_KeyCache::MODE_WRITE
- );
- }
- $string .= $body;
- }
-
- if (!empty($this->_immediateChildren))
- {
- foreach ($this->_immediateChildren as $child)
- {
- $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
- $string .= $child->toString();
- }
- $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
- }
-
- return $string;
- }
-
- /**
- * Returns a string representation of this object.
- *
- * @return string
- *
- * @see toString()
- */
- public function __toString()
- {
- return $this->toString();
- }
-
- /**
- * Write this entire entity to a {@link Swift_InputByteStream}.
- * @param Swift_InputByteStream
- */
- public function toByteStream(Swift_InputByteStream $is)
- {
- $is->write($this->_headers->toString());
- $is->commit();
-
- if (empty($this->_immediateChildren))
- {
- if (isset($this->_body))
- {
- if ($this->_cache->hasKey($this->_cacheKey, 'body'))
- {
- $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
- }
- else
- {
- $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
- if ($cacheIs)
- {
- $is->bind($cacheIs);
- }
-
- $is->write("\r\n");
-
- if ($this->_body instanceof Swift_OutputByteStream)
- {
- $this->_body->setReadPointer(0);
-
- $this->_encoder->encodeByteStream($this->_body, $is, 0,
- $this->getMaxLineLength()
- );
- }
- else
- {
- $is->write($this->_encoder->encodeString(
- $this->getBody(), 0, $this->getMaxLineLength()
- ));
- }
-
- if ($cacheIs)
- {
- $is->unbind($cacheIs);
- }
- }
- }
- }
-
- if (!empty($this->_immediateChildren))
- {
- foreach ($this->_immediateChildren as $child)
- {
- $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
- $child->toByteStream($is);
- }
- $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
- }
- }
-
- // -- Protected methods
-
- /**
- * Get the name of the header that provides the ID of this entity */
- protected function _getIdField()
- {
- return 'Content-ID';
- }
-
- /**
- * Get the model data (usually an array or a string) for $field.
- */
- protected function _getHeaderFieldModel($field)
- {
- if ($this->_headers->has($field))
- {
- return $this->_headers->get($field)->getFieldBodyModel();
- }
- }
-
- /**
- * Set the model data for $field.
- */
- protected function _setHeaderFieldModel($field, $model)
- {
- if ($this->_headers->has($field))
- {
- $this->_headers->get($field)->setFieldBodyModel($model);
- return true;
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Get the parameter value of $parameter on $field header.
- */
- protected function _getHeaderParameter($field, $parameter)
- {
- if ($this->_headers->has($field))
- {
- return $this->_headers->get($field)->getParameter($parameter);
- }
- }
-
- /**
- * Set the parameter value of $parameter on $field header.
- */
- protected function _setHeaderParameter($field, $parameter, $value)
- {
- if ($this->_headers->has($field))
- {
- $this->_headers->get($field)->setParameter($parameter, $value);
- return true;
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Re-evaluate what content type and encoding should be used on this entity.
- */
- protected function _fixHeaders()
- {
- if (count($this->_immediateChildren))
- {
- $this->_setHeaderParameter('Content-Type', 'boundary',
- $this->getBoundary()
- );
- $this->_headers->remove('Content-Transfer-Encoding');
- }
- else
- {
- $this->_setHeaderParameter('Content-Type', 'boundary', null);
- $this->_setEncoding($this->_encoder->getName());
- }
- }
-
- /**
- * Get the KeyCache used in this entity.
- */
- protected function _getCache()
- {
- return $this->_cache;
- }
-
- /**
- * Get the grammar used for validation.
- * @return Swift_Mime_Grammar
- */
- protected function _getGrammar()
- {
- return $this->_grammar;
- }
-
- /**
- * Empty the KeyCache for this entity.
- */
- protected function _clearCache()
- {
- $this->_cache->clearKey($this->_cacheKey, 'body');
- }
-
- /**
- * Returns a random Content-ID or Message-ID.
- * @return string
- */
- protected function getRandomId()
- {
- $idLeft = time() . '.' . uniqid();
- $idRight = !empty($_SERVER['SERVER_NAME'])
- ? $_SERVER['SERVER_NAME']
- : 'swift.generated';
- $id = $idLeft . '@' . $idRight;
-
- try
- {
- $this->_assertValidId($id);
- }
- catch (Swift_RfcComplianceException $e)
- {
- $id = $idLeft . '@swift.generated';
- }
-
- return $id;
- }
-
- // -- Private methods
-
- private function _readStream(Swift_OutputByteStream $os)
- {
- $string = '';
- while (false !== $bytes = $os->read(8192))
- {
- $string .= $bytes;
- }
- return $string;
- }
-
- private function _setEncoding($encoding)
- {
- if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding))
- {
- $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
- }
- }
-
- private function _assertValidBoundary($boundary)
- {
- if (!preg_match(
- '/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di',
- $boundary))
- {
- throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.');
- }
- }
-
- private function _setContentTypeInHeaders($type)
- {
- if (!$this->_setHeaderFieldModel('Content-Type', $type))
- {
- $this->_headers->addParameterizedHeader('Content-Type', $type);
- }
- }
-
- private function _setNestingLevel($level)
- {
- $this->_nestingLevel = $level;
- }
-
- private function _getCompoundLevel($children)
- {
- $level = 0;
- foreach ($children as $child)
- {
- $level |= $child->getNestingLevel();
- }
- return $level;
- }
-
- private function _getNeededChildLevel($child, $compoundLevel)
- {
- $filter = array();
- foreach ($this->_compoundLevelFilters as $bitmask => $rules)
- {
- if (($compoundLevel & $bitmask) === $bitmask)
- {
- $filter = $rules + $filter;
- }
- }
-
- $realLevel = $child->getNestingLevel();
- $lowercaseType = strtolower($child->getContentType());
-
- if (isset($filter[$realLevel])
- && isset($filter[$realLevel][$lowercaseType]))
- {
- return $filter[$realLevel][$lowercaseType];
- }
- else
- {
- return $realLevel;
- }
- }
-
- private function _createChild()
- {
- return new self($this->_headers->newInstance(),
- $this->_encoder, $this->_cache, $this->_grammar);
- }
-
- private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
- {
- foreach ($this->_immediateChildren as $child)
- {
- $child->encoderChanged($encoder);
- }
- }
-
- private function _notifyCharsetChanged($charset)
- {
- $this->_encoder->charsetChanged($charset);
- $this->_headers->charsetChanged($charset);
- foreach ($this->_immediateChildren as $child)
- {
- $child->charsetChanged($charset);
- }
- }
-
- private function _sortChildren()
- {
- $shouldSort = false;
- foreach ($this->_immediateChildren as $child)
- {
- //NOTE: This include alternative parts moved into a related part
- if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE)
- {
- $shouldSort = true;
- break;
- }
- }
-
- //Sort in order of preference, if there is one
- if ($shouldSort)
- {
- usort($this->_immediateChildren, array($this, '_childSortAlgorithm'));
- }
- }
-
- private function _childSortAlgorithm($a, $b)
- {
- $typePrefs = array();
- $types = array(
- strtolower($a->getContentType()),
- strtolower($b->getContentType())
- );
- foreach ($types as $type)
- {
- $typePrefs[] = (array_key_exists($type, $this->_alternativePartOrder))
- ? $this->_alternativePartOrder[$type]
- : (max($this->_alternativePartOrder) + 1);
- }
- return ($typePrefs[0] >= $typePrefs[1]) ? 1 : -1;
- }
-
- // -- Destructor
-
- /**
- * Empties it's own contents from the cache.
- */
- public function __destruct()
- {
- $this->_cache->clearAll($this->_cacheKey);
- }
-
- /**
- * Throws an Exception if the id passed does not comply with RFC 2822.
- * @param string $id
- * @throws Swift_RfcComplianceException
- */
- private function _assertValidId($id)
- {
- if (!preg_match(
- '/^' . $this->_grammar->getDefinition('id-left') . '@' .
- $this->_grammar->getDefinition('id-right') . '$/D',
- $id
- ))
- {
- throw new Swift_RfcComplianceException(
- 'Invalid ID given <' . $id . '>'
- );
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/MimePart.php b/lib/swift/classes/Swift/MimePart.php
deleted file mode 100644
index e22f15e6e..000000000
--- a/lib/swift/classes/Swift/MimePart.php
+++ /dev/null
@@ -1,63 +0,0 @@
-createDependenciesFor('mime.part')
- );
-
- if (!isset($charset))
- {
- $charset = Swift_DependencyContainer::getInstance()
- ->lookup('properties.charset');
- }
- $this->setBody($body);
- $this->setCharset($charset);
- if ($contentType)
- {
- $this->setContentType($contentType);
- }
- }
-
- /**
- * Create a new MimePart.
- * @param string $body
- * @param string $contentType
- * @param string $charset
- * @return Swift_Mime_MimePart
- */
- public static function newInstance($body = null, $contentType = null,
- $charset = null)
- {
- return new self($body, $contentType, $charset);
- }
-
-}
diff --git a/lib/swift/classes/Swift/NullTransport.php b/lib/swift/classes/Swift/NullTransport.php
deleted file mode 100644
index 8c82ee282..000000000
--- a/lib/swift/classes/Swift/NullTransport.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Pretends messages have been sent, but just ignores them.
- * @package Swift
- * @author Fabien Potencier
- */
-class Swift_NullTransport extends Swift_Transport_NullTransport
-{
- /**
- * Create a new NullTransport.
- */
- public function __construct()
- {
- call_user_func_array(
- array($this, 'Swift_Transport_NullTransport::__construct'),
- Swift_DependencyContainer::getInstance()
- ->createDependenciesFor('transport.null')
- );
- }
-
- /**
- * Create a new NullTransport instance.
- * @return Swift_NullTransport
- */
- public static function newInstance()
- {
- return new self();
- }
-}
diff --git a/lib/swift/classes/Swift/OutputByteStream.php b/lib/swift/classes/Swift/OutputByteStream.php
deleted file mode 100644
index 951b83834..000000000
--- a/lib/swift/classes/Swift/OutputByteStream.php
+++ /dev/null
@@ -1,41 +0,0 @@
-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;
- }
-
- /**
- * 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;
- }
-
- /**
- * 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.
- * @param Swift_Events_SendEvent $evt
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt)
- {
- }
-
- /**
- * Invoked immediately after the Message is sent.
- * @param Swift_Events_SendEvent $evt
- */
- 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);
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/lib/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php
deleted file mode 100644
index f56d3374a..000000000
--- a/lib/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ /dev/null
@@ -1,166 +0,0 @@
-getMessage();
- $message->toByteStream($this);
- }
-
- /**
- * Invoked immediately following a command being sent.
- * @param Swift_Events_ResponseEvent $evt
- */
- public function commandSent(Swift_Events_CommandEvent $evt)
- {
- $command = $evt->getCommand();
- $this->_out += strlen($command);
- }
-
- /**
- * Invoked immediately following a response coming back.
- * @param Swift_Events_ResponseEvent $evt
- */
- public function responseReceived(Swift_Events_ResponseEvent $evt)
- {
- $response = $evt->getResponse();
- $this->_in += strlen($response);
- }
-
- /**
- * Called when a message is sent so that the outgoing counter can be increased.
- * @param string $bytes
- */
- public function write($bytes)
- {
- $this->_out += strlen($bytes);
- foreach ($this->_mirrors as $stream)
- {
- $stream->write($bytes);
- }
- }
-
- /**
- * Not used.
- */
- public function commit()
- {
- }
-
- /**
- * Attach $is to this stream.
- * The stream acts as an observer, receiving all data that is written.
- * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
- *
- * @param Swift_InputByteStream $is
- */
- public function bind(Swift_InputByteStream $is)
- {
- $this->_mirrors[] = $is;
- }
-
- /**
- * Remove an already bound stream.
- * If $is is not bound, no errors will be raised.
- * If the stream currently has any buffered data it will be written to $is
- * before unbinding occurs.
- *
- * @param Swift_InputByteStream $is
- */
- public function unbind(Swift_InputByteStream $is)
- {
- foreach ($this->_mirrors as $k => $stream)
- {
- if ($is === $stream)
- {
- unset($this->_mirrors[$k]);
- }
- }
- }
-
- /**
- * Not used.
- */
- public function flushBuffers()
- {
- foreach ($this->_mirrors as $stream)
- {
- $stream->flushBuffers();
- }
- }
-
- /**
- * Get the total number of bytes sent to the server.
- * @return int
- */
- public function getBytesOut()
- {
- return $this->_out;
- }
-
- /**
- * Get the total number of bytes received from the server.
- * @return int
- */
- public function getBytesIn()
- {
- return $this->_in;
- }
-
- /**
- * Reset the internal counters to zero.
- */
- public function reset()
- {
- $this->_out = 0;
- $this->_in = 0;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Decorator/Replacements.php b/lib/swift/classes/Swift/Plugins/Decorator/Replacements.php
deleted file mode 100644
index 9735d0a04..000000000
--- a/lib/swift/classes/Swift/Plugins/Decorator/Replacements.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- * $replacements = array(
- * "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
- * "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
- * )
- *
- *
- * 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
- */
- public function __construct($replacements)
- {
- if (!($replacements instanceof Swift_Plugins_Decorator_Replacements))
- {
- $this->_replacements = (array) $replacements;
- }
- else
- {
- $this->_replacements = $replacements;
- }
- }
-
- /**
- * Invoked immediately before the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- 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 = array();
- 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;
- }
- }
- }
- else
- {
- $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);
- }
- else
- {
- return isset($this->_replacements[$address])
- ? $this->_replacements[$address]
- : null
- ;
- }
- }
-
- /**
- * Invoked immediately after the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function sendPerformed(Swift_Events_SendEvent $evt)
- {
- $this->_restoreMessage($evt->getMessage());
- }
-
- // -- Private methods
-
- /** Restore a changed message back to its original state */
- private function _restoreMessage(Swift_Mime_Message $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)
- {
- $body = $header->getFieldBodyModel();
- if (array_key_exists($header->getFieldName(), $this->_originalHeaders))
- {
- $header->setFieldBodyModel($this->_originalHeaders[$header->getFieldName()]);
- }
- }
- $this->_originalHeaders = array();
- }
- 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 = array();
- }
- $this->_lastMessage = null;
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/ImpersonatePlugin.php b/lib/swift/classes/Swift/Plugins/ImpersonatePlugin.php
deleted file mode 100644
index 3b0a42514..000000000
--- a/lib/swift/classes/Swift/Plugins/ImpersonatePlugin.php
+++ /dev/null
@@ -1,68 +0,0 @@
-_sender = $sender;
- }
-
- /**
- * Invoked immediately before the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt) {
- $message = $evt->getMessage();
- $headers = $message->getHeaders();
-
- // save current recipients
- $headers->addPathHeader('X-Swift-Return-Path', $message->getReturnPath());
-
- // replace them with the one to send to
- $message->setReturnPath($this->_sender);
- }
-
- /**
- * Invoked immediately after the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function sendPerformed(Swift_Events_SendEvent $evt) {
- $message = $evt->getMessage();
-
- // restore original headers
- $headers = $message->getHeaders();
-
- if ($headers->has('X-Swift-Return-Path')) {
- $message->setReturnPath($headers->get('X-Swift-Return-Path')->getAddress());
- $headers->removeAll('X-Swift-Return-Path');
- }
- }
-}
diff --git a/lib/swift/classes/Swift/Plugins/Logger.php b/lib/swift/classes/Swift/Plugins/Logger.php
deleted file mode 100644
index 9864da0dd..000000000
--- a/lib/swift/classes/Swift/Plugins/Logger.php
+++ /dev/null
@@ -1,37 +0,0 @@
-_logger = $logger;
- }
-
- /**
- * Add a log entry.
- *
- * @param string $entry
- */
- public function add($entry)
- {
- $this->_logger->add($entry);
- }
-
- /**
- * Clear the log contents.
- */
- public function clear()
- {
- $this->_logger->clear();
- }
-
- /**
- * Get this log as a string.
- *
- * @return string
- */
- public function dump()
- {
- return $this->_logger->dump();
- }
-
- /**
- * Invoked immediately following a command being sent.
- *
- * @param Swift_Events_ResponseEvent $evt
- */
- public function commandSent(Swift_Events_CommandEvent $evt)
- {
- $command = $evt->getCommand();
- $this->_logger->add(sprintf(">> %s", $command));
- }
-
- /**
- * Invoked immediately following a response coming back.
- *
- * @param Swift_Events_ResponseEvent $evt
- */
- public function responseReceived(Swift_Events_ResponseEvent $evt)
- {
- $response = $evt->getResponse();
- $this->_logger->add(sprintf("<< %s", $response));
- }
-
- /**
- * Invoked just before a Transport is started.
- *
- * @param Swift_Events_TransportChangeEvent $evt
- */
- public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
- {
- $transportName = get_class($evt->getSource());
- $this->_logger->add(sprintf("++ Starting %s", $transportName));
- }
-
- /**
- * Invoked immediately after the Transport is started.
- *
- * @param Swift_Events_TransportChangeEvent $evt
- */
- public function transportStarted(Swift_Events_TransportChangeEvent $evt)
- {
- $transportName = get_class($evt->getSource());
- $this->_logger->add(sprintf("++ %s started", $transportName));
- }
-
- /**
- * Invoked just before a Transport is stopped.
- *
- * @param Swift_Events_TransportChangeEvent $evt
- */
- public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
- {
- $transportName = get_class($evt->getSource());
- $this->_logger->add(sprintf("++ Stopping %s", $transportName));
- }
-
- /**
- * Invoked immediately after the Transport is stopped.
- *
- * @param Swift_Events_TransportChangeEvent $evt
- */
- public function transportStopped(Swift_Events_TransportChangeEvent $evt)
- {
- $transportName = get_class($evt->getSource());
- $this->_logger->add(sprintf("++ %s stopped", $transportName));
- }
-
- /**
- * Invoked as a TransportException is thrown in the Transport system.
- *
- * @param Swift_Events_TransportExceptionEvent $evt
- */
- public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
- {
- $e = $evt->getException();
- $message = $e->getMessage();
- $this->_logger->add(sprintf("!! %s", $message));
- $message .= PHP_EOL;
- $message .= 'Log data:' . PHP_EOL;
- $message .= $this->_logger->dump();
- $evt->cancelBubble();
- throw new Swift_TransportException($message);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php b/lib/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php
deleted file mode 100644
index 930eca25f..000000000
--- a/lib/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ /dev/null
@@ -1,73 +0,0 @@
-_size = $size;
- }
-
- /**
- * Add a log entry.
- * @param string $entry
- */
- public function add($entry)
- {
- $this->_log[] = $entry;
- while (count($this->_log) > $this->_size)
- {
- array_shift($this->_log);
- }
- }
-
- /**
- * Clear the log contents.
- */
- public function clear()
- {
- $this->_log = array();
- }
-
- /**
- * Get this log as a string.
- * @return string
- */
- public function dump()
- {
- return implode(PHP_EOL, $this->_log);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Loggers/EchoLogger.php b/lib/swift/classes/Swift/Plugins/Loggers/EchoLogger.php
deleted file mode 100644
index 83dd54b5f..000000000
--- a/lib/swift/classes/Swift/Plugins/Loggers/EchoLogger.php
+++ /dev/null
@@ -1,64 +0,0 @@
-_isHtml = $isHtml;
- }
-
- /**
- * Add a log entry.
- * @param string $entry
- */
- public function add($entry)
- {
- if ($this->_isHtml)
- {
- printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '
', PHP_EOL);
- }
- else
- {
- printf('%s%s', $entry, PHP_EOL);
- }
- }
-
- /**
- * Not implemented.
- */
- public function clear()
- {
- }
-
- /**
- * Not implemented.
- */
- public function dump()
- {
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/MessageLogger.php b/lib/swift/classes/Swift/Plugins/MessageLogger.php
deleted file mode 100644
index b6a942235..000000000
--- a/lib/swift/classes/Swift/Plugins/MessageLogger.php
+++ /dev/null
@@ -1,77 +0,0 @@
-messages = array();
- }
-
- /**
- * Get the message list
- *
- * @return array
- */
- public function getMessages()
- {
- return $this->messages;
- }
-
- /**
- * Get the message count
- *
- * @return int count
- */
- public function countMessages()
- {
- return count($this->messages);
- }
-
- /**
- * Empty the message list
- *
- */
- public function clear()
- {
- $this->messages = array();
- }
-
- /**
- * Invoked immediately before the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt)
- {
- $this->messages[] = clone $evt->getMessage();
- }
-
- /**
- * Invoked immediately after the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function sendPerformed(Swift_Events_SendEvent $evt)
- {
- }
-}
diff --git a/lib/swift/classes/Swift/Plugins/Pop/Pop3Connection.php b/lib/swift/classes/Swift/Plugins/Pop/Pop3Connection.php
deleted file mode 100644
index 1c96dcfaf..000000000
--- a/lib/swift/classes/Swift/Plugins/Pop/Pop3Connection.php
+++ /dev/null
@@ -1,36 +0,0 @@
-_host = $host;
- $this->_port = $port;
- $this->_crypto = $crypto;
- }
-
- /**
- * Create a new PopBeforeSmtpPlugin for $host and $port.
- *
- * @param string $host
- * @param int $port
- * @param string $cypto as "tls" or "ssl"
- *
- * @return Swift_Plugins_PopBeforeSmtpPlugin
- */
- public static function newInstance($host, $port = 110, $crypto = null)
- {
- return new self($host, $port, $crypto);
- }
-
- /**
- * Set a Pop3Connection to delegate to instead of connecting directly.
- *
- * @param Swift_Plugins_Pop_Pop3Connection $connection
- */
- public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
- {
- $this->_connection = $connection;
- return $this;
- }
-
- /**
- * Bind this plugin to a specific SMTP transport instance.
- *
- * @param Swift_Transport
- */
- public function bindSmtp(Swift_Transport $smtp)
- {
- $this->_transport = $smtp;
- }
-
- /**
- * Set the connection timeout in seconds (default 10).
- *
- * @param int $timeout
- */
- public function setTimeout($timeout)
- {
- $this->_timeout = (int) $timeout;
- return $this;
- }
-
- /**
- * Set the username to use when connecting (if needed).
- *
- * @param string $username
- */
- public function setUsername($username)
- {
- $this->_username = $username;
- return $this;
- }
-
- /**
- * Set the password to use when connecting (if needed).
- *
- * @param string $password
- */
- 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.
- *
- * @param Swift_Events_TransportChangeEvent $evt
- */
- 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 Methods
-
- 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 (substr($response, 0, 3) != '+OK')
- {
- 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;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/RedirectingPlugin.php b/lib/swift/classes/Swift/Plugins/RedirectingPlugin.php
deleted file mode 100644
index 71a3e6094..000000000
--- a/lib/swift/classes/Swift/Plugins/RedirectingPlugin.php
+++ /dev/null
@@ -1,109 +0,0 @@
-_recipient = $recipient;
- }
-
- /**
- * Set the recipient of all messages.
- * @param int $threshold
- */
- public function setRecipient($recipient)
- {
- $this->_recipient = $recipient;
- }
-
- /**
- * Get the recipient of all messages.
- * @return int
- */
- public function getRecipient()
- {
- return $this->_recipient;
- }
-
- /**
- * Invoked immediately before the Message is sent.
- * @param Swift_Events_SendEvent $evt
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt)
- {
- $message = $evt->getMessage();
- $headers = $message->getHeaders();
-
- // save current recipients
- $headers->addMailboxHeader('X-Swift-To', $message->getTo());
- $headers->addMailboxHeader('X-Swift-Cc', $message->getCc());
- $headers->addMailboxHeader('X-Swift-Bcc', $message->getBcc());
-
- // replace them with the one to send to
- $message->setTo($this->_recipient);
- $headers->removeAll('Cc');
- $headers->removeAll('Bcc');
- }
-
- /**
- * Invoked immediately after the Message is sent.
- *
- * @param Swift_Events_SendEvent $evt
- */
- public function sendPerformed(Swift_Events_SendEvent $evt)
- {
- $this->_restoreMessage($evt->getMessage());
- }
-
- // -- Private methods
-
- private function _restoreMessage(Swift_Mime_Message $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');
- }
-
- 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');
- }
- }
-}
diff --git a/lib/swift/classes/Swift/Plugins/Reporter.php b/lib/swift/classes/Swift/Plugins/Reporter.php
deleted file mode 100644
index d87fdc3f9..000000000
--- a/lib/swift/classes/Swift/Plugins/Reporter.php
+++ /dev/null
@@ -1,35 +0,0 @@
-_reporter = $reporter;
- }
-
- /**
- * Not used.
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt)
- {
- }
-
- /**
- * Invoked immediately after the Message is sent.
- * @param Swift_Events_SendEvent $evt
- */
- 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)
- );
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Reporters/HitReporter.php b/lib/swift/classes/Swift/Plugins/Reporters/HitReporter.php
deleted file mode 100644
index af5d7e386..000000000
--- a/lib/swift/classes/Swift/Plugins/Reporters/HitReporter.php
+++ /dev/null
@@ -1,61 +0,0 @@
-_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;
- }
-
- /**
- * Clear the buffer (empty the list).
- */
- public function clear()
- {
- $this->_failures = $this->_failures_cache = array();
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php b/lib/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php
deleted file mode 100644
index 119c4b271..000000000
--- a/lib/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-" . PHP_EOL;
- echo "PASS " . $address . PHP_EOL;
- echo "" . PHP_EOL;
- flush();
- }
- else
- {
- echo "" . PHP_EOL;
- echo "FAIL " . $address . PHP_EOL;
- echo "
" . PHP_EOL;
- flush();
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Sleeper.php b/lib/swift/classes/Swift/Plugins/Sleeper.php
deleted file mode 100644
index 148cbd3e8..000000000
--- a/lib/swift/classes/Swift/Plugins/Sleeper.php
+++ /dev/null
@@ -1,26 +0,0 @@
-_rate = $rate;
- $this->_mode = $mode;
- $this->_sleeper = $sleeper;
- $this->_timer = $timer;
- }
-
- /**
- * Invoked immediately before the Message is sent.
- * @param Swift_Events_SendEvent $evt
- */
- public function beforeSendPerformed(Swift_Events_SendEvent $evt)
- {
- $time = $this->getTimestamp();
- if (!isset($this->_start))
- {
- $this->_start = $time;
- }
- $duration = $time - $this->_start;
-
- if (self::BYTES_PER_MINUTE == $this->_mode)
- {
- $sleep = $this->_throttleBytesPerMinute($duration);
- }
- else
- {
- $sleep = $this->_throttleMessagesPerMinute($duration);
- }
-
- if ($sleep > 0)
- {
- $this->sleep($sleep);
- }
- }
-
- /**
- * Invoked when a Message is sent.
- * @param Swift_Events_SendEvent $evt
- */
- public function sendPerformed(Swift_Events_SendEvent $evt)
- {
- parent::sendPerformed($evt);
- ++$this->_messages;
- }
-
- /**
- * Sleep for $seconds.
- * @param int $seconds
- */
- public function sleep($seconds)
- {
- if (isset($this->_sleeper))
- {
- $this->_sleeper->sleep($seconds);
- }
- else
- {
- sleep($seconds);
- }
- }
-
- /**
- * Get the current UNIX timestamp
- * @return int
- */
- public function getTimestamp()
- {
- if (isset($this->_timer))
- {
- return $this->_timer->getTimestamp();
- }
- else
- {
- return time();
- }
- }
-
- // -- Private methods
-
- /**
- * Get a number of seconds to sleep for.
- * @param int $timePassed
- * @return int
- * @access private
- */
- private function _throttleBytesPerMinute($timePassed)
- {
- $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
- return (int) ceil($expectedDuration - $timePassed);
- }
-
- /**
- * Get a number of seconds to sleep for.
- * @param int $timePassed
- * @return int
- * @access private
- */
- private function _throttleMessagesPerMinute($timePassed)
- {
- $expectedDuration = $this->_messages / ($this->_rate / 60);
- return (int) ceil($expectedDuration - $timePassed);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Plugins/Timer.php b/lib/swift/classes/Swift/Plugins/Timer.php
deleted file mode 100644
index 92207bff9..000000000
--- a/lib/swift/classes/Swift/Plugins/Timer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-register('properties.charset')->asValue($charset);
- return $this;
- }
-
- /**
- * Set the directory where temporary files can be saved.
- * @param string $dir
- * @return Swift_Preferences
- */
- public function setTempDir($dir)
- {
- Swift_DependencyContainer::getInstance()
- ->register('tempdir')->asValue($dir);
- return $this;
- }
-
- /**
- * Set the type of cache to use (i.e. "disk" or "array").
- * @param string $type
- * @return Swift_Preferences
- */
- public function setCacheType($type)
- {
- Swift_DependencyContainer::getInstance()
- ->register('cache')->asAliasOf(sprintf('cache.%s', $type));
- return $this;
- }
-
- /**
- * Add the
- * @param boolean $dotEscape
- * @return Swift_Preferences
- */
- public function setQPDotEscape($dotEscape)
- {
- $dotEscape=!empty($dotEscape);
- Swift_DependencyContainer::getInstance()
- -> register('mime.qpcontentencoder')
- -> asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
- -> withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
- -> addConstructorValue($dotEscape);
- return $this;
- }
-
-}
diff --git a/lib/swift/classes/Swift/ReplacementFilterFactory.php b/lib/swift/classes/Swift/ReplacementFilterFactory.php
deleted file mode 100644
index db29e6dba..000000000
--- a/lib/swift/classes/Swift/ReplacementFilterFactory.php
+++ /dev/null
@@ -1,27 +0,0 @@
-createDependenciesFor('transport.sendmail')
- );
-
- $this->setCommand($command);
- }
-
- /**
- * Create a new SendmailTransport instance.
- * @param string $command
- * @return Swift_SendmailTransport
- */
- public static function newInstance($command = '/usr/sbin/sendmail -bs')
- {
- return new self($command);
- }
-
-}
diff --git a/lib/swift/classes/Swift/SmtpTransport.php b/lib/swift/classes/Swift/SmtpTransport.php
deleted file mode 100644
index 0e69b3769..000000000
--- a/lib/swift/classes/Swift/SmtpTransport.php
+++ /dev/null
@@ -1,54 +0,0 @@
-createDependenciesFor('transport.smtp')
- );
-
- $this->setHost($host);
- $this->setPort($port);
- $this->setEncryption($security);
- }
-
- /**
- * Create a new SmtpTransport instance.
- * @param string $host
- * @param int $port
- * @param int $security
- * @return Swift_SmtpTransport
- */
- public static function newInstance($host = 'localhost', $port = 25,
- $security = null)
- {
- return new self($host, $port, $security);
- }
-
-}
diff --git a/lib/swift/classes/Swift/Spool.php b/lib/swift/classes/Swift/Spool.php
deleted file mode 100644
index daeeefbc1..000000000
--- a/lib/swift/classes/Swift/Spool.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for spools.
- * @package Swift
- * @author Fabien Potencier
- */
-interface Swift_Spool
-{
- /**
- * Starts this Spool mechanism.
- */
- public function start();
-
- /**
- * Stops this Spool mechanism.
- */
- public function stop();
-
- /**
- * Tests if this Spool mechanism has started.
- *
- * @return boolean
- */
- public function isStarted();
-
- /**
- * Queues a message.
- * @param Swift_Mime_Message $message The message to store
- *
- * @return boolean Whether the operation has succeeded
- */
- public function queueMessage(Swift_Mime_Message $message);
-
- /**
- * Sends messages using the given transport instance.
- *
- * @param Swift_Transport $transport A transport instance
- * @param string[] &$failedRecipients An array of failures by-reference
- *
- * @return int The number of sent emails
- */
- public function flushQueue(Swift_Transport $transport, &$failedRecipients = null);
-}
diff --git a/lib/swift/classes/Swift/SpoolTransport.php b/lib/swift/classes/Swift/SpoolTransport.php
deleted file mode 100644
index 156f9b6a8..000000000
--- a/lib/swift/classes/Swift/SpoolTransport.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages in a queue.
- * @package Swift
- * @author Fabien Potencier
- */
-class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
-{
- /**
- * Create a new SpoolTransport.
- * @param Swift_Spool $spool
- */
- public function __construct(Swift_Spool $spool)
- {
- $arguments = Swift_DependencyContainer::getInstance()
- ->createDependenciesFor('transport.spool');
-
- $arguments[] = $spool;
-
- call_user_func_array(
- array($this, 'Swift_Transport_SpoolTransport::__construct'),
- $arguments
- );
- }
-
- /**
- * Create a new SpoolTransport instance.
- * @param Swift_Spool $spool
- * @return Swift_SpoolTransport
- */
- public static function newInstance(Swift_Spool $spool)
- {
- return new self($spool);
- }
-}
diff --git a/lib/swift/classes/Swift/StreamFilter.php b/lib/swift/classes/Swift/StreamFilter.php
deleted file mode 100644
index 6c262ce3a..000000000
--- a/lib/swift/classes/Swift/StreamFilter.php
+++ /dev/null
@@ -1,33 +0,0 @@
-_search = $search;
- $this->_index = array();
- $this->_tree = array();
- $this->_replace = array();
- $this->_repSize = array();
-
- $tree = null;
- $i = null;
- $last_size = $size = 0;
- foreach ($search as $i => $search_element)
- {
- if ($tree !== null)
- {
- $tree[-1] = min (count($replace) - 1, $i - 1);
- $tree[-2] = $last_size;
- }
- $tree = &$this->_tree;
- if (is_array ($search_element))
- {
- foreach ($search_element as $k => $char)
- {
- $this->_index[$char] = true;
- if (!isset($tree[$char]))
- {
- $tree[$char] = array();
- }
- $tree = &$tree[$char];
- }
- $last_size = $k+1;
- $size = max($size, $last_size);
- }
- else
- {
- $last_size = 1;
- if (!isset($tree[$search_element]))
- {
- $tree[$search_element] = array();
- }
- $tree = &$tree[$search_element];
- $size = max($last_size, $size);
- $this->_index[$search_element] = true;
- }
- }
- if ($i !== null)
- {
- $tree[-1] = min (count ($replace) - 1, $i);
- $tree[-2] = $last_size;
- $this->_treeMaxLen = $size;
- }
- foreach ($replace as $rep)
- {
- if (!is_array($rep))
- {
- $rep = array ($rep);
- }
- $this->_replace[] = $rep;
- }
- for ($i = count($this->_replace) - 1; $i >= 0; --$i)
- {
- $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
- $this->_repSize[$i] = count($rep);
- }
- }
-
- /**
- * Returns true if based on the buffer passed more bytes should be buffered.
- * @param array $buffer
- * @return boolean
- */
- public function shouldBuffer($buffer)
- {
- $endOfBuffer = end($buffer);
- return isset ($this->_index[$endOfBuffer]);
- }
-
- /**
- * Perform the actual replacements on $buffer and return the result.
- * @param array $buffer
- * @return array
- */
- public function filter($buffer, $_minReplaces = -1)
- {
- if ($this->_treeMaxLen == 0)
- {
- return $buffer;
- }
-
- $newBuffer = array();
- $buf_size = count($buffer);
- for ($i = 0; $i < $buf_size; ++$i)
- {
- $search_pos = $this->_tree;
- $last_found = PHP_INT_MAX;
- // We try to find if the next byte is part of a search pattern
- for ($j = 0; $j <= $this->_treeMaxLen; ++$j)
- {
- // We have a new byte for a search pattern
- if (isset ($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]]))
- {
- $search_pos = $search_pos[$buffer[$p]];
- // We have a complete pattern, save, in case we don't find a better match later
- if (isset($search_pos[- 1]) && $search_pos[-1] < $last_found
- && $search_pos[-1] > $_minReplaces)
- {
- $last_found = $search_pos[-1];
- $last_size = $search_pos[-2];
- }
- }
- // We got a complete pattern
- elseif ($last_found !== PHP_INT_MAX)
- {
- // Adding replacement datas to output buffer
- $rep_size = $this->_repSize[$last_found];
- for ($j = 0; $j < $rep_size; ++$j)
- {
- $newBuffer[] = $this->_replace[$last_found][$j];
- }
- // We Move cursor forward
- $i += $last_size - 1;
- // Edge Case, last position in buffer
- if ($i >= $buf_size)
- {
- $newBuffer[] = $buffer[$i];
- }
-
- // We start the next loop
- continue 2;
- }
- else
- {
- // this byte is not in a pattern and we haven't found another pattern
- break;
- }
- }
- // Normal byte, move it to output buffer
- $newBuffer[] = $buffer[$i];
- }
-
- return $newBuffer;
- }
-
-}
diff --git a/lib/swift/classes/Swift/StreamFilters/StringReplacementFilter.php b/lib/swift/classes/Swift/StreamFilters/StringReplacementFilter.php
deleted file mode 100644
index deebcd615..000000000
--- a/lib/swift/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ /dev/null
@@ -1,65 +0,0 @@
-_search = $search;
- $this->_replace = $replace;
- }
-
- /**
- * Returns true if based on the buffer passed more bytes should be buffered.
- * @param string $buffer
- * @return boolean
- */
- public function shouldBuffer($buffer)
- {
- $endOfBuffer = substr($buffer, -1);
- foreach ((array) $this->_search as $needle)
- {
- if (false !== strpos($needle, $endOfBuffer))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Perform the actual replacements on $buffer and return the result.
- * @param string $buffer
- * @return string
- */
- public function filter($buffer)
- {
- return str_replace($this->_search, $this->_replace, $buffer);
- }
-
-}
diff --git a/lib/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/lib/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
deleted file mode 100644
index 4b6448746..000000000
--- a/lib/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-_filters[$search][$replace]))
- {
- if (!isset($this->_filters[$search]))
- {
- $this->_filters[$search] = array();
- }
-
- if (!isset($this->_filters[$search][$replace]))
- {
- $this->_filters[$search][$replace] = array();
- }
-
- $this->_filters[$search][$replace]
- = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
- }
-
- return $this->_filters[$search][$replace];
- }
-
-}
diff --git a/lib/swift/classes/Swift/SwiftException.php b/lib/swift/classes/Swift/SwiftException.php
deleted file mode 100644
index bd3b656a5..000000000
--- a/lib/swift/classes/Swift/SwiftException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-_eventDispatcher = $dispatcher;
- $this->_buffer = $buf;
- $this->_lookupHostname();
- }
-
- /**
- * Set the name of the local domain which Swift will identify itself as.
- * This should be a fully-qualified domain name and should be truly the domain
- * you're using. If your server doesn't have a domain name, use the IP in square
- * brackets (i.e. [127.0.0.1]).
- *
- * @param string $domain
- * @return Swift_Transport_AbstractSmtpTransport
- */
- public function setLocalDomain($domain)
- {
- $this->_domain = $domain;
- return $this;
- }
-
- /**
- * Get the name of the domain Swift will identify as.
- *
- * @return string
- */
- public function getLocalDomain()
- {
- return $this->_domain;
- }
-
-
- /**
- * Sets the sourceIp
- * @param string $source
- */
- public function setSourceIp($source)
- {
- $this->_sourceIp=$source;
- }
-
- /**
- * Returns the ip used to connect to the destination
- * @return string
- */
- public function getSourceIp()
- {
- return $this->_sourceIp;
- }
-
- /**
- * Start the SMTP connection.
- */
- public function start()
- {
- if (!$this->_started)
- {
- if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
- if ($evt->bubbleCancelled())
- {
- return;
- }
- }
-
- try
- {
- $this->_buffer->initialize($this->_getBufferParams());
- }
- catch (Swift_TransportException $e)
- {
- $this->_throwException($e);
- }
- $this->_readGreeting();
- $this->_doHeloCommand();
-
- if ($evt)
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
- }
-
- $this->_started = true;
- }
- }
-
- /**
- * Test if an SMTP connection has been established.
- *
- * @return boolean
- */
- public function isStarted()
- {
- return $this->_started;
- }
-
- /**
- * Send the given Message.
- *
- * Recipient/sender data will be retrieved from the Message API.
- * The return value is the number of recipients who were accepted for delivery.
- *
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- * @return int
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $sent = 0;
- $failedRecipients = (array) $failedRecipients;
-
- if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
- if ($evt->bubbleCancelled())
- {
- return 0;
- }
- }
-
- if (!$reversePath = $this->_getReversePath($message))
- {
- throw new Swift_TransportException(
- 'Cannot send message without a sender address'
- );
- }
-
- $to = (array) $message->getTo();
- $cc = (array) $message->getCc();
- $bcc = (array) $message->getBcc();
-
- $message->setBcc(array());
-
- try
- {
- $sent += $this->_sendTo($message, $reversePath, $to, $failedRecipients);
- $sent += $this->_sendCc($message, $reversePath, $cc, $failedRecipients);
- $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
- }
- catch (Exception $e)
- {
- $message->setBcc($bcc);
- throw $e;
- }
-
- $message->setBcc($bcc);
-
- if ($evt)
- {
- if ($sent == count($to) + count($cc) + count($bcc))
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
- }
- elseif ($sent > 0)
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
- }
- else
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
- }
- $evt->setFailedRecipients($failedRecipients);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
-
- $message->generateId(); //Make sure a new Message ID is used
-
- return $sent;
- }
-
- /**
- * Stop the SMTP connection.
- */
- public function stop()
- {
- if ($this->_started)
- {
- if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
- if ($evt->bubbleCancelled())
- {
- return;
- }
- }
-
- try
- {
- $this->executeCommand("QUIT\r\n", array(221));
- }
- catch (Swift_TransportException $e) {}
-
- try
- {
- $this->_buffer->terminate();
-
- if ($evt)
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
- }
- }
- catch (Swift_TransportException $e)
- {
- $this->_throwException($e);
- }
- }
- $this->_started = false;
- }
-
- /**
- * Register a plugin.
- *
- * @param Swift_Events_EventListener $plugin
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- $this->_eventDispatcher->bindEventListener($plugin);
- }
-
- /**
- * Reset the current mail transaction.
- */
- public function reset()
- {
- $this->executeCommand("RSET\r\n", array(250));
- }
-
- /**
- * Get the IoBuffer where read/writes are occurring.
- *
- * @return Swift_Transport_IoBuffer
- */
- public function getBuffer()
- {
- return $this->_buffer;
- }
-
- /**
- * Run a command against the buffer, expecting the given response codes.
- *
- * If no response codes are given, the response will not be validated.
- * If codes are given, an exception will be thrown on an invalid response.
- *
- * @param string $command
- * @param int[] $codes
- * @param string[] &$failures
- * @return string
- */
- public function executeCommand($command, $codes = array(), &$failures = null)
- {
- $failures = (array) $failures;
- $seq = $this->_buffer->write($command);
- $response = $this->_getFullResponse($seq);
- if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
- }
- $this->_assertResponseCode($response, $codes);
- return $response;
- }
-
- // -- Protected methods
-
- /** Read the opening SMTP greeting */
- protected function _readGreeting()
- {
- $this->_assertResponseCode($this->_getFullResponse(0), array(220));
- }
-
- /** Send the HELO welcome */
- protected function _doHeloCommand()
- {
- $this->executeCommand(
- sprintf("HELO %s\r\n", $this->_domain), array(250)
- );
- }
-
- /** Send the MAIL FROM command */
- protected function _doMailFromCommand($address)
- {
- $this->executeCommand(
- sprintf("MAIL FROM: <%s>\r\n", $address), array(250)
- );
- }
-
- /** Send the RCPT TO command */
- protected function _doRcptToCommand($address)
- {
- $this->executeCommand(
- sprintf("RCPT TO: <%s>\r\n", $address), array(250, 251, 252)
- );
- }
-
- /** Send the DATA command */
- protected function _doDataCommand()
- {
- $this->executeCommand("DATA\r\n", array(354));
- }
-
- /** Stream the contents of the message over the buffer */
- protected function _streamMessage(Swift_Mime_Message $message)
- {
- $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
- try
- {
- $message->toByteStream($this->_buffer);
- $this->_buffer->flushBuffers();
- }
- catch (Swift_TransportException $e)
- {
- $this->_throwException($e);
- }
- $this->_buffer->setWriteTranslations(array());
- $this->executeCommand("\r\n.\r\n", array(250));
- }
-
- /** Determine the best-use reverse path for this message */
- protected function _getReversePath(Swift_Mime_Message $message)
- {
- $return = $message->getReturnPath();
- $sender = $message->getSender();
- $from = $message->getFrom();
- $path = null;
- if (!empty($return))
- {
- $path = $return;
- }
- elseif (!empty($sender))
- {
- // Don't use array_keys
- reset($sender); // Reset Pointer to first pos
- $path = key($sender); // Get key
- }
- elseif (!empty($from))
- {
- reset($from); // Reset Pointer to first pos
- $path = key($from); // Get key
- }
- return $path;
- }
-
- /** Throw a TransportException, first sending it to any listeners */
- protected function _throwException(Swift_TransportException $e)
- {
- if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
- if (!$evt->bubbleCancelled())
- {
- throw $e;
- }
- }
- else
- {
- throw $e;
- }
- }
-
- /** Throws an Exception if a response code is incorrect */
- protected function _assertResponseCode($response, $wanted)
- {
- list($code, $separator, $text) = sscanf($response, '%3d%[ -]%s');
- $valid = (empty($wanted) || in_array($code, $wanted));
-
- if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
- $valid))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
- }
-
- if (!$valid)
- {
- $this->_throwException(
- new Swift_TransportException(
- 'Expected response code ' . implode('/', $wanted) . ' but got code ' .
- '"' . $code . '", with message "' . $response . '"'
- )
- );
- }
- }
-
- /** Get an entire multi-line response using its sequence number */
- protected function _getFullResponse($seq)
- {
- $response = '';
- try
- {
- do
- {
- $line = $this->_buffer->readLine($seq);
- $response .= $line;
- }
- while (null !== $line && false !== $line && ' ' != $line{3});
- }
- catch (Swift_TransportException $e)
- {
- $this->_throwException($e);
- }
- return $response;
- }
-
- // -- Private methods
-
- /** Send an email to the given recipients from the given reverse path */
- private function _doMailTransaction($message, $reversePath,
- array $recipients, array &$failedRecipients)
- {
- $sent = 0;
- $this->_doMailFromCommand($reversePath);
- foreach ($recipients as $forwardPath)
- {
- try
- {
- $this->_doRcptToCommand($forwardPath);
- $sent++;
- }
- catch (Swift_TransportException $e)
- {
- $failedRecipients[] = $forwardPath;
- }
- }
-
- if ($sent != 0)
- {
- $this->_doDataCommand();
- $this->_streamMessage($message);
- }
- else
- {
- $this->reset();
- }
-
- return $sent;
- }
-
- /** Send a message to the given To: recipients */
- private function _sendTo(Swift_Mime_Message $message, $reversePath,
- array $to, array &$failedRecipients)
- {
- if (empty($to))
- {
- return 0;
- }
- return $this->_doMailTransaction($message, $reversePath, array_keys($to),
- $failedRecipients);
- }
-
- /** Send a message to the given Cc: recipients */
- private function _sendCc(Swift_Mime_Message $message, $reversePath,
- array $cc, array &$failedRecipients)
- {
- if (empty($cc))
- {
- return 0;
- }
- return $this->_doMailTransaction($message, $reversePath, array_keys($cc),
- $failedRecipients);
- }
-
- /** Send a message to all Bcc: recipients */
- private function _sendBcc(Swift_Mime_Message $message, $reversePath,
- array $bcc, array &$failedRecipients)
- {
- $sent = 0;
- foreach ($bcc as $forwardPath => $name)
- {
- $message->setBcc(array($forwardPath => $name));
- $sent += $this->_doMailTransaction(
- $message, $reversePath, array($forwardPath), $failedRecipients
- );
- }
- return $sent;
- }
-
- /** Try to determine the hostname of the server this is run on */
- private function _lookupHostname()
- {
- if (!empty($_SERVER['SERVER_NAME'])
- && $this->_isFqdn($_SERVER['SERVER_NAME']))
- {
- $this->_domain = $_SERVER['SERVER_NAME'];
- }
- elseif (!empty($_SERVER['SERVER_ADDR']))
- {
- $this->_domain = sprintf('[%s]', $_SERVER['SERVER_ADDR']);
- }
- }
-
- /** Determine is the $hostname is a fully-qualified name */
- private function _isFqdn($hostname)
- {
- //We could do a really thorough check, but there's really no point
- if (false !== $dotPos = strpos($hostname, '.'))
- {
- return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Destructor.
- */
- public function __destruct()
- {
- $this->stop();
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/lib/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
deleted file mode 100644
index 1595211b4..000000000
--- a/lib/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ /dev/null
@@ -1,85 +0,0 @@
-executeCommand("AUTH CRAM-MD5\r\n", array(334));
- $challenge = base64_decode(substr($challenge, 4));
- $message = base64_encode(
- $username . ' ' . $this->_getResponse($password, $challenge)
- );
- $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
- return true;
- }
- catch (Swift_TransportException $e)
- {
- $agent->executeCommand("RSET\r\n", array(250));
- return false;
- }
- }
-
- /**
- * Generate a CRAM-MD5 response from a server challenge.
- * @param string $secret
- * @param string $challenge
- * @return string
- */
- private function _getResponse($secret, $challenge)
- {
- if (strlen($secret) > 64)
- {
- $secret = pack('H32', md5($secret));
- }
-
- if (strlen($secret) < 64)
- {
- $secret = str_pad($secret, 64, chr(0));
- }
-
- $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
- $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
- $inner = pack('H32', md5($k_ipad . $challenge));
- $digest = md5($k_opad . $inner);
-
- return $digest;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/lib/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
deleted file mode 100644
index 312b7e20d..000000000
--- a/lib/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ /dev/null
@@ -1,55 +0,0 @@
-executeCommand("AUTH LOGIN\r\n", array(334));
- $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
- $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
- return true;
- }
- catch (Swift_TransportException $e)
- {
- $agent->executeCommand("RSET\r\n", array(250));
- return false;
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/lib/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
deleted file mode 100644
index ca588eaaa..000000000
--- a/lib/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
- return true;
- }
- catch (Swift_TransportException $e)
- {
- $agent->executeCommand("RSET\r\n", array(250));
- return false;
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/swift/classes/Swift/Transport/Esmtp/AuthHandler.php
deleted file mode 100644
index 1d98cd6aa..000000000
--- a/lib/swift/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ /dev/null
@@ -1,259 +0,0 @@
-setAuthenticators($authenticators);
- }
-
- /**
- * Set the Authenticators which can process a login request.
- * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
- */
- public function setAuthenticators(array $authenticators)
- {
- $this->_authenticators = $authenticators;
- }
-
- /**
- * Get the Authenticators which can process a login request.
- * @return Swift_Transport_Esmtp_Authenticator[]
- */
- public function getAuthenticators()
- {
- return $this->_authenticators;
- }
-
- /**
- * Set the username to authenticate with.
- * @param string $username
- */
- public function setUsername($username)
- {
- $this->_username = $username;
- }
-
- /**
- * Get the username to authenticate with.
- * @return string
- */
- public function getUsername()
- {
- return $this->_username;
- }
-
- /**
- * Set the password to authenticate with.
- * @param string $password
- */
- public function setPassword($password)
- {
- $this->_password = $password;
- }
-
- /**
- * Get the password to authenticate with.
- * @return string
- */
- public function getPassword()
- {
- return $this->_password;
- }
-
- /**
- * Set the auth mode to use to authenticate.
- * @param string $mode
- */
- public function setAuthMode($mode)
- {
- $this->_auth_mode = $mode;
- }
-
- /**
- * Get the auth mode to use to authenticate.
- * @return string
- */
- public function getAuthMode()
- {
- return $this->_auth_mode;
- }
-
- /**
- * Get the name of the ESMTP extension this handles.
- * @return boolean
- */
- public function getHandledKeyword()
- {
- return 'AUTH';
- }
-
- /**
- * Set the parameters which the EHLO greeting indicated.
- * @param string[] $parameters
- */
- public function setKeywordParams(array $parameters)
- {
- $this->_esmtpParams = $parameters;
- }
-
- /**
- * Runs immediately after a EHLO has been issued.
- * @param Swift_Transport_SmtpAgent $agent to read/write
- */
- public function afterEhlo(Swift_Transport_SmtpAgent $agent)
- {
- if ($this->_username)
- {
- $count = 0;
- foreach ($this->_getAuthenticatorsForAgent() as $authenticator)
- {
- if (in_array(strtolower($authenticator->getAuthKeyword()),
- array_map('strtolower', $this->_esmtpParams)))
- {
- $count++;
- if ($authenticator->authenticate($agent, $this->_username, $this->_password))
- {
- return;
- }
- }
- }
- throw new Swift_TransportException(
- 'Failed to authenticate on SMTP server with username "' .
- $this->_username . '" using ' . $count . ' possible authenticators'
- );
- }
- }
-
- /**
- * Not used.
- */
- public function getMailParams()
- {
- return array();
- }
-
- /**
- * Not used.
- */
- public function getRcptParams()
- {
- return array();
- }
-
- /**
- * Not used.
- */
- public function onCommand(Swift_Transport_SmtpAgent $agent,
- $command, $codes = array(), &$failedRecipients = null, &$stop = false)
- {
- }
-
- /**
- * Returns +1, -1 or 0 according to the rules for usort().
- * This method is called to ensure extensions can be execute in an appropriate order.
- * @param string $esmtpKeyword to compare with
- * @return int
- */
- public function getPriorityOver($esmtpKeyword)
- {
- return 0;
- }
-
- /**
- * Returns an array of method names which are exposed to the Esmtp class.
- * @return string[]
- */
- public function exposeMixinMethods()
- {
- return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
- }
-
- /**
- * Not used.
- */
- public function resetState()
- {
- }
-
- // -- Protected methods
-
- /**
- * Returns the authenticator list for the given agent.
- * @param Swift_Transport_SmtpAgent $agent
- * @return array
- * @access protected
- */
- protected function _getAuthenticatorsForAgent()
- {
- if (!$mode = strtolower($this->_auth_mode))
- {
- return $this->_authenticators;
- }
-
- foreach ($this->_authenticators as $authenticator)
- {
- if (strtolower($authenticator->getAuthKeyword()) == $mode)
- {
- return array($authenticator);
- }
- }
-
- throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
- }
-}
diff --git a/lib/swift/classes/Swift/Transport/Esmtp/Authenticator.php b/lib/swift/classes/Swift/Transport/Esmtp/Authenticator.php
deleted file mode 100644
index 4af223eea..000000000
--- a/lib/swift/classes/Swift/Transport/Esmtp/Authenticator.php
+++ /dev/null
@@ -1,37 +0,0 @@
-.
- * @return string[]
- */
- public function getMailParams();
-
- /**
- * Get params which are appended to RCPT TO:<>.
- * @return string[]
- */
- public function getRcptParams();
-
- /**
- * Runs when a command is due to be sent.
- * @param Swift_Transport_SmtpAgent $agent to read/write
- * @param string $command to send
- * @param int[] $codes expected in response
- * @param string[] &$failedRecipients
- * @param boolean &$stop to be set true if the command is now sent
- */
- public function onCommand(Swift_Transport_SmtpAgent $agent,
- $command, $codes = array(), &$failedRecipients = null, &$stop = false);
-
- /**
- * Returns +1, -1 or 0 according to the rules for usort().
- * This method is called to ensure extensions can be execute in an appropriate order.
- * @param string $esmtpKeyword to compare with
- * @return int
- */
- public function getPriorityOver($esmtpKeyword);
-
- /**
- * Returns an array of method names which are exposed to the Esmtp class.
- * @return string[]
- */
- public function exposeMixinMethods();
-
- /**
- * Tells this handler to clear any buffers and reset its state.
- */
- public function resetState();
-
-}
diff --git a/lib/swift/classes/Swift/Transport/EsmtpTransport.php b/lib/swift/classes/Swift/Transport/EsmtpTransport.php
deleted file mode 100644
index 54f9ff5c1..000000000
--- a/lib/swift/classes/Swift/Transport/EsmtpTransport.php
+++ /dev/null
@@ -1,395 +0,0 @@
- 'tcp',
- 'host' => 'localhost',
- 'port' => 25,
- 'timeout' => 30,
- 'blocking' => 1,
- 'tls' => false,
- 'type' => Swift_Transport_IoBuffer::TYPE_SOCKET
- );
-
- /**
- * Creates a new EsmtpTransport using the given I/O buffer.
- * @param Swift_Transport_IoBuffer $buf
- * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
- * @param Swift_Events_EventDispatcher $dispatcher
- */
- public function __construct(Swift_Transport_IoBuffer $buf,
- array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
- {
- parent::__construct($buf, $dispatcher);
- $this->setExtensionHandlers($extensionHandlers);
- }
-
- /**
- * Set the host to connect to.
- * @param string $host
- * @return Swift_Transport_EsmtpTransport
- */
- public function setHost($host)
- {
- $this->_params['host'] = $host;
- return $this;
- }
-
- /**
- * Get the host to connect to.
- * @return string
- */
- public function getHost()
- {
- return $this->_params['host'];
- }
-
- /**
- * Set the port to connect to.
- * @param int $port
- * @return Swift_Transport_EsmtpTransport
- */
- public function setPort($port)
- {
- $this->_params['port'] = (int) $port;
- return $this;
- }
-
- /**
- * Get the port to connect to.
- * @return int
- */
- public function getPort()
- {
- return $this->_params['port'];
- }
-
- /**
- * Set the connection timeout.
- * @param int $timeout seconds
- * @return Swift_Transport_EsmtpTransport
- */
- public function setTimeout($timeout)
- {
- $this->_params['timeout'] = (int) $timeout;
- $this->_buffer->setParam('timeout', (int) $timeout);
- return $this;
- }
-
- /**
- * Get the connection timeout.
- * @return int
- */
- public function getTimeout()
- {
- return $this->_params['timeout'];
- }
-
- /**
- * Set the encryption type (tls or ssl)
- * @param string $encryption
- * @return Swift_Transport_EsmtpTransport
- */
- public function setEncryption($enc)
- {
- if ('tls' == $enc)
- {
- $this->_params['protocol'] = 'tcp';
- $this->_params['tls'] = true;
- } else {
- $this->_params['protocol'] = $enc;
- $this->_params['tls'] = false;
- }
- return $this;
- }
-
- /**
- * Get the encryption type.
- * @return string
- */
- public function getEncryption()
- {
- return $this->_params['tls'] ? 'tls' : $this->_params['protocol'];
- }
-
- /**
- * Sets the sourceIp
- * @param string $source
- * @return Swift_Transport_EsmtpTransport
- */
- public function setSourceIp($source)
- {
- $this->_params['sourceIp']=$source;
- return $this;
- }
-
- /**
- * Returns the ip used to connect to the destination
- * @return string
- */
- public function getSourceIp()
- {
- return $this->_params['sourceIp'];
- }
-
- /**
- * Set ESMTP extension handlers.
- * @param Swift_Transport_EsmtpHandler[] $handlers
- * @return Swift_Transport_EsmtpTransport
- */
- public function setExtensionHandlers(array $handlers)
- {
- $assoc = array();
- foreach ($handlers as $handler)
- {
- $assoc[$handler->getHandledKeyword()] = $handler;
- }
- uasort($assoc, array($this, '_sortHandlers'));
- $this->_handlers = $assoc;
- $this->_setHandlerParams();
- return $this;
- }
-
- /**
- * Get ESMTP extension handlers.
- * @return Swift_Transport_EsmtpHandler[]
- */
- public function getExtensionHandlers()
- {
- return array_values($this->_handlers);
- }
-
- /**
- * Run a command against the buffer, expecting the given response codes.
- * If no response codes are given, the response will not be validated.
- * If codes are given, an exception will be thrown on an invalid response.
- * @param string $command
- * @param int[] $codes
- * @param string[] &$failures
- * @return string
- */
- public function executeCommand($command, $codes = array(), &$failures = null)
- {
- $failures = (array) $failures;
- $stopSignal = false;
- $response = null;
- foreach ($this->_getActiveHandlers() as $handler)
- {
- $response = $handler->onCommand(
- $this, $command, $codes, $failures, $stopSignal
- );
- if ($stopSignal)
- {
- return $response;
- }
- }
- return parent::executeCommand($command, $codes, $failures);
- }
-
- // -- Mixin invocation code
-
- /** Mixin handling method for ESMTP handlers */
- public function __call($method, $args)
- {
- foreach ($this->_handlers as $handler)
- {
- if (in_array(strtolower($method),
- array_map('strtolower', (array) $handler->exposeMixinMethods())
- ))
- {
- $return = call_user_func_array(array($handler, $method), $args);
- //Allow fluid method calls
- if (is_null($return) && substr($method, 0, 3) == 'set')
- {
- return $this;
- }
- else
- {
- return $return;
- }
- }
- }
- trigger_error('Call to undefined method ' . $method, E_USER_ERROR);
- }
-
- // -- Protected methods
-
- /** Get the params to initialize the buffer */
- protected function _getBufferParams()
- {
- return $this->_params;
- }
-
- /** Overridden to perform EHLO instead */
- protected function _doHeloCommand()
- {
- try
- {
- $response = $this->executeCommand(
- sprintf("EHLO %s\r\n", $this->_domain), array(250)
- );
- }
- catch (Swift_TransportException $e)
- {
- return parent::_doHeloCommand();
- }
-
- if ($this->_params['tls'])
- {
- try
- {
- $this->executeCommand("STARTTLS\r\n", array(220));
-
- if (!$this->_buffer->startTLS())
- {
- throw new Swift_TransportException('Unable to connect with TLS encryption');
- }
-
- try
- {
- $response = $this->executeCommand(
- sprintf("EHLO %s\r\n", $this->_domain), array(250)
- );
- }
- catch (Swift_TransportException $e)
- {
- return parent::_doHeloCommand();
- }
- }
- catch (Swift_TransportException $e)
- {
- $this->_throwException($e);
- }
- }
-
- $this->_capabilities = $this->_getCapabilities($response);
- $this->_setHandlerParams();
- foreach ($this->_getActiveHandlers() as $handler)
- {
- $handler->afterEhlo($this);
- }
- }
-
- /** Overridden to add Extension support */
- protected function _doMailFromCommand($address)
- {
- $handlers = $this->_getActiveHandlers();
- $params = array();
- foreach ($handlers as $handler)
- {
- $params = array_merge($params, (array) $handler->getMailParams());
- }
- $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
- $this->executeCommand(
- sprintf("MAIL FROM: <%s>%s\r\n", $address, $paramStr), array(250)
- );
- }
-
- /** Overridden to add Extension support */
- protected function _doRcptToCommand($address)
- {
- $handlers = $this->_getActiveHandlers();
- $params = array();
- foreach ($handlers as $handler)
- {
- $params = array_merge($params, (array) $handler->getRcptParams());
- }
- $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
- $this->executeCommand(
- sprintf("RCPT TO: <%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
- );
- }
-
- // -- Private methods
-
- /** Determine ESMTP capabilities by function group */
- private function _getCapabilities($ehloResponse)
- {
- $capabilities = array();
- $ehloResponse = trim($ehloResponse);
- $lines = explode("\r\n", $ehloResponse);
- array_shift($lines);
- foreach ($lines as $line)
- {
- if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches))
- {
- $keyword = strtoupper($matches[1]);
- $paramStr = strtoupper(ltrim($matches[2], ' ='));
- $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
- $capabilities[$keyword] = $params;
- }
- }
- return $capabilities;
- }
-
- /** Set parameters which are used by each extension handler */
- private function _setHandlerParams()
- {
- foreach ($this->_handlers as $keyword => $handler)
- {
- if (array_key_exists($keyword, $this->_capabilities))
- {
- $handler->setKeywordParams($this->_capabilities[$keyword]);
- }
- }
- }
-
- /** Get ESMTP handlers which are currently ok to use */
- private function _getActiveHandlers()
- {
- $handlers = array();
- foreach ($this->_handlers as $keyword => $handler)
- {
- if (array_key_exists($keyword, $this->_capabilities))
- {
- $handlers[] = $handler;
- }
- }
- return $handlers;
- }
-
- /** Custom sort for extension handler ordering */
- private function _sortHandlers($a, $b)
- {
- return $a->getPriorityOver($b->getHandledKeyword());
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/FailoverTransport.php b/lib/swift/classes/Swift/Transport/FailoverTransport.php
deleted file mode 100644
index ffb822c9b..000000000
--- a/lib/swift/classes/Swift/Transport/FailoverTransport.php
+++ /dev/null
@@ -1,95 +0,0 @@
-_transports);
- $sent = 0;
-
- for ($i = 0; $i < $maxTransports
- && $transport = $this->_getNextTransport(); ++$i)
- {
- try
- {
- if (!$transport->isStarted())
- {
- $transport->start();
- }
-
- return $transport->send($message, $failedRecipients);
- }
- catch (Swift_TransportException $e)
- {
- $this->_killCurrentTransport();
- }
- }
-
- if (count($this->_transports) == 0)
- {
- throw new Swift_TransportException(
- 'All Transports in FailoverTransport failed, or no Transports available'
- );
- }
-
- return $sent;
- }
-
- // -- Protected methods
-
- protected function _getNextTransport()
- {
- if (!isset($this->_currentTransport))
- {
- $this->_currentTransport = parent::_getNextTransport();
- }
- return $this->_currentTransport;
- }
-
- protected function _killCurrentTransport()
- {
- $this->_currentTransport = null;
- parent::_killCurrentTransport();
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/IoBuffer.php b/lib/swift/classes/Swift/Transport/IoBuffer.php
deleted file mode 100644
index 9a46cd91e..000000000
--- a/lib/swift/classes/Swift/Transport/IoBuffer.php
+++ /dev/null
@@ -1,63 +0,0 @@
-_transports = $transports;
- $this->_deadTransports = array();
- }
-
- /**
- * Get $transports to delegate to.
- *
- * @return array Swift_Transport
- */
- public function getTransports(array $transports)
- {
- return array_merge($this->_transports, $this->_deadTransports);
- }
-
- /**
- * Test if this Transport mechanism has started.
- *
- * @return boolean
- */
- public function isStarted()
- {
- return count($this->_transports) > 0;
- }
-
- /**
- * Start this Transport mechanism.
- */
- public function start()
- {
- $this->_transports = array_merge($this->_transports, $this->_deadTransports);
- }
-
- /**
- * Stop this Transport mechanism.
- */
- public function stop()
- {
- foreach ($this->_transports as $transport)
- {
- $transport->stop();
- }
- }
-
- /**
- * Send the given Message.
- *
- * Recipient/sender data will be retrieved from the Message API.
- * The return value is the number of recipients who were accepted for delivery.
- *
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- * @return int
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $maxTransports = count($this->_transports);
- $sent = 0;
-
- for ($i = 0; $i < $maxTransports
- && $transport = $this->_getNextTransport(); ++$i)
- {
- try
- {
- if (!$transport->isStarted())
- {
- $transport->start();
- }
- if ($sent = $transport->send($message, $failedRecipients))
- {
- break;
- }
- }
- catch (Swift_TransportException $e)
- {
- $this->_killCurrentTransport();
- }
- }
-
- if (count($this->_transports) == 0)
- {
- throw new Swift_TransportException(
- 'All Transports in LoadBalancedTransport failed, or no Transports available'
- );
- }
-
- return $sent;
- }
-
- /**
- * Register a plugin.
- *
- * @param Swift_Events_EventListener $plugin
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- foreach ($this->_transports as $transport)
- {
- $transport->registerPlugin($plugin);
- }
- }
-
- // -- Protected methods
-
- /**
- * Rotates the transport list around and returns the first instance.
- *
- * @return Swift_Transport
- * @access protected
- */
- protected function _getNextTransport()
- {
- if ($next = array_shift($this->_transports))
- {
- $this->_transports[] = $next;
- }
- return $next;
- }
-
- /**
- * Tag the currently used (top of stack) transport as dead/useless.
- *
- * @access protected
- */
- protected function _killCurrentTransport()
- {
- if ($transport = array_pop($this->_transports))
- {
- try
- {
- $transport->stop();
- }
- catch (Exception $e)
- {
- }
- $this->_deadTransports[] = $transport;
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/MailInvoker.php b/lib/swift/classes/Swift/Transport/MailInvoker.php
deleted file mode 100644
index dda882fd1..000000000
--- a/lib/swift/classes/Swift/Transport/MailInvoker.php
+++ /dev/null
@@ -1,36 +0,0 @@
-_invoker = $invoker;
- $this->_eventDispatcher = $eventDispatcher;
- }
-
- /**
- * Not used.
- */
- public function isStarted()
- {
- return false;
- }
-
- /**
- * Not used.
- */
- public function start()
- {
- }
-
- /**
- * Not used.
- */
- public function stop()
- {
- }
-
- /**
- * Set the additional parameters used on the mail() function.
- *
- * This string is formatted for sprintf() where %s is the sender address.
- *
- * @param string $params
- * @return Swift_Transport_MailTransport
- */
- public function setExtraParams($params)
- {
- $this->_extraParams = $params;
- return $this;
- }
-
- /**
- * Get the additional parameters used on the mail() function.
- *
- * This string is formatted for sprintf() where %s is the sender address.
- *
- * @return string
- */
- public function getExtraParams()
- {
- return $this->_extraParams;
- }
-
- /**
- * Send the given Message.
- *
- * Recipient/sender data will be retrieved from the Message API.
- * The return value is the number of recipients who were accepted for delivery.
- *
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- * @return int
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $failedRecipients = (array) $failedRecipients;
-
- if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
- if ($evt->bubbleCancelled())
- {
- return 0;
- }
- }
-
- $count = (
- count((array) $message->getTo())
- + count((array) $message->getCc())
- + count((array) $message->getBcc())
- );
-
- $toHeader = $message->getHeaders()->get('To');
- $subjectHeader = $message->getHeaders()->get('Subject');
-
- if (!$toHeader)
- {
- throw new Swift_TransportException(
- 'Cannot send message without a recipient'
- );
- }
- $to = $toHeader->getFieldBody();
- $subject = $subjectHeader ? $subjectHeader->getFieldBody() : '';
-
- $reversePath = $this->_getReversePath($message);
-
- //Remove headers that would otherwise be duplicated
- $message->getHeaders()->remove('To');
- $message->getHeaders()->remove('Subject');
-
- $messageStr = $message->toString();
-
- $message->getHeaders()->set($toHeader);
- $message->getHeaders()->set($subjectHeader);
-
- //Separate headers from body
- if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n"))
- {
- $headers = substr($messageStr, 0, $endHeaders) . "\r\n"; //Keep last EOL
- $body = substr($messageStr, $endHeaders + 4);
- }
- else
- {
- $headers = $messageStr . "\r\n";
- $body = '';
- }
-
- unset($messageStr);
-
- if ("\r\n" != PHP_EOL) //Non-windows (not using SMTP)
- {
- $headers = str_replace("\r\n", PHP_EOL, $headers);
- $body = str_replace("\r\n", PHP_EOL, $body);
- }
- else //Windows, using SMTP
- {
- $headers = str_replace("\r\n.", "\r\n..", $headers);
- $body = str_replace("\r\n.", "\r\n..", $body);
- }
-
- if ($this->_invoker->mail($to, $subject, $body, $headers,
- sprintf($this->_extraParams, $reversePath)))
- {
- if ($evt)
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
- $evt->setFailedRecipients($failedRecipients);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
- }
- else
- {
- $failedRecipients = array_merge(
- $failedRecipients,
- array_keys((array) $message->getTo()),
- array_keys((array) $message->getCc()),
- array_keys((array) $message->getBcc())
- );
-
- if ($evt)
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
- $evt->setFailedRecipients($failedRecipients);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
-
- $message->generateId();
-
- $count = 0;
- }
-
- return $count;
- }
-
- /**
- * Register a plugin.
- *
- * @param Swift_Events_EventListener $plugin
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- $this->_eventDispatcher->bindEventListener($plugin);
- }
-
- // -- Private methods
-
- /** Determine the best-use reverse path for this message */
- private function _getReversePath(Swift_Mime_Message $message)
- {
- $return = $message->getReturnPath();
- $sender = $message->getSender();
- $from = $message->getFrom();
- $path = null;
- if (!empty($return))
- {
- $path = $return;
- }
- elseif (!empty($sender))
- {
- $keys = array_keys($sender);
- $path = array_shift($keys);
- }
- elseif (!empty($from))
- {
- $keys = array_keys($from);
- $path = array_shift($keys);
- }
- return $path;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/NullTransport.php b/lib/swift/classes/Swift/Transport/NullTransport.php
deleted file mode 100644
index c60d93881..000000000
--- a/lib/swift/classes/Swift/Transport/NullTransport.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Pretends messages have been sent, but just ignores them.
- * @package Swift
- * @author Fabien Potencier
- */
-class Swift_Transport_NullTransport implements Swift_Transport
-{
- /** The event dispatcher from the plugin API */
- private $_eventDispatcher;
-
- /**
- * Constructor.
- */
- public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
- {
- $this->_eventDispatcher = $eventDispatcher;
- }
-
- /**
- * Tests if this Transport mechanism has started.
- *
- * @return boolean
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * Starts this Transport mechanism.
- */
- public function start()
- {
- }
-
- /**
- * Stops this Transport mechanism.
- */
- public function stop()
- {
- }
-
- /**
- * Sends the given message.
- *
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- *
- * @return int The number of sent emails
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
- if ($evt->bubbleCancelled())
- {
- return 0;
- }
- }
-
- if ($evt)
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
-
- return 0;
- }
-
- /**
- * Register a plugin.
- *
- * @param Swift_Events_EventListener $plugin
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- $this->_eventDispatcher->bindEventListener($plugin);
- }
-}
diff --git a/lib/swift/classes/Swift/Transport/SendmailTransport.php b/lib/swift/classes/Swift/Transport/SendmailTransport.php
deleted file mode 100644
index 1ed74e02f..000000000
--- a/lib/swift/classes/Swift/Transport/SendmailTransport.php
+++ /dev/null
@@ -1,170 +0,0 @@
- 30,
- 'blocking' => 1,
- 'command' => '/usr/sbin/sendmail -bs',
- 'type' => Swift_Transport_IoBuffer::TYPE_PROCESS
- );
-
- /**
- * Create a new SendmailTransport with $buf for I/O.
- * @param Swift_Transport_IoBuffer $buf
- * @param Swift_Events_EventDispatcher $dispatcher
- */
- public function __construct(Swift_Transport_IoBuffer $buf,
- Swift_Events_EventDispatcher $dispatcher)
- {
- parent::__construct($buf, $dispatcher);
- }
-
- /**
- * Start the standalone SMTP session if running in -bs mode.
- */
- public function start()
- {
- if (false !== strpos($this->getCommand(), ' -bs'))
- {
- parent::start();
- }
- }
-
- /**
- * Set the command to invoke.
- * If using -t mode you are strongly advised to include -oi or -i in the
- * flags. For example: /usr/sbin/sendmail -oi -t
- * Swift will append a -f flag if one is not present.
- * The recommended mode is "-bs" since it is interactive and failure notifications
- * are hence possible.
- * @param string $command
- * @return Swift_Transport_SendmailTransport
- */
- public function setCommand($command)
- {
- $this->_params['command'] = $command;
- return $this;
- }
-
- /**
- * Get the sendmail command which will be invoked.
- * @return string
- */
- public function getCommand()
- {
- return $this->_params['command'];
- }
-
- /**
- * Send the given Message.
- * Recipient/sender data will be retrieved from the Message API.
- * The return value is the number of recipients who were accepted for delivery.
- * NOTE: If using 'sendmail -t' you will not be aware of any failures until
- * they bounce (i.e. send() will always return 100% success).
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- * @return int
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- $failedRecipients = (array) $failedRecipients;
- $command = $this->getCommand();
- $buffer = $this->getBuffer();
-
- if (false !== strpos($command, ' -t'))
- {
- if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
- if ($evt->bubbleCancelled())
- {
- return 0;
- }
- }
-
- if (false === strpos($command, ' -f'))
- {
- $command .= ' -f' . $this->_getReversePath($message);
- }
-
- $buffer->initialize(array_merge($this->_params, array('command' => $command)));
-
- if (false === strpos($command, ' -i') && false === strpos($command, ' -oi'))
- {
- $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
- }
- else
- {
- $buffer->setWriteTranslations(array("\r\n"=>"\n"));
- }
-
- $count = count((array) $message->getTo())
- + count((array) $message->getCc())
- + count((array) $message->getBcc())
- ;
- $message->toByteStream($buffer);
- $buffer->flushBuffers();
- $buffer->setWriteTranslations(array());
- $buffer->terminate();
-
- if ($evt)
- {
- $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
- $evt->setFailedRecipients($failedRecipients);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
-
- $message->generateId();
- }
- elseif (false !== strpos($command, ' -bs'))
- {
- $count = parent::send($message, $failedRecipients);
- }
- else
- {
- $this->_throwException(new Swift_TransportException(
- 'Unsupported sendmail command flags [' . $command . ']. ' .
- 'Must be one of "-bs" or "-t" but can include additional flags.'
- ));
- }
-
- return $count;
- }
-
- // -- Protected methods
-
- /** Get the params to initialize the buffer */
- protected function _getBufferParams()
- {
- return $this->_params;
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/SimpleMailInvoker.php b/lib/swift/classes/Swift/Transport/SimpleMailInvoker.php
deleted file mode 100644
index cc278d034..000000000
--- a/lib/swift/classes/Swift/Transport/SimpleMailInvoker.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-
- */
-
-
-/**
- * This is the implementation class for {@link Swift_Transport_MailInvoker}.
- *
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
-{
-
- /**
- * Send mail via the mail() function.
- *
- * This method takes the same arguments as PHP mail().
- *
- * @param string $to
- * @param string $subject
- * @param string $body
- * @param string $headers
- * @param string $extraParams
- *
- * @return boolean
- */
- public function mail($to, $subject, $body, $headers = null, $extraParams = null)
- {
- if (!ini_get('safe_mode'))
- {
- return @mail($to, $subject, $body, $headers, $extraParams);
- }
- else
- {
- return @mail($to, $subject, $body, $headers);
- }
- }
-
-}
diff --git a/lib/swift/classes/Swift/Transport/SmtpAgent.php b/lib/swift/classes/Swift/Transport/SmtpAgent.php
deleted file mode 100644
index ee9b8ed51..000000000
--- a/lib/swift/classes/Swift/Transport/SmtpAgent.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages in a queue.
- * @package Swift
- * @author Fabien Potencier
- */
-class Swift_Transport_SpoolTransport implements Swift_Transport
-{
- /** The spool instance */
- private $_spool;
-
- /** The event dispatcher from the plugin API */
- private $_eventDispatcher;
-
- /**
- * Constructor.
- */
- public function __construct(Swift_Events_EventDispatcher $eventDispatcher, Swift_Spool $spool = null)
- {
- $this->_eventDispatcher = $eventDispatcher;
- $this->_spool = $spool;
- }
-
- /**
- * Sets the spool object.
- * @param Swift_Spool $spool
- * @return Swift_Transport_SpoolTransport
- */
- public function setSpool(Swift_Spool $spool)
- {
- $this->_spool = $spool;
- return $this;
- }
-
- /**
- * Get the spool object.
- * @return Swift_Spool
- */
- public function getSpool()
- {
- return $this->_spool;
- }
-
- /**
- * Tests if this Transport mechanism has started.
- *
- * @return boolean
- */
- public function isStarted()
- {
- return true;
- }
-
- /**
- * Starts this Transport mechanism.
- */
- public function start()
- {
- }
-
- /**
- * Stops this Transport mechanism.
- */
- public function stop()
- {
- }
-
- /**
- * Sends the given message.
- *
- * @param Swift_Mime_Message $message
- * @param string[] &$failedRecipients to collect failures by-reference
- *
- * @return int The number of sent emails
- */
- public function send(Swift_Mime_Message $message, &$failedRecipients = null)
- {
- if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
- {
- $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
- if ($evt->bubbleCancelled())
- {
- return 0;
- }
- }
-
- $success = $this->_spool->queueMessage($message);
-
- if ($evt)
- {
- $evt->setResult($success ? Swift_Events_SendEvent::RESULT_SUCCESS : Swift_Events_SendEvent::RESULT_FAILED);
- $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
- }
-
- return 1;
- }
-
- /**
- * Register a plugin.
- *
- * @param Swift_Events_EventListener $plugin
- */
- public function registerPlugin(Swift_Events_EventListener $plugin)
- {
- $this->_eventDispatcher->bindEventListener($plugin);
- }
-}
diff --git a/lib/swift/classes/Swift/Transport/StreamBuffer.php b/lib/swift/classes/Swift/Transport/StreamBuffer.php
deleted file mode 100644
index d9801fab1..000000000
--- a/lib/swift/classes/Swift/Transport/StreamBuffer.php
+++ /dev/null
@@ -1,329 +0,0 @@
-_replacementFactory = $replacementFactory;
- }
-
- /**
- * Perform any initialization needed, using the given $params.
- * Parameters will vary depending upon the type of IoBuffer used.
- * @param array $params
- */
- public function initialize(array $params)
- {
- $this->_params = $params;
- switch ($params['type'])
- {
- case self::TYPE_PROCESS:
- $this->_establishProcessConnection();
- break;
- case self::TYPE_SOCKET:
- default:
- $this->_establishSocketConnection();
- break;
- }
- }
-
- /**
- * Set an individual param on the buffer (e.g. switching to SSL).
- * @param string $param
- * @param mixed $value
- */
- public function setParam($param, $value)
- {
- if (isset($this->_stream))
- {
- switch ($param)
- {
- case 'timeout':
- if ($this->_stream)
- {
- stream_set_timeout($this->_stream, $value);
- }
- break;
-
- case 'blocking':
- if ($this->_stream)
- {
- stream_set_blocking($this->_stream, 1);
- }
-
- }
- }
- $this->_params[$param] = $value;
- }
-
- public function startTLS()
- {
- return stream_socket_enable_crypto($this->_stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
- }
-
- /**
- * Perform any shutdown logic needed.
- */
- public function terminate()
- {
- if (isset($this->_stream))
- {
- switch ($this->_params['type'])
- {
- case self::TYPE_PROCESS:
- fclose($this->_in);
- fclose($this->_out);
- proc_close($this->_stream);
- break;
- case self::TYPE_SOCKET:
- default:
- fclose($this->_stream);
- break;
- }
- }
- $this->_stream = null;
- $this->_out = null;
- $this->_in = null;
- }
-
- /**
- * Set an array of string replacements which should be made on data written
- * to the buffer. This could replace LF with CRLF for example.
- * @param string[] $replacements
- */
- public function setWriteTranslations(array $replacements)
- {
- foreach ($this->_translations as $search => $replace)
- {
- if (!isset($replacements[$search]))
- {
- $this->removeFilter($search);
- unset($this->_translations[$search]);
- }
- }
-
- foreach ($replacements as $search => $replace)
- {
- if (!isset($this->_translations[$search]))
- {
- $this->addFilter(
- $this->_replacementFactory->createFilter($search, $replace), $search
- );
- $this->_translations[$search] = true;
- }
- }
- }
-
- /**
- * Get a line of output (including any CRLF).
- * The $sequence number comes from any writes and may or may not be used
- * depending upon the implementation.
- * @param int $sequence of last write to scan from
- * @return string
- */
- public function readLine($sequence)
- {
- if (isset($this->_out) && !feof($this->_out))
- {
- $line = fgets($this->_out);
- if (strlen($line)==0)
- {
- $metas = stream_get_meta_data($this->_out);
- if ($metas['timed_out']) {
- throw new Swift_IoException(
- 'Connection to ' .
- $this->_getReadConnectionDescription() .
- ' Timed Out'
- );
- }
- }
- return $line;
- }
- }
-
- /**
- * Reads $length bytes from the stream into a string and moves the pointer
- * through the stream by $length. If less bytes exist than are requested the
- * remaining bytes are given instead. If no bytes are remaining at all, boolean
- * false is returned.
- * @param int $length
- * @return string
- */
- public function read($length)
- {
- if (isset($this->_out) && !feof($this->_out))
- {
- $ret = fread($this->_out, $length);
- if (strlen($ret)==0)
- {
- $metas = stream_get_meta_data($this->_out);
- if ($metas['timed_out'])
- {
- throw new Swift_IoException(
- 'Connection to ' .
- $this->_getReadConnectionDescription() .
- ' Timed Out'
- );
- }
- }
- return $ret;
- }
- }
-
- /** Not implemented */
- public function setReadPointer($byteOffset)
- {
- }
-
- // -- Protected methods
-
- /** Flush the stream contents */
- protected function _flush()
- {
- if (isset($this->_in))
- {
- fflush($this->_in);
- }
- }
-
- /** Write this bytes to the stream */
- protected function _commit($bytes)
- {
- if (isset($this->_in)
- && fwrite($this->_in, $bytes))
- {
- return ++$this->_sequence;
- }
- }
-
- // -- Private methods
-
- /**
- * Establishes a connection to a remote server.
- * @access private
- */
- private function _establishSocketConnection()
- {
- $host = $this->_params['host'];
- if (!empty($this->_params['protocol']))
- {
- $host = $this->_params['protocol'] . '://' . $host;
- }
- $timeout = 15;
- if (!empty($this->_params['timeout']))
- {
- $timeout = $this->_params['timeout'];
- }
- $options = array();
- if (!empty($this->_params['sourceIp']))
- {
- $options['socket']['bindto']=$this->_params['sourceIp'].':0';
- }
- $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, stream_context_create($options));
- if (false === $this->_stream)
- {
- throw new Swift_TransportException(
- 'Connection could not be established with host ' . $this->_params['host'] .
- ' [' . $errstr . ' #' . $errno . ']'
- );
- }
- if (!empty($this->_params['blocking']))
- {
- stream_set_blocking($this->_stream, 1);
- }
- else
- {
- stream_set_blocking($this->_stream, 0);
- }
- stream_set_timeout($this->_stream, $timeout);
- $this->_in =& $this->_stream;
- $this->_out =& $this->_stream;
- }
-
- /**
- * Opens a process for input/output.
- * @access private
- */
- private function _establishProcessConnection()
- {
- $command = $this->_params['command'];
- $descriptorSpec = array(
- 0 => array('pipe', 'r'),
- 1 => array('pipe', 'w'),
- 2 => array('pipe', 'w')
- );
- $this->_stream = proc_open($command, $descriptorSpec, $pipes);
- stream_set_blocking($pipes[2], 0);
- if ($err = stream_get_contents($pipes[2]))
- {
- throw new Swift_TransportException(
- 'Process could not be started [' . $err . ']'
- );
- }
- $this->_in =& $pipes[0];
- $this->_out =& $pipes[1];
- }
-
-
- private function _getReadConnectionDescription()
- {
- switch ($this->_params['type'])
- {
- case self::TYPE_PROCESS:
- return 'Process '.$this->_params['command'];
- break;
-
- case self::TYPE_SOCKET:
- default:
- $host = $this->_params['host'];
- if (!empty($this->_params['protocol']))
- {
- $host = $this->_params['protocol'] . '://' . $host;
- }
- $host.=':'.$this->_params['port'];
- return $host;
- break;
- }
- }
-}
diff --git a/lib/swift/classes/Swift/TransportException.php b/lib/swift/classes/Swift/TransportException.php
deleted file mode 100644
index 7df6e0b4f..000000000
--- a/lib/swift/classes/Swift/TransportException.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
- */
-class Swift_Validate
-{
- /**
- * Grammar Object
- * @var Swift_Mime_Grammar
- */
- private static $grammar = null;
-
- /**
- * Checks if an email matches the current grammars
- * @param string $email
- */
- public static function email($email)
- {
- if (self::$grammar===null)
- {
- self::$grammar = Swift_DependencyContainer::getInstance()
- ->lookup('mime.grammar');
- }
- return preg_match(
- '/^' . self::$grammar->getDefinition('addr-spec') . '$/D',
- $email
- );
- }
-}
\ No newline at end of file
diff --git a/lib/swift/dependency_maps/cache_deps.php b/lib/swift/dependency_maps/cache_deps.php
deleted file mode 100644
index 605820646..000000000
--- a/lib/swift/dependency_maps/cache_deps.php
+++ /dev/null
@@ -1,25 +0,0 @@
- register('cache')
- -> asAliasOf('cache.array')
-
- -> register('tempdir')
- -> asValue('/tmp')
-
- -> register('cache.null')
- -> asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
-
- -> register('cache.array')
- -> asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
- -> withDependencies(array('cache.inputstream'))
-
- -> register('cache.disk')
- -> asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
- -> withDependencies(array('cache.inputstream', 'tempdir'))
-
- -> register('cache.inputstream')
- -> asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
-
- ;
diff --git a/lib/swift/dependency_maps/message_deps.php b/lib/swift/dependency_maps/message_deps.php
deleted file mode 100644
index 38ba4c091..000000000
--- a/lib/swift/dependency_maps/message_deps.php
+++ /dev/null
@@ -1,9 +0,0 @@
- register('message.message')
- -> asNewInstanceOf('Swift_Message')
-
- -> register('message.mimepart')
- -> asNewInstanceOf('Swift_MimePart');
diff --git a/lib/swift/dependency_maps/mime_deps.php b/lib/swift/dependency_maps/mime_deps.php
deleted file mode 100644
index 6d7b30d68..000000000
--- a/lib/swift/dependency_maps/mime_deps.php
+++ /dev/null
@@ -1,105 +0,0 @@
- register('properties.charset')
- -> asValue('utf-8')
-
- -> register('mime.grammar')
- -> asSharedInstanceOf('Swift_Mime_Grammar')
-
- -> register('mime.message')
- -> asNewInstanceOf('Swift_Mime_SimpleMessage')
- -> withDependencies(array(
- 'mime.headerset',
- 'mime.qpcontentencoder',
- 'cache',
- 'mime.grammar',
- 'properties.charset'
- ))
-
- -> register('mime.part')
- -> asNewInstanceOf('Swift_Mime_MimePart')
- -> withDependencies(array(
- 'mime.headerset',
- 'mime.qpcontentencoder',
- 'cache',
- 'mime.grammar',
- 'properties.charset'
- ))
-
- -> register('mime.attachment')
- -> asNewInstanceOf('Swift_Mime_Attachment')
- -> withDependencies(array(
- 'mime.headerset',
- 'mime.base64contentencoder',
- 'cache',
- 'mime.grammar'
- ))
- -> addConstructorValue($swift_mime_types)
-
- -> register('mime.embeddedfile')
- -> asNewInstanceOf('Swift_Mime_EmbeddedFile')
- -> withDependencies(array(
- 'mime.headerset',
- 'mime.base64contentencoder',
- 'cache',
- 'mime.grammar'
- ))
- -> addConstructorValue($swift_mime_types)
-
- -> register('mime.headerfactory')
- -> asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
- -> withDependencies(array(
- 'mime.qpheaderencoder',
- 'mime.rfc2231encoder',
- 'mime.grammar',
- 'properties.charset'
- ))
-
- -> register('mime.headerset')
- -> asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
- -> withDependencies(array('mime.headerfactory', 'properties.charset'))
-
- -> register('mime.qpheaderencoder')
- -> asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
- -> withDependencies(array('mime.charstream'))
-
- -> register('mime.charstream')
- -> asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
- -> withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
-
- -> register('mime.bytecanonicalizer')
- -> asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
- -> addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
- -> addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
-
- -> register('mime.characterreaderfactory')
- -> asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
-
- -> register('mime.qpcontentencoder')
- -> asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
- -> withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
-
- -> register('mime.7bitcontentencoder')
- -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
- -> addConstructorValue('7bit')
- -> addConstructorValue(true)
-
- -> register('mime.8bitcontentencoder')
- -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
- -> addConstructorValue('8bit')
- -> addConstructorValue(true)
-
- -> register('mime.base64contentencoder')
- -> asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
-
- -> register('mime.rfc2231encoder')
- -> asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
- -> withDependencies(array('mime.charstream'))
-
- ;
-
-unset($swift_mime_types);
diff --git a/lib/swift/dependency_maps/transport_deps.php b/lib/swift/dependency_maps/transport_deps.php
deleted file mode 100644
index 52c334165..000000000
--- a/lib/swift/dependency_maps/transport_deps.php
+++ /dev/null
@@ -1,70 +0,0 @@
- register('transport.smtp')
- -> asNewInstanceOf('Swift_Transport_EsmtpTransport')
- -> withDependencies(array(
- 'transport.buffer',
- array('transport.authhandler'),
- 'transport.eventdispatcher'
- ))
-
- -> register('transport.sendmail')
- -> asNewInstanceOf('Swift_Transport_SendmailTransport')
- -> withDependencies(array(
- 'transport.buffer',
- 'transport.eventdispatcher'
- ))
-
- -> register('transport.mail')
- -> asNewInstanceOf('Swift_Transport_MailTransport')
- -> withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
-
- -> register('transport.loadbalanced')
- -> asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
-
- -> register('transport.failover')
- -> asNewInstanceOf('Swift_Transport_FailoverTransport')
-
- -> register('transport.spool')
- -> asNewInstanceOf('Swift_Transport_SpoolTransport')
- -> withDependencies(array('transport.eventdispatcher'))
-
- -> register('transport.null')
- -> asNewInstanceOf('Swift_Transport_NullTransport')
- -> withDependencies(array('transport.eventdispatcher'))
-
- -> register('transport.mailinvoker')
- -> asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
-
- -> register('transport.buffer')
- -> asNewInstanceOf('Swift_Transport_StreamBuffer')
- -> withDependencies(array('transport.replacementfactory'))
-
- -> register('transport.authhandler')
- -> asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
- -> withDependencies(array(
- array(
- 'transport.crammd5auth',
- 'transport.loginauth',
- 'transport.plainauth'
- )
- ))
-
- -> register('transport.crammd5auth')
- -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
-
- -> register('transport.loginauth')
- -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
-
- -> register('transport.plainauth')
- -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
-
- -> register('transport.eventdispatcher')
- -> asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
-
- -> register('transport.replacementfactory')
- -> asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
-
- ;
diff --git a/lib/swift/mime_types.php b/lib/swift/mime_types.php
deleted file mode 100644
index 65c9aa077..000000000
--- a/lib/swift/mime_types.php
+++ /dev/null
@@ -1,76 +0,0 @@
- 'audio/x-aiff',
- 'aiff' => 'audio/x-aiff',
- 'avi' => 'video/avi',
- 'bmp' => 'image/bmp',
- 'bz2' => 'application/x-bz2',
- 'csv' => 'text/csv',
- 'dmg' => 'application/x-apple-diskimage',
- 'doc' => 'application/msword',
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'eml' => 'message/rfc822',
- 'aps' => 'application/postscript',
- 'exe' => 'application/x-ms-dos-executable',
- 'flv' => 'video/x-flv',
- 'gif' => 'image/gif',
- 'gz' => 'application/x-gzip',
- 'hqx' => 'application/stuffit',
- 'htm' => 'text/html',
- 'html' => 'text/html',
- 'jar' => 'application/x-java-archive',
- 'jpeg' => 'image/jpeg',
- 'jpg' => 'image/jpeg',
- 'm3u' => 'audio/x-mpegurl',
- 'm4a' => 'audio/mp4',
- 'mdb' => 'application/x-msaccess',
- 'mid' => 'audio/midi',
- 'midi' => 'audio/midi',
- 'mov' => 'video/quicktime',
- 'mp3' => 'audio/mpeg',
- 'mp4' => 'video/mp4',
- 'mpeg' => 'video/mpeg',
- 'mpg' => 'video/mpeg',
- 'odg' => 'vnd.oasis.opendocument.graphics',
- 'odp' => 'vnd.oasis.opendocument.presentation',
- 'odt' => 'vnd.oasis.opendocument.text',
- 'ods' => 'vnd.oasis.opendocument.spreadsheet',
- 'ogg' => 'audio/ogg',
- 'pdf' => 'application/pdf',
- 'png' => 'image/png',
- 'ppt' => 'application/vnd.ms-powerpoint',
- 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
- 'ps' => 'application/postscript',
- 'rar' => 'application/x-rar-compressed',
- 'rtf' => 'application/rtf',
- 'tar' => 'application/x-tar',
- 'sit' => 'application/x-stuffit',
- 'svg' => 'image/svg+xml',
- 'tif' => 'image/tiff',
- 'tiff' => 'image/tiff',
- 'ttf' => 'application/x-font-truetype',
- 'txt' => 'text/plain',
- 'vcf' => 'text/x-vcard',
- 'wav' => 'audio/wav',
- 'wma' => 'audio/x-ms-wma',
- 'wmv' => 'audio/x-ms-wmv',
- 'xls' => 'application/excel',
- 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- 'xml' => 'application/xml',
- 'zip' => 'application/zip'
-);
diff --git a/lib/swift/preferences.php b/lib/swift/preferences.php
deleted file mode 100644
index da9602f6e..000000000
--- a/lib/swift/preferences.php
+++ /dev/null
@@ -1,22 +0,0 @@
-setCharset('utf-8');
-
-// Without these lines the default caching mechanism is "array" but this uses
-// a lot of memory.
-// If possible, use a disk cache to enable attaching large attachments etc
-if (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()))
-{
- Swift_Preferences::getInstance()
- -> setTempDir(sys_get_temp_dir())
- -> setCacheType('disk');
-}
-
-Swift_Preferences::getInstance()->setQPDotEscape(false);
diff --git a/lib/swift/swift_init.php b/lib/swift/swift_init.php
deleted file mode 100644
index 77807676a..000000000
--- a/lib/swift/swift_init.php
+++ /dev/null
@@ -1,27 +0,0 @@
-