No OneTemporary
Actions

Size

175 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index 45b310ebc..aac9e6524 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1365 +1,1366 @@
	CHANGELOG Roundcube Webmail
	===========================

	+- Update to Mail_Mime-1.8.5 (#1488521)
	- Fix Shift + delete button does not permanently delete messages (#1488243)
	- Add Content-Length for attachments where possible (#1485478)
	- Fix attachment sizes in message print page and attachment preview page (#1488515)
	- Fix XSS vulnerability in message subject handling using Larry skin (#1488519)
	- Fix handling of links with various URI schemes e.g. "skype:" (#1488106)
	- Fix handling of links inside PRE elements on html to text conversion
	- Fix indexing of links on html to text conversion
	- Add mail attachments using drag & drop on HTML5 enabled browsers
	- Add workaround for invalid BODYSTRUCTURE response - parse message with Mail_mimeDecode package (#1485585)
	- Decode header value in rcube_mime::get() by default (#1488511)
	- Fix errors with enabled PHP magic_quotes_sybase option (#1488506)
	- Fix SQL query for contacts listing on MS SQL Server (#1488505)
	- Update to TinyMCE 3.5.2
	- Fix window.resize handler on IE8 and Opera (#1488453)
	- Don't let error message popups cover the login form (#1488500)
	- Display Tiff as Jpeg in browsers without Tiff support (#1488452)
	- Don't display Pdf/Tiff/Flash attachments inline without browser support (#1488452, #1487929)
	- Don't show errors when moving contacts into groups they are already in (#1488493)
	- Make folders with unread messages in subfolders bold again (#1486793)
	- Abbreviate long attachment file names with ellipsis (#1488499)
	- Fix html2text conversion of strong\|b\|a\|th\|h tags when used in upper case
	- Add listcontrols template container in Larry skin (#1488498)
	- Fix host autoselection when default_host is an array (#1488495)
	- Move messages forwarding mode setting into Preferences
	- Add is_escaped attribute for html_select and html_textarea (#1488485)
	- Fix HTML entities handling in HTML editor (#1488483)
	- Fix listing shared folders on Courier IMAP (#1488466)
	- Fix issue where draft auto-save wasn't executed after some inactivity time
	- Add vCard import from multiple files at once (#1488015)
	- Roundcube Framework:
	Add possibility to replace IMAP driver with custom class
	Add IMAP auto-connection feature, improving performance with caching enabled
	Replace imap_init hook with storage_init (with additional 'driver' argument)
	Improved performance by caching IMAP server's capabilities in session
	Unified global functions naming (rcube_ prefix)
	Move global functions from main.inc and rcube_shared.inc into classes
	Better classes separation

	RELEASE 0.8-rc
	--------------
	- Added new translations in Belarusian, Interlingua and Malayalam
	- Flipped compose options arrow (#1488474)
	- Fix handling of large uuencode attachments (#1488473)
	- Fix handling of "usemap" attribute (#1488472)
	- Fix handling of some HTML tags e.g. IMG (#1488471)
	- Use similar language as a fallback for plugin localization (#1488401)
	- Fix issue where signature wasn't re-added on draft compose (#1488322)
	- Update to TinyMCE 3.5 (#1488459)
	- Fixed multi-threaded autocompletion when number of threads > number of sources
	- Allow to configure the number of values allowed for each LDAP attribute
	- Support for serialized LDAP address values (usually delimited with a $)
	- Less restrictive session auth checks, repeat keep-alive requests on failure (#1488449)
	- Fix redirect to mail/compose on re-login (#1488226)
	- Add IE8 hack for messages list issue (#1487821)
	- Fix handling errors on draft auto-save
	- Fix importing vCard photo with ENCODING param specified (#1488432)
	- Support mutliple name/email pairs for Bcc and Reply-To identity settings (#1488445)
	- Set flexible width to login form fields (#1488418)
	- Fix re-draw bug on list columns change in IE8 (#1487822)
	- Allow mass-removal of addresses from a group (#1487748)
	- Fix removing all contacts on import to LDAP addressbook
	- Fix so "Back" from compose/show doesn't reset search request (#1488238)
	- Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)
	- Fix invisible cursor when replying to a html message (#1487073)
	- Reset IP stored in session when destroying session data (#1488056)
	- Fix bug where memory_limit = -1 wasn't handled properly
	- Support LDAP RFC2256's country object class read/write (#1488123)
	- Upgraded to jQuery 1.7.2
	- Image resize with GD extension (#1488383)
	- Fix lack of warning when switching task in compose window (#1488399)
	- Fix bug where it wasn't possible to enter ( or & characters in autocomplete fields
	- Request all needed fields from address book backends (#1488394)
	- Unified (single) spellchecker button
	- Scroll long lists on drag&drop (#1485946)
	- Copy all skins in installto script (#1488376)

	RELEASE 0.8-beta
	----------------
	- Upgraded to jQuery 1.7.1 (#1488337) and jQuery UI 1.8.18
	- Add Russian to the spellchecker languages list (#1488135)
	- Remember custom skin selection after logout (#1488355)
	- Make sure About tab is always the last tab (#1488257)
	- Fix issue with folder creation under INBOX. namespace (#1488349)
	- Added mailto: protocol handler registration link in User Preferences (#1486580)
	- Handle identity details box with an iframe (#1487020)
	- Fix issue where some text from original message was missing on reply (#1488340)
	- Fix autoselect_host() for login (#1488297)
	- Changed license to GNU GPLv3+ with exceptions for skins & plugins
	- Added address book widget on compose screen
	- Use proper timezones from PHP's internal timezonedb (#1485592)
	- Add separate pagesize setting for mail messages and contacts (#1488269)
	- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
	- Add option to set default font for HTML message (#1484137)
	- Fix issues with big memory allocation of IMAP results
	- Prevent from memory_limit exceeding when trying to parse big messages bodies (#1487424)
	- Add possibility to add SASL mechanisms for SMTP in smtp_connect hook (#1487937)
	- Mark (with different color) folders with recent messages (#1486234)
	- Added About tab in Settings
	- TinyMCE updated to 3.4.6

	RELEASE 0.7.2
	-------------
	- Fix encoding of attachment with comma in name (#1488389)
	- Fix handling of % character in IMAP protocol (#1488382)
	- Fix duplicate names handling in addressbook searches (#1488375)
	- Fix displaying of HTML messages from Disqus (#1488372)
	- Disable E_STRICT warnings on PHP 5.4
	- Prevent from folder selection on virtual folder collapsing (#1488346)
	- Fix automatic unsubscribe of non-existent folders
	- Fix double-quotes handling in recipient names
	- User configurable setting how to display contact names in list
	- Make contacts list sorting configurable for the admin/user
	- Fix parse errors in DDL files for MS SQL Server
	- Revert SORT=DISPLAY support, removed by mistake (#1488327)
	- Add lost translation label in de_DE (#1488315)
	- Fix drafts update issues when edited from preview pane (#1488314)
	- Fix wrong variable name in rcube_ldap.php (#1488302)
	- Make mime type detection based on filename extension to be case-insensitive
	- Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)


	RELEASE 0.7.1
	-------------
	- Fix bug in handling of base href and inline content (#1488290)
	- Fix SQL Error when saving a contact with many email addresses (#1488286)
	- Fix strict email address searching if contact has more than one address
	- Remove duplicated 'organization' label (#1488287)
	- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'
	- Fix wrong (long) label usage (#1488283)
	- Fix handling of INBOX's subfolders in special folders config (#1488279)
	- Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)
	- Fix crashes with eAccelerator (#1488256)
	- Fix searching on IMAP servers without CHARSET specifier support (#1488271)
	- Fix expanding folders during drag&drop (#1488260)
	- Fix wrong postgres sequence name in upgrade from 0.6
	- Fix broken CREATE INDEX queries in SQLite DDL files (#1488255)

	RELEASE 0.7
	-----------
	- Make Roundcube render the Email Standards Project Acid Test correctly
	- Replace prompt() with jQuery UI dialog (#1485135)
	- Fix navigation in messages search results
	- Improved handling of some malformed values encoded with quoted-printable (#1488232)
	- Add possibility to do LDAP bind before searching for bind DN
	- Fix handling of empty <U> tags in HTML messages (#1488225)
	- Add content filter for embedded attachments to protect from XSS on IE (#1487895)
	- Use strpos() instead of strstr() when possible (#1488211)
	- Fix handling HTML entities when converting HTML to text (#1488212)
	- Fix fit_string_to_size() renders browser and ui unresponsive (#1488207)
	- Fix handling of invalid characters in request (#1488124)
	- Fix merging some configuration options in update.sh script (#1485864)
	- Fix so TEXT key will remove all HEADER keys in IMAP SEARCH (#1488208)
	- Fix handling contact photo url with https:// prefix (#1488202)
	- Fix possible infinite redirect on attachment preview (#1488199)
	- Improved clickjacking protection for browsers which don't support X-Frame-Options headers
	- Fixed bug where similiar folder names were highlighted wrong (#1487860)
	- Fixed bug in handling link with '!' character in it (#1488195)
	- Fixed bug where session ID's length was limited to 40 characters (#1488196)
	- TinyMCE security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)

	RELEASE 0.7-beta
	----------------
	- Fix handling of HTML form elements in messages (#1485137)
	- Fix regression in setting recipient to self when replying to a Sent message (#1487074)
	- Fix listing of folders in hidden namespaces (#1486796)
	- Don't consider \Noselect flag when building folders tree (#1488004)
	- Fix sorting autocomplete results (#1488084)
	- Add option to set session name (#1486433)
	- Add option to skip alternative email addresses in autocompletion
	- Fix inconsistent behaviour of Compose button in Drafts folder, add Edit button for drafts
	- Fix problem with parsing HTML message body with non-unicode characters (#1487813)
	- Add option to define matching method for addressbook search (#1486564, #1487907)
	- Make email recipients separator configurable
	- Fix so folders with \Noinferiors attribute aren't listed in parent selector
	- Fix handling of curly brackets in URLs (#1488168)
	- Fix handling of dates (birthday/anniversary) in contact data (#1488147)
	- Fix error on opening searched LDAP contact (#1488144)
	- Fix redundant line break in flowed format (#1488146)
	- Fix IDN address validation issue (#1488137)
	- Fix JS error when dst_active checkbox doesn't exist (#1488133)
	- Autocomplete LDAP records when adding contacts from mail (#1488073)
	- Plugin API: added 'ready' hook (#1488063)
	- Ignore DSN request when it isn't supported by SMTP server (#1487800)
	- Make sure LDAP name fields aren't arrays (#1488108)
	- Fixed imap test to non-default port when using ssl (#1488118)
	- Force all files to be overwritten when updating (#1488117)
	- Fix issue where it wasn't possible to change list view mode in folder manager for INBOX (#1488107)
	- Fix namespace handling in special folders settings (#1488112)
	- Disable time limit for CLI scripts (#1488109)
	- Fix misleading display when chaning editor type (#1488104)
	- Add loading indicator on contact delete
	- Fix bug where after delete message rows can be added to the list of another folder (#1487752)
	- Add notice on autocompletion that not all records were displayed
	- Add option 'searchonly' for LDAP address books
	- Add Priority filter to the messages list
	- Cache synchronization using QRESYNC/CONDSTORE
	- Trigger 'new_messages' hook for all checked folders (#1488083)
	- Make date/time format user configurable; drop 'date_today' config option
	- Fix setting title for truncated subject in IE (#1487128)
	- Fix displaying multipart/alternative messages with only one part (#1487938)
	- Rewritten messages caching:
	Indexes are stored in a separate table, so there's no need to store all messages in a folder
	Added threads data caching
	Flags are stored separately, so flag change doesn't cause DELETE+INSERT, just UPDATE
	- Improved FETCH response handling
	- Improvements in response tokenization method
	- Use 'From' and 'To' labels instead of 'Sender' and 'Recipient'
	- Fix username case-insensitivity issue in MySQL (#1488021)
	- Addressbook Saved Searches
	- Added spellchecker exceptions dictionary (shared or per-user)
	- Added possibility to ignore words containing caps, numbers, symbols (spellcheck_ignore_* options)
	- Added 'priority' column on messages list (#1486782)
	- Localize forwarded message header (#1488058)

	RELEASE 0.6
	-----------
	- Fix bug where the last identity is used on reply (#1488101)
	- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
	- Fix session race conditions when composing new messages
	- Fix encoding of LDAP contacts identifiers (#1488079)
	- jQuery 1.6.4
	- Fix handling of binary attachments encoded with quoted-printable (#1488065)
	- Fix text-overflow:ellipsis issues on messages list in FF7 and Webkit (#1488061)
	- Fix handling of links with IP address
	- Fix compacting folder resets message list filter (#1488076)

	RELEASE 0.6-rc
	----------------
	- Send X-Frame-Options headers to protect from clickjacking (#1487037)
	- Fallback to mail_domain in LDAP variable replacements; added 'host' to 'user_create' hook arguments (#1488024)
	- Fixed wrong vCard type parameter mobile (#1488067)
	- Fixed vCard WORKFAX issue (#1488046)
	- Add vCard's Profile URL support (#1488062)
	- jQuery 1.6.3
	- Fix imap_cache setting to values other than 'db' (#1488060)
	- Fix handling of attachments inside message/rfc822 parts (#1488026)
	- Make list of mimetypes that open in preview window configurable (#1487625)
	- Added plugin hook 'message_part_get' for attachment downloads
	- Added unique connection identifier to IMAP debug messages
	- Fix image type check for contact photo uploads

	RELEASE 0.6-beta
	----------------
	- Fixed selecting identity on reply/forward (#1487981)
	- Add option to hide selected LDAP addressbook on the list
	- Add client-side checking of uploaded files size
	- Add newlines between organization, department, jobtitle (#1488028)
	- Recalculate date when replying to a message and localize the cite header (#1487675)
	- Fix handling of email addresses with quoted local part (#1487939)
	- Fix EOL character in vCard exports (#1487873)
	- Added optional "multithreading" autocomplete feature
	- Plugin API: Added 'config_get' hook
	- Fixed new_user_identity plugin to work with updated rcube_ldap class (#1487994)
	- Plugin API: added folder_delete and folder_rename hooks
	- Added possibility to undo last contact delete operation
	- Fix sorting of contact groups after group create (#1487747)
	- Add optional textual upload progress indicator (#1486039)
	- Fix parsing URLs containing commas (#1487970)
	- Added vertical splitter for books/groups list in addressbook (#1487923)
	- Improved namespace roots handling in folder manager
	- Added searching in all addressbook sources
	- Added addressbook source selection in contacts import
	- Implement LDAPv3 Virtual List View (VLV) for paged results listing
	- Use 'address_template' config option when adding a new address block (#1487944)
	- Added addressbook advanced search
	- Add popup with basic fields selection for addressbook search
	- Case-insensitive matching in autocompletion (#1487933)
	- Added option to force spellchecking before sending a message (#1485458)
	- Fix handling of "<" character in contact data, search fields and folder names (#1487864)
	- Fix saving "<" character in identity name and organization fields (#1487864)
	- Added option to specify to which address book add new contacts
	- Added plugin hook for keep-alive requests
	- Store user preferences in session when write-master is not available and session is stored in memcache, write them later
	- Improve performence of folder manager operations
	- Fix default_port option handling in Installer when config.inc.php file exists (#1487925)
	- Removed option focus_on_new_message, added newmail_notifier plugin
	- Added general rcube_cache class with Memcache and APC support
	- Improved caching performance by skipping writes of unchanged data
	- Option enable_caching replaced by imap_cache and messages_cache options
	- Fix WORKFAX saving in address book (#1487910)
	- Add forward-as-attachment feature
	- jQuery-1.6.2 (#1487913, #1487144)
	- Improve display name composition when saving contacts (#1487143)
	- Fix problems with subfolders of INBOX folder on some IMAP servers (#1487725)
	- Fix handling of folders that doesn't belong to any namespace (#1487637)
	- Enable multiselection for attachments uploading in capable browsers (#1485969)
	- Add possibility to change HTML editor configuration by skin
	- Fix a bug where selecting too many contacts would produce too large URI request (#1487892)
	- Improve performance by including files with absolute path (#1487849)
	- Move folder name truncation to client/skin (#1485412)
	- Added plugin hook for request token creation
	- Replace LDAP vars in group queries (#1487837)
	- Fix vcard folding with uncode characters (#1487868)
	- Keep all submitted data if contact form validation fails (#1487865)
	- Handle uncode strings in rcube_addressbook::normalize_string() (#1487866)
	- Fix handling of debug_level=4 in ajax requests (#1487831)
	- Enable TinyMCE's contextmenu (#1487014)
	- Allow multiple concurrent compose sessions
	- New config option for custom logo
	- Allow skins to define/override texts with <roundcube:label />
	- Add simple ACL rights/namespace handling in folder manager
	- Force IE to send referers (#1487806)
	- Better display of vcard import results (#1485457)
	- Improved vcard import
	- Interactive update script with improved DB schema check
	- Fix problem with contactgroupmembers table creation on MySQL 4.x, add index on contact_id column
	- Add LDAP SASL bind and proxy authentication (#1486692)
	- Replying to a sent message puts the old recipient as the new recipient (#1487074)
	- Fulltext search over (almost) all data for contacts
	- Extend address book with rich contact information

	RELEASE 0.5.4
	-------------
	- Fix XSS vulnerability in UI messages (#1488030)

	RELEASE 0.5.3
	-------------
	- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
	- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900)
	- Fix some CSS issues in Settings for Internet Explorer
	- Fixed handling of folder with name "0" in folder selector
	- Fix bug where messages were deleted instead moved to trash folder after Shift key was used (#1487902)
	- Fix relative URLs handling according to a <base> in HTML (#1487889)
	- Fix handling of top-level domains with more than 5 chars or unicode chars (#1487883)
	- Fix usage of non-standard HTTP error codes (#1487797)
	- Fix PHP warning on mistaken in_array() usage (#1487901)

	RELEASE 0.5.2
	-------------
	- TinyMCE 3.4.2 now compatible with IE9
	- PEAR::Net_SMTP 1.5.2, fixed timeout issue (#1487843)
	- Fix bug where template name without plugin prefix was used in render_page hook
	- Support 'abort' and 'result' response in 'preferences_save' hook, add error handling
	- Fix bug where some content would cause hang on html2text conversion (#1487863)
	- Improve space-stuffing handling in format=flowed messages (#1487861)
	- Fix bug where some dates would produce SQL error in MySQL (#1487856)
	- Added workaround for some IMAP server with broken STATUS response (#1487859)
	- Fix bug where default_charset was not used for text messages (#1487836)
	- Stateless request tokens. No keep-alive necessary on login page (#1487829)
	- Force names of unique constraints in PostgreSQL DDL
	- Add code for prevention from IMAP connection hangs when server closes socket unexpectedly
	- Remove redundant DELETE query (for old session deletion) on login
	- Get around unreliable rand() and mt_rand() in session ID generation (#1486281)
	- Fix some emails are not shown using Cyrus IMAP (#1487820)
	- Fix handling of mime-encoded words with non-integral number of octets in a word (#1487801)
	- Fix parsing links with non-printable characters inside (#1487805)
	- Fixed de_CH Localization bugs (#1487773)
	- Add variable for 'Today' label in date_today option (#1486120)
	- Fix dont_override setting does not override existing user preferences (#1487664)
	- Use only one from IMAP authentication methods to prevent login delays (1487784)
	- Support strftime format in date_today option
	- Fix SQL query in rcube_user::query() so it uses index on MySQL again
	- Removed redundant </form> tags from contact add/edit pages
	- Fix CSS error in contact details screen on IE7 (#1487775)

	RELEASE 0.5.1
	-------------
	- Fix handling of attachments with invalid content type (#1487767)
	- Add workaround for DBMail's bug http://www.dbmail.org/mantis/view.php?id=881 (#1487766)
	- Use IMAP's ID extension (RFC2971) to print more info into debug log
	- Security: add optional referer check to prevent CSRF in GET requests
	- Fix email_dns_check setting not used for identities/contacts (#1487740)
	- Fix ICANN example addresses doesn't validate (#1487742)
	- Security: protect login form submission from CSRF
	- Security: prevent from relaying malicious requests through modcss.inc
	- Fix handling of non-image attachments in multipart/related messages (#1487750)
	- Fix IDNA support when IDN/INTL modules are in use (#1487742)
	- Fix handling of invalid HTML comments in messages (#1487759)
	- Fix parsing FETCH response for very long headers (#1487753)
	- Fix add/remove columns in message list when message_sort_order isn't set (#1487751)
	- Check mime headers before attempt to parse them (#1487745)
	- Quote header values in show_additional_headers plugin (#1487744)
	- Fix settings UI on IE 6 (#1487724)
	- Remove double borders in folder listing (#1487713)
	- Separate full message headers UI element from headers table (#1487715)
	- Add part MIME ID to message_part_* hooks (#1487718)
	- Improve parsing of MS Outlook vCards (#1487716)
	- Updated PEAR::Net_Socket to 1.0.10
	- Updated PEAR::Net_IDNA2 to 0.1.1
	- Fix handling of comments inside an email address spec. (#1487673)
	- Show full mail subject as title when hovering a cut subject link (#1487128)
	- Fix randomly disappearing folders list in IE (#1487704)
	- Fix list column add/removal in IE (#1487703)
	- Fix login redirect issues (#1487686)
	- Require PHP 5.2.1 or greater
	- Fix %h/%z variables in username_domain option (#1487701)
	- Workaround for setting charset in case of malformed bodystructure response (#1487700)
	- Fix impossible to subscribe to protected folders (#1487656)
	- Fix setting timezone in Preferences (#1487705)

	RELEASE 0.5
	-----------
	- Fix double-login/session issue (#1487104)
	- Wrap HTML parts with <html><body> and add Doctype declaration (#1487098)
	- Make rcube_autoload silently skip unknown classes (#1487109)
	- Fix charset detection in vcards with encoded values (#1485542)
	- Better CSS cursors for splitters (#1486874)
	- Show the same message only once (#1487641)
	- Fix namespaces handling (#1487649)
	- Add handling of multifolder METADATA/ANNOTATION responses
	- Fix handling of INBOX when personal namespace prefix is non-empty (#1487657)
	- Fix handling square brackets in links (#1487672)
	- Add description of 'use_https' option in main.inc.php.dist file

	RELEASE 0.5-RC
	--------------
	- Plugin API: Add 'pass' argument in 'authenticate' hook (#1487134)
	- Fix attachments of type message/rfc822 are not listed on attachments list
	- Add 'login_lc' config option for case-insensitive authentication (#1487113)
	- Fix window is blur'ed in IE when selecting a message (#1487316)
	- Fix cursor position on compose form in Webkit browsers (#1486674)
	- Fix setting charset of attachment filenames (#1487122)
	- Allow setting autocomplete attribute for all inputs separately (#1487313)
	- New Folder Manager UI
	- Fix invalid Request when creating a folder (#1487443)
	- Add folder size and quota indicator in folder manager (#1485780)
	- Add possibility to move a subfolder into root folder (#1486791)
	- Fix copying all messages in a folder copies only messages from current page
	- Improve performance of moving or copying of all messages in a folder
	- Fix plaintext versions of HTML messages don't contain placeholders for emotions (#1485206)
	- Improve performance of folder rename and delete actions
	- Better support for READ-ONLY and NOPERM responses handling (#1487083)
	- Add confirmation message on purge/expunge command response
	- Fix handling of untagged responses for AUTHENTICATE command (#1487450)
	- Add username and IP address to log message on unsuccessful login (#1487626)
	- Improved Mail-Followup-To and Mail-Reply-To headers handling
	- Fix charset conversion for text attachments without charset specification (#1487634)

	RELEASE 0.5-BETA
	----------------
	- Make session data storage more robust against garbage session data (#1487136)
	- Config option for autocomplete on login screen
	- Allow plugin templates to include local files (#1487133)
	- List groups in address detail view and allow to subscribe/unsubscribe from there (#1486753)
	- Messages caching: performance improvements, fixed syncing, fixes related with #1486748
	- Add link to identities in compose window (#1486729)
	- Add Internationalized Domain Name (IDNA) support (#1483894)
	- Add option to automatically send read notifications for known senders (#1485883)
	- Add option to "Return receipt" will be always checked (#1486352)
	- Fix HTML to plain text conversion doesn't handle citation blocks (#1486921)
	- Use custom sorting when SORT is disabled by IMAP admin (#1486959)
	- Allow setting some washtml options from plugin (#1486578)
	- Add option do bind for an individual LDAP address book (#1486997)
	- Change reply prefix to display email address only if sender name doesn't exist (#1486550)
	- Plugin API: improved 'abort' flag handling, added 'result' item in some hooks (#1486914)
	- Fix mailto optional params in plain text messages aren't handled (#1487026)
	- Add Reply-to-List feature (#1484252)
	- Add Mail-Followup-To/Mail-Reply-To support (#1485547)
	- Fix confirmation message isn't displayed after sending mail on Chrome (#1486177)
	- Fix keyboard doesn't work with autocomplete list with Chrome (#1487029)
	- Improve tabs to fixed width and add tabs in identities info (#1486974)
	- Add unique index on users.username+users.mail_host
	- Make htmleditor option more consistent and add option to use HTML on reply to HTML message (#1485840)
	- Use empty envelope sender address for message disposition notifications (RFC 2298.3)
	- Support SMTP Delivery Status Notifications - RFC 3461 (#1486142)
	- Use css sprite image for messages list
	- Add (different) attachment icon for messages of type multipart/report (#1486165)
	- Prevent from inserting empty link when composing HTML message (#1486944)
	- Add caching support in id2uid and uid2id functions (#1487019)
	- Add SASL proxy authentication for SMTP (#1486693)
	- Improve displaying of UI messages (#1486977)
	- Fix double e-mail filed in identity form (#1487054)
	- Display IMAP errors for LIST/THREAD/SEARCH commands (#1486905)
	- Add LITERAL+ (IMAP4 non-synchronizing literals) support (RFC 2088)
	- Add separate column for message status icon (#1486665)
	- Add ACL extension support into IMAP classes (RFC 4314)
	- Add ANNOTATEMORE extension support into IMAP classes (draft-daboo-imap-annotatemore)
	- Add METADATA extension support into IMAP classes (RFC 5464)
	- Fix decoding of e-mail address strings in message headers (#1487068)
	- Fix handling of attachments when Content-Disposition is not inline nor attachment (#1487051)
	- Improve performance of unseen messages counting (#1487058)
	- Improve performance of messages counting using ESEARCH extension (RFC4731)
	- Add LIST-STATUS support in rcube_imap_generic class (RFC 5819)
	- Add SASL-IR support in IMAP (RFC 4959)
	- Add LOGINDISABLED support (RFC 2595)
	- Add support for AUTH=PLAIN in IMAP authentication
	- Re-implemented SMTP proxy authentication support
	- Add support for IMAP proxy authentication (#1486690)
	- Add support for AUTH=DIGEST-MD5 in IMAP (RFC 2831)
	- Fix parent folder with unread subfolder not bold when message is open (#1487078)
	- Add basic IMAP LIST's \Noselect option support
	- Add support for selection options from LIST-EXTENDED extension (RFC 5258)
	- Don't list subscribed but non-existent folders (#1486225)
	- Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088)
	- Plugin API: added 'contact_form' hook
	- Add SORT=DISPLAY support (RFC 5957)
	- Plugin API: add possibility to disable plugin in AJAX mode, 'noajax' property
	- Plugin API: add possibility to disable plugin in framed mode, 'noframe' property
	- Improve performance of setting IMAP flags using .SILENT suffix
	- Improve performance of message cache status checking with skip_disabled=true
	- Support contact's email addresses up to 255 characters long (#1487095)
	- Add option to place replies in the folder of the message being replied to (#1485945)
	- Add missing confirmation/error messages on contact/group/message actions (#1486845)
	- Add 'loading' message on message move/copy/delete/mark actions
	- Improve responsiveness of messages displaying (#1486986)
	- Add option for minimum length of autocomplete's string (#1486428)
	- Fix operations on messages in unsubscribed folder (#1487107)
	- Add support for shared folders (#1403507)
	- Fix handling of folders with name "0" (#1487119)
	- Fix handling of folders with "<>" characters in name
	- jQuery 1.4.4
	- Fix handling of HTML entity strings in plain text messages
	- Fix focused elements aren't unfocused when clicking on the list (#1487123)
	- Fix error in MSSQL DDL scripts (#1487112)
	- Lock submit button in onsubmit event on login page (#1487036)
	- Don't set attachment's charset in Content-type header (#1487122)
	- Fix handling of message bodies (quoted-printable encoded) with NULL characters (#1486189)
	- Add workaround for MSOE's multipart/related messages with non-related attachments

	RELEASE 0.4.2
	-------------
	- Fix handling of backslash as IMAP delimiter
	- Fix charset replacement in HTML message bodies (#1487021)
	- Fix: contact group input is empty when using rename action more than once on the same group record
	- Fix "Server Error! (Not Found)" when using utils/save-pref action (#1487023)
	- Fix handling of Thunderbird's vCards (#1487024)

	RELEASE 0.4.1
	-------------
	- Fix space-stuffing in format=flowed messages (#1487018)
	- Fix msgexport.sh now using the new imap wrapper
	- Avoid displaying password on shell (#1486947)
	- Only lower-case user name if first login attempt failed (#1486393)
	- Make alias setting in squirrelmail_usercopy plugin configurable (patch by pommi, #1487007)
	- Prevent from saving a non-existing skin path in user prefs (#1486936)
	- Improve handling of single-part messages with bogus BODYSTRUCTURE (#1486898)
	- Fix path to SQL files when using pgsql/mysqli/sqlsrv drivers (#1486902)
	- Fix upgrade script for SQLite (#1486903)
	- Fixes in SQL init script + added update script for MSSQL database
	- Remove redundant date in syslog messages (#1486945)
	- Fix contacts list page controls when a group is selected (#1486946)
	- Fix SMTP test in Installer (#1486952)
	- Fix "Select all" causes message to be opened in folder with exactly one message (#1486913)
	- Fix Tab key doesn't work in HTML editor in Google Chrome (#1486925)
	- Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)
	- Fix TinyMCE buttons are hidden in Opera (#1486922)
	- Fix JS error on IE when trying to send HTML message with enabled spellchecker (#1486940)
	- Display inline images with known extensions and non-image content-type (#1486934)
	- Fix "Threaded" checkbox after subfolder creation (#1486928)
	- Fix timezone string in sent mail (#1486961)
	- Show disabled checkboxes for protected folders instead of dots (#1485498)
	- Added fieldsets in Identity form, added 'identity_form' hook
	- Re-added 'Close' button in upload form (#1486930, #1486823)
	- Fix handling of charsets with LATIN-* label
	- Fix messages background image handling in some cases (#1486990)
	- Fix format=flowed handling (#1486989)
	- Fix when IMAP connection fails in 'get' action session shouldn't be destroyed (#1486995)
	- Fix list_cols is not updated after column dragging (#1486999)
	- Support %z variable in host configuration options (#1487003)

	RELEASE 0.4
	-----------
	- Fix disapearing upload form disapears when user selects a file on Safari (#1486823)
	- Don't replace error messages with loading info (#1486300)
	- Fix JS errors on compose mode switch (#1486870)
	- Fix message structure parsing when it lacks optional fields (#1486881)
	- Include all recipients in sendmail log
	- Support HTTP_X_FORWARDED_PROTO header for HTTPS detecting (#1486866)
	- Fix default IMAP port configuration (#1486864)
	- Create Sent folder when starting to compose a new message (#1486802)
	- Fix handling of messages with Content-Type: application/* and no filename (#1484050)
	- Improved compose screen: resizable body and attachments list, vertical splitter, options menu
	- Fix RC forgets search results (#1483883)
	- TinyMCE 3.3.7
	- Improve parsing of styled empty tags in HTML messages (#1486812)
	- Add %dc variable support in base_dn/bind_dn config (#1486779)
	- Add button to hide/unhide the preview pane (#1484215)
	- Fix no-cache headers on https to prevent content caching by proxies (#1486798)
	- Fix attachment filenames broken with TNEF decoder using long filenames (#1486795)
	- Use user's timezone in Date header, not server's timezone (#1486119)
	- Add option to set separate footer for HTML messages (#1486660)
	- Add real SMTP error description to displayed error messages (#1485927)
	- Fix some IMAP errors handling when opening the message (#1485443)
	- Fix related parts aren't displayed when got mimetype other than image/* (#1486432)
	- Multiple identity and database support for squirrelmail_usercopy plugin (#1486517)
	- Support dynamic hostname (%d/%n) variables in configuration options (#1485438)
	- Add 'messages_list' hook (#1486266)
	- Add request* event triggers in http_post/http_request (#1486054)
	- Fix use RFC-compliant line-delimiter when saving messages on IMAP (#1486712)
	- Add 'imap_timeout' option (#1486760)
	- Fix forwarding of messages with winmail attachments
	- Fix handling of uuencoded attachments in message body (#1485839)
	- Added list_mailboxes hook in rcube_imap::list_unsubscribed() (#1486668)
	- Fix wrong message on file upload error (#1486725)
	- Add support for data URI scheme [RFC2397] (#1486740)
	- Added 'actionbefore', 'actionafter', 'responsebefore', 'responseafter' events
	- Fix double-addition of e-mail domain to content ID in HTML images
	- Read and send messages with format=flowed (#1484370), fixes word wrapping issues (#1486543)
	- Fix duplicated attachments when forwarding a message (#1486487)
	- Fix message/rfc822 attachments containing only attachments are not parsed properly (#1486743)
	- Fix %00 character in winmail.dat attachments names (#1486738)
	- Fix handling errors of folder deletion (#1486705)
	- Parse untagged CAPABILITY response for LOGIN command (#1486742)
	- Renamed all php-cli scripts to use .sh extension
	- Some files from /bin + spellchecking actions moved to the new 'utils' task
	- Added thread tree icons
	- Extend contact groups support (#1486682)
	- Fix check-recent action issues and performance (#1486526)
	- Fix messages order after checking for recent (#1484664)
	- Fix autocomplete shows entries without email (#1486452)
	- Fix listupdate event doesn't trigger on search response (#1486708)
	- Fix select_all_mode value after selecting a message (#1486720)
	- Set focus to editor on reply in HTML mode (#1486632)
	- Fix composing in HTML jumps cursor to body instead of recipients (#1486674)
	- Allow columns order change per user - drag&drop (#1485795)
	- Add References header in read receipt (#1486681)
	- Fix database constraint violation when opening a message (#1486696)
	- Add 'loading' message while login is in progress (#1486667)
	- Fix quota_zero_as_unlimited (#1486662)
	- Fix folder subscription checking (#1486684)
	- Fix INBOX appears (sometimes) twice in mailbox list (#1486672)
	- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
	- Fix DB Schema checking when some db_table_* options are not set (#1486654)

	RELEASE 0.4-beta
	----------------
	- Add sizelimit and timelimit variables in LDAP config (#1486544)
	- Hide IMAP host dropdown when single host is defined (#1486326)
	- Add images pre-loading on login page (#1451160)
	- Add HTTP_X_REAL_IP and HTTP_X_FORWARDED_FOR to successful logins log (#1486441)
	- Fix setting spellcheck languages with extended codes (#1486605)
	- Fix messages list scrolling in FF3.6 (#1486472)
	- Fix quicksearch input focus (#1486637)
	- Always set changed date when flagging a DB record as deleted + provide a cleanup script
	- Fix address book/group selection (#1486619)
	- Assign newly created contacts to the active group (#1486626)
	- Added option not to mark messages as read when viewed in preview pane (#1485012)
	- Allow plugins modify the Sent folder when composing (#1486548)
	- Added optional (max_recipients) support to restrict total number of recipients per message (#1484542)
	- Re-organize editor buttons, add blockquote and search buttons
	- Make possible to write inside or after a quoted html message (#1485476)
	- Fix bugs on unexpected IMAP connection close (#1486190, #1486270)
	- Iloha's imap.inc rewritten into rcube_imap_generic class
	- Added contact groups in address book (not finished yet)
	- Added PageUp/PageDown/Home/End keys support on lists (#1486430)
	- Added possibility to select all messages in a folder (#1484756)
	- Added 'imap_force_caps' option for after-login CAPABILITY checking (#1485750)
	- Password: Support dovecotpw encryption
	- TinyMCE 3.3.1
	- Implemented messages copying using drag&drop + SHIFT (#1484086)
	- Improved performance of folders operations (#1486525)
	- Fix blocked.gif attachment is not attached to the message (#1486516)
	- Managesieve: import from Horde-INGO
	- Managesieve: support for more than one match (#1486078)
	- Managesieve: support for selectively disabling rules within a single sieve script (#1485882)
	- Threaded message listing now available
	- Added sorting by ARRIVAL and CC
	- Message list columns configurable by the user
	- Removed 'index_sort' option, now we're using empty 'message_sort_col' for this
	- virtuser_query: support other identity data (#1486148)
	- Options virtuser_* replaced with virtuser_* plugins
	- Plugin API: Implemented 'email2user' and 'user2email' hooks
	- Fix forwarding message omits CC header (#1486305)
	- Add 'default_charset' option to user preferences (#1485451)
	- Add 'delete_always' option to user preferences
	- Support/Require tls:// prefix in 'smtp_server' option for TLS connections
	- Fix inconsistent behaviour of 'delete_always' option (#1486299)
	- Fix deleting all messages from last list page (#1486293)
	- Flag original messages when sending a draft (#1486203)
	- Changed signature separator when top-posting (#1486330)
	- Let the admin define defaults for search modifiers (#1485897)
	- Fix long e-mail addresses validation (#1486453)
	- Remember search modifiers in user prefs (#1486146)
	- Added force_7bit option to force MIME encoding of plain/text messages (#1486510)
	- Use case sensitive check when checking for default folders (#1486346)
	- Fix checking for new mail: now checks unseen count of inbox (#1485794)
	- Improve performance by avoiding unnecessary updates to the session table (#1486325)
	- Fix invalid <font> tags which cause HTML message rendering problems (#1486521)
	- Fix CVE-2010-0464: Disable DNS prefetching (#1486449)
	- Fix Received headers to behave better with SpamAssassin (#1486513)
	- Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473)
	- Fix adding contacts SQL error on mysql (#1486459)
	- Squirrelmail_usercopy: support reply-to field (#1486506)
	- Fix IE spellcheck suggestion popup issue (#1486471)
	- Fix email address auto-completion shows regexp pattern (#1486258)
	- Fix merging of configuration parameters: user prefs always survive (#1486368)
	- Fix quota indicator value after folder purge/expunge (#1486488)
	- Fix external mailto links support for use as protocol handler (#1486037)
	- Fix attachment excessive memory use, support messages of any size (#1484660)
	- Fix setting task name according to auth state
	- Password: fix vpopmaild driver (#1486478)
	- Add workaround for MySQL bug [http://bugs.mysql.com/bug.php?id=46293] (#1486474)
	- Fix quoted text wrapping when replying to an HTML email in plain text (#1484141)
	- Fix handling of extended mailto links (with params) (#1486354)
	- Fix sorting by date of messages without date header on servers without SORT (#1486286)
	- Fix inconsistency when not using default table names (#1486467)
	- Fix folder rename/delete buttons do not appear on creation of first folder (#1486468)
	- Fix character set conversion fails on systems where iconv doesn't accept //IGNORE (#1486375)
	- Log in performance: Create default folders on first login only
	- Import contacts into the selected address book (by Phil Weir)
	- Add support for MDB2's 'sqlsrv' driver (#1486395)
	- Use jQuery-1.4
	- Removed problematic browser-caching of messages
	- Fix incompatybility with suhosin.executor.disable_emodifier (#1486321)
	- Use PLAIN auth when CRAM fails and imap_auth_type='check' (#1486371)
	- Fix removal of <title> tag from HTML messages (#1486432)
	- Fix 'force_https' to specified port when URL contains a port number (#1486411)
	- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422)
	- Bug in spellchecker suggestions when server charset != UTF8 (#1486406)
	- Managesieve: Fix requires generation for multiple actions (#1486397)
	- Fix LDAP problem with special characters in RDN (#1486320)
	- Improved handling of message parts of type message/rfc822
	- Plugin API: added 'quota' hook
	- Fix parsing conditional comments in HTML messages (#1486350)
	- Use built-in json_encode() for proper JSON format in AJAX replies
	- Allow setting only selected params in 'message_compose' hook (#1486312)
	- Plugin API: added 'message_compose_body' hook (#1486285)
	- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128)
	- Fix displaying alternative parts in messages of type message/rfc822 (#1486246)
	- Fix possible messages exposure when using Roundcube behind a proxy (#1486281)
	- Fix unicode para and line separators in javascript response (#1486310)
	- Additional_message_headers: allow unsetting headers, support plugin's config file (#1486268)
	- Fix displaying of hidden directories in skins list (#1486301)
	- Fix open_basedir restriction error when reading skins list (#1486304)
	- Fix pasting from Office apps into html editor (#1486271)
	- Fix empty <a> tags parsing (#1486272)
	- Don't cut off attachment names when using non-RFC2231 encoding (#1485515)
	- Allow inserting signatures above replied message body (#1484272)
	- Managesieve 2.0: multi-script support
	- Fix imap_auth_type regression (#1486263)

	RELEASE 0.3.1
	------------------
	- Specify toolbar container in compose template (#1486247)
	- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
	- Avoid unnecessary page loads for selected tab (#1486032)
	- Fix quota indicator issues by content generation on client-size (#1486197, #1486220)
	- Don't display disabled sections in Settings (#1486099)
	- Added server-side e-mail address validation with 'email_dns_check' option (#1485857)
	- Fix login page loading into an iframe when session expires (#1485952)
	- Allow setting port number in 'force_https' option (#1486091)
	- Option 'force_https' replaced by 'force_https' plugin
	- Fix IE issue with non-UTF-8 characters in AJAX response (#1486159)
	- Partially fixed "empty body" issue by showing raw body of malformed message (#1486166)
	- Fix importing/sending to email address with whitespace (#1486214)
	- Added XIMSS (CommuniGate) driver for Password plugin
	- Fix newly attached files are not saved in drafts w/o editing any text (#1486202)
	- Added attachment upload indicator with parallel upload (#1486058)
	- Use default_charset for bodies of messages without charset definition (#1486187)
	- Password: added cPanel driver
	- Fix return to first page from e-mail screen (#1486105)
	- Fix handling HTML comments in HTML messages (#1486189)
	- Fix folder/messagelist controls alignment - icons used (#1486072)
	- Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
	- Fix cache status checking + improve cache operations performance (#1486104)
	- Prevent from setting INBOX as any of special folders (#1486114)
	- Fix regular expression for e-mail address (#1486152)
	- Fix Received header format
	- Implemented sorting by message index - added 'index_sort' option (#1485936)
	- Fix dl() use in installer (#1486150)
	- Added 'ldap_debug' option
	- Fix "Empty startup greeting" bug (#1486085)
	- Fix setting user name in 'new_user_identity' plugin (#1486137)
	- Fix incorrect count of new messages in folder list when using multiple IMAP clients (#1485995)
	- Fix all folders checking for new messages with disabled caching (#1486128)
	- Support skins in 'archive' and 'markasjunk' plugins
	- Added 'html_editor' hook (#1486068)
	- Fix DB constraint violation when populating messages cache (#1486052)
	- Password: added password strength options (#1486062)
	- Fix LDAP partial result warning (#1485536)
	- Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101)
	- Use faster/secure mt_rand() (#1486094)
	- Fix roundcube hangs on empty inbox with bincimapd (#1486093)
	- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926)
	- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)
	- Check 'post_max_size' for upload max filesize (#1486089)
	- Password Plugin: Fix %d inserts username instead of domain (#1486088)
	- Fix rcube_mdb2::affected_rows() (#1486082)

	RELEASE 0.3-stable
	------------------
	- Fix gn and givenName should be synonymous in LDAP addressbook (#1485892)
	- Add mail_domain to LDAP email entries without @ sign (#1485201)
	- Fix saving empty values in LDAP contact data (#1485781)
	- Fix LDAP contact update when RDN field is changed (#1485788)
	- Fix LDAP attributes case senitivity problems (#1485830)
	- Fix LDAP addressbook browsing when only one directory is used (#1486022)
	- Fix endless loop on error response for APPEND command (#1486060)
	- Don't require date.timezone setting in installer (#1485989)
	- Fix date sorting problem with Courier IMAP server (#1486065)
	- Unselect pressed buttons on mouse up (#1485987)
	- Don't set php_value error_log in .htaccess but mention in INSTALL (#1485924)
	- Fix too small status/flag/attachment columns in Safari 4 (#1486063)
	- Fix selection disabling while dragging splitter in webkit browsers (#1486056)
	- Added 'new_messages' plugin hook (#1486005)
	- Added 'logout_after' plugin hook (#1486042)
	- Added 'message_compose' hook
	- Added 'imap_connect' hook (#1485956)
	- Fix vcard_attachments plugin (#1486035)
	- Updated PEAR::Auth_SASL to 1.0.3 version
	- Use sequence names only with PostgreSQL (#1486018)
	- Re-designed User Preferences interface
	- Fix MS SQL DDL (#1486020)
	- Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
	- Added 'display_next' option
	- Fix rcube_mdb2::unixtimestamp for MS SQL (#1486015)
	- Fix HTML washing to respect character encoding
	- Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)
	- Fix #messagemenu display on IE (#1486006)
	- Speedup UI by using sprites for (toolbar) buttons
	- Fix charset names with X- prefix handling
	- Fix displaying of HTML messages with unknown/malformed tags (#1486003)

	RELEASE 0.3-RC1
	---------------
	- Fix import of vCard entries with params (#1485453)
	- Fix HTML messages output with empty block elements (#1485974)
	- Use request tokens to protect POST requests from CSRF
	- Added hook when killing a session
	- Added hook to write_log function (#1485971)
	- Performance improvements by use UID commands (#1485690)
	- Fix HTML editor tabIndex setting (#1485972)
	- Added 'imap_debug' and 'smtp_debug' options
	- Support strftime's format modifiers in date_* options (#1484806)
	- Support %h variable in 'smtp_server' option (#1485766)
	- Show SMTP errors in browser (#1485927)
	- Allow WBR tag in HTML message (#1485960)
	- Use spl_autoload_register() instead of __autoload (#1485947)
	- Add hook for identities listing (#1485958)
	- Trigger hook 'smtp_connect' when opening an SMTP connection (#1485954)
	- Added config option to enforce HTTPS connections
	- Fix non-unicode characters caching in unicode database (#1484608)
	- Performance improvements of messages caching
	- Fix empty Date header issue (#1485923)
	- Open collapsed folders during drag & drop (#1485914)
	- Fixed link text replacements (#1485789)
	- Also trigger 'insertrow' events on page load (#1485826)
	- No link on subject in IE browsers (#1484913)
	- Fixed filename encoding according to RFC2231 (#1485875)
	- Added message Edit feature (#1483891, #1484440)
	- Fix message Etag generation for counter issues (#1485623)
	- Fix messages searching on MailEnable IMAP (#1485762)
	- Fixed many 'skip_deleted' issues (#1485634)
	- Fixed messages list sorting on servers without SORT capability
	- Colorized signatures in plain text messages
	- Reviewed/fixed skip_deleted/read_when_deleted/flag_for_deletion options handling in UI
	- Fix displaying of big maximum upload filesize (#1485889)
	- Added possibility to invert messages selection
	- After move/delete from 'show' action display next message instead of messages list (#1485887)
	- Fixed problem with double quote at the end of folder name (#1485884)
	- Speedup UI by using CSS sprites and etags/expires/deflate in Apache config (#1484858,#1485800)
	- Support UID EXPUNGE: remove only moved/deleted messages
	- Add drag cancelling with ESC key (#1484344)
	- Support initial identity name from virtuser_query (#1484003)
	- Added message menu, removed Print and Source buttons
	- Added possibility to save message as .eml file (#1485861)
	- Added 1 minute interval in autosave options (#1485854)
	- Support UTF-7 encoding in messages (#1485832)
	- Better support for malformed character names (#1485758)

	RELEASE 0.3-BETA
	----------------
	- Plugin API + jQuery engine
	- Added possibility to encrypt received header, option 'http_received_header_encrypt',
	added some more logic in encrypt/decrypt functions for security
	- Fix Answered/Forwarded flag setting for messages in subfolders
	- Fix autocomplete problem with capital letters (#1485792)
	- Support UUencode content encoding (#1485839)
	- Minimize chance of race condition in session handling (#1485659, #1484678)
	- Fix session handling on non-session SQL query error (#1485734)
	- Fix html editor mode setting when reopening draft message (#1485834)
	- Added quick search box menu (#1484304)
	- Fix wrong column sort order icons (#1485823)
	- Updated TinyMCE to 3.2.3 version
	- Fix attachment names encoding when charset isn't specified in attachment part (#1484969)
	- Fix message normal priority problem (#1485820)
	- Fix autocomplete spinning wheel does not disappear (#1485804)
	- Added log_date_format option (#1485709)
	- Fix text wrapping in HTML editor after switching from plain text to HTML (#1485521)
	- Fix auto-complete function hangs with plus sign (#1485815)
	- Fix AJAX requests errors handler (#1485000)
	- Speed up message list displaying on IE
	- Fix read/write database recognition (#1485811)

	RELEASE 0.2.2
	-------------
	- Fix quicksearchbox look in Chrome and Konqueror (#1484841)
	- Fix UTF-8 byte-order mark removing (#1485514)
	- Fix folders subscribtions on Konqueror (#1484841)
	- Fix debug console on Konqueror and Safari
	- Fix messagelist focus issue when modifying status of selected messages (#1485807)
	- Support STARTTLS in IMAP connection (#1485284)
	- Fix DEL key problem in search boxes (#1485528)
	- Support several e-mail addresses per user from virtuser_file (#1485678)
	- Fix drag&drop with scrolling on IE (#1485786)
	- Fix adding signature separator in html mode (#1485350)
	- Fix opening attachment marks message as read (#1485803)
	- Fix 'temp_dir' does not support relative path under Windows (#1484529)
	- Fix "Initialize Database" button missing from installer (#1485802)
	- Fix compose window doesn't fit 1024x768 window (#1485396)
	- Fix service not available error when pressing back from compose dialog (#1485552)
	- Fix using mail() on Windows (#1485779)
	- Fix word wrapping in message-part's <PRE>s for printing (#1485787)
	- Fix incorrect word wrapping in outgoing plaintext multibyte messages (#1485714)
	- Fix double footer in HTML message with embedded images
	- Fix TNEF implementation bug (#1485773)
	- Fix incorrect row id parsing for LDAP contacts list (#1485784)
	- Fix 'mode' parameter in sqlite DSN (#1485772)

	RELEASE 0.2.1
	------------------
	- Use US-ASCII as failover when Unicode searching fails (#1485762)
	- Fix errors handling in IMAP command continuations (#1485762)
	- Fix FETCH result parsing for servers returning flags at the end of result (#1485763)
	- Fix datetime columns defaults in mysql's DDL (#1485641)
	- Fix attaching more than nine inline images (#1485759)
	- Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#1485758)
	- Fix mime-type detection using a hard-coded map (#1485311)
	- Don't return empty string if charset conversion failed (#1485757)
	- Disable concurrent autocomplete query results display (#1485743)
	- Fix new lines stripped from message footer (#1485751)
	- Fix IE problem with mouse click autocomplete (#1485739)
	- Fix html body washing on reply/forward + fix attachments handling (#1485676)
	- Fix multiple recipients input parsing (#1485733)
	- Fix replying to message with html attachment (#1485676)
	- Use default_charset for messages without specified charset (#1485661, #1484961)
	- Support non-standard "GMT-XXXX" literal in date header (#1485729)
	- Added TNEF support to decode MS Outlook attachments (winmail.dat)
	- Fix "value continuation" MIME headers by adding required semicolon (#1485727)
	- Fix pressing select all/unread multiple times (#1485723)
	- Fix selecting all unread does not honor new messages (#1485724)
	- Fix some base64 encoded attachments handling (#1485725)
	- Support NGINX as IMAP backend: better BAD response handling (#1485720)
	- Performance fix: don't fetch attachment parts headers twice to parse filename
	- Fix checking for recent messages on various IMAP servers (#1485702)
	- Performance fix: Don't fetch quota and recent messages in "message view" mode
	- Fix displaying of alternative-inside-alternative messages (#1485713)
	- Fix MDNSent flag checking, use arbitrary keywords (asterisk) flag (#1485706)
	- Fix creation of folders with '&' sign in name
	- Fix parsing of email addresses without angle brackets (#1485693)
	- Save spellcheck corrections when switching from plain to html editor (and spellchecking is on)
	- Fix large search results on server without SORT capability (#1485668)
	- Get rid of preg_replace() with eval modifier and create_function usage (#1485686)
	- Bring back <base> and <link> tags in HTML messages
	- Fix XSS vulnerability through background attributes as reported by Julien Cayssol
	- Fix problems with backslash as IMAP hierarchy delimiter (#1484467)
	- Secure vcard export by getting rid of preg's 'e' modifier use (#1485689)
	- Fix authentication when submitting form with existing session (#1485679)
	- Allow absolute URLs to images in HTML messages/sigs (#1485666)
	- Fix message body which contains both inline attachments and emotions
	- Fix SQL query execution errors handling in rcube_mdb2 class (#1485509)
	- Fix address names with '@' sign handling (#1485654)
	- Improve messages display performance
	- Fix messages searching with 'to:' modifier

	RELEASE 0.2-STABLE
	------------------
	- Fix mark popup in IE 7 (#1485369)
	- Fix line-break issue when copy & paste in Firefox (#1485425)
	- Fix autocomplete "unknown server error" (#1485637)
	- Fix STARTTLS before AUTH in SMTP connection (#1484883)
	- Support multiple quota values in QUOTAROOT resonse (#1485626)
	- Only abbreviate file name for IE < 7 browsers (#1485063)
	- Performance: allow setting imap rootdir and delimiter before connect (#1485172)
	- Fix sorting of folders with more than 2 levels (#1485569)
	- Fix search results page jumps in LDAP addressbook (#1485253)
	- Fix empty line before the signature in IE (#1485351)
	- Fix horizontal scrollbar in preview pane on IE (#1484633)
	- Add Robots meta tag in login page and installer (#1484846)
	- Added 'show_images' option, removed 'addrbook_show_images' (#1485597)
	- Option to check for new mails in all folders (#1484374)
	- Don't set client busy when checking for new messages (#1485276)
	- Allow UTF-8 folder names in config (#1485579)
	- Add junk_mbox option configuration in installer (#1485579)
	- Do serverside addressbook queries for autocompletion (#1485531)
	- Allow setting attachment col position in 'list_cols' option
	- Allow override 'list_cols' via skin (#1485577)
	- Fix 'cache' table cleanup on session destroy (#1485516)
	- Increase speed of session destroy and garbage clean up
	- Fix session timeout when DB server got clock skew (#1485490)
	- Fix handling of some malformed messages (#1484438)
	- Speed up raw message body handling
	- Better HTML entities conversion in html2text (#1485519)
	- Fix big memory consumption and speed up searching on servers without SORT capability
	- Fix setting locale to tr_TR, ku and az_AZ (#1485470)
	- Use SORT for searching on servers with SORT capability
	- Added message status filter
	- Fix empty file sending (#1485389)
	- Improved searching with many criterias (calling one SEARCH command)
	- Fix HTML editor initialization on IE (#1485304)
	- Add warning when switching editor mode from html to plain (#1485488)
	- Make identities list scrollable (#1485538)
	- Fix problem with numeric folder names (#1485527)
	- Added BYE response simple support to prevent from endless loops in imap.inc (#1483956)
	- Fix unread message unintentionally marked as read if read_when_deleted=true (#1485409)
	- Remove port number from SERVER_NAME in smtp_helo_host (#1485518)
	- Don't send disposition notification receipts for messages marked as 'read' (#1485523)
	- Added 'keep_alive' and 'min_keep_alive' options (#1485360)
	- Added option 'identities_level', removed 'multiple_identities'
	- Allow deleting identities when multiple_identities=false (#1485435)
	- Added option focus_on_new_message (#1485374)
	- Fix html2text class autoloading on Windows (#1485505)
	- Fix html signature formatting when identity save error occured (#1485426)
	- Add feedback and set busy when moving folder (#1485497)
	- Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)
	- Fix messages count bar overlapping (#1485270)
	- Fix adding signature in drafts compose mode (#1485484)
	- Fix iil_C_Sort() to support very long and/or divided responses (#1485283)
	- Fix matching case sensitivity when setting identity on reply (#1485480)
	- Prefer default identity on reply
	- Fix imap searching on ISMail server (#1485466)
	- Add css class for flagged messages (#1485464)
	- Write username instead of id in sendmail log (#1485477)
	- Fix htmlspecialchars() use for PHP version < 5.2.3 (#1485475)
	- Fix js keywords escaping in json_serialize() for IE/Opera (#1485472)
	- Added bin/killcache.php script (#1485434)
	- Add support for SJIS, GB2312, BIG5 in rc_detect_encoding()
	- Fix vCard file encoding detection for non-UTF-8 strings (#1485410)
	- Add 'skip_deleted' option in User Preferences (#1485445)
	- Minimize "inline" javascript scripts use (#1485433)
	- Fix css class setting for folders with names matching defined classes names (#1485355)
	- Fix race conditions when changing mailbox
	- Fix spellchecking when switching to html editor (#1485362)
	- Fix compose window width/height (#1485396)
	- Allow calling msgimport.sh/msgexport.sh from any directory (#1485431)
	- Localized filesize units (#1485340)
	- Better handling of "no identity" and "no email in identity" situations (#1485117)
	- Added 'mime_param_folding' option with possibility to choose long/non-ascii attachment names encoding eg. to be readable in MS Outlook/OE (#1485320)
	- Added "advanced options" feature in User Preferences
	- Fix unread counter when displaying cached massage in preview panel (#1485290)
	- Fix htmleditor spellchecking on MS Windows (#1485397)
	- Fix problem with non-ascii attachment names in Mail_mime (#1485267, #1485096)
	- Fix language autodetection (#1485401)
	- Fix button label in folders management (#1485405)
	- Fix collapsed folder not indicating unread msgs count of all subfolders (#1485403)
	- Fix handling of apostrophes in filenames decoded according to rfc2231

	RELEASE 0.2-BETA
	----------------
	- Made config files location configurable (#1485215)
	- Reduced memory footprint when forwarding attachments (#1485345)
	- Allow and use spellcheck attribute for input/textarea fields (#1485060)
	- Added icons for forwarded/forwarded+replied messages (#1485257)
	- Added Reply-To to forwarded emails (#1485315)
	- Display progress message for folders create/delete/rename (#1485357)
	- Smart Tags and NOBR tag support in html messages (#1485363, #1485327)
	- Redesign of the identities settings (#1484042)
	- Add config option to disable creation/deletion of identities (#1484498)
	- Added 'sendmail_delay' option to restrict messages sending interval (#1484491)
	- Added vertical splitter for folders list resizing
	- Added possibility to view all headers in message view
	- Fixed splitter drag/resize on Opera (#1485170)
	- Fixed quota img height/width setting from template (#1484857)
	- Refactor drag & drop functionality. Don't rely on browser events anymore (#1484453)
	- Insert "virtual" folders in subscription list (#1484779)
	- Added link to open message in new window
	- Enable export of address book contacts as vCard
	- Add feature to import contacts from vcard files (#1326103)
	- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946)
	- Allowed max. attachment size now indicated in compose screen (#1485030)
	- Also capture backspace key in list mode (#1484566)
	- Allow application/pgp parts to be displayed (#1484753)
	- Correctly handle options in mailto-links (#1485228)
	- Immediately save sort_col/sort_order in user prefs (#1485265)
	- Truncate very long (above 50 characters) attachment filenames when displaying
	- Allow to auto-detect client language if none set (#1484434)
	- Auto-detect the client timezone (user configurable)
	- Add RFC2231 header value continuations support for attachment filenames + hack for servers that not support that feature
	- Fix Reply-To header displaying (#1485314)
	- Mark form buttons that provide the most obvious operation (mainaction)
	- Added option 'quota_zero_as_unlimited' (#1484604)
	- Added PRE handling in html2text class (#1484740)
	- Added folder hierarchy collapsing
	- Added options to use syslog instead of log file (#1484850)
	- Added Logging & Debugging section in Installer
	- Fix In-Reply-To and References headers when composing saved draft message (#1485288)
	- Fix html message charset conversion for charsets with underline (#1485287)
	- Fix buttons status after contacts deletion (#1485233)
	- Fix escaping of To: and From: fields when building message body for reply or forward in the HTML editor (#1484904)
	- Use current mailbox name in template (#1485256)
	- Better fix for skipping untagged responses (#1485261)
	- Added pspell support patch by Kris Steinhoff (#1483960)
	- Enable spellchecker for HTML editor (#1485114)
	- Respect spellcheck_uri in tinyMCE spellchecker (#1484196)
	- Case insensitive contacts searching using PostgreSQL (#1485259)
	- Make default imap folders configurable for each user (#1485075)
	- Save outgoing mail to selectable folder (#1324581)
	- Fix hiding of mark menu when clicking th button again (#1484944)
	- Use long date format in print mode (#1485191)
	- Updated TinyMCE to version 3.1.0.1
	- Re-enable autocomplete attribute for login form (#1485211)
	- Check PERMANENTFLAGS before saving $MDNSent flag (#1484963, #1485163)
	- Added flag column on messages list (#1484623)
	- Patched Mail/MimePart.php (http://pear.php.net/bugs/bug.php?id=14232)
	- Allow trash/junk subfolders to be purged (#1485085)
	- Store compose parameters in session and redirect to a unique URL
	- Fixed CRAM-MD5 authentication (#1484819)
	- Fixed forwarding messages with one HTML attachment (#1484442)
	- Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1484914)
	- Added option to select skin in user preferences
	- Added option to configure displaying of attached images below the message body
	- Added option to display images in messages from known senders (#1484601)
	- User preferences grouped in more fieldsets
	- Fix corrupted MIME headers of messages in Sent folder (#1485111)
	- Fixed bug in MDB2 package: http://pear.php.net/bugs/bug.php?id=14124
	- Use keypress instead of keydown to select list's row (#1484816)
	- Don't call expunge and don't remove message row after message move if flag_for_deletion is set to true (#1485002)

	RELEASE 0.2-ALPHA
	-----------------
	- Added option to disable autocompletion from selected LDAP address books (#1484922)
	- TLS support in LDAP connections: 'use_tls' property (#1485104)
	- Fixed removing messages from search set after deleting them (#1485106)
	- imap.inc: Fixed iil_C_FetchStructureString() to handle many
	literal strings in response (#1484969)
	- Support for subfolders in default/protected folders (#1484665)
	- Disallowed delimiter in folder name (#1484803)
	- Support " and \ in folder names
	- Escape \ in login (#1484614)
	- Better HTML sanitization with the DOM-based washtml script (#1484701)
	- Fixed sorting of folders with non-ascii characters
	- Fixed Mysql DDL for default identities creation (#1485070)
	- In Preferences added possibility to configure 'read_when_deleted',
	'mdn_requests', 'flag_for_deletion' options
	- Made IMAP auth type configurable (#1483825)
	- Fixed empty values with FROM_UNIXTIME() in rcube_mdb2 (#1485055)
	- Fixed attachment list on IE 6/7 (#1484807)
	- Fixed JavaScript in compose.html that shows cc/bcc fields if populated
	- Make password input fields of type password in installer (#1484886)
	- Don't attempt to delete cache entries if enable_caching is FALSE (#1485051)
	- Optimized messages sorting on servers without sort capability (#1485049)
	- Corrected message headers decoding when charset isn't specified and improved
	support for native languages (#1485050, #1485048)
	- Expanded LDAP configuration options to support LDAP server writes.
	- Installer: encode special characters in DB username/password (#1485042)
	- Fixed management of folders with national characters in names (#1485036, #1485001)
	- Fixed identities saving when using MDB2 pgsql driver (#1485032)
	- Fixed BCC header reset (#1484997)
	- Improved messages list performance - patch from Justin Heesemann
	- Append skin_path to images location only when it starts with '/' sign (#1484859)
	- Fix IMAP response in message body when message has no body (#1484964)
	- Fixed non-RFC dates formatting (#1484901)
	- Fixed typo in set_charset() (#1484991)
	- Decode entities when inserting HTML signature to plain text message (#1484990)
	- HTML editing is now working with PHP5 updates and TinyMCE v3.0.6
	- Fixed signature loading on Windows (#1484545)
	- Added language support to HTML editing (#1484862)
	- Fixed remove signature when replying (#1333167)
	- Fixed problem with line with a space at the end (#1484916)
	- Fixed <!DOCTYPE> tag filtering (#1484391)
	- Fixed <?xml> tag filtering (#1484403)
	- Added sections (fieldset+label) in Settings interface
	- Mark as read in one action with message preview (#1484972)
	- Deleted redundant quota reads (#1484972)
	- Added options for empty trash and expunge inbox on logout (#1483863)
	- Removed lines wrapping when displaying message
	- Fixed month localization
	- Changed codebase to PHP5 with autoloader

	RELEASE 0.1.1
	-------------
	- Clear selection when selecting single item (#1484942)
	- Remove hard-coded image size in skin templates (#1484893)
	- Database schema improvements (dropped unnecessary indexes)
	- Fixed creating a new folder with a comma in its name (#1484681)
	- Fixed sorting of messages when default mailbox is empty (#1484317)
	- Improve message previewpane - less loading (#1484316)
	- Fixed login form autoompletion (#1484839)
	- Fixed virtuser_query option for mdb2 backend (#1484874)
	- Fixed attachment resoting from Drafts when message body was empty (#1484506)
	- Fixed usage of ob_gzhandler (#1484851)
	- Fixed message part window in IE6 (#1484610)
	- Fixed decoding of mime-encoded strings (#1484191)
	- Fixed some iconv/mb_string problems (#1484598)
	- Correctly quote mailbox name when using in URL (#1484313)
	- Fixed "headers already sent" errors (#1484860)

	RELEASE 0.1-STABLE
	------------------
	- Added interactive installer script
	- Fix folder adding/renaming inspired by #1484800
	- Localize folder name in page title (#1484785)
	- Fix code using wrong variable name (#1484018)
	- Allow to send mail with BCC recipients only
	- condense TinyMCE toolbar down to one line, removing table buttons (#1484747)
	- Add function to mark the selected messages as read/unread (#1457360)
	- Also do charset decoding as suggested in RFC 2231 (fix #1484321)
	- Show message count in folder list and hint when creating a subfolder
	- Distinguish ssl and tls for imap connections (#1484667)
	- Added some charset aliases to fix typical mis-labelling (#1484565)
	- Remember decision to display images for a certain message during session (#1484754)
	- Truncate attachment filenames to 55 characters due to an IE bug (#1484757)
	- Make sending of read receipts configurable
	- Respect config when localize folder names (#1484707)
	- Also respect receipt and priority settings when re-opening a draft message
	- Remember search results (closes #1483883), patch by the_glu
	- Add Received header on outgoing mail
	- Upgrade to TinyMCE 2.1.3
	- Allow inserting image attachments into HTML messages while composing (#1484557)
	- Implement Message-Disposition-Notification (Receipts)
	- Fix overriding of session vars when register_globals is on (#1484670)
	- Fix bug with case-sensitive folder names (#1484245)
	- Don't create default folders by default
	- Fixed some potential security risks (audited by Andris)
	- Only show new messages if they match the current search (#1484176)
	- Switch to/from when searcing in Sent folder (#1484555)
	- Correctly read the References header (#1484646)
	- Unset old cookie before sending a new value (#1484639)
	- Correctly decode attachments when downloading them (#1484645 and #1484642)
	- Suppress IE errors when clearing attachments form (#1484356)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #1484056)
	- Improve message compose screen (closes #1484383)
	- Select next row after removing one from list (#1484387)

	RELEASE 0.1-RC2
	---------------
	- Enable drag-&-dropping of folders to a new parent and allow to create subfolders (#1457344)
	- Suppress IE errors when clearing attachments form (#1484356)
	- Set preferences field in user table to NULL (#1484386)
	- Log error when login fails due to auto_create_user turned off
	- Filter linked/imported CSS files (closes #1484056)
	- Improve message compose screen (closes #1484383)
	- Select next row after removing one from list (#1484387)
	- Make smtp HELO/EHLO hostname configurable (#1484067)
	- IPv6 Compatability (#1484322), Patch #1484373
	- Unlock interface when message sending fails (#1484570)
	- Eval PHP code in template includes (if configured)
	- Show message when folder is empty. Mo more static text in table (#1484395)
	- Only display unread count in page title when new messages arrived
	- Fixed wrong delete button tooltip (#1483965)
	- Fixed charset encoding bug (#1484429)
	- Applied patch for LDAP version (#1484552)
	- Improved XHTML validation
	- Fix message list selection (#1484550)
	- Better fix lowercased usernames (#1484473)
	- Update pngbehavior Script as suggested in #1484490
	- Fixed moving/deleting messages when more than 1 is selected
	- Applied patch for LDAP contacts listing by Glen Ogilvie
	- Applied patch for more address fields in LDAP contacts (#1484402)
	- Add alternative for getallheaders() (fix #1484508)
	- Identify mailboxes case-sensitive
	- Sort mailbox list case-insensitive (closes #1484338)
	- Fix display of multipart messages from Apple Mail (closes #1484027)
	- Protect AJAX request from being fetched by a foreign site (XSS)
	- Make autocomplete for loginform configurable by the skin template
	- Fix compose function from address book (closes #1484426)
	- Added //IGNORE to iconv call (patch #1484420, closes #1484023)
	- Check if mbstring supports charset (#1484290 and #1484292)
	- Prefer iconv over mbstring (as suggested in #1484292)
	- Check filesize of template includes (#1484409)
	- Fixed bug with buttons not dimming/enabling properly after switching folders
	- Fixed compose window becoming unresponsive after saving a draft (#1484487)
	- Re-enabled "Back" button in compose window now that bug #1484487 is fixed
	- Fixed unresponsive interface issue when downloading attachments (#1484496)
	- Lowered status message time from 5 to 3 seconds to improve responsiveness
	- Raised .htaccess upload_max_filesize from 2M to 5M to differ from default php.ini
	- Increased "mailboxcontrols" mail.css width from 160 to 170px to fix non-english languages (#1484499)
	- Fix status message bug #1484464 with regard to #1484353
	- Fix address adding bug reported by David Koblas
	- Applied socket error patch by Thomas Mangin
	- Pass-by-reference workarround for PHP5 in sendmail.inc
	- Fixed buggy imap_root settings (closes #1484379)
	- Prevent default events on subject links (#1484399)
	- Use HTTP-POST requests for actions that change state

	RELEASE 0.1-RC1
	---------------
	- Use global filters and bind username/ for Ldap searches (#1484159)
	- Hide quota display if imap server does not support it
	- Hide address groups if no LDAP servers configured
	- Add link to message subjects (closes #1484257)
	- Better SQL query for contact listing/search (closes #1484369)
	- Fixed marking as read in preview pane (closes #1484364)
	- CSS hack to display attachments correctly in IE6
	- Wrap message body text (closes #1484148)
	- LDAP access is back in address book (closes #1484087)
	- Added search function for contacts
	- New Template parsing and output encoding
	- Fixed bugs #1484119 and #1483978
	- Fixed message moving procedure (closes #1484308)
	- Fixed display of multiple attachments (closes #1466563)
	- Fixed check for new messages (closes #1484310)
	- List attachments without filename
	- New session authentication: Change sessid cookie when login, authentication with sessauth cookie is now configurable.
	Should close bugs #1483951 and #1484299
	- Correctly translate mailbox names (closes #1484276)
	- Quote e-mail address links (closes #1484300)
	- Updated PEAR::Mail_mime package
	- Accept single quotes for HTML attributes when modifying message body (thanks Jason)
	- Sanitize input for new users/identities (thanks Colin Alston)
	- Don't download HTML message parts
	- Convert HTML parts to plaintext if 'prefer_html' is off
	- Correctly parse message/rfc822 parts (closes #1484045)
	- Also use user_id for unique key in messages table (closes #1484074)
	- Hide contacts drop down on blur (closes #1484203)
	- Make entries in contacts drop down clickable
	- Turn off browser autocompletion on login page
	- Quote <? in text/html message parts
	- Hide border around radio buttons
	- Applied patch for attachment download by crichardson (closes #1484198)
	- Fixed bug in Postgres DB handling (closes #1484068)
	- Fixed bug of invalid calls to fetchRow() in rcube_db.inc (closes #1484280)
	- Fixed array_merge bug (closes #1484281)
	- Fixed flag for deletion in list view (closes #1484264)
	- Finally support semicolons as recipient separator (closes ##1484251)
	- Fixed message headers (subject) encoding
	- check if safe mode is on or not (closes #1484269)
	- Show "no subject" in message list if subject is missing (closes #1484243)
	- Solved page caching of message preview (closes #1484153)
	- Only use gzip compression if configured (closes #1484236)
	- Fixed priority selector issue (#1484150)
	- Fixed some CSS issues in default skin (closes #1484210 and #1484161)
	- Prevent from double quoting of numeric HTML character references (closes #1484253)
	- Fixed display of HTML message attachments (closes #1484178)
	- Applied patch for preview caching (closes #1484186)
	- Added error handling for attachment uploads
	- Use multibyte safe string functions where necessary (closes #1483988)
	- Applied security patch to validate the submitted host value (by Kees Cook)
	- Applied security patch to validate input values when deleting contacts (by Kees Cook)
	- Applied security patch that sanitizes emoticon paths when attaching them (by Kees Cook)
	- Applied a patch to more aggressively sanitize a HTML message
	- Visualize blocked images in HTML messages
	- Fixed wrong message listing when showing search results (closes #1484131)
	- Show remote images when opening HTML message part as attachment
	- Improve memory usage when sending mail (closes #1484098)
	- Mark messages as read once the preview is loaded (closes #1484132)
	- Include smtp final response in log (closes #1484081)
	- Corrected date string in sent message header (closes #1484125)
	- Correclty choose "To" column in sent and draft mailboxes (closes #1483943)
	- Changed srong tooltips for message browse buttons (closes #1483930)
	- Fixed signature delimeter character to be standard (Bug #1484035)
	- Fixed XSS vulnerability (Bug #1484109)
	- Remove newlines from mail headers (Bug #1484031)
	- Selection issues when moving/deleting (Bug #1484044)
	- Applied patch of Clement Moulin for imap host auto-selection
	- ISO-encode IMAP password for plaintext login (Bugs #1483977 & #1483886)
	- Fixed folder name encoding in subscription list (Bug #1484113)
	- Fixed JS errors in identity list (Bug #1484120)
	- Translate foldernames in folder form (closes #1484113)
	- Added first and last buttons to message list, address book
	and message detail
	- Pressing Shift-Del bypasses Trash folder
	- Enable purge command for Junk folder
	- Fetch all aliases if virtuser_query is used instead
	- Re-enabled multi select of contacts (Bug #1484017)
	- Enable contact editing right after creation (Bug #1459641)
	- Correct UTF-7 to UTF-8 conversion if mbstring is not available
	- Fixed IMAP fetch of message body (Bug #1484019)
	- Fixed safe_mode problems (Bug #1418381)
	- Fixed wrong header encoding (Bug #1483976)
	- Made automatic draft saving configurable
	- Fixed JS bug when renaming folders (Bug #1483989)
	- Added quota display as image (by Brett Patterson)
	- Corrected creation of a message-id
	- New indentation for quoted message text
	- Improved HTML validity
	- Fixed URL character set (Ticket #1445501)
	- Fixed saving of contact into MySQL from LDAP query results (Ticket #1483820)
	- Fixed folder renaming: unsubscribe before rename (Bug #1483920)
	- Finalized new message parsing (+ chaching)
	- Fixed wrong usage of mbstring (Bug #1462439)
	- Set default spelling language (Ticket #1483938)
	- Added support for Nox Spell Server
	- Re-built message parsing (Bug #1327068)
	Now based on the message structure delivered by the IMAP server.
	- Fixed some XSS and SQL injection issues
	- Fixed charset problems with folder renaming




	diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
	index a7dfa6d0c..76c6ec2ff 100644
	--- a/program/lib/Mail/mime.php
	+++ b/program/lib/Mail/mime.php
	@@ -1,1475 +1,1476 @@
	<?php
	/**
	* The Mail_Mime class is used to create MIME E-mail messages
	*
	* The Mail_Mime class provides an OO interface to create MIME
	* enabled email messages. This way you can create emails that
	* contain plain-text bodies, HTML bodies, attachments, inline
	* images and specific headers.
	*
	* Compatible with PHP versions 4 and 5
	*
	* LICENSE: This LICENSE is in the BSD license style.
	* Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
	* Copyright (c) 2003-2006, PEAR <pear-group@php.net>
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or
	* without modification, are permitted provided that the following
	* conditions are met:
	*
	* - Redistributions of source code must retain the above copyright
	* notice, this list of conditions and the following disclaimer.
	* - Redistributions in binary form must reproduce the above copyright
	* notice, this list of conditions and the following disclaimer in the
	* documentation and/or other materials provided with the distribution.
	* - Neither the name of the authors, nor the names of its contributors
	* may be used to endorse or promote products derived from this
	* software without specific prior written permission.
	*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	* THE POSSIBILITY OF SUCH DAMAGE.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Tomas V.V. Cox <cox@idecnet.com>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version 1.8.4
	+ * @version 1.8.5
	* @link http://pear.php.net/package/Mail_mime
	*
	* This class is based on HTML Mime Mail class from
	* Richard Heyes <richard@phpguru.org> which was based also
	* in the mime_mail.class by Tobias Ratschiller <tobias@dnet.it>
	* and Sascha Schumann <sascha@schumann.cx>
	*/


	/**
	* require PEAR
	*
	* This package depends on PEAR to raise errors.
	*/
	require_once 'PEAR.php';

	/**
	* require Mail_mimePart
	*
	* Mail_mimePart contains the code required to
	* create all the different parts a mail can
	* consist of.
	*/
	require_once 'Mail/mimePart.php';


	/**
	* The Mail_Mime class provides an OO interface to create MIME
	* enabled email messages. This way you can create emails that
	* contain plain-text bodies, HTML bodies, attachments, inline
	* images and specific headers.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Tomas V.V. Cox <cox@idecnet.com>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.4
	+ * @version Release: 1.8.5
	* @link http://pear.php.net/package/Mail_mime
	*/
	class Mail_mime
	{
	/**
	* Contains the plain text part of the email
	*
	* @var string
	* @access private
	*/
	var $_txtbody;

	/**
	* Contains the html part of the email
	*
	* @var string
	* @access private
	*/
	var $_htmlbody;

	/**
	* list of the attached images
	*
	* @var array
	* @access private
	*/
	var $_html_images = array();

	/**
	* list of the attachements
	*
	* @var array
	* @access private
	*/
	var $_parts = array();

	/**
	* Headers for the mail
	*
	* @var array
	* @access private
	*/
	var $_headers = array();

	/**
	* Build parameters
	*
	* @var array
	* @access private
	*/
	var $_build_params = array(
	// What encoding to use for the headers
	// Options: quoted-printable or base64
	'head_encoding' => 'quoted-printable',
	// What encoding to use for plain text
	// Options: 7bit, 8bit, base64, or quoted-printable
	'text_encoding' => 'quoted-printable',
	// What encoding to use for html
	// Options: 7bit, 8bit, base64, or quoted-printable
	'html_encoding' => 'quoted-printable',
	// The character set to use for html
	'html_charset' => 'ISO-8859-1',
	// The character set to use for text
	'text_charset' => 'ISO-8859-1',
	// The character set to use for headers
	'head_charset' => 'ISO-8859-1',
	// End-of-line sequence
	'eol' => "\r\n",
	// Delay attachment files IO until building the message
	'delay_file_io' => false
	);

	/**
	* Constructor function
	*
	* @param mixed $params Build parameters that change the way the email
	* is built. Should be an associative array.
	* See $_build_params.
	*
	* @return void
	* @access public
	*/
	function Mail_mime($params = array())
	{
	// Backward-compatible EOL setting
	if (is_string($params)) {
	$this->_build_params['eol'] = $params;
	} else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
	$this->_build_params['eol'] = MAIL_MIME_CRLF;
	}

	// Update build parameters
	if (!empty($params) && is_array($params)) {
	while (list($key, $value) = each($params)) {
	$this->_build_params[$key] = $value;
	}
	}
	}

	/**
	* Set build parameter value
	*
	* @param string $name Parameter name
	* @param string $value Parameter value
	*
	* @return void
	* @access public
	* @since 1.6.0
	*/
	function setParam($name, $value)
	{
	$this->_build_params[$name] = $value;
	}

	/**
	* Get build parameter value
	*
	* @param string $name Parameter name
	*
	* @return mixed Parameter value
	* @access public
	* @since 1.6.0
	*/
	function getParam($name)
	{
	return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
	}

	/**
	* Accessor function to set the body text. Body text is used if
	* it's not an html mail being sent or else is used to fill the
	* text/plain part that emails clients who don't support
	* html should show.
	*
	* @param string $data Either a string or
	* the file name with the contents
	* @param bool $isfile If true the first param should be treated
	* as a file name, else as a string (default)
	* @param bool $append If true the text or file is appended to
	* the existing body, else the old body is
	* overwritten
	*
	* @return mixed True on success or PEAR_Error object
	* @access public
	*/
	function setTXTBody($data, $isfile = false, $append = false)
	{
	if (!$isfile) {
	if (!$append) {
	$this->_txtbody = $data;
	} else {
	$this->_txtbody .= $data;
	}
	} else {
	$cont = $this->_file2str($data);
	if (PEAR::isError($cont)) {
	return $cont;
	}
	if (!$append) {
	$this->_txtbody = $cont;
	} else {
	$this->_txtbody .= $cont;
	}
	}
	return true;
	}

	/**
	* Get message text body
	*
	* @return string Text body
	* @access public
	* @since 1.6.0
	*/
	function getTXTBody()
	{
	return $this->_txtbody;
	}

	/**
	* Adds a html part to the mail.
	*
	* @param string $data Either a string or the file name with the
	* contents
	* @param bool $isfile A flag that determines whether $data is a
	* filename, or a string(false, default)
	*
	* @return bool True on success
	* @access public
	*/
	function setHTMLBody($data, $isfile = false)
	{
	if (!$isfile) {
	$this->_htmlbody = $data;
	} else {
	$cont = $this->_file2str($data);
	if (PEAR::isError($cont)) {
	return $cont;
	}
	$this->_htmlbody = $cont;
	}

	return true;
	}

	/**
	* Get message HTML body
	*
	* @return string HTML body
	* @access public
	* @since 1.6.0
	*/
	function getHTMLBody()
	{
	return $this->_htmlbody;
	}

	/**
	* Adds an image to the list of embedded images.
	*
	* @param string $file The image file name OR image data itself
	* @param string $c_type The content type
	* @param string $name The filename of the image.
	* Only used if $file is the image data.
	* @param bool $isfile Whether $file is a filename or not.
	* Defaults to true
	* @param string $content_id Desired Content-ID of MIME part
	* Defaults to generated unique ID
	*
	* @return bool True on success
	* @access public
	*/
	function addHTMLImage($file,
	$c_type='application/octet-stream',
	$name = '',
	$isfile = true,
	$content_id = null
	) {
	$bodyfile = null;

	if ($isfile) {
	// Don't load file into memory
	if ($this->_build_params['delay_file_io']) {
	$filedata = null;
	$bodyfile = $file;
	} else {
	if (PEAR::isError($filedata = $this->_file2str($file))) {
	return $filedata;
	}
	}
	$filename = ($name ? $name : $file);
	} else {
	$filedata = $file;
	$filename = $name;
	}

	if (!$content_id) {
	$content_id = md5(uniqid(time()));
	}

	$this->_html_images[] = array(
	'body' => $filedata,
	'body_file' => $bodyfile,
	'name' => $filename,
	'c_type' => $c_type,
	'cid' => $content_id
	);

	return true;
	}

	/**
	* Adds a file to the list of attachments.
	*
	* @param string $file The file name of the file to attach
	* or the file contents itself
	* @param string $c_type The content type
	* @param string $name The filename of the attachment
	* Only use if $file is the contents
	* @param bool $isfile Whether $file is a filename or not. Defaults to true
	* @param string $encoding The type of encoding to use. Defaults to base64.
	* Possible values: 7bit, 8bit, base64 or quoted-printable.
	* @param string $disposition The content-disposition of this file
	* Defaults to attachment.
	* Possible values: attachment, inline.
	* @param string $charset The character set of attachment's content.
	* @param string $language The language of the attachment
	* @param string $location The RFC 2557.4 location of the attachment
	* @param string $n_encoding Encoding of the attachment's name in Content-Type
	* By default filenames are encoded using RFC2231 method
	* Here you can set RFC2047 encoding (quoted-printable
	* or base64) instead
	* @param string $f_encoding Encoding of the attachment's filename
	* in Content-Disposition header.
	* @param string $description Content-Description header
	* @param string $h_charset The character set of the headers e.g. filename
	* If not specified, $charset will be used
	- * @param array $add_headers Additional part headers
	+ * @param array $add_headers Additional part headers. Array keys can be in form
	+ * of <header_name>:<parameter_name>
	*
	* @return mixed True on success or PEAR_Error object
	* @access public
	*/
	function addAttachment($file,
	$c_type = 'application/octet-stream',
	$name = '',
	$isfile = true,
	$encoding = 'base64',
	$disposition = 'attachment',
	$charset = '',
	$language = '',
	$location = '',
	$n_encoding = null,
	$f_encoding = null,
	$description = '',
	$h_charset = null,
	$add_headers = array()
	) {
	$bodyfile = null;

	if ($isfile) {
	// Don't load file into memory
	if ($this->_build_params['delay_file_io']) {
	$filedata = null;
	$bodyfile = $file;
	} else {
	if (PEAR::isError($filedata = $this->_file2str($file))) {
	return $filedata;
	}
	}
	// Force the name the user supplied, otherwise use $file
	$filename = ($name ? $name : $file);
	} else {
	$filedata = $file;
	$filename = $name;
	}

	if (!strlen($filename)) {
	$msg = "The supplied filename for the attachment can't be empty";
	$err = PEAR::raiseError($msg);
	return $err;
	}
	$filename = $this->_basename($filename);

	$this->_parts[] = array(
	'body' => $filedata,
	'body_file' => $bodyfile,
	'name' => $filename,
	'c_type' => $c_type,
	'charset' => $charset,
	'encoding' => $encoding,
	'language' => $language,
	'location' => $location,
	'disposition' => $disposition,
	'description' => $description,
	'add_headers' => $add_headers,
	'name_encoding' => $n_encoding,
	'filename_encoding' => $f_encoding,
	'headers_charset' => $h_charset,
	);

	return true;
	}

	/**
	* Get the contents of the given file name as string
	*
	* @param string $file_name Path of file to process
	*
	* @return string Contents of $file_name
	* @access private
	*/
	function &_file2str($file_name)
	{
	// Check state of file and raise an error properly
	if (!file_exists($file_name)) {
	$err = PEAR::raiseError('File not found: ' . $file_name);
	return $err;
	}
	if (!is_file($file_name)) {
	$err = PEAR::raiseError('Not a regular file: ' . $file_name);
	return $err;
	}
	if (!is_readable($file_name)) {
	$err = PEAR::raiseError('File is not readable: ' . $file_name);
	return $err;
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}
	$cont = file_get_contents($file_name);
	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	return $cont;
	}

	/**
	* Adds a text subpart to the mimePart object and
	* returns it during the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	* @param string $text The text to add.
	*
	* @return object The text mimePart object
	* @access private
	*/
	function &_addTextPart(&$obj, $text)
	{
	$params['content_type'] = 'text/plain';
	$params['encoding'] = $this->_build_params['text_encoding'];
	$params['charset'] = $this->_build_params['text_charset'];
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	$ret = $obj->addSubpart($text, $params);
	return $ret;
	} else {
	$ret = new Mail_mimePart($text, $params);
	return $ret;
	}
	}

	/**
	* Adds a html subpart to the mimePart object and
	* returns it during the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	*
	* @return object The html mimePart object
	* @access private
	*/
	function &_addHtmlPart(&$obj)
	{
	$params['content_type'] = 'text/html';
	$params['encoding'] = $this->_build_params['html_encoding'];
	$params['charset'] = $this->_build_params['html_charset'];
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	$ret = $obj->addSubpart($this->_htmlbody, $params);
	return $ret;
	} else {
	$ret = new Mail_mimePart($this->_htmlbody, $params);
	return $ret;
	}
	}

	/**
	* Creates a new mimePart object, using multipart/mixed as
	* the initial content-type and returns it during the
	* build process.
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	function &_addMixedPart()
	{
	$params = array();
	$params['content_type'] = 'multipart/mixed';
	$params['eol'] = $this->_build_params['eol'];

	// Create empty multipart/mixed Mail_mimePart object to return
	$ret = new Mail_mimePart('', $params);
	return $ret;
	}

	/**
	* Adds a multipart/alternative part to a mimePart
	* object (or creates one), and returns it during
	* the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	function &_addAlternativePart(&$obj)
	{
	$params['content_type'] = 'multipart/alternative';
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	return $obj->addSubpart('', $params);
	} else {
	$ret = new Mail_mimePart('', $params);
	return $ret;
	}
	}

	/**
	* Adds a multipart/related part to a mimePart
	* object (or creates one), and returns it during
	* the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	function &_addRelatedPart(&$obj)
	{
	$params['content_type'] = 'multipart/related';
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	return $obj->addSubpart('', $params);
	} else {
	$ret = new Mail_mimePart('', $params);
	return $ret;
	}
	}

	/**
	* Adds an html image subpart to a mimePart object
	* and returns it during the build process.
	*
	* @param object &$obj The mimePart to add the image to
	* @param array $value The image information
	*
	* @return object The image mimePart object
	* @access private
	*/
	function &_addHtmlImagePart(&$obj, $value)
	{
	$params['content_type'] = $value['c_type'];
	$params['encoding'] = 'base64';
	$params['disposition'] = 'inline';
	$params['filename'] = $value['name'];
	$params['cid'] = $value['cid'];
	$params['body_file'] = $value['body_file'];
	$params['eol'] = $this->_build_params['eol'];

	if (!empty($value['name_encoding'])) {
	$params['name_encoding'] = $value['name_encoding'];
	}
	if (!empty($value['filename_encoding'])) {
	$params['filename_encoding'] = $value['filename_encoding'];
	}

	$ret = $obj->addSubpart($value['body'], $params);
	return $ret;
	}

	/**
	* Adds an attachment subpart to a mimePart object
	* and returns it during the build process.
	*
	* @param object &$obj The mimePart to add the image to
	* @param array $value The attachment information
	*
	* @return object The image mimePart object
	* @access private
	*/
	function &_addAttachmentPart(&$obj, $value)
	{
	$params['eol'] = $this->_build_params['eol'];
	$params['filename'] = $value['name'];
	$params['encoding'] = $value['encoding'];
	$params['content_type'] = $value['c_type'];
	$params['body_file'] = $value['body_file'];
	$params['disposition'] = isset($value['disposition']) ?
	$value['disposition'] : 'attachment';

	// content charset
	if (!empty($value['charset'])) {
	$params['charset'] = $value['charset'];
	}
	// headers charset (filename, description)
	if (!empty($value['headers_charset'])) {
	$params['headers_charset'] = $value['headers_charset'];
	}
	if (!empty($value['language'])) {
	$params['language'] = $value['language'];
	}
	if (!empty($value['location'])) {
	$params['location'] = $value['location'];
	}
	if (!empty($value['name_encoding'])) {
	$params['name_encoding'] = $value['name_encoding'];
	}
	if (!empty($value['filename_encoding'])) {
	$params['filename_encoding'] = $value['filename_encoding'];
	}
	if (!empty($value['description'])) {
	$params['description'] = $value['description'];
	}
	if (is_array($value['add_headers'])) {
	$params['headers'] = $value['add_headers'];
	}

	$ret = $obj->addSubpart($value['body'], $params);
	return $ret;
	}

	/**
	* Returns the complete e-mail, ready to send using an alternative
	* mail delivery method. Note that only the mailpart that is made
	* with Mail_Mime is created. This means that,
	* YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF
	* using the $headers parameter!
	*
	* @param string $separation The separation between these two parts.
	* @param array $params The Build parameters passed to the
	* &get() function. See &get for more info.
	* @param array $headers The extra headers that should be passed
	* to the &headers() function.
	* See that function for more info.
	* @param bool $overwrite Overwrite the existing headers with new.
	*
	* @return mixed The complete e-mail or PEAR error object
	* @access public
	*/
	function getMessage($separation = null, $params = null, $headers = null,
	$overwrite = false
	) {
	if ($separation === null) {
	$separation = $this->_build_params['eol'];
	}

	$body = $this->get($params);

	if (PEAR::isError($body)) {
	return $body;
	}

	$head = $this->txtHeaders($headers, $overwrite);
	$mail = $head . $separation . $body;
	return $mail;
	}

	/**
	* Returns the complete e-mail body, ready to send using an alternative
	* mail delivery method.
	*
	* @param array $params The Build parameters passed to the
	* &get() function. See &get for more info.
	*
	* @return mixed The e-mail body or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function getMessageBody($params = null)
	{
	return $this->get($params, null, true);
	}

	/**
	* Writes (appends) the complete e-mail into file.
	*
	* @param string $filename Output file location
	* @param array $params The Build parameters passed to the
	* &get() function. See &get for more info.
	* @param array $headers The extra headers that should be passed
	* to the &headers() function.
	* See that function for more info.
	* @param bool $overwrite Overwrite the existing headers with new.
	*
	* @return mixed True or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
	{
	// Check state of file and raise an error properly
	if (file_exists($filename) && !is_writable($filename)) {
	$err = PEAR::raiseError('File is not writable: ' . $filename);
	return $err;
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	if (!($fh = fopen($filename, 'ab'))) {
	$err = PEAR::raiseError('Unable to open file: ' . $filename);
	return $err;
	}

	// Write message headers into file (skipping Content-* headers)
	$head = $this->txtHeaders($headers, $overwrite, true);
	if (fwrite($fh, $head) === false) {
	$err = PEAR::raiseError('Error writing to file: ' . $filename);
	return $err;
	}

	fclose($fh);

	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	// Write the rest of the message into file
	$res = $this->get($params, $filename);

	return $res ? $res : true;
	}

	/**
	* Writes (appends) the complete e-mail body into file.
	*
	* @param string $filename Output file location
	* @param array $params The Build parameters passed to the
	* &get() function. See &get for more info.
	*
	* @return mixed True or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function saveMessageBody($filename, $params = null)
	{
	// Check state of file and raise an error properly
	if (file_exists($filename) && !is_writable($filename)) {
	$err = PEAR::raiseError('File is not writable: ' . $filename);
	return $err;
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	if (!($fh = fopen($filename, 'ab'))) {
	$err = PEAR::raiseError('Unable to open file: ' . $filename);
	return $err;
	}

	// Write the rest of the message into file
	$res = $this->get($params, $filename, true);

	return $res ? $res : true;
	}

	/**
	* Builds the multipart message from the list ($this->_parts) and
	* returns the mime content.
	*
	* @param array $params Build parameters that change the way the email
	* is built. Should be associative. See $_build_params.
	* @param resource $filename Output file where to save the message instead of
	* returning it
	* @param boolean $skip_head True if you want to return/save only the message
	* without headers
	*
	* @return mixed The MIME message content string, null or PEAR error object
	* @access public
	*/
	function &get($params = null, $filename = null, $skip_head = false)
	{
	if (isset($params)) {
	while (list($key, $value) = each($params)) {
	$this->_build_params[$key] = $value;
	}
	}

	if (isset($this->_headers['From'])) {
	// Bug #11381: Illegal characters in domain ID
	if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
	$domainID = $matches[1];
	} else {
	$domainID = '@localhost';
	}
	foreach ($this->_html_images as $i => $img) {
	$cid = $this->_html_images[$i]['cid'];
	if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
	$this->_html_images[$i]['cid'] = $cid . $domainID;
	}
	}
	}

	if (count($this->_html_images) && isset($this->_htmlbody)) {
	foreach ($this->_html_images as $key => $value) {
	$regex = array();
	$regex[] = '#(\s)((?i)src\|background\|href(?-i))\s=\s(["\']?)' .
	preg_quote($value['name'], '#') . '\3#';
	$regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
	preg_quote($value['name'], '#') . '\1\s*\)#';

	$rep = array();
	$rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
	$rep[] = 'url(\1cid:' . $value['cid'] . '\1)';

	$this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
	$this->_html_images[$key]['name']
	= $this->_basename($this->_html_images[$key]['name']);
	}
	}

	$this->_checkParams();

	$null = null;
	$attachments = count($this->_parts) ? true : false;
	$html_images = count($this->_html_images) ? true : false;
	$html = strlen($this->_htmlbody) ? true : false;
	$text = (!$html && strlen($this->_txtbody)) ? true : false;

	switch (true) {
	case $text && !$attachments:
	$message =& $this->_addTextPart($null, $this->_txtbody);
	break;

	case !$text && !$html && $attachments:
	$message =& $this->_addMixedPart();
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $text && $attachments:
	$message =& $this->_addMixedPart();
	$this->_addTextPart($message, $this->_txtbody);
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $html && !$attachments && !$html_images:
	if (isset($this->_txtbody)) {
	$message =& $this->_addAlternativePart($null);
	$this->_addTextPart($message, $this->_txtbody);
	$this->_addHtmlPart($message);
	} else {
	$message =& $this->_addHtmlPart($null);
	}
	break;

	case $html && !$attachments && $html_images:
	// * Content-Type: multipart/alternative;
	// * text
	// * Content-Type: multipart/related;
	// * html
	// * image...
	if (isset($this->_txtbody)) {
	$message =& $this->_addAlternativePart($null);
	$this->_addTextPart($message, $this->_txtbody);

	$ht =& $this->_addRelatedPart($message);
	$this->_addHtmlPart($ht);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($ht, $this->_html_images[$i]);
	}
	} else {
	// * Content-Type: multipart/related;
	// * html
	// * image...
	$message =& $this->_addRelatedPart($null);
	$this->_addHtmlPart($message);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($message, $this->_html_images[$i]);
	}
	}
	/*
	// #13444, #9725: the code below was a non-RFC compliant hack
	// * Content-Type: multipart/related;
	// * Content-Type: multipart/alternative;
	// * text
	// * html
	// * image...
	$message =& $this->_addRelatedPart($null);
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$this->_addHtmlPart($alt);
	} else {
	$this->_addHtmlPart($message);
	}
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($message, $this->_html_images[$i]);
	}
	*/
	break;

	case $html && $attachments && !$html_images:
	$message =& $this->_addMixedPart();
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$this->_addHtmlPart($alt);
	} else {
	$this->_addHtmlPart($message);
	}
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $html && $attachments && $html_images:
	$message =& $this->_addMixedPart();
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$rel =& $this->_addRelatedPart($alt);
	} else {
	$rel =& $this->_addRelatedPart($message);
	}
	$this->_addHtmlPart($rel);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($rel, $this->_html_images[$i]);
	}
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	}

	if (!isset($message)) {
	$ret = null;
	return $ret;
	}

	// Use saved boundary
	if (!empty($this->_build_params['boundary'])) {
	$boundary = $this->_build_params['boundary'];
	} else {
	$boundary = null;
	}

	// Write output to file
	if ($filename) {
	// Append mimePart message headers and body into file
	$headers = $message->encodeToFile($filename, $boundary, $skip_head);
	if (PEAR::isError($headers)) {
	return $headers;
	}
	$this->_headers = array_merge($this->_headers, $headers);
	$ret = null;
	return $ret;
	} else {
	$output = $message->encode($boundary, $skip_head);
	if (PEAR::isError($output)) {
	return $output;
	}
	$this->_headers = array_merge($this->_headers, $output['headers']);
	$body = $output['body'];
	return $body;
	}
	}

	/**
	* Returns an array with the headers needed to prepend to the email
	* (MIME-Version and Content-Type). Format of argument is:
	* $array['header-name'] = 'header-value';
	*
	* @param array $xtra_headers Assoc array with any extra headers (optional)
	* (Don't set Content-Type for multipart messages here!)
	* @param bool $overwrite Overwrite already existing headers.
	* @param bool $skip_content Don't return content headers: Content-Type,
	* Content-Disposition and Content-Transfer-Encoding
	*
	* @return array Assoc array with the mime headers
	* @access public
	*/
	function &headers($xtra_headers = null, $overwrite = false, $skip_content = false)
	{
	// Add mime version header
	$headers['MIME-Version'] = '1.0';

	// Content-Type and Content-Transfer-Encoding headers should already
	// be present if get() was called, but we'll re-set them to make sure
	// we got them when called before get() or something in the message
	// has been changed after get() [#14780]
	if (!$skip_content) {
	$headers += $this->_contentHeaders();
	}

	if (!empty($xtra_headers)) {
	$headers = array_merge($headers, $xtra_headers);
	}

	if ($overwrite) {
	$this->_headers = array_merge($this->_headers, $headers);
	} else {
	$this->_headers = array_merge($headers, $this->_headers);
	}

	$headers = $this->_headers;

	if ($skip_content) {
	unset($headers['Content-Type']);
	unset($headers['Content-Transfer-Encoding']);
	unset($headers['Content-Disposition']);
	} else if (!empty($this->_build_params['ctype'])) {
	$headers['Content-Type'] = $this->_build_params['ctype'];
	}

	$encodedHeaders = $this->_encodeHeaders($headers);
	return $encodedHeaders;
	}

	/**
	* Get the text version of the headers
	* (usefull if you want to use the PHP mail() function)
	*
	* @param array $xtra_headers Assoc array with any extra headers (optional)
	* (Don't set Content-Type for multipart messages here!)
	* @param bool $overwrite Overwrite the existing headers with new.
	* @param bool $skip_content Don't return content headers: Content-Type,
	* Content-Disposition and Content-Transfer-Encoding
	*
	* @return string Plain text headers
	* @access public
	*/
	function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
	{
	$headers = $this->headers($xtra_headers, $overwrite, $skip_content);

	// Place Received: headers at the beginning of the message
	// Spam detectors often flag messages with it after the Subject: as spam
	if (isset($headers['Received'])) {
	$received = $headers['Received'];
	unset($headers['Received']);
	$headers = array('Received' => $received) + $headers;
	}

	$ret = '';
	$eol = $this->_build_params['eol'];

	foreach ($headers as $key => $val) {
	if (is_array($val)) {
	foreach ($val as $value) {
	$ret .= "$key: $value" . $eol;
	}
	} else {
	$ret .= "$key: $val" . $eol;
	}
	}

	return $ret;
	}

	/**
	* Sets message Content-Type header.
	* Use it to build messages with various content-types e.g. miltipart/raport
	* not supported by _contentHeaders() function.
	*
	* @param string $type Type name
	* @param array $params Hash array of header parameters
	*
	* @return void
	* @access public
	* @since 1.7.0
	*/
	function setContentType($type, $params = array())
	{
	$header = $type;

	$eol = !empty($this->_build_params['eol'])
	? $this->_build_params['eol'] : "\r\n";

	// add parameters
	$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
	. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
	if (is_array($params)) {
	foreach ($params as $name => $value) {
	if ($name == 'boundary') {
	$this->_build_params['boundary'] = $value;
	}
	if (!preg_match($token_regexp, $value)) {
	$header .= ";$eol $name=$value";
	} else {
	$value = addcslashes($value, '\\"');
	$header .= ";$eol $name=\"$value\"";
	}
	}
	}

	// add required boundary parameter if not defined
	if (preg_match('/^multipart\//i', $type)) {
	if (empty($this->_build_params['boundary'])) {
	$this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
	}

	$header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
	}

	$this->_build_params['ctype'] = $header;
	}

	/**
	* Sets the Subject header
	*
	* @param string $subject String to set the subject to.
	*
	* @return void
	* @access public
	*/
	function setSubject($subject)
	{
	$this->_headers['Subject'] = $subject;
	}

	/**
	* Set an email to the From (the sender) header
	*
	* @param string $email The email address to use
	*
	* @return void
	* @access public
	*/
	function setFrom($email)
	{
	$this->_headers['From'] = $email;
	}

	/**
	* Add an email to the To header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addTo($email)
	{
	if (isset($this->_headers['To'])) {
	$this->_headers['To'] .= ", $email";
	} else {
	$this->_headers['To'] = $email;
	}
	}

	/**
	* Add an email to the Cc (carbon copy) header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addCc($email)
	{
	if (isset($this->_headers['Cc'])) {
	$this->_headers['Cc'] .= ", $email";
	} else {
	$this->_headers['Cc'] = $email;
	}
	}

	/**
	* Add an email to the Bcc (blank carbon copy) header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addBcc($email)
	{
	if (isset($this->_headers['Bcc'])) {
	$this->_headers['Bcc'] .= ", $email";
	} else {
	$this->_headers['Bcc'] = $email;
	}
	}

	/**
	* Since the PHP send function requires you to specify
	* recipients (To: header) separately from the other
	* headers, the To: header is not properly encoded.
	* To fix this, you can use this public method to
	* encode your recipients before sending to the send
	* function
	*
	* @param string $recipients A comma-delimited list of recipients
	*
	* @return string Encoded data
	* @access public
	*/
	function encodeRecipients($recipients)
	{
	$input = array("To" => $recipients);
	$retval = $this->_encodeHeaders($input);
	return $retval["To"] ;
	}

	/**
	* Encodes headers as per RFC2047
	*
	* @param array $input The header data to encode
	* @param array $params Extra build parameters
	*
	* @return array Encoded data
	* @access private
	*/
	function _encodeHeaders($input, $params = array())
	{
	$build_params = $this->_build_params;
	while (list($key, $value) = each($params)) {
	$build_params[$key] = $value;
	}

	foreach ($input as $hdr_name => $hdr_value) {
	if (is_array($hdr_value)) {
	foreach ($hdr_value as $idx => $value) {
	$input[$hdr_name][$idx] = $this->encodeHeader(
	$hdr_name, $value,
	$build_params['head_charset'], $build_params['head_encoding']
	);
	}
	} else {
	$input[$hdr_name] = $this->encodeHeader(
	$hdr_name, $hdr_value,
	$build_params['head_charset'], $build_params['head_encoding']
	);
	}
	}

	return $input;
	}

	/**
	* Encodes a header as per RFC2047
	*
	* @param string $name The header name
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	*
	* @return string Encoded header data (without a name)
	* @access public
	* @since 1.5.3
	*/
	function encodeHeader($name, $value, $charset, $encoding)
	{
	$mime_part = new Mail_mimePart;
	return $mime_part->encodeHeader(
	$name, $value, $charset, $encoding, $this->_build_params['eol']
	);
	}

	/**
	* Get file's basename (locale independent)
	*
	* @param string $filename Filename
	*
	* @return string Basename
	* @access private
	*/
	function _basename($filename)
	{
	// basename() is not unicode safe and locale dependent
	if (stristr(PHP_OS, 'win') \|\| stristr(PHP_OS, 'netware')) {
	return preg_replace('/^.*[\\\\\\/]/', '', $filename);
	} else {
	return preg_replace('/^.*[\/]/', '', $filename);
	}
	}

	/**
	* Get Content-Type and Content-Transfer-Encoding headers of the message
	*
	* @return array Headers array
	* @access private
	*/
	function _contentHeaders()
	{
	$attachments = count($this->_parts) ? true : false;
	$html_images = count($this->_html_images) ? true : false;
	$html = strlen($this->_htmlbody) ? true : false;
	$text = (!$html && strlen($this->_txtbody)) ? true : false;
	$headers = array();

	// See get()
	switch (true) {
	case $text && !$attachments:
	$headers['Content-Type'] = 'text/plain';
	break;

	case !$text && !$html && $attachments:
	case $text && $attachments:
	case $html && $attachments && !$html_images:
	case $html && $attachments && $html_images:
	$headers['Content-Type'] = 'multipart/mixed';
	break;

	case $html && !$attachments && !$html_images && isset($this->_txtbody):
	case $html && !$attachments && $html_images && isset($this->_txtbody):
	$headers['Content-Type'] = 'multipart/alternative';
	break;

	case $html && !$attachments && !$html_images && !isset($this->_txtbody):
	$headers['Content-Type'] = 'text/html';
	break;

	case $html && !$attachments && $html_images && !isset($this->_txtbody):
	$headers['Content-Type'] = 'multipart/related';
	break;

	default:
	return $headers;
	}

	$this->_checkParams();

	$eol = !empty($this->_build_params['eol'])
	? $this->_build_params['eol'] : "\r\n";

	if ($headers['Content-Type'] == 'text/plain') {
	// single-part message: add charset and encoding
	$charset = 'charset=' . $this->_build_params['text_charset'];
	// place charset parameter in the same line, if possible
	// 26 = strlen("Content-Type: text/plain; ")
	$headers['Content-Type']
	.= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
	$headers['Content-Transfer-Encoding']
	= $this->_build_params['text_encoding'];
	} else if ($headers['Content-Type'] == 'text/html') {
	// single-part message: add charset and encoding
	$charset = 'charset=' . $this->_build_params['html_charset'];
	// place charset parameter in the same line, if possible
	$headers['Content-Type']
	.= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
	$headers['Content-Transfer-Encoding']
	= $this->_build_params['html_encoding'];
	} else {
	// multipart message: and boundary
	if (!empty($this->_build_params['boundary'])) {
	$boundary = $this->_build_params['boundary'];
	} else if (!empty($this->_headers['Content-Type'])
	&& preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
	) {
	$boundary = $m[1];
	} else {
	$boundary = '=_' . md5(rand() . microtime());
	}

	$this->_build_params['boundary'] = $boundary;
	$headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
	}

	return $headers;
	}

	/**
	* Validate and set build parameters
	*
	* @return void
	* @access private
	*/
	function _checkParams()
	{
	$encodings = array('7bit', '8bit', 'base64', 'quoted-printable');

	$this->_build_params['text_encoding']
	= strtolower($this->_build_params['text_encoding']);
	$this->_build_params['html_encoding']
	= strtolower($this->_build_params['html_encoding']);

	if (!in_array($this->_build_params['text_encoding'], $encodings)) {
	$this->_build_params['text_encoding'] = '7bit';
	}
	if (!in_array($this->_build_params['html_encoding'], $encodings)) {
	$this->_build_params['html_encoding'] = '7bit';
	}

	// text body
	if ($this->_build_params['text_encoding'] == '7bit'
	&& !preg_match('/ascii/i', $this->_build_params['text_charset'])
	&& preg_match('/[^\x00-\x7F]/', $this->_txtbody)
	) {
	$this->_build_params['text_encoding'] = 'quoted-printable';
	}
	// html body
	if ($this->_build_params['html_encoding'] == '7bit'
	&& !preg_match('/ascii/i', $this->_build_params['html_charset'])
	&& preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
	) {
	$this->_build_params['html_encoding'] = 'quoted-printable';
	}
	}

	} // End of class
	diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
	index f3cd98e6d..4e4170d8e 100644
	--- a/program/lib/Mail/mimePart.php
	+++ b/program/lib/Mail/mimePart.php
	@@ -1,1205 +1,1228 @@
	<?php
	/**
	* The Mail_mimePart class is used to create MIME E-mail messages
	*
	* This class enables you to manipulate and build a mime email
	* from the ground up. The Mail_Mime class is a userfriendly api
	* to this class for people who aren't interested in the internals
	* of mime mail.
	* This class however allows full control over the email.
	*
	* Compatible with PHP versions 4 and 5
	*
	* LICENSE: This LICENSE is in the BSD license style.
	* Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
	* Copyright (c) 2003-2006, PEAR <pear-group@php.net>
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or
	* without modification, are permitted provided that the following
	* conditions are met:
	*
	* - Redistributions of source code must retain the above copyright
	* notice, this list of conditions and the following disclaimer.
	* - Redistributions in binary form must reproduce the above copyright
	* notice, this list of conditions and the following disclaimer in the
	* documentation and/or other materials provided with the distribution.
	* - Neither the name of the authors, nor the names of its contributors
	* may be used to endorse or promote products derived from this
	* software without specific prior written permission.
	*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	* THE POSSIBILITY OF SUCH DAMAGE.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version 1.8.4
	+ * @version 1.8.5
	* @link http://pear.php.net/package/Mail_mime
	*/


	/**
	* The Mail_mimePart class is used to create MIME E-mail messages
	*
	* This class enables you to manipulate and build a mime email
	* from the ground up. The Mail_Mime class is a userfriendly api
	* to this class for people who aren't interested in the internals
	* of mime mail.
	* This class however allows full control over the email.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.4
	+ * @version Release: 1.8.5
	* @link http://pear.php.net/package/Mail_mime
	*/
	class Mail_mimePart
	{
	/**
	* The encoding type of this part
	*
	* @var string
	* @access private
	*/
	var $_encoding;

	/**
	* An array of subparts
	*
	* @var array
	* @access private
	*/
	var $_subparts;

	/**
	* The output of this part after being built
	*
	* @var string
	* @access private
	*/
	var $_encoded;

	/**
	* Headers for this part
	*
	* @var array
	* @access private
	*/
	var $_headers;

	/**
	* The body of this part (not encoded)
	*
	* @var string
	* @access private
	*/
	var $_body;

	/**
	* The location of file with body of this part (not encoded)
	*
	* @var string
	* @access private
	*/
	var $_body_file;

	/**
	* The end-of-line sequence
	*
	* @var string
	* @access private
	*/
	var $_eol = "\r\n";


	/**
	* Constructor.
	*
	* Sets up the object.
	*
	* @param string $body The body of the mime part if any.
	* @param array $params An associative array of optional parameters:
	* content_type - The content type for this part eg multipart/mixed
	* encoding - The encoding to use, 7bit, 8bit,
	* base64, or quoted-printable
	* charset - Content character set
	* cid - Content ID to apply
	* disposition - Content disposition, inline or attachment
	* filename - Filename parameter for content disposition
	* description - Content description
	* name_encoding - Encoding of the attachment name (Content-Type)
	* By default filenames are encoded using RFC2231
	* Here you can set RFC2047 encoding (quoted-printable
	* or base64) instead
	* filename_encoding - Encoding of the attachment filename (Content-Disposition)
	* See 'name_encoding'
	* headers_charset - Charset of the headers e.g. filename, description.
	* If not set, 'charset' will be used
	* eol - End of line sequence. Default: "\r\n"
	- * headers - Hash array with additional part headers
	+ * headers - Hash array with additional part headers. Array keys can be
	+ * in form of <header_name>:<parameter_name>
	* body_file - Location of file with part's body (instead of $body)
	*
	* @access public
	*/
	function Mail_mimePart($body = '', $params = array())
	{
	if (!empty($params['eol'])) {
	$this->_eol = $params['eol'];
	} else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
	$this->_eol = MAIL_MIMEPART_CRLF;
	}

	// Additional part headers
	if (!empty($params['headers']) && is_array($params['headers'])) {
	$headers = $params['headers'];
	}

	foreach ($params as $key => $value) {
	switch ($key) {
	case 'encoding':
	$this->_encoding = $value;
	$headers['Content-Transfer-Encoding'] = $value;
	break;

	case 'cid':
	$headers['Content-ID'] = '<' . $value . '>';
	break;

	case 'location':
	$headers['Content-Location'] = $value;
	break;

	case 'body_file':
	$this->_body_file = $value;
	break;

	// for backward compatibility
	case 'dfilename':
	$params['filename'] = $value;
	break;
	}
	}

	// Default content-type
	if (empty($params['content_type'])) {
	$params['content_type'] = 'text/plain';
	}

	// Content-Type
	$headers['Content-Type'] = $params['content_type'];
	if (!empty($params['charset'])) {
	$charset = "charset={$params['charset']}";
	// place charset parameter in the same line, if possible
	if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
	$headers['Content-Type'] .= '; ';
	} else {
	$headers['Content-Type'] .= ';' . $this->_eol . ' ';
	}
	$headers['Content-Type'] .= $charset;

	// Default headers charset
	if (!isset($params['headers_charset'])) {
	$params['headers_charset'] = $params['charset'];
	}
	}
	+
	+ // header values encoding parameters
	+ $h_charset = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
	+ $h_language = !empty($params['language']) ? $params['language'] : null;
	+ $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
	+
	+
	if (!empty($params['filename'])) {
	$headers['Content-Type'] .= ';' . $this->_eol;
	$headers['Content-Type'] .= $this->_buildHeaderParam(
	- 'name', $params['filename'],
	- !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
	- !empty($params['language']) ? $params['language'] : null,
	- !empty($params['name_encoding']) ? $params['name_encoding'] : null
	+ 'name', $params['filename'], $h_charset, $h_language, $h_encoding
	);
	}

	// Content-Disposition
	if (!empty($params['disposition'])) {
	$headers['Content-Disposition'] = $params['disposition'];
	if (!empty($params['filename'])) {
	$headers['Content-Disposition'] .= ';' . $this->_eol;
	$headers['Content-Disposition'] .= $this->_buildHeaderParam(
	- 'filename', $params['filename'],
	- !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
	- !empty($params['language']) ? $params['language'] : null,
	+ 'filename', $params['filename'], $h_charset, $h_language,
	!empty($params['filename_encoding']) ? $params['filename_encoding'] : null
	);
	}
	+
	+ // add attachment size
	+ $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
	+ if ($size) {
	+ $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
	+ }
	}

	if (!empty($params['description'])) {
	$headers['Content-Description'] = $this->encodeHeader(
	- 'Content-Description', $params['description'],
	- !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII',
	- !empty($params['name_encoding']) ? $params['name_encoding'] : 'quoted-printable',
	+ 'Content-Description', $params['description'], $h_charset, $h_encoding,
	$this->_eol
	);
	}

	+ // Search and add existing headers' parameters
	+ foreach ($headers as $key => $value) {
	+ $items = explode(':', $key);
	+ if (count($items) == 2) {
	+ $header = $items[0];
	+ $param = $items[1];
	+ if (isset($headers[$header])) {
	+ $headers[$header] .= ';' . $this->_eol;
	+ }
	+ $headers[$header] .= $this->_buildHeaderParam(
	+ $param, $value, $h_charset, $h_language, $h_encoding
	+ );
	+ unset($headers[$key]);
	+ }
	+ }
	+
	// Default encoding
	if (!isset($this->_encoding)) {
	$this->_encoding = '7bit';
	}

	// Assign stuff to member variables
	$this->_encoded = array();
	$this->_headers = $headers;
	$this->_body = $body;
	}

	/**
	* Encodes and returns the email. Also stores
	* it in the encoded member variable
	*
	* @param string $boundary Pre-defined boundary string
	*
	* @return An associative array containing two elements,
	* body and headers. The headers element is itself
	* an indexed array. On error returns PEAR error object.
	* @access public
	*/
	function encode($boundary=null)
	{
	$encoded =& $this->_encoded;

	if (count($this->_subparts)) {
	$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
	$eol = $this->_eol;

	$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";

	$encoded['body'] = '';

	for ($i = 0; $i < count($this->_subparts); $i++) {
	$encoded['body'] .= '--' . $boundary . $eol;
	$tmp = $this->_subparts[$i]->encode();
	if (PEAR::isError($tmp)) {
	return $tmp;
	}
	foreach ($tmp['headers'] as $key => $value) {
	$encoded['body'] .= $key . ': ' . $value . $eol;
	}
	$encoded['body'] .= $eol . $tmp['body'] . $eol;
	}

	$encoded['body'] .= '--' . $boundary . '--' . $eol;

	} else if ($this->_body) {
	$encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
	} else if ($this->_body_file) {
	// Temporarily reset magic_quotes_runtime for file reads and writes
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}
	$body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	if (PEAR::isError($body)) {
	return $body;
	}
	$encoded['body'] = $body;
	} else {
	$encoded['body'] = '';
	}

	// Add headers to $encoded
	$encoded['headers'] =& $this->_headers;

	return $encoded;
	}

	/**
	* Encodes and saves the email into file. File must exist.
	* Data will be appended to the file.
	*
	* @param string $filename Output file location
	* @param string $boundary Pre-defined boundary string
	* @param boolean $skip_head True if you don't want to save headers
	*
	* @return array An associative array containing message headers
	* or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function encodeToFile($filename, $boundary=null, $skip_head=false)
	{
	if (file_exists($filename) && !is_writable($filename)) {
	$err = PEAR::raiseError('File is not writeable: ' . $filename);
	return $err;
	}

	if (!($fh = fopen($filename, 'ab'))) {
	$err = PEAR::raiseError('Unable to open file: ' . $filename);
	return $err;
	}

	// Temporarily reset magic_quotes_runtime for file reads and writes
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	$res = $this->_encodePartToFile($fh, $boundary, $skip_head);

	fclose($fh);

	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	return PEAR::isError($res) ? $res : $this->_headers;
	}

	/**
	* Encodes given email part into file
	*
	* @param string $fh Output file handle
	* @param string $boundary Pre-defined boundary string
	* @param boolean $skip_head True if you don't want to save headers
	*
	* @return array True on sucess or PEAR error object
	* @access private
	*/
	function _encodePartToFile($fh, $boundary=null, $skip_head=false)
	{
	$eol = $this->_eol;

	if (count($this->_subparts)) {
	$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
	$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
	}

	if (!$skip_head) {
	foreach ($this->_headers as $key => $value) {
	fwrite($fh, $key . ': ' . $value . $eol);
	}
	$f_eol = $eol;
	} else {
	$f_eol = '';
	}

	if (count($this->_subparts)) {
	for ($i = 0; $i < count($this->_subparts); $i++) {
	fwrite($fh, $f_eol . '--' . $boundary . $eol);
	$res = $this->_subparts[$i]->_encodePartToFile($fh);
	if (PEAR::isError($res)) {
	return $res;
	}
	$f_eol = $eol;
	}

	fwrite($fh, $eol . '--' . $boundary . '--' . $eol);

	} else if ($this->_body) {
	fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
	} else if ($this->_body_file) {
	fwrite($fh, $f_eol);
	$res = $this->_getEncodedDataFromFile(
	$this->_body_file, $this->_encoding, $fh
	);
	if (PEAR::isError($res)) {
	return $res;
	}
	}

	return true;
	}

	/**
	* Adds a subpart to current mime part and returns
	* a reference to it
	*
	* @param string $body The body of the subpart, if any.
	* @param array $params The parameters for the subpart, same
	* as the $params argument for constructor.
	*
	* @return Mail_mimePart A reference to the part you just added. It is
	* crucial if using multipart/* in your subparts that
	* you use =& in your script when calling this function,
	* otherwise you will not be able to add further subparts.
	* @access public
	*/
	function &addSubpart($body, $params)
	{
	$this->_subparts[] = new Mail_mimePart($body, $params);
	return $this->_subparts[count($this->_subparts) - 1];
	}

	/**
	* Returns encoded data based upon encoding passed to it
	*
	* @param string $data The data to encode.
	* @param string $encoding The encoding type to use, 7bit, base64,
	* or quoted-printable.
	*
	* @return string
	* @access private
	*/
	function _getEncodedData($data, $encoding)
	{
	switch ($encoding) {
	case 'quoted-printable':
	return $this->_quotedPrintableEncode($data);
	break;

	case 'base64':
	return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
	break;

	case '8bit':
	case '7bit':
	default:
	return $data;
	}
	}

	/**
	* Returns encoded data based upon encoding passed to it
	*
	* @param string $filename Data file location
	* @param string $encoding The encoding type to use, 7bit, base64,
	* or quoted-printable.
	* @param resource $fh Output file handle. If set, data will be
	* stored into it instead of returning it
	*
	* @return string Encoded data or PEAR error object
	* @access private
	*/
	function _getEncodedDataFromFile($filename, $encoding, $fh=null)
	{
	if (!is_readable($filename)) {
	$err = PEAR::raiseError('Unable to read file: ' . $filename);
	return $err;
	}

	if (!($fd = fopen($filename, 'rb'))) {
	$err = PEAR::raiseError('Could not open file: ' . $filename);
	return $err;
	}

	$data = '';

	switch ($encoding) {
	case 'quoted-printable':
	while (!feof($fd)) {
	$buffer = $this->_quotedPrintableEncode(fgets($fd));
	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	break;

	case 'base64':
	while (!feof($fd)) {
	// Should read in a multiple of 57 bytes so that
	// the output is 76 bytes per line. Don't use big chunks
	// because base64 encoding is memory expensive
	$buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
	$buffer = base64_encode($buffer);
	$buffer = chunk_split($buffer, 76, $this->_eol);
	if (feof($fd)) {
	$buffer = rtrim($buffer);
	}

	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	break;

	case '8bit':
	case '7bit':
	default:
	while (!feof($fd)) {
	$buffer = fread($fd, 1048576); // 1 MB
	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	}

	fclose($fd);

	if (!$fh) {
	return $data;
	}
	}

	/**
	* Encodes data to quoted-printable standard.
	*
	* @param string $input The data to encode
	* @param int $line_max Optional max line length. Should
	* not be more than 76 chars
	*
	* @return string Encoded data
	*
	* @access private
	*/
	function _quotedPrintableEncode($input , $line_max = 76)
	{
	$eol = $this->_eol;
	/*
	// imap_8bit() is extremely fast, but doesn't handle properly some characters
	if (function_exists('imap_8bit') && $line_max == 76) {
	$input = preg_replace('/\r?\n/', "\r\n", $input);
	$input = imap_8bit($input);
	if ($eol != "\r\n") {
	$input = str_replace("\r\n", $eol, $input);
	}
	return $input;
	}
	*/
	$lines = preg_split("/\r?\n/", $input);
	$escape = '=';
	$output = '';

	while (list($idx, $line) = each($lines)) {
	$newline = '';
	$i = 0;

	while (isset($line[$i])) {
	$char = $line[$i];
	$dec = ord($char);
	$i++;

	if (($dec == 32) && (!isset($line[$i]))) {
	// convert space at eol only
	$char = '=20';
	} elseif ($dec == 9 && isset($line[$i])) {
	; // Do nothing if a TAB is not on eol
	} elseif (($dec == 61) \|\| ($dec < 32) \|\| ($dec > 126)) {
	$char = $escape . sprintf('%02X', $dec);
	} elseif (($dec == 46) && (($newline == '')
	\|\| ((strlen($newline) + strlen("=2E")) >= $line_max))
	) {
	// Bug #9722: convert full-stop at bol,
	// some Windows servers need this, won't break anything (cipri)
	// Bug #11731: full-stop at bol also needs to be encoded
	// if this line would push us over the line_max limit.
	$char = '=2E';
	}

	// Note, when changing this line, also change the ($dec == 46)
	// check line, as it mimics this line due to Bug #11731
	// EOL is not counted
	if ((strlen($newline) + strlen($char)) >= $line_max) {
	// soft line break; " =\r\n" is okay
	$output .= $newline . $escape . $eol;
	$newline = '';
	}
	$newline .= $char;
	} // end of for
	$output .= $newline . $eol;
	unset($lines[$idx]);
	}
	// Don't want last crlf
	$output = substr($output, 0, -1 * strlen($eol));
	return $output;
	}

	/**
	* Encodes the paramater of a header.
	*
	* @param string $name The name of the header-parameter
	* @param string $value The value of the paramter
	* @param string $charset The characterset of $value
	* @param string $language The language used in $value
	* @param string $encoding Parameter encoding. If not set, parameter value
	* is encoded according to RFC2231
	* @param int $maxLength The maximum length of a line. Defauls to 75
	*
	* @return string
	*
	* @access private
	*/
	function _buildHeaderParam($name, $value, $charset=null, $language=null,
	$encoding=null, $maxLength=75
	) {
	// RFC 2045:
	// value needs encoding if contains non-ASCII chars or is longer than 78 chars
	if (!preg_match('#[^\x20-\x7E]#', $value)) {
	$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
	. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
	if (!preg_match($token_regexp, $value)) {
	// token
	if (strlen($name) + strlen($value) + 3 <= $maxLength) {
	return " {$name}={$value}";
	}
	} else {
	// quoted-string
	$quoted = addcslashes($value, '\\"');
	if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
	return " {$name}=\"{$quoted}\"";
	}
	}
	}

	// RFC2047: use quoted-printable/base64 encoding
	if ($encoding == 'quoted-printable' \|\| $encoding == 'base64') {
	return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
	}

	// RFC2231:
	$encValue = preg_replace_callback(
	'/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
	array($this, '_encodeReplaceCallback'), $value
	);
	$value = "$charset'$language'$encValue";

	$header = " {$name}*={$value}";
	if (strlen($header) <= $maxLength) {
	return $header;
	}

	$preLength = strlen(" {$name}0=");
	$maxLength = max(16, $maxLength - $preLength - 3);
	$maxLengthReg = "\|(.{0,$maxLength}[^\%][^\%])\|";

	$headers = array();
	$headCount = 0;
	while ($value) {
	$matches = array();
	$found = preg_match($maxLengthReg, $value, $matches);
	if ($found) {
	$headers[] = " {$name}{$headCount}={$matches[0]}";
	$value = substr($value, strlen($matches[0]));
	} else {
	$headers[] = " {$name}{$headCount}={$value}";
	$value = '';
	}
	$headCount++;
	}

	$headers = implode(';' . $this->_eol, $headers);
	return $headers;
	}

	/**
	* Encodes header parameter as per RFC2047 if needed
	*
	* @param string $name The parameter name
	* @param string $value The parameter value
	* @param string $charset The parameter charset
	* @param string $encoding Encoding type (quoted-printable or base64)
	* @param int $maxLength Encoded parameter max length. Default: 76
	*
	* @return string Parameter line
	* @access private
	*/
	function _buildRFC2047Param($name, $value, $charset,
	$encoding='quoted-printable', $maxLength=76
	) {
	// WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
	// parameter of a MIME Content-Type or Content-Disposition field",
	// but... it's supported by many clients/servers
	$quoted = '';

	if ($encoding == 'base64') {
	$value = base64_encode($value);
	$prefix = '=?' . $charset . '?B?';
	$suffix = '?=';

	// 2 x SPACE, 2 x '"', '=', ';'
	$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
	$len = $add_len + strlen($value);

	while ($len > $maxLength) {
	// We can cut base64-encoded string every 4 characters
	$real_len = floor(($maxLength - $add_len) / 4) * 4;
	$_quote = substr($value, 0, $real_len);
	$value = substr($value, $real_len);

	$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
	$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
	$len = strlen($value) + $add_len;
	}
	$quoted .= $prefix . $value . $suffix;

	} else {
	// quoted-printable
	$value = $this->encodeQP($value);
	$prefix = '=?' . $charset . '?Q?';
	$suffix = '?=';

	// 2 x SPACE, 2 x '"', '=', ';'
	$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
	$len = $add_len + strlen($value);

	while ($len > $maxLength) {
	$length = $maxLength - $add_len;
	// don't break any encoded letters
	if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
	$_quote = $matches[1];
	}

	$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
	$value = substr($value, strlen($_quote));
	$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
	$len = strlen($value) + $add_len;
	}

	$quoted .= $prefix . $value . $suffix;
	}

	return " {$name}=\"{$quoted}\"";
	}

	/**
	* Encodes a header as per RFC2047
	*
	* @param string $name The header name
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded header data (without a name)
	* @access public
	* @since 1.6.1
	*/
	function encodeHeader($name, $value, $charset='ISO-8859-1',
	$encoding='quoted-printable', $eol="\r\n"
	) {
	// Structured headers
	$comma_headers = array(
	'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
	'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
	'resent-sender', 'resent-reply-to',
	'return-receipt-to', 'disposition-notification-to',
	);
	$other_headers = array(
	'references', 'in-reply-to', 'message-id', 'resent-message-id',
	);

	$name = strtolower($name);

	if (in_array($name, $comma_headers)) {
	$separator = ',';
	} else if (in_array($name, $other_headers)) {
	$separator = ' ';
	}

	if (!$charset) {
	$charset = 'ISO-8859-1';
	}

	// Structured header (make sure addr-spec inside is not encoded)
	if (!empty($separator)) {
	// Simple e-mail address regexp
	$email_regexp = '([^\s<]+\|("[^\r\n"]+"))@\S+';

	$parts = Mail_mimePart::_explodeQuotedString($separator, $value);
	$value = '';

	foreach ($parts as $part) {
	$part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
	$part = trim($part);

	if (!$part) {
	continue;
	}
	if ($value) {
	$value .= $separator==',' ? $separator.' ' : ' ';
	} else {
	$value = $name . ': ';
	}

	// let's find phrase (name) and/or addr-spec
	if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
	$value .= $part;
	} else if (preg_match('/^' . $email_regexp . '$/', $part)) {
	// address without brackets and without name
	$value .= $part;
	} else if (preg_match('/<' . $email_regexp . '>$/', $part, $matches)) {
	// address with name (handle name)
	$address = $matches[0];
	$word = str_replace($address, '', $part);
	$word = trim($word);
	// check if phrase requires quoting
	if ($word) {
	// non-ASCII: require encoding
	if (preg_match('#([\x80-\xFF]){1}#', $word)) {
	if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
	// de-quote quoted-string, encoding changes
	// string to atom
	$search = array("\\\"", "\\\\");
	$replace = array("\"", "\\");
	$word = str_replace($search, $replace, $word);
	$word = substr($word, 1, -1);
	}
	// find length of last line
	if (($pos = strrpos($value, $eol)) !== false) {
	$last_len = strlen($value) - $pos;
	} else {
	$last_len = strlen($value);
	}
	$word = Mail_mimePart::encodeHeaderValue(
	$word, $charset, $encoding, $last_len, $eol
	);
	} else if (($word[0] != '"' \|\| $word[strlen($word)-1] != '"')
	&& preg_match('/[\<\>\\\.\[\]@,;:"]/', $word)
	) {
	// ASCII: quote string if needed
	$word = '"'.addcslashes($word, '\\"').'"';
	}
	}
	$value .= $word.' '.$address;
	} else {
	// addr-spec not found, don't encode (?)
	$value .= $part;
	}

	// RFC2822 recommends 78 characters limit, use 76 from RFC2047
	$value = wordwrap($value, 76, $eol . ' ');
	}

	// remove header name prefix (there could be EOL too)
	$value = preg_replace(
	'/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
	);

	} else {
	// Unstructured header
	// non-ASCII: require encoding
	if (preg_match('#([\x80-\xFF]){1}#', $value)) {
	if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
	// de-quote quoted-string, encoding changes
	// string to atom
	$search = array("\\\"", "\\\\");
	$replace = array("\"", "\\");
	$value = str_replace($search, $replace, $value);
	$value = substr($value, 1, -1);
	}
	$value = Mail_mimePart::encodeHeaderValue(
	$value, $charset, $encoding, strlen($name) + 2, $eol
	);
	} else if (strlen($name.': '.$value) > 78) {
	// ASCII: check if header line isn't too long and use folding
	$value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
	$tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
	$value = preg_replace('/^'.$name.':\s*/', '', $tmp);
	// hard limit 998 (RFC2822)
	$value = wordwrap($value, 998, $eol . ' ', true);
	}
	}

	return $value;
	}

	/**
	* Explode quoted string
	*
	* @param string $delimiter Delimiter expression string for preg_match()
	* @param string $string Input string
	*
	* @return array String tokens array
	* @access private
	*/
	function _explodeQuotedString($delimiter, $string)
	{
	$result = array();
	$strlen = strlen($string);

	for ($q=$p=$i=0; $i < $strlen; $i++) {
	if ($string[$i] == "\""
	&& (empty($string[$i-1]) \|\| $string[$i-1] != "\\")
	) {
	$q = $q ? false : true;
	} else if (!$q && preg_match("/$delimiter/", $string[$i])) {
	$result[] = substr($string, $p, $i - $p);
	$p = $i + 1;
	}
	}

	$result[] = substr($string, $p);
	return $result;
	}

	/**
	* Encodes a header value as per RFC2047
	*
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param int $prefix_len Prefix length. Default: 0
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded header data
	* @access public
	* @since 1.6.1
	*/
	function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
	{
	// #17311: Use multibyte aware method (requires mbstring extension)
	if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
	return $result;
	}

	// Generate the header using the specified params and dynamicly
	// determine the maximum length of such strings.
	// 75 is the value specified in the RFC.
	$encoding = $encoding == 'base64' ? 'B' : 'Q';
	$prefix = '=?' . $charset . '?' . $encoding .'?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix);
	$maxLength1stLine = $maxLength - $prefix_len;

	if ($encoding == 'B') {
	// Base64 encode the entire string
	$value = base64_encode($value);

	// We can cut base64 every 4 characters, so the real max
	// we can get must be rounded down.
	$maxLength = $maxLength - ($maxLength % 4);
	$maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);

	$cutpoint = $maxLength1stLine;
	$output = '';

	while ($value) {
	// Split translated string at every $maxLength
	$part = substr($value, 0, $cutpoint);
	$value = substr($value, $cutpoint);
	$cutpoint = $maxLength;
	// RFC 2047 specifies that any split header should
	// be seperated by a CRLF SPACE.
	if ($output) {
	$output .= $eol . ' ';
	}
	$output .= $prefix . $part . $suffix;
	}
	$value = $output;
	} else {
	// quoted-printable encoding has been selected
	$value = Mail_mimePart::encodeQP($value);

	// This regexp will break QP-encoded text at every $maxLength
	// but will not break any encoded letters.
	$reg1st = "\|(.{0,$maxLength1stLine}[^\=][^\=])\|";
	$reg2nd = "\|(.{0,$maxLength}[^\=][^\=])\|";

	if (strlen($value) > $maxLength1stLine) {
	// Begin with the regexp for the first line.
	$reg = $reg1st;
	$output = '';
	while ($value) {
	// Split translated string at every $maxLength
	// But make sure not to break any translated chars.
	$found = preg_match($reg, $value, $matches);

	// After this first line, we need to use a different
	// regexp for the first line.
	$reg = $reg2nd;

	// Save the found part and encapsulate it in the
	// prefix & suffix. Then remove the part from the
	// $value_out variable.
	if ($found) {
	$part = $matches[0];
	$len = strlen($matches[0]);
	$value = substr($value, $len);
	} else {
	$part = $value;
	$value = '';
	}

	// RFC 2047 specifies that any split header should
	// be seperated by a CRLF SPACE
	if ($output) {
	$output .= $eol . ' ';
	}
	$output .= $prefix . $part . $suffix;
	}
	$value = $output;
	} else {
	$value = $prefix . $value . $suffix;
	}
	}

	return $value;
	}

	/**
	* Encodes the given string using quoted-printable
	*
	* @param string $str String to encode
	*
	* @return string Encoded string
	* @access public
	* @since 1.6.0
	*/
	function encodeQP($str)
	{
	// Bug #17226 RFC 2047 restricts some characters
	// if the word is inside a phrase, permitted chars are only:
	// ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"

	// "=", "_", "?" must be encoded
	$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
	$str = preg_replace_callback(
	$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
	);

	return str_replace(' ', '_', $str);
	}

	/**
	* Encodes the given string using base64 or quoted-printable.
	* This method makes sure that encoded-word represents an integral
	* number of characters as per RFC2047.
	*
	* @param string $str String to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param int $prefix_len Prefix length. Default: 0
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded string
	* @access public
	* @since 1.8.0
	*/
	function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
	{
	if (!function_exists('mb_substr') \|\| !function_exists('mb_strlen')) {
	return;
	}

	$encoding = $encoding == 'base64' ? 'B' : 'Q';
	// 75 is the value specified in the RFC
	$prefix = '=?' . $charset . '?'.$encoding.'?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix);

	// A multi-octet character may not be split across adjacent encoded-words
	// So, we'll loop over each character
	// mb_stlen() with wrong charset will generate a warning here and return null
	$length = mb_strlen($str, $charset);
	$result = '';
	$line_length = $prefix_len;

	if ($encoding == 'B') {
	// base64
	$start = 0;
	$prev = '';

	for ($i=1; $i<=$length; $i++) {
	// See #17311
	$chunk = mb_substr($str, $start, $i-$start, $charset);
	$chunk = base64_encode($chunk);
	$chunk_len = strlen($chunk);

	if ($line_length + $chunk_len == $maxLength \|\| $i == $length) {
	if ($result) {
	$result .= "\n";
	}
	$result .= $chunk;
	$line_length = 0;
	$start = $i;
	} else if ($line_length + $chunk_len > $maxLength) {
	if ($result) {
	$result .= "\n";
	}
	if ($prev) {
	$result .= $prev;
	}
	$line_length = 0;
	$start = $i - 1;
	} else {
	$prev = $chunk;
	}
	}
	} else {
	// quoted-printable
	// see encodeQP()
	$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';

	for ($i=0; $i<=$length; $i++) {
	$char = mb_substr($str, $i, 1, $charset);
	// RFC recommends underline (instead of =20) in place of the space
	// that's one of the reasons why we're not using iconv_mime_encode()
	if ($char == ' ') {
	$char = '_';
	$char_len = 1;
	} else {
	$char = preg_replace_callback(
	$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
	);
	$char_len = strlen($char);
	}

	if ($line_length + $char_len > $maxLength) {
	if ($result) {
	$result .= "\n";
	}
	$line_length = 0;
	}

	$result .= $char;
	$line_length += $char_len;
	}
	}

	if ($result) {
	$result = $prefix
	.str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
	}

	return $result;
	}

	/**
	* Callback function to replace extended characters (\x80-xFF) with their
	* ASCII values (RFC2047: quoted-printable)
	*
	* @param array $matches Preg_replace's matches array
	*
	* @return string Encoded character string
	* @access private
	*/
	function _qpReplaceCallback($matches)
	{
	return sprintf('=%02X', ord($matches[1]));
	}

	/**
	* Callback function to replace extended characters (\x80-xFF) with their
	* ASCII values (RFC2231)
	*
	* @param array $matches Preg_replace's matches array
	*
	* @return string Encoded character string
	* @access private
	*/
	function _encodeReplaceCallback($matches)
	{
	return sprintf('%%%02X', ord($matches[1]));
	}

	} // End of class

File Metadata

Mime Type: text/x-diff
Expires: Mon, Sep 15, 9:36 AM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 287518
Default Alt Text: (175 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions