diff --git a/includes/kohana/modules/email/vendor/swift/CHANGES b/includes/kohana/modules/email/vendor/swift/CHANGES new file mode 100644 index 00000000..86fdb119 --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/CHANGES @@ -0,0 +1,61 @@ +Changelog for Swift Mailer, since Version 4.x +--------------------------------------------- + +09 March 2009: 4.0.0 +-------------------- + + * Complete rewrite of Version 3.x with lots of breaking changes at the interface + level, but for the best in the long run. + * Changed Connections to Transports + * Made sending more robust (less error prone) + * Simplified Swift_Message interface (removed need for separate RecipientList) + * Improved Plugin API (better event management) + * Changed all MIME generated content to be full RFC 2822 (and friends) compliant + +11 March 2009: 4.0.1 +-------------------- + + * Fixed regression with cache clearing logic in setBody(), setEncoder() and + setCharset() + +13 March 2009: 4.0.2 +-------------------- + + * Added addTo(), addCc() etc methods. + * Allowed setTo(), setCc() etc to accept a $name parameters. + * Patched a bug in MailTransport where failed recipients were not being merged. + * Added Swift::VERSION constant + * Allowed custom autoloaders to be used + +20 March 2009: 4.0.3 +-------------------- + + * Fixed Bug where base64 encoded content could exceed 76 chars per line + * Allowed Decorator plugin to accept a custom Replacements object + +12 August 2009: 4.0.4 +-------------------- + + * Bugfixes for operating under safe mode and using the MailTransport + * Compatibility for PHP 5.3 + * Optimizations for addTo(), addCc() etc operations + * Bugfix for double-escaping issue in batch sending + +27 September 2009: 4.0.5 +------------------------ + + * Fixed a warning (#78) + * Clarified license and updated the file headers accordingly + * Added __toString() methods where toString() methods already exists + * Removed constants (SWIFT_LIB_DIRECTORY, SWIFT_MAP_DIRECTORY, SWIFT_CLASS_DIRECTORY) + * Simplified autoloading + * Added a setAuthMode() method to AuthHandler (#54) + +20 January 2010: 4.0.6 +---------------------- + + * added a PEAR package and a script to generate PEAR packages + * fixed Swift_Transport_TransportException for SMTP connection not thrown (#109) + * fixed Message-IDs are not updated properly (#118) + +-- End of Changes -- diff --git a/includes/kohana/modules/email/vendor/swift/LICENSE b/includes/kohana/modules/email/vendor/swift/LICENSE new file mode 100644 index 00000000..fc8a5de7 --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/includes/kohana/modules/email/vendor/swift/README b/includes/kohana/modules/email/vendor/swift/README new file mode 100644 index 00000000..794d8320 --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/README @@ -0,0 +1,30 @@ +Swift Mailer, by Chris Corbyn +----------------------------- + +Swift Mailer is a component based mailing solution for PHP 5. +It is released under the LGPL license. + +Homepage: http://swiftmailer.org +Documentation: http://swiftmailer.org/docs +Mailing List: http://groups.google.com/group/swiftmailer +Bugs: http://swiftmailer.lighthouseapp.com/ +Repository: http://github.com/swiftmailer/swiftmailer + +Swift Mailer is highly object-oriented by design and lends itself +to use in complex web application with a great deal of flexibility. + +For full details on usage, see the documentation. + +IMPORTANT: Users upgrading from version 3.x or earlier absolutely + MUST read the documentation. In short, the API is considerably + different so your old code won't "just work". + +If you'd like to make a donation, we are working on a system where +donations are taken on a per-feature-request basis via the website +with target amounts for each feature. In the meantime however you +may donate directly to the author via PayPal: + + PayPal: chris@w3style.co.uk + +Donations are certainly voluntary, but seriously, you donors are +complete legends and drive this project! :) diff --git a/includes/kohana/modules/email/vendor/swift/VERSION b/includes/kohana/modules/email/vendor/swift/VERSION new file mode 100644 index 00000000..2064f106 --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/VERSION @@ -0,0 +1 @@ +Swift-4.0.6 diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift.php b/includes/kohana/modules/email/vendor/swift/classes/Swift.php index 50c72b01..77abbbf6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** @@ -29,7 +19,7 @@ abstract class Swift { /** Swift Mailer Version number generated during dist release process */ - const VERSION = '4.0.4'; + const VERSION = '4.0.6'; /** * Internal autoloader for spl_autoload_register(). @@ -39,17 +29,19 @@ abstract class Swift public static function autoload($class) { //Don't interfere with other autoloaders - if (substr($class, 0, strlen(__CLASS__)) != __CLASS__) + if (0 !== strpos($class, 'Swift')) { - return; + return false; } - - $path = SWIFT_CLASS_DIRECTORY . '/' . str_replace('_', '/', $class) . '.php'; - - if (file_exists($path)) + + $path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php'; + + if (!file_exists($path)) { - require_once $path; + return false; } + + require_once $path; } /** @@ -59,19 +51,7 @@ abstract class Swift */ public static function registerAutoload() { - if (!$callbacks = spl_autoload_functions()) - { - $callbacks = array(); - } - foreach ($callbacks as $callback) - { - spl_autoload_unregister($callback); - } spl_autoload_register(array('Swift', 'autoload')); - foreach ($callbacks as $callback) - { - spl_autoload_register($callback); - } } } diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php index 63f6cc2c..d3779bfe 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Attachment.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php index 98540342..71bc3f1b 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/InputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php index e41425f8..f9188894 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/InputByteStream.php'; @@ -112,8 +102,11 @@ class Swift_ByteStream_ArrayByteStream public function write($bytes) { $to_add = str_split($bytes); - array_unshift($to_add, &$this->_array); - $this->_arraySize = call_user_func_array('array_push', $to_add); + foreach ($to_add as $value) + { + $this->_array[] = $value; + } + $this->_arraySize = count($this->_array); foreach ($this->_mirrors as $stream) { diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php index 49d10010..14773c2f 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/ByteStream/AbstractFilterableInputStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php index e4be5812..53d39ece 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** @@ -23,10 +13,31 @@ * @package Swift * @subpackage Encoder * @author Chris Corbyn + * @author Xavier De Cock */ interface Swift_CharacterReader { - + const MAP_TYPE_INVALID = 0x01; + const MAP_TYPE_FIXED_LEN = 0x02; + const MAP_TYPE_POSITIONS = 0x03; + + /** + * Returns the complete charactermap + * + * @param string $string + * @param int $startOffset + * @param array $currentMap + * @param mixed $ignoredChars + * @return int + */ + public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars); + + /** + * Returns mapType + * @int mapType + */ + public function getMapType(); + /** * Returns an integer which specifies how many more bytes to read. * A positive integer indicates the number of more bytes to fetch before invoking diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php index 02ae988f..26b13ff4 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterReader.php'; @@ -25,18 +15,19 @@ * @package Swift * @subpackage Encoder * @author Chris Corbyn + * @author Xavier De Cock */ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader { - + /** * The number of bytes in a single character. * @var int * @access private */ private $_width; - + /** * Creates a new GenericFixedWidthReader using $width bytes per character. * @param int $width @@ -46,6 +37,35 @@ class Swift_CharacterReader_GenericFixedWidthReader $this->_width = $width; } + /** + * Returns the complete charactermap + * + * @param string $string + * @param int $startOffset + * @param array $currentMap + * @param mixed $ignoredChars + * @return $int + */ + public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars) + { + $strlen = strlen($string); + // % and / are CPU intensive, so, maybe find a better way + $ignored = $strlen%$this->_width; + $ignoredChars = substr($string, - $ignored); + $currentMap = $this->_width; + return ($strlen - $ignored)/$this->_width; + + } + + /** + * Returns mapType + * @int mapType + */ + public function getMapType() + { + return self::MAP_TYPE_FIXED_LEN; + } + /** * Returns an integer which specifies how many more bytes to read. * A positive integer indicates the number of more bytes to fetch before invoking diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php index bdf2543e..3e0228a3 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterReader.php'; @@ -29,7 +19,36 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader { - + /** + * Returns the complete charactermap + * + * @param string $string + * @param int $startOffset + * @param string $ignoredChars + */ + public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars) + { + $strlen=strlen($string); + $ignoredChars=''; + for( $i = 0; $i < $strlen; ++$i) + { + if ($string[$i]>"\x07F") + { // Invalid char + $currentMap[$i+$startOffset]=$string[$i]; + } + } + return $strlen; + } + + /** + * Returns mapType + * @int mapType + */ + public function getMapType() + { + return self::MAP_TYPE_INVALID; + } + /** * Returns an integer which specifies how many more bytes to read. * A positive integer indicates the number of more bytes to fetch before invoking diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php index 6faae75e..54ea9a46 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterReader.php'; @@ -25,6 +15,7 @@ * @package Swift * @subpackage Encoder * @author Chris Corbyn + * @author Xavier De Cock */ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader @@ -32,6 +23,7 @@ class Swift_CharacterReader_Utf8Reader /** Pre-computed for optimization */ private static $length_map=array( +//N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x0N 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x1N 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x2N @@ -49,8 +41,115 @@ class Swift_CharacterReader_Utf8Reader 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, //0xEN 4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0 //0xFN ); + private static $s_length_map=array( + "\x00"=>1, "\x01"=>1, "\x02"=>1, "\x03"=>1, "\x04"=>1, "\x05"=>1, "\x06"=>1, "\x07"=>1, + "\x08"=>1, "\x09"=>1, "\x0a"=>1, "\x0b"=>1, "\x0c"=>1, "\x0d"=>1, "\x0e"=>1, "\x0f"=>1, + "\x10"=>1, "\x11"=>1, "\x12"=>1, "\x13"=>1, "\x14"=>1, "\x15"=>1, "\x16"=>1, "\x17"=>1, + "\x18"=>1, "\x19"=>1, "\x1a"=>1, "\x1b"=>1, "\x1c"=>1, "\x1d"=>1, "\x1e"=>1, "\x1f"=>1, + "\x20"=>1, "\x21"=>1, "\x22"=>1, "\x23"=>1, "\x24"=>1, "\x25"=>1, "\x26"=>1, "\x27"=>1, + "\x28"=>1, "\x29"=>1, "\x2a"=>1, "\x2b"=>1, "\x2c"=>1, "\x2d"=>1, "\x2e"=>1, "\x2f"=>1, + "\x30"=>1, "\x31"=>1, "\x32"=>1, "\x33"=>1, "\x34"=>1, "\x35"=>1, "\x36"=>1, "\x37"=>1, + "\x38"=>1, "\x39"=>1, "\x3a"=>1, "\x3b"=>1, "\x3c"=>1, "\x3d"=>1, "\x3e"=>1, "\x3f"=>1, + "\x40"=>1, "\x41"=>1, "\x42"=>1, "\x43"=>1, "\x44"=>1, "\x45"=>1, "\x46"=>1, "\x47"=>1, + "\x48"=>1, "\x49"=>1, "\x4a"=>1, "\x4b"=>1, "\x4c"=>1, "\x4d"=>1, "\x4e"=>1, "\x4f"=>1, + "\x50"=>1, "\x51"=>1, "\x52"=>1, "\x53"=>1, "\x54"=>1, "\x55"=>1, "\x56"=>1, "\x57"=>1, + "\x58"=>1, "\x59"=>1, "\x5a"=>1, "\x5b"=>1, "\x5c"=>1, "\x5d"=>1, "\x5e"=>1, "\x5f"=>1, + "\x60"=>1, "\x61"=>1, "\x62"=>1, "\x63"=>1, "\x64"=>1, "\x65"=>1, "\x66"=>1, "\x67"=>1, + "\x68"=>1, "\x69"=>1, "\x6a"=>1, "\x6b"=>1, "\x6c"=>1, "\x6d"=>1, "\x6e"=>1, "\x6f"=>1, + "\x70"=>1, "\x71"=>1, "\x72"=>1, "\x73"=>1, "\x74"=>1, "\x75"=>1, "\x76"=>1, "\x77"=>1, + "\x78"=>1, "\x79"=>1, "\x7a"=>1, "\x7b"=>1, "\x7c"=>1, "\x7d"=>1, "\x7e"=>1, "\x7f"=>1, + "\x80"=>0, "\x81"=>0, "\x82"=>0, "\x83"=>0, "\x84"=>0, "\x85"=>0, "\x86"=>0, "\x87"=>0, + "\x88"=>0, "\x89"=>0, "\x8a"=>0, "\x8b"=>0, "\x8c"=>0, "\x8d"=>0, "\x8e"=>0, "\x8f"=>0, + "\x90"=>0, "\x91"=>0, "\x92"=>0, "\x93"=>0, "\x94"=>0, "\x95"=>0, "\x96"=>0, "\x97"=>0, + "\x98"=>0, "\x99"=>0, "\x9a"=>0, "\x9b"=>0, "\x9c"=>0, "\x9d"=>0, "\x9e"=>0, "\x9f"=>0, + "\xa0"=>0, "\xa1"=>0, "\xa2"=>0, "\xa3"=>0, "\xa4"=>0, "\xa5"=>0, "\xa6"=>0, "\xa7"=>0, + "\xa8"=>0, "\xa9"=>0, "\xaa"=>0, "\xab"=>0, "\xac"=>0, "\xad"=>0, "\xae"=>0, "\xaf"=>0, + "\xb0"=>0, "\xb1"=>0, "\xb2"=>0, "\xb3"=>0, "\xb4"=>0, "\xb5"=>0, "\xb6"=>0, "\xb7"=>0, + "\xb8"=>0, "\xb9"=>0, "\xba"=>0, "\xbb"=>0, "\xbc"=>0, "\xbd"=>0, "\xbe"=>0, "\xbf"=>0, + "\xc0"=>2, "\xc1"=>2, "\xc2"=>2, "\xc3"=>2, "\xc4"=>2, "\xc5"=>2, "\xc6"=>2, "\xc7"=>2, + "\xc8"=>2, "\xc9"=>2, "\xca"=>2, "\xcb"=>2, "\xcc"=>2, "\xcd"=>2, "\xce"=>2, "\xcf"=>2, + "\xd0"=>2, "\xd1"=>2, "\xd2"=>2, "\xd3"=>2, "\xd4"=>2, "\xd5"=>2, "\xd6"=>2, "\xd7"=>2, + "\xd8"=>2, "\xd9"=>2, "\xda"=>2, "\xdb"=>2, "\xdc"=>2, "\xdd"=>2, "\xde"=>2, "\xdf"=>2, + "\xe0"=>3, "\xe1"=>3, "\xe2"=>3, "\xe3"=>3, "\xe4"=>3, "\xe5"=>3, "\xe6"=>3, "\xe7"=>3, + "\xe8"=>3, "\xe9"=>3, "\xea"=>3, "\xeb"=>3, "\xec"=>3, "\xed"=>3, "\xee"=>3, "\xef"=>3, + "\xf0"=>4, "\xf1"=>4, "\xf2"=>4, "\xf3"=>4, "\xf4"=>4, "\xf5"=>4, "\xf6"=>4, "\xf7"=>4, + "\xf8"=>5, "\xf9"=>5, "\xfa"=>5, "\xfb"=>5, "\xfc"=>6, "\xfd"=>6, "\xfe"=>0, "\xff"=>0, + ); - + /** + * Returns the complete charactermap + * + * @param string $string + * @param int $startOffset + * @param array $currentMap + * @param mixed $ignoredChars + */ + public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars) + { + if (!isset($currentMap['i']) || !isset($currentMap['p'])) + { + $currentMap['p'] = $currentMap['i'] = array(); + } + $strlen=strlen($string); + $charPos=count($currentMap['p']); + $foundChars=0; + $invalid=false; + for ($i=0; $i<$strlen; ++$i) + { + $char=$string[$i]; + $size=self::$s_length_map[$char]; + if ($size==0) + { + /* char is invalid, we must wait for a resync */ + $invalid=true; + continue; + } + else + { + if ($invalid==true) + { + /* We mark the chars as invalid and start a new char */ + $currentMap['p'][$charPos+$foundChars]=$startOffset+$i; + $currentMap['i'][$charPos+$foundChars]=true; + ++$foundChars; + $invalid=false; + } + if (($i+$size) > $strlen){ + $ignoredChars=substr($string, $i); + break; + } + for ($j=1; $j<$size; ++$j) + { + $char=$string[$i+$j]; + if ($char>"\x7F" && $char<"\xC0") + { + // Valid - continue parsing + } + else + { + /* char is invalid, we must wait for a resync */ + $invalid=true; + continue 2; + } + } + /* Ok we got a complete char here */ + $lastChar=$currentMap['p'][$charPos+$foundChars]=$startOffset+$i+$size; + $i+=$j-1; + ++$foundChars; + } + } + return $foundChars; + } + + /** + * Returns mapType + * @int mapType + */ + public function getMapType() + { + return self::MAP_TYPE_POSITIONS; + } + /** * Returns an integer which specifies how many more bytes to read. * A positive integer indicates the number of more bytes to fetch before invoking diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php index 6c1dfde6..9e01de17 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterReader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php index 3bf017fb..a6f9f948 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterReaderFactory.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php index 6ea0eced..bf915282 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ require_once dirname(__FILE__) . '/OutputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php index 96d6afa4..9612365a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/CharacterStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php new file mode 100644 index 00000000..f090aa7d --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php @@ -0,0 +1,300 @@ +. + + */ + +//@require 'Swift/CharacterStream.php'; +//@require 'Swift/OutputByteStream.php'; + + +/** + * A CharacterStream implementation which stores characters in an internal array. + * @package Swift + * @subpackage CharacterStream + * @author Xavier De Cock + */ + +Class Swift_CharacterStream_NgCharacterStream + implements Swift_CharacterStream +{ + + /** + * The char reader (lazy-loaded) for the current charset. + * @var Swift_CharacterReader + * @access private + */ + private $_charReader; + + /** + * A factory for creatiing CharacterReader instances. + * @var Swift_CharacterReaderFactory + * @access private + */ + private $_charReaderFactory; + + /** + * The character set this stream is using. + * @var string + * @access private + */ + private $_charset; + + /** + * The datas stored as is + * + * @var string + */ + private $_datas = ""; + + /** + * Number of bytes in the stream + * + * @var int + */ + private $_datasSize = 0; + + /** + * Map + * + * @var mixed + */ + private $_map; + + /** + * Map Type + * + * @var int + */ + private $_mapType = 0; + + /** + * Number of characters in the stream + * + * @var int + */ + private $_charCount = 0; + + /** + * Position in the stream + * + * @var unknown_type + */ + private $_currentPos = 0; + + /** + * The constructor + * + * @param Swift_CharacterReaderFactory $factory + * @param unknown_type $charset + */ + public function __construct(Swift_CharacterReaderFactory $factory, + $charset) + { + $this->setCharacterReaderFactory($factory); + $this->setCharacterSet($charset); + } + + /* -- Changing parameters of the stream -- */ + + /** + * Set the character set used in this CharacterStream. + * @param string $charset + */ + public function setCharacterSet($charset) + { + $this->_charset = $charset; + $this->_charReader = null; + $this->_mapType = 0; + } + + /** + * Set the CharacterReaderFactory for multi charset support. + * @param Swift_CharacterReaderFactory $factory + */ + public function setCharacterReaderFactory( + Swift_CharacterReaderFactory $factory) + { + $this->_charReaderFactory = $factory; + } + + /** + * @see Swift_CharacterStream::flushContents() + * + */ + public function flushContents() + { + $this->_datas = null; + $this->_map = null; + $this->_charCount = 0; + $this->_currentPos = 0; + $this->_datasSize = 0; + } + + /** + * @see Swift_CharacterStream::importByteStream() + * + * @param Swift_OutputByteStream $os + */ + public function importByteStream(Swift_OutputByteStream $os) + { + $this->flushContents(); + $blocks=512; + $os->setReadPointer(0); + while(false!==($read = $os->read($blocks))) + $this->write($read); + } + + /** + * @see Swift_CharacterStream::importString() + * + * @param string $string + */ + public function importString($string) + { + $this->flushContents(); + $this->write($string); + } + + /** + * @see Swift_CharacterStream::read() + * + * @param int $length + * @return string + */ + public function read($length) + { + if ($this->_currentPos>=$this->_charCount) + { + return false; + } + $ret=false; + $length = ($this->_currentPos+$length > $this->_charCount) + ? $this->_charCount - $this->_currentPos + : $length; + switch ($this->_mapType) + { + case Swift_CharacterReader::MAP_TYPE_FIXED_LEN: + $len = $length*$this->_map; + $ret = substr($this->_datas, + $this->_currentPos * $this->_map, + $len); + $this->_currentPos += $length; + break; + + case Swift_CharacterReader::MAP_TYPE_INVALID: + $end = $this->_currentPos + $length; + $end = $end > $this->_charCount + ?$this->_charCount + :$end; + $ret = ''; + for (; $this->_currentPos < $length; ++$this->_currentPos) + { + if (isset ($this->_map[$this->_currentPos])) + { + $ret .= '?'; + } + else + { + $ret .= $this->_datas[$this->_currentPos]; + } + } + break; + + case Swift_CharacterReader::MAP_TYPE_POSITIONS: + $end = $this->_currentPos + $length; + $end = $end > $this->_charCount + ?$this->_charCount + :$end; + $ret = ''; + $start = 0; + if ($this->_currentPos>0) + { + $start = $this->_map['p'][$this->_currentPos-1]; + } + $to = $start; + for (; $this->_currentPos < $end; ++$this->_currentPos) + { + if (isset($this->_map['i'][$this->_currentPos])) { + $ret .= substr($this->_datas, $start, $to - $start).'?'; + $start = $this->_map['p'][$this->_currentPos]; + } else { + $to = $this->_map['p'][$this->_currentPos]; + } + } + $ret .= substr($this->_datas, $start, $to - $start); + break; + } + return $ret; + } + + /** + * @see Swift_CharacterStream::readBytes() + * + * @param int $length + * @return int[] + */ + public function readBytes($length) + { + $read=$this->read($length); + if ($read!==false) + { + $ret = array_map('ord', str_split($read, 1)); + return $ret; + } + return false; + } + + /** + * @see Swift_CharacterStream::setPointer() + * + * @param int $charOffset + */ + public function setPointer($charOffset) + { + if ($this->_charCount<$charOffset){ + $charOffset=$this->_charCount; + } + $this->_currentPos = $charOffset; + } + + /** + * @see Swift_CharacterStream::write() + * + * @param string $chars + */ + public function write($chars) + { + if (!isset($this->_charReader)) + { + $this->_charReader = $this->_charReaderFactory->getReaderFor( + $this->_charset); + $this->_map = array(); + $this->_mapType = $this->_charReader->getMapType(); + } + $ignored=''; + $this->_datas .= $chars; + $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored); + if ($ignored!==false) { + $this->_datasSize=strlen($this->_datas)-strlen($ignored); + } + else + { + $this->_datasSize=strlen($this->_datas); + } + } +} \ No newline at end of file diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php index a7f8e8d0..b6ba554e 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/DependencyException.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php index 40bc649f..bb1681ce 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/SwiftException.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php index a2b9e867..34d096c6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Attachment.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php index 3efc099b..32aa96a0 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/CharsetObserver.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php index 3ecadc7f..09c71baf 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Encoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php index 9ee676c3..6914f6c4 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Encoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php index bdaa7a50..febc6ba8 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - //@require 'Swift/Encoder.php'; //@require 'Swift/CharacterStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php index 701d8c99..1849a829 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/DependencyContainer.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php index ac787209..73eb5850 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventObject.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php index d53f0ca6..2fd71172 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php index 6fbd1d23..c6726a75 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * The minimum interface for an Event. * diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php index 8a63695a..aaf12117 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php index 2f50ba5f..00fb799d 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * An identity interface which all EventListeners must extend. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php index e2f560f2..5d494fe8 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - //@require 'Swift/Events/Event.php'; /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php index 7a02e5ea..addf9e7a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventObject.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php index 4fe35759..092385b2 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php index 7de70d34..49a83513 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventObject.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php index e906dbfc..a8f0cc33 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php index 64985d1c..3e6c0beb 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventDispatcher.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php index 227b936e..f069a4c1 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventObject.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php index 22dedf45..ba729d01 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php index 9f11582e..a1bf7d27 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventObject.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php index 4a86d1ec..d6dce94f 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/EventListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php index 63f0e639..6e6b7a8b 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/FailoverTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php index 01a26786..a7f894dc 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/OutputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php index d7fb2a96..c0479671 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/StreamFilter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php index 5ce8b1b8..c161d7a6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Image.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php index 01e5115c..e8f45f4a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php index 3f45372d..88a5b0dd 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php @@ -1,23 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - + //@require 'Swift/SwiftException.php'; /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php index 417ef16b..b942663a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/InputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php index 7ce4987e..fe3b7c99 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/KeyCache.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php index 5270320b..599fd6c7 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/KeyCache.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php index 9d50fbd1..a1f4440c 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/KeyCache.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php index 3bfb3ce1..2646522e 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/KeyCache.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php index 57394f98..87cdced8 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/KeyCache.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php index 9cfac83b..14ae2928 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/LoadBalancedTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php index 31789620..afe29c6f 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/MailTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php index 55584c80..c92feb41 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php index 01655b09..65d60c18 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mailer/RecipientIterator.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php index b4cc3b22..27138416 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Provides an abstract way of specifying recipients for batch sending. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php index dbcae915..e8183ea5 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/SimpleMessage.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php index 46d53cda..25ef68b3 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/SimpleMimeEntity.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php index 76daa10d..c26009f7 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php index 3403775b..e1c99c59 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Encoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php index c0e85660..e89938ef 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/ContentEncoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php index b9f5e291..4a725d85 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/ContentEncoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php index b7cf4dbe..3beeb635 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/ContentEncoder.php'; @@ -68,7 +58,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder $this->_charStream->flushContents(); $this->_charStream->importByteStream($os); - + $currentLine = ''; $prepend = ''; $size=$lineLen=0; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php index e41edcbd..983b78da 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Attachment.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php index 30508510..50472db6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php @@ -1,23 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - + //@require 'Swift/Mime/ContentEncoder.php'; /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php index cc451b77..38fc40cd 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * A MIME Header. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php index 27a7f968..cc70c5f6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Encoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php index 4ac6ea7e..feaba981 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ require_once dirname(__FILE__) . '/../HeaderEncoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php index a766b2aa..d727da02 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ require_once dirname(__FILE__) . '/../HeaderEncoder.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php index 85aef558..83bb35ad 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/CharsetObserver.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php index ecfa25d2..81e7a979 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/CharsetObserver.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php index 1aac98ff..c3049c25 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Header.php'; @@ -187,6 +177,18 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header 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 /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php index 4fde86e3..598c0c5a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/AbstractHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php index c0060b67..55ff7373 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/AbstractHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php index affb684c..77d3bba2 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/AbstractHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php index 07e1e135..974b44e2 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/UnstructuredHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php index 0417f3ec..0a8a100a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/AbstractHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php index dcbb464e..fdcc21ed 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Headers/AbstractHeader.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php index 50dc6be7..0496c087 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/MimeEntity.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php index 7d6f3c6a..2b08009d 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/InputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php index 80173cff..78c6fe09 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/SimpleMimeEntity.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php index 0dff8420..da65ca98 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Header.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php index 93390708..6954ac5c 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/HeaderFactory.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php index 4e2e1f3a..eeb0221b 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/HeaderSet.php'; @@ -324,6 +314,18 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet 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 */ diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php index d3d65934..bbe1e8fc 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Message.php'; @@ -547,6 +537,18 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart 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 diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php index 7e31df78..16158225 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/HeaderSet.php'; @@ -122,7 +112,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity ) ) ); - $this->generateId(); + + $this->_id = $this->getRandomId(); } /** @@ -131,12 +122,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity */ public function generateId() { - $idLeft = time() . '.' . uniqid(); - $idRight = !empty($_SERVER['SERVER_NAME']) - ? $_SERVER['SERVER_NAME'] - : 'swift.generated'; - $this->_id = $idLeft . '@' . $idRight; - return $this->getId(); + $this->setId($this->getRandomId()); + return $this->_id; } /** @@ -481,6 +468,18 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity 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 @@ -640,6 +639,19 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity $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'; + return $idLeft . '@' . $idRight; + } + // -- Private methods private function _readStream(Swift_OutputByteStream $os) @@ -666,7 +678,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity '/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di', $boundary)) { - throw new Exception('Mime boundary set is not RFC 2046 compliant.'); + throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.'); } } diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php index cd21e6bb..60b6d569 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/MimePart.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php index 56607e4e..951b8383 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * An abstract means of reading data. * Classes implementing this interface may use a subsystem which requires less diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php index 827ab358..46a7f448 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/SendListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php index 121db58d..501cd809 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/SendListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php index b759eb55..9735d0a0 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php index 2a9481d6..da1a3079 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/SendListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php index 2a820466..9864da0d 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php index 8dffc160..d595f264 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/CommandListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php index 53e6b817..930eca25 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php index 3d2324da..83dd54b5 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php index d5aaafe8..1c96dcfa 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Pop3Connection interface for connecting and disconnecting to a POP3 host. * diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php index a03ab304..e0205f44 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/IoException.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php index f194d243..fd1cf467 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/TransportChangeListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php index 97444a50..00d5765d 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Message.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php index f38d2a5e..1beac5b9 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/SendListener.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php index dcd9cf5c..0022f5e6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Plugins/Reporter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php index 605999f5..73700780 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Plugins/Reporter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php index c29011b2..148cbd3e 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Sleeps for a duration of time. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php index 620851b6..43bb1f48 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Events/SendEvent.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php index 6708ad3a..92207bff 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Provides timestamp data. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php index 5b2fed39..20a2e5f1 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/DependencyContainer.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php index 686ea435..db29e6db 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Creates StreamFilters. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php index 4b1d3206..5bb394b5 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php @@ -1,23 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - + //@require 'Swift/SwiftException.php'; /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php index 39a50c28..60a70007 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/SendmailTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php index 8e499ef6..65180d58 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/EsmtpTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php index 81c2311f..6c262ce3 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Processes bytes as they pass through a stream and performs filtering. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php index 0809c21b..2df52be1 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/StreamFilter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php index e2286207..9ab6c308 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/StreamFilter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php index 37b22a52..fcd4b830 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/StreamFilters/StringReplacementFilter.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php index 019df839..bd3b656a 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php @@ -1,24 +1,13 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - /** * Base Exception class. * @package Swift diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php index 328b1066..9b54752f 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Mime/Message.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php index d9809a7b..3329d34f 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php index f8bd636f..4c7e0f2e 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/Esmtp/Authenticator.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php index 4564f359..bd226174 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/Esmtp/Authenticator.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php index 5b64f5f0..ddd80942 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/Esmtp/Authenticator.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php index 02d5130a..a223169b 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/TransportException.php'; @@ -52,6 +42,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler */ private $_password; + /** + * The auth mode for authentication. + * @var string + * @access private + */ + private $_auth_mode; + /** * The ESMTP AUTH parameters available. * @var string[] @@ -122,6 +119,24 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler 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 @@ -149,7 +164,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler if ($this->_username) { $count = 0; - foreach ($this->_authenticators as $authenticator) + foreach ($this->_getAuthenticatorsForAgent() as $authenticator) { if (in_array(strtolower($authenticator->getAuthKeyword()), array_map('strtolower', $this->_esmtpParams))) @@ -209,7 +224,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler */ public function exposeMixinMethods() { - return array('setUsername', 'getUsername', 'setPassword', 'getPassword'); + return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'); } /** @@ -219,4 +234,29 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler { } + // -- 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/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php index 2decfb69..bf166d32 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/SmtpAgent.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php index 88cd3e59..e96f95f6 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/EsmtpBufferWrapper.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php index 8d264ad6..c7833c34 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/AbstractSmtpTransport.php'; @@ -249,16 +239,17 @@ class Swift_Transport_EsmtpTransport $response = $this->executeCommand( sprintf("EHLO %s\r\n", $this->_domain), array(250) ); - $this->_capabilities = $this->_getCapabilities($response); - $this->_setHandlerParams(); - foreach ($this->_getActiveHandlers() as $handler) - { - $handler->afterEhlo($this); - } } catch (Swift_TransportException $e) { - parent::_doHeloCommand(); + return parent::_doHeloCommand(); + } + + $this->_capabilities = $this->_getCapabilities($response); + $this->_setHandlerParams(); + foreach ($this->_getActiveHandlers() as $handler) + { + $handler->afterEhlo($this); } } diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php index 4741cb78..e62491c2 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/LoadBalancedTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php index b26c6c07..ac66ef03 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/InputByteStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php index 0737d760..367981b1 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php index 2934863d..dda882fd 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php index f3fa675b..eca59e16 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php index 51b14eb4..aae8bde4 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/Transport/EsmtpTransport.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php index 2f1c3910..ee9b8ed5 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ /** diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php index 9c9aaa21..01ae8a59 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/ByteStream/AbstractFilterableInputStream.php'; diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php index 01279265..b7cd6589 100644 --- a/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php +++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php @@ -1,21 +1,11 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ //@require 'Swift/IoException.php'; diff --git a/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php b/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php index 210b17f2..e03927a3 100644 --- a/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php +++ b/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php @@ -60,7 +60,7 @@ Swift_DependencyContainer::getInstance() -> withDependencies(array('mime.charstream')) -> register('mime.charstream') - -> asNewInstanceOf('Swift_CharacterStream_ArrayCharacterStream') + -> asNewInstanceOf('Swift_CharacterStream_NgCharacterStream') -> withDependencies(array('mime.characterreaderfactory', 'properties.charset')) -> register('mime.bytecanonicalizer') diff --git a/includes/kohana/modules/email/vendor/swift/mime_types.php b/includes/kohana/modules/email/vendor/swift/mime_types.php index 1edbf4a2..65c9aa07 100644 --- a/includes/kohana/modules/email/vendor/swift/mime_types.php +++ b/includes/kohana/modules/email/vendor/swift/mime_types.php @@ -1,23 +1,17 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ - + +/* + * List of MIME type automatically detected in Swift Mailer. + */ + //You may add or take away what you like (lowercase required) $swift_mime_types = array( diff --git a/includes/kohana/modules/email/vendor/swift/swift_init.php b/includes/kohana/modules/email/vendor/swift/swift_init.php index 0687b343..fe624a9d 100644 --- a/includes/kohana/modules/email/vendor/swift/swift_init.php +++ b/includes/kohana/modules/email/vendor/swift/swift_init.php @@ -1,34 +1,21 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ -//Define where the root of Swift Mailer is found -defined('SWIFT_LIB_DIRECTORY') - or define('SWIFT_LIB_DIRECTORY', dirname(__FILE__)); - -//Define where dependency maps can be found -define('SWIFT_MAP_DIRECTORY', SWIFT_LIB_DIRECTORY . '/dependency_maps'); +/* + * Dependency injection initialization for Swift Mailer. + */ //Load in dependency maps -require_once SWIFT_MAP_DIRECTORY . '/cache_deps.php'; -require_once SWIFT_MAP_DIRECTORY . '/mime_deps.php'; -require_once SWIFT_MAP_DIRECTORY . '/transport_deps.php'; +require_once dirname(__FILE__) . '/dependency_maps/cache_deps.php'; +require_once dirname(__FILE__) . '/dependency_maps/mime_deps.php'; +require_once dirname(__FILE__) . '/dependency_maps/transport_deps.php'; //Load in global library preferences -require_once SWIFT_LIB_DIRECTORY . '/preferences.php'; +require_once dirname(__FILE__) . '/preferences.php'; diff --git a/includes/kohana/modules/email/vendor/swift/swift_required.php b/includes/kohana/modules/email/vendor/swift/swift_required.php index 6274815e..ad1a4ad5 100644 --- a/includes/kohana/modules/email/vendor/swift/swift_required.php +++ b/includes/kohana/modules/email/vendor/swift/swift_required.php @@ -1,35 +1,22 @@ . - + * This file is part of SwiftMailer. + * (c) 2004-2009 Chris Corbyn + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. */ -//Indicate where Swift Mailer lib is found -defined('SWIFT_LIB_DIRECTORY') - or define('SWIFT_LIB_DIRECTORY', dirname(__FILE__)); - -//Path to classes inside lib -define('SWIFT_CLASS_DIRECTORY', SWIFT_LIB_DIRECTORY . '/classes'); +/* + * Autoloader and dependency injection initialization for Swift Mailer. + */ //Load Swift utility class -require_once SWIFT_CLASS_DIRECTORY . '/Swift.php'; +require_once dirname(__FILE__) . '/classes/Swift.php'; //Start the autoloader Swift::registerAutoload(); //Load the init script to set up dependency injection -require_once SWIFT_LIB_DIRECTORY . '/swift_init.php'; +require_once dirname(__FILE__) . '/swift_init.php'; diff --git a/includes/kohana/modules/email/vendor/swift/swift_required_pear.php b/includes/kohana/modules/email/vendor/swift/swift_required_pear.php new file mode 100644 index 00000000..20a61597 --- /dev/null +++ b/includes/kohana/modules/email/vendor/swift/swift_required_pear.php @@ -0,0 +1,22 @@ +