No OneTemporary
Actions

Size

88 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index b109156dd..975e442ed 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1476 +1,1480 @@
	CHANGELOG RoundCube Webmail
	---------------------------

	+2008/09/25 (alec)
	+----------
	+- Fix problem with non-ascii attachment names in Mail_mime (#1485267, #1485096)
	+
	2008/09/23 (alec)
	----------
	- 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

	2008/09/19 (thomasb)
	----------
	- Made config files location configurable (#1485215)

	2008/09/16 (alec)
	----------
	- Reduced memory footprint when forwarding attachments (#1485345)
	- Fix inline images handling when replying/forwarding html messages
	- 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)

	2008/09/15 (thomasb)
	----------
	- Redesign of the identities settings (#1484042)
	- Add config option to disable creation/deletion of identities (#1484498)

	2008/09/15 (alec)
	----------
	- Added 'sendmail_delay' option to restrict messages sending interval (#1484491)

	2008/09/12 (alec)
	----------
	- 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)

	2008/09/12 (thomasb)
	----------
	- 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

	2008/09/05 (thomasb)
	----------
	- Enable export of address book contacts as vCard
	- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946)
	- Applied mime_decode patch by David Lublink
	- 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)

	2008/09/04 (alec)
	----------
	- Truncate very long (above 50 characters) attachment filenames when displaying
	- Support \" and \\ in quoted strings when parsing BODYSTRUCTURE (mime.inc)
	- Allow 'readonly' atributes in input and textarea (#1485312)

	2008/09/03 (thomasb)
	----------
	- Allow to auto-detect client language if none set (#1484434)
	- Auto-detect the client timezone (user configurable)

	2008/09/03 (alec)
	----------
	- Add RFC2231 header value continuations support for attachment
	filenames + hack for servers that not support that feature
	- Fix Reply-To header displaying (#1485314)

	2008/09/02 (thomasb)
	----------
	- Add feature to import contacts from vcard files (#1326103)
	- Mark form buttons that provide the most obvious operation (mainaction)

	2008/08/30 (alec)
	----------
	- Improved HTML to TXT conversion by html2text class update
	to version 1.0.0

	2008/08/28 (alec)
	----------
	- Added option 'quota_zero_as_unlimited' (#1484604)
	- Added PRE handling in html2text class (#1484740)

	2008/08/28 (robin)
	----------
	- Added folder hierarchy collapsing

	2008/08/27 (alec)
	----------
	- Added options to use syslog instead of log file (#1484850)
	- Added Logging & Debugging section in Installer
	- Write to smtp log also sent MDN confirmations

	2008/08/26 (alec)
	----------
	- Removed support for PEAR::DB driver

	2008/08/21 (alec)
	----------
	- Add Content-Length header while attachments downloading (#1484256)
	- Fix In-Reply-To and References headers when composing saved draft
	message (#1485288)
	- Removed PHP4 class constructors
	- Fix html message charset conversion for charsets with underline (#1485287)
	- Fix buttons status after contacts deletion (#1485233)

	2008/08/21 (estadtherr)
	----------
	- Fix escaping of To: and From: fields when building message body for reply
	or forward in the HTML editor (#1484904)

	2008/08/15 (thomasb)
	----------
	- 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)

	2008/08/09 (alec)
	----------
	- Case insensitive contacts searching using PostgreSQL (#1485259)

	2008/07/31 (thomasb)
	----------
	- 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)

	2008/07/21 (alec)
	----------
	- use long date format in print mode (#1485191)

	2008/07/18 (alec)
	----------
	- Updated TinyMCE to version 3.1.0.1

	2008/07/14 (thomasb)
	----------
	- Re-enable autocomplete attribute for login form (#1485211)
	- Check PERMANENTFLAGS before saving $MDNSent flag (#1484963, #1485163)

	2008/06/30 (alec)
	----------
	- Added flag column on messages list (#1484623)

	2008/06/24 (alec)
	----------
	- Patched Mail/MimePart.php (http://pear.php.net/bugs/bug.php?id=14232)

	2008/06/24 (alec)
	----------
	- Allow trash/junk subfolders to be purged (#1485085)

	2008/06/20 (alec)
	----------
	- Added Azerbaijani translation

	2008/06/20 (thomasb)
	----------
	- Store compose parameters in session and redirect to a unique URL

	2008/06/18 (thomasb)
	----------
	- Fixed CRAM-MD5 authentication (#1484819)
	- Add fallback to old 'skin_path' property

	2008/06/16 (alec)
	----------
	- Fixed sending emoticons
	- Fixed forwarding messages with one HTML attachment (#1484442)
	- Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1484914)

	2008/06/15 (alec)
	----------
	- Added option to select skin in user preferences
	WARNING: option 'skin_path' replaced by 'skin' option!

	2008/06/14 (alec)
	----------
	- Added option to disable displaying of attached images below the message body

	2008/06/13 (alec)
	----------
	- Added option to display images in messages from known senders (#1484601)
	- Updated PEAR::Mail_Mime
	- User preferences grouped in more fieldsets

	2008/06/12 (alec)
	----------
	- 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)

	2008/06/11 (alec)
	----------
	- Don't call expunge and don't remove message row after message move
	if flag_for_deletion is set to true (#1485002)

	2008/06/08 (alec)
	----------
	- Added option to disable autocompletion from selected LDAP address books (#1484922)

	2008/06/07 (thomasb)
	----------
	- Cleaned up localization names. Now named with lang_COUNTRY according to ISO 639-1/3166-1
	- Updated Catalan localization

	2008/06/06 (robin)
	----------
	- Add option to log successful logins

	2008/06/06 (alec)
	----------
	- TLS support in LDAP connections: 'use_tls' property (#1485104)

	2008/06/05 (alec)
	----------
	- Fix removing messages from search set after deleting them (#1485106)

	2008/06/03 (alec)
	----------
	- imap.inc: Fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
	- imap.inc: Fixed iil_C_FetchStructureString() to handle many
	literal strings in response (#1484969)
	- imap.inc: Removed hardcoded data size in iil_ReadLine()

	2008/05/30 (alec)
	----------
	- Support for subfolders in default/protected folders (#1484665)
	- Disallowed delimiter in folder name (#1484803)
	- Support " and \ in folder names
	- Escape \ in login (#1484614)

	2008/05/29 (thomasb)
	----------
	- Better HTML sanitization with the DOM-based washtml script (#1484701)

	2008/05/29 (alec)
	----------
	- Polish localization folder renamed to pl_PL

	2008/05/28 (alec)
	----------
	- Fixed sorting of folders with non-ascii characters

	2008/05/21 (alec)
	----------
	- Localized pagetitle in Settings and Address Book

	2008/05/19 (alec)
	----------
	- Fixed Mysql DDL for default identities creation (#1485070)

	2008/05/16 (alec)
	----------
	- In Preferences added possibility to configure 'read_when_deleted',
	'mdn_requests', 'flag_for_deletion' options

	2008/05/15 (thomasb)
	----------
	- Make IMAP auth type configurable (#1483825)
	- Fix empty values with FROM_UNIXTIME() in rcube_mdb2 (#1485055)

	2008/05/15 (alec)
	----------
	- Fix attachment list on IE 6/7 (#1484807)

	2008/05/12 (estadtherr)
	----------
	- fix JavaScript in compose.html that shows cc/bcc fields if populated

	2008/05/12 (alec)
	----------
	- Updated PEAR::DB package to version 1.7.13

	2008/05/10 (alec)
	----------
	- Make password input fields of type password in installer (#1484886)

	2008/05/09 (alec)
	----------
	- Don't call CAPABILITY if was recieved as server's optional response
	on connect (RFC3501 [7.1])

	2008/05/08 (alec)
	----------
	- Don't attempt to delete cache entries if enable_caching is FALSE (#1485051)
	- Optimized messages sorting on servers without sort capability (#1485049)
	- Option 'use_SQL_address_book' replaced by 'address_book_type'
	- Corrected message headers decoding when charset isn't specified and improved
	support for native languages (#1485050, #1485048)

	2008/05/07 (davidke/richs)
	----------
	- Completed LDAP address book support so it can now write to an LDAP server.
	- Expanded LDAP configuration options to support LDAP server writes.
	- Modified config/main.inc.php.dist:
	New Option: $rcmail_config['use_SQL_address_book']
	Changed Option: $rcmail_config['ldap_public']['Verisign']

	2008/05/05 (alec)
	----------
	- Installer: encode special characters in DB username/password (#1485042)
	- Do charset conversion also for from/to column on messages list
	- Fix management of folders with national characters in names (#1485036, #1485001)

	2008/05/02 (alec)
	----------
	- Updated MDB2 package to version 2.5.0b1
	- Updated MDB2 pgsql, mysql, mysqli, sqlite drivers to version 1.5.0b1
	- Updated MDB2 mssql driver to version 1.3.0b1
	- Fixed identities saving when using MDB2 pgsql driver (#1485032)

	2008/05/01 (alec)
	----------
	- Fix BCC header reset (#1484997)

	2008/04/30 (thomasb)
	----------
	- Introduce new application class 'rcmail' and get rid of some global vars

	2008/04/29 (alec)
	----------
	- improved messages list performance - patch from Justin Heesemann

	2008/04/23 (alec)
	----------
	- Append skin_path to images location only when it starts
	with '/' sign (#1484859)

	2008/04/20 (estadtherr)
	----------
	- fix parse_attrib_string to handle unquoted values, which fixes
	display issues with HTML messages that do not quote attributes

	2008/04/17 (alec)
	----------
	- Fix IMAP response in message body when message has no body (#1484964)
	- Updated PEAR::Auth_SASL to 1.0.2
	- Fix non-RFC dates formatting (#1484901)

	2008/04/16 (estadtherr)
	----------
	- Fix mail sending with new TinyMCE

	2008/04/16 (alec)
	----------
	- Fix typo in set_charset() (#1484991)
	- Decode entities when inserting HTML signature to plain text message (#1484990)

	2008/04/15 (estadtherr)
	----------
	- HTML editing is now working with PHP5 updates and TinyMCE v3.0.6
	- fix signature loading on Windows (#1484545)
	- add language support to HTML editing (#1484862)

	2008/04/15 (alec)
	----------
	- Fix remove signature when replying (#1333167)
	- Fix problem with line with a space at the end (#1484916)
	- Don't send set_env() in ajax response when env array is empty
	- Fix <!DOCTYPE> tag filtering (#1484391)
	- Fix <?xml> tag filtering (#1484403)

	2008/04/14 (alec)
	----------
	- Added sections (fieldset+label) in Settings interface

	2008/04/12 (alec)
	----------
	- Fixed and optimized 'read_when_deleted': mark as read on server side
	in one action when marking as deleted, fixed js bugs when deleting
	from message preview page

	2008/04/12 (thomasb)
	----------
	- Changed codebase to PHP5 with autoloader
	- Added some new classes from devel-vnext branch

	2008/04/11 (alec)
	----------
	- Mark as read in one action with message preview (#1484972)
	- Delete redundant quota reads (#1484972)
	- Add options for empty trash and expunge inbox on logout (#1483863)

	2008/04/10 (alec)
	----------
	- Add rows highlighting in onmousemove on ksearch list
	- Remove lines wrapping when displaying message
	- Fix month localization
	- Do ob_start/ob_end_clean when reading config files (#1484624)
	- Fix debug (ajax) console

	2008/04/02 (alec)
	----------
	- Updated timezones list (#1484908)
	- Fix design in Settings (#1484799)
	- Fix deleting messages after clicking on "All" (#1484838)
	- Fix sorting o0f message list when default folder is empty (#1484317)
	- Fix creating a new folder w/a comma in its name (#1484681)

	2008/04/01 (thomasb)
	----------
	- Fix Enter problem on login (#1484839)
	- Make the http-received header in outgoing mails configurable

	2008/03/30 (till)
	----------
	- Fix Firefox problem with ob_gzhandler (#1484932)
	- Improve message previewpane - less loading (#1484316)

	2008/03/28 (thomasb)
	----------
	- Disable installer by default; add config option to enable it again

	2008/03/24 (till)
	----------
	- Don't send mark requests for already marked messages (#1484906)
	- Fix "quote inside a quote" (#1484783)

	2008/03/23 (till)

	- Applied patch to strip newlines from headers (#1484811)
	- Applied patch to trim login (#1484231)
	- Added robots.txt
	- Fix attachment problem when restoring saved draft without body (#1484506)
	- Fix call to undefined function decrypt_passwd()

	2008/03/21 (thomasb)
	----------
	- Add configurable default charset for message decoding
	- Applied patch to fix mime decoding an folder subscription (#1484191)
	- Applied patch to correctly quote email recipient strings (#1484191)
	- Fix wrong charset aliases (#1484818 and #1484598)
	- Remove hard-coded size of logo image (#1484378)
	- Strip slashes from virtuser email values (#1484700)
	- Fixed message part window display in IE6 (#1484610)

	2008/02/28 (thomasb)
	----------
	- Fix folder adding/renaming inspired by #1484800
	- Applied patch by Emanuele Rocca to make LDAP filters work with or without brackets
	- Fix quirky message selection
	- Completed installer

	2008/02/20 (thomasb)
	----------
	- Localize folder name in page title (#1484785)
	- Fix code using wrong variable name (#1484018)
	- Allow to send mail with BCC recipients only
	- Remove MDN headers before saving in sent folder

	2008/02/12 (estadtherr)
	----------
	- fix switching between HTML/plain composing (#1484752)
	- condense TinyMCE toolbar down to one line, removing table buttons (#1484747)
	- fix image removal in message display when message HTML includes JS event handlers

	2008/02/11 (thomasb)
	----------
	- 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

	2008/02/08 (thomasb)
	----------
	- Distinguish ssl and tls for imap connections (#1484667)
	- Added some charset aliases to fix typical mis-labelling (#1484565)

	2008/02/07 (thomasb)
	----------
	- Remember decision to display images for a certain message during session (#1484754)
	- Truncate attachment filenames to 55 characters due to an IE bug (#1484757)
	- Fix size of the attachment preview frame (#1484758)

	2008/02/05 (thomasb)
	----------
	- Fix regular expression for checking e-mail address (#1484710)
	- Make sending of read receipts configurable
	- Respect config when localize folder names (#1484707)
	- Applied patch for updating page title (#1484727, #1484650)
	- Applied patch to prevent from purging inbox by uberlinuxguy (#1484449)
	- Applied patch to prevent bad header delimiters (#1484751)
	- Also send search request when deleting a contact (#1484620)
	- Add CSS hack for Safari

	2008/02/02 (thomasb)
	----------
	- Always update $CONFIG with user prefs (#1484729)
	- Don't ask for MDN confirmations on drafted messages (#1484691)
	- Also respect receipt and priority settings when re-opening a draft message

	2008/01/31 (robin)
	----------
	- Remember search results (closes #1483883), patch by the_glu

	2008/01/08 (tomekp)
	----------
	- add he (Hebrew) localization (#1484713)

	2008/01/08 (tomekp)
	----------
	- update fr localization

	2008/01/04 (tomekp)
	- purge kur_KU because it has no messages translation
	- bump copyright for all localization files

	2007/12/31 (tomekp)
	----------
	- update es localization

	2007/12/28 (tomekp)
	----------
	- update mk localization

	2007/12/27 (tomekp)
	----------
	- update se localization

	2007/12/13 (robin)
	----------
	- Add Received header on outgoing mail

	2007/12/10 (estadtherr)
	----------
	- Upgrade to TinyMCE 2.1.3
	- Allow inserting image attachments into HTML messages while composing (#1484557)

	2007/12/10 (thomasb)
	----------
	- Delegate user-stuff to new class rcube_user
	- Implement Message-Disposition-Notification (Receipts)

	2007/12/05 (tomekp)
	----------
	- update bg, uk localization

	2007/12/04 (tomekp)
	----------
	- update bg localization

	2007/11/25 (thomasb)
	----------
	- Applied UID fetch patch by Glen Ogilvie
	- Applied patch for correct Postgres instructions from ticket #1484674
	- Fix overriding of session vars when register_globals is on (#1484670)
	- Fix wrong Postgres setup instructions in INSTALL (#1484674)
	- Fix bug with case-sensitive folder names (#1484245)
	- Don't create default folders by default
	- Added Georgian localization by Zaza Zviadadze
	- Updated Russian localization
	- Fixed some potential security risks (audited by Andris)
	- Only show new messages if they match the current search (#1484176)

	2007/11/20 (tomekp)
	----------
	- add Korean (kr) localization

	2007/11/14 (tomekp)
	----------
	- update id_ID localization

	2007/11/06 (thomasb)
	----------
	- Switch to/from when searcing in Sent folder (#1484555)
	- Correctly read the References header (#1484646)
	- Unset old cookie in before sending a new value (#1484639)
	- Correctly decode attachments when downloading them (#1484645 and #1484642)

	2007/10/22 (tomekp)
	----------
	- update ru, eo localizations

	2007/10/17 (thomasb)
	----------
	- Make message listing less error prone

	2007/10/10 (thomasb)
	----------
	- 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
	- Update UPGRADING instructions

	2007/10/05 (tomekp)
	----------
	- Add Esperanto localization

	2007/10/04 (Stiwi)
	----------
	- Updated German localization

	2007/10/04 (yllar)
	----------
	- Added Malay localization
	- Updated Lithuanian localization

	2007/09/27 (tomekp)
	----------
	- Update dutch localization (closes #1484588)

	2007/09/29 (thomasb)
	----------
	- Filter linked/imported CSS files (closes #1484056)


	2007/09/27 (tomekp)
	----------
	- Update brazilian portuguese localization (#1484580)

	2007/09/26 (thomasb)
	----------
	- Improve message compose screen (closes #1484383)
	- Select next row after removing one from list (#1484387)


	2007/09/26 (tomekp)
	----------
	- Add polish labels for changes in r816.
	- Update polish localization (#1484579)
	- Update thai localization (#1484578)

	2007/09/25 (robin)
	----------
	- Enable drag-/dropping of folders to a new parent folder (#1457344)


	2007/09/24 (robin)
	----------
	- Fix preview pane size for Safari & Konqueror (#1484187)


	2007/09/20 (robin)
	----------
	- Make smtp HELO/EHLO hostname configurable (#1484067)


	2007/09/19 (thomasb)
	----------
	- 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
	- Show mailbox name in page title


	2007/09/09 (thomasb)
	----------
	- Fixed wrong delete button tooltip (#1483965)
	- Fixed charset encoding bug (#1484429)
	- Applied patch for LDAP version (#1484552)
	- Improved XHTML validation


	2007/09/05 (thomasb)
	----------
	- Fix message list selection (#1484550)
	- Better fix lowercased usernames (#1484473)
	- Update pngbehavior Script as suggested in #1484490


	2007/08/29 (richs)
	----------
	- Fixed moving/deleting messages when more than 1 is selected

	2007/08/15 (thomasb)
	----------
	- Applied patch for LDAP contacts listing by Glen Ogilvie
	- Applied patch for more address fields in LDAP contacts (#1484402)
	- Close LDAP connections on script shutdown


	2007/08/13 (thomasb)
	----------
	- Add alternative for getallheaders() (fix #1484508)
	- Revert changes for mbstring usage (fix #1484509)


	2007/08/10 (thomasb)
	----------
	- 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)
	- Updated Simplified Chinese localization
	- Added Ukrainian translation


	2007/08/09 (richs)
	----------
	- 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
	- Added note to INSTALL about .htaccess limiting upload_max_filesize
	- 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)
	- Fixed empty-message sending with TinyMCE plain-text mode, or if it's not installed


	2007/07/03 (thomasb)
	----------
	- Added Macedonian (Slavic FYROM) localization
	- Fix status message bug #1484464 with regard to #1484353
	- Fix address adding bug reported by David Koblas
	- Applied socket error patch by Thomas Mangin


	2007/06/28 (tomekp)
	----------
	- fix typos in Polish localization (Janusz Zamecki)


	2007/06/27 (tomekp)
	----------
	- Update Polish (Janusz Zamecki), Croatian (Svebor Prstacic) localization


	2007/06/12 (thomasb)
	----------
	- Updated Turkish, Polish, Finnish/Suomi, Japanese, Hungarian, Greek, Euskara localization
	- Added Irish/Gaelic translation
	- Little correction in Swedish translation
	- Quote username for virtuser_query
	- Pass-by-reference workarround for PHP5 in sendmail.inc


	2007/06/04 (estadtherr)
	----------
	- Fixed bug in HTML->Plain editor toggling


	2007/05/28 (thomasb)
	---------
	- Fixed buggy imap_root settings (closes #1484379)
	- Prevent default events on subject links (#1484399)
	- Typo in rcube_smtp.inc


	2007/05/23 (estadtherr)
	----------
	- Upgrade to TinyMCE v2.1.1.1


	2007/05/18 (thomasb)
	----------
	- Use HTTP-POST requests for actions that change state


	2007/05/17 (thomasb)
	----------
	- Updated Catalan, Russian, Portuguese, Slovak and Chinese translations
	- Renamed localization folder for Chinese (Big5)
	- Chanegd Slovenian language code from 'si' to 'sl'
	- Added Sinhala (Sri-Lanka) localization
	- 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)


	2007/05/13 (thomasb)
	----------
	- Updated Norwegian (bokmal), Czech, Danish and Portuguese (standard) translation
	- Fixed marking as read in preview pane (closes #1484364)
	- CSS hack to display attachments correctly in IE6
	- Wrap message body text (closes #1484148)


	2007/05/03 (yllar)
	----------
	- Updated French, Lithuanian, Armenian, Spanish and Italian translations


	2007/05/01 (thomasb)
	----------
	- Updated German, Euskara, Hungarian, Romanian and Spanish translation
	- Added Hindi and Kurdish localization


	2007/04/28 (thomasb)
	----------
	- 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


	2007/04/08 (thomasb)
	----------
	- Fixed message moving procedure (closes #1484308)
	- Fixed display of multiple attachments (closes #1466563)
	- Fixed check for new messages (closes #1484310)
	- List attachments without filename


	2007/03/27 (thomasb)
	----------
	- New session authentication: Change sessid cookie when login, authentication with sessauth cookie is now configurable.
	Should close bugs #1483951 and #1484299


	2007/03/23 (thomasb)
	----------
	- Correctly translate mailbox names (closes #1484276)
	- Quote e-mail address links (closes #1484300)


	2007/03/21 (thomasb)
	----------
	- Updated PEAR::Mail_mime package
	- Added Persian localization
	- Updated Catalan and Brazilian Portuguese translations
	- Updated INSTALL manual with a note about database passwords
	- Accept single quotes for HTML attributes when modifying message body (thanks Jason)
	- Sanitize input for new users/identities (thanks Colin Alston)


	2007/03/19 (thomasb)
	----------
	- Don't download HTML message parts
	- Convert HTML parts to plaintext if 'prefer_html' is off
	- Correctly parse message/rfc822 parts (closes #1484045)
	- Code cleanup


	2007/03/18 (thomasb)
	----------
	- 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
	- Replaced old JS function calls.


	2007/03/13 (thomasb)
	----------
	- 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


	2007/03/04 (tomekp)
	----------
	- check if safe mode is on or not (closes #1484269)


	2007/03/02 (thomasb)
	----------
	- 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)


	2007/02/25 (estadtherr)
	----------
	- Fixed priority selector issue (#1484150)
	- Upgraded to TinyMCE v2.1.0


	2007/02/21 (thomasb)
	----------
	- Fixed some CSS issues in default skin (closes #1484210 and #1484161)
	- Prevent from double quoting of numeric HTML character references (closes #1484253)


	2007/02/07 (tomekp)
	----------
	- Updated (bg) translation (Doichin Dokov)


	2007/02/06 (tomekp)
	----------
	- Updated (pl) translation
	- Updated (pt_BR) translation (Robson F. Ramaldes)
	- Big cleanup in program/localization


	2007/02/05 (thomasb)
	----------
	- Updated Italian, Slovenian, Greek, Bulgarian, Hungarian and Croatian translation


	2007/01/07 (estadtherr)
	----------
	- Fixed display of HTML message attachments (closes #1484178)


	2007/01/07 (thomasb)
	----------
	- Applied patch for preview caching (closes #1484186)
	- Added Thai and Vietnamese localization files


	2006/12/29 (thomasb)
	----------
	- Added error handling for attachment uploads
	- Use multibyte safe string functions where necessary (closes #1483988)
	- Updated Swiss German localization (de_CH)


	2006/12/22 (thomasb)
	----------
	- 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


	2006/12/20 (thomasb)
	----------
	- Fixed wrong message listing when showing search results (closes #1484131)
	- Introduced functions Q() and JQ() as aliases for rep_specialchars_output()
	- Show remote images when opening HTML message part as attachment


	2006/12/17 (thomasb)
	----------
	- Added patch by Ryan Rittenhouse & David Glick for a resizeable preview pane


	2006/12/06 (thomasb)
	----------
	- 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)


	2006/12/04 (thomasb)
	----------
	- 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)


	2006/12/03 (estadtherr)
	----------
	- Added fix to convert HTML signatures for plain text messages
	- Fixed signature delimeter character to be standard (Bug #1484035)


	2006/12/01 (thomasb)
	----------
	- Implemented preview pane
	- 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)
	- Show client debug console on debug_level 8
	- Added Serbian translation
	- Updated Spanish and Bulgarian localization


	2006/11/22 (robin)
	----------
	- Fix a bug introduced with Shift-Del yesterday


	2006/11/21 (robin)
	----------
	- Add missing nl_NL translations
	- Translate foldernames in folder form (closes #1484113)


	2006/11/21 (robin)
	----------
	- 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


	2006/11/17 (robin)
	----------
	- Re-initialize message list after shift-select and delete


	2006/11/16 (robin)
	----------
	- Fixed updating message list after expunge and purge
	- Fetch all aliases if virtuser_query is used instead
	of only the first one


	2006/11/11 (estadtherr)
	----------
	- fixed deletion/moving of messages from within "show" page


	2006/11/09 (thomasb)
	----------
	- Little bugfix in HTML encoding
	- Fixed encoding issues and delete-on-reply problem
	- Corrected template parsing


	2006/11/07 (estadtherr)
	----------
	- Upgraded to TinyMCE v2.0.8
	- Fixed CSS path for editor popups

	2006/09/26 (estadtherr)
	----------
	- Added spellchecker plugin to TinyMCE configuration
	- Fixed HTML/Plain toggle labels


	2006/09/24 (thomasb)
	----------
	- Partial client re-write with a common list class
	- Re-enabled multi select of contacts (Bug #1484017)
	- Enable contact editing right after creation (Bug #1459641)
	- Updated Hungarian, Estonian and Traditional Chinese localization


	2006/09/19 (thomasb)
	----------
	- Correct UTF-7 to UTF-8 conversion if mbstring is not available


	2006/09/13 (estadtherr)
	----------
	- Introduction of TinyMCE HTML editor support for message composition and signatures
	Note : a new column is added to the "identities" database table


	2006/09/12 (estadtherr)
	----------
	- Fixed html2text treatment of table headers (Bug #1484020)
	- Fixed IMAP fetch of message body (Bug #1484019)


	2006/09/08 (thomasb)
	----------
	- Fixed safe_mode problems (Bug #1418381)
	- Fixed wrong header encoding (Bug #1483976)


	2006/09/07 (thomasb)
	----------
	- Made automatic draft saving configurable
	- Fixed JS bug when renaming folders (Bug #1483989)
	- Don't wait for complete page load when calling JavaScript init()
	- Some improvements to prevent session expiration
	- Prevent from double submit of spell check requests


	2006/09/01 (thomasb)
	----------
	- Imporoved message parsing and HTML validation
	- Added quota display as image (by Brett Patterson)
	- Corrected creation of a message-id
	- Updated Norwegian (bokmal) localization


	2006/08/30 (thomasb)
	----------
	- New indentation for quoted message text
	- Improved HTML validity


	2006/08/28 (estadtherr)
	----------
	- Fixed URL character set (Ticket #1445501)
	- Fixed saving of contact into MySQL from LDAP query results (Ticket #1483820)


	2006/08/25 (thomasb)
	----------
	- Fixed folder renaming: unsubscribe before rename (Bug #1483920)
	- Finalized new message parsing (+ chaching)
	- Updated SQL scripts and UPGRADING instructions


	2006/08/23 (thomasb)
	----------
	- Updated Polish, Portuguese, Latvian, Chinese and Japanese localization


	2006/08/20 (thomasb)
	----------
	- Fixed wrong usage of mbstring (Bug #1462439)
	- Set default spelling language (Ticket #1483938)
	- Added support for Nox Spell Server


	2006/08/18 (thomasb)
	----------
	- Re-built message parsing (Bug #1327068)
	Now based on the message structure delivered by the IMAP server.
	- Fixed some XSS and SQL injection issues


	2006/08/10 (thomasb)
	----------
	- Fixed charset problems with folder renaming


	2006/08/04 (thomasb)
	----------
	- Fixed Bug in saving identities (Ticket #1483915)
	- Set folder name in window title (Bug #1483919)
	- Don't add imap_root to INBOX path (Bug #1483816)
	- Attempt to create default folders only after login
	- Avoid usage of $CONFIG in rcube_imap class


	2006/07/30 (thomasb)
	----------
	- Alter links in HTML messages (Bug #1326402)
	- Added fallback if host not found in 'mail_domain' array
	- Applied patch of Charles to highlight droptargets (Ticket #1473034)
	- Fixed folder renaming (Bug #1483914)
	- Added confirmation message after deleting a folder


	2006/07/25 (thomasb)
	----------
	- Made folder renaming a bit more ajax-style
	- Changed rename-labels and German translation
	- Fixed addressbox countbar width (Bug #1483845)
	- Fixed refresh interval problems in Safari (Bug #1483902)
	- Fixed clear_message_list_header() errors (Bug #1483898)
	- Sanity check of $message_set in imap.inc (Bug #1443200)
	- Added correct changing of message list headers for Sent folder
	- Updated Spanish localization (Ticket #1483887)
	- Applied patch #1483846


	2006/07/24 (richs)
	----------
	- Draft window no longer reloads. It saves to an iframe in the background instead (fixes bug #1483869)
	- Draft timer now part of program/js/app.js instead of skins/default/templates/compose.inc
	- Draft saving now properly returns an error when saving fails
	- Draft timer stops and resets properly when attachments are uploaded, or when saving manually
	- Old compose session/attachments are now cleaned up when a new/forward/reply/draft is made/opened


	2006/07/19 (thomasb)
	----------
	- Correct entity encoding of link urls (HTML validity)
	- Improved usability in compose step (Ticket #1483807)
	- Added absolute URLs to several buttons (for "open in new window")
	- Applied patch #1328032
	- Fixed Bug/Patch #1443200


	2006/07/18 (thomasb)
	----------
	- Fixed password with spaces issue (Bug #1364122)
	- Replaced _auth hash with second cookie (Ticket #1483811)
	- Don't use get_input_value() for passwords (Bug #1468895)
	- Made password encryption key configurable
	- Minor bugfixes with charset encoding
	- Added <label> tags to forms (Ticket #1483810)


	2006/07/07 (thomasb)
	----------
	- Fixed INSTALL_PATH bug #1425663


	2006/07/03 (richs)
	----------
	- Fixed compatibility with in-body email addresses containing "+" (Bug #1483836)
	- Updated French localizations (Ticket #1483862)
	- Incoming messages can now be moved to Drafts, edited, saved, then moved back (Feature #1436191)
	- Added Firefox workaround when clicking whitespace to drag messages (Bug #1483857)
	- Corrected Dutch and Italian localizations (Ticket #1483851 and #1483848)
	- Enabled 'Empty' (purge) command for Junk mailbox (defined in main.inc.php)


	2006/06/30 (richs)
	----------
	- Fixed empty INBOX compatibility bug (Patch #1443200)
	- Temporarily fixed French "compact" localization (Patch #1483862)
	- Fixed "Select All" not working with Delete interface button (Bug #1332434)
	- Fixed messsage list column compatibility with Konqueror (Bug #1395711)
	- Fixed "unread count" in window title when count changed (Bug #1483812)
	- Fixed DB error when deleting from message table (Patch #1483835)


	2006/06/29 (richs)
	----------
	- Added ability to remove attachments (Feature #1436721)
	- Default folders are now auto-created on first login (Feature #1471594)
	- Fixed compatibility with folder apostrophes (e.g.: Joe's Folder) (Bug #1429458)
	- Corrected Italian localizations
	- Tweaked rename-folder form to clear after a rename


	2006/06/26 (richs)
	----------
	- Added button to immediately check for new messages
	- New message checking now displays status "Checking for new messages..."
	- New message checking now looks for unread messages in all mailboxes (Feature #1326401)
	- Task buttons now respond to clicks by darkening (as in other applications)
	- Fixed "Sender" column changing to "Recipient" for "Sent" and "Drafts" message lists
	- Added ability to sort messages by "Size"
	- Added ability to rename folders (Feature #1326396)
	- Added 'protect_default_folders' option to main.inc.php to prevent renames/deletes/unsubscribes of default folders
	- Corrected 5 typos of "INSTLL" to "INSTALL" in program/include/main.inc


	2006/06/25
	----------
	- Changed behavior to include host-specific configuration (Bug #1483849)
	- Assume ISO-8859-1 encoding of mail messages by default (Patch #1483839)
	- Fixed spell checker to work with the new URL at google.com
	- Some memory and security optimizations sendmail.inc
	- Updated UGRADING description


	2006/06/19
	----------
	- Added Drafts support (Feature #1326839) (richs)


	2006/06/02
	----------
	- Updated Estonian localization and moved from ee to et
	- Added Bulgarian localization


	2006/05/25
	----------
	- Finalized GoogieSpell integration


	2006/05/18
	----------
	- Added Arabic and Armenian localizations
	- Updated Russian localization
	- Removed MDB2 classes from repository. Install them seperately if used.
	- Updated MDB2 wrapper class contributed by Lukas Kahwe Smith
	- Allow & in e-mail addresses


	2006/05/05
	----------
	- Fixed typos in function rcube_button() (Bugs #1473198 and #1473201)
	- Check for zlib.output_compression before using ob_gzhandler (Bug #1471069)
	- Casting date parts in iil_StrToTime() to avoid warnings (Bug #1482140)
	- Corrected INSTALL description (Bug #1476106)
	- Added charset to javascript HTTP headers
	- Fixed Opera bug with CC and BCC fields (Bug #1474576)
	- Changed login page title regarding product name (Bug #1476413)
	- Pimped search function
	- Applied attachment viewing/forwarding patches by Andrew Fladmark
	- Applied prev/next patch by Leonard Bouchet
	- Applied patches by Mark Bucciarelli
	- Applied patch for requesting receipts by Salvatore Ansani
	- Integrated GoogieSpell as suggested by phil (styling is not perfect yet, localization is missing)


	2006/04/13
	----------
	- Added Slovenian localization
	- Updated Portuguese localization
	- Fixed parent.location problem for compose-links
	- Added sort order saving patch by Jacob Brunson
	- Added gzip compression support


	2006/04/02
	----------
	- Added Lithuanian localization
	- Improved search function
	- Added version string as template object
	- Load host-specific configuration file (see config/main.inc.php)
	- New config parameter adding domain to user names for login
	- Strip tags on _auth, _action, _task parameters
	- Corrected labels for next/previous page buttons in address book


	2006/03/23
	----------
	- Auto-detect mail header delimiters
	- Regard daylight savings
	- Localized quota display
	- Started implementing search function


	2006/03/20
	----------
	- Avoid error message when saving an unchanged identity (Bug #1429510)
	- Fixed hard-coded cols selection for sent folder (Bug #1354586)
	- Enable some HTML links for use with "open in new window" or "save target"
	- Check meta-key instead of ctrl on Macs
	- Ignore double clicks when holding down a modifier key
	- Fixed reloading of the login page
	- Fixed typo in compose template (Bug #1446852)
	- Added compose button to message read step (Request #1433288)
	- New config parameter for persistent database connections (Bug #1431817)


	2006/03/14
	----------
	- Don't remove internal HTML tags in plaintext messages
	- Improved error handling in DB connection failure


	2006/02/22
	----------
	- Updated localizations
	- Fixed bug #1435989


	2006/02/19
	----------
	- Updated localizations
	- Applied patch of Anders Karlsson
	- Applied patch of Jacob Brunson
	- Applied patch for virtuser_query by Robin Elfrink
	- Added support for References header (patch by Auke)
	- Added support for mbstring module by Tadashi Jokagi
	- Added function for automatic remove of slashes on GET and POST vars
	if magic_quotes is enabled


	2006/02/05
	----------
	- Added Slovak, Hungarian, Bosnian and Croation translation
	- Fixed bug when inserting signatures with !?&
	- Chopping message headers before inserting into the message cache table
	(to avoid bugs in Postgres)
	- Allow one-char domains in e-mail addresses
	- Make product name in page title configurable
	- Make username available as skin object
	- Added session_write_close() in rcube_db class destructor to avoid problems
	in PHP 5.0.5
	- Use move_uploaded_file() instead of copy() for a more secure handling of
	uploaded attachments
	- Additional config parameter to show/hide deleted messages
	- Added periodic request for checking new mails (Request #1307821)
	- Added EXPUNGE command
	- Optimized loading time for mail interface
	- Changed to full UTF-8 support
	- Additional timezones (Patch #1389912)
	- Added LDAP public search (experimental)
	- Applied patch for correct ctrl/shift behavior for message selection (Bug #1326364)
	- Casting to strings when adding empty headers to message cache (Bug #1406026)
	- Skip sender-address as recipient when Reply-to-all
	- Fixes in utf8-class
	- Added patch for Quota display by Aury Fink Filho <nuny@aury.com.br>
	- Added garbage collector for message cache
	- Added patches for BCC headers


	2005/12/16
	----------
	- Added Turkish and Simplified Chinese translation
	- Use virtusertable to resolve e-mail addresses at login
	- Configurable mail_domain used to compose correct e-mail addresses
	on first login


	2005/12/03
	----------
	- Added Finnish, Romanian, Polish, Czech, British, Norwegian, Greek, Russian,
	Estonian and Chinese translation
	- Get IMAP server capabilities in array
	- Check for NAMESPACE capability before sending command
	- Set default user language from config 'locale_string'
	- Added sorting patch for message list
	- Make default sort col/order configurable
	- Fixed XSS in address book and identities
	- Added more XSS protection (Bug #1308236)
	- Added tab indexes for compose form
	- Added 'changed' col to contacts table
	- Support for 160-bit session hashes
	- Added input check for contacts and identities (Patch #1346523)
	- Added messages/warning to compose step (Patch #1323895)
	- Added favicon to the default skin
	- Fixed Bug #1334337 as far as possible
	- Added Reply-To-All functionality (Request #1326395, Patch #1349777)
	- Redesign of client side AJAX code (enable multi threading)
	- Added keep-alive signal every minute
	- Make logs dir configurable
	- Added support for SMTPS
	- Decode attachment file names
	- Make delimiter for message headers configurable
	- Add generic footer to sent messages
	- Choose the rigt identity when replying
	- Remove signature when replying (Request #1333167)
	- Signatures for each identity
	- Select charset when composing message
	- Complete re-design of the caching mechanism


	2005/08/11
	----------
	- Write list header to client even if list is empty
	- Add functions "select all", "select none" to message list
	- Improved filter for HTML messages to remove potentially malicious tags
	(script, iframe, object) and event handlers.
	- Buttons for next/previous message in view mode
	- Add new created contact to list and show confirmation status
	- Added folder management (subscribe/create/delete)
	- Log message sending (SMTP log)
	- Grant access for Camino browser
	- Added German translation


	2005/10/20
	----------
	- Added Swedish, Latvian, Portuguese and Catalan translation
	- Make SMTP auth method configurable
	- Make mailboxlist scrollable (Bug #1326372)
	- Fixed SSL support
	- Improved support for Courier IMAP (root folder and delimiter issues)
	- Moved taskbar from bottom to top
	- Added 'session_lifetime' parameter
	- Fixed wrong unread count when deleting message (Bug #1332434)
	- Srip tags when creating a new folder (Bug #1332084)
	- Translate HTML tags in message headers (Bug #1330134)
	- Correction in German translation (Bug #1329434)
	- Display folder names with special chars correctly (Bug #1330157)


	2005/10/07
	----------
	- Added French, Italian, Spanish, Danish, Dutch translation
	- Clarified license (Bug #1305966)
	- Fixed PHP warnings (Bug #1299403)
	- Fixed english translation (Bug #1295406)
	- Fixed bug #1290833: Last character of email not seen
	- Fixed bug #1292199 when creating new user
	- Allow more browsers (Bug #1285101)
	- Added setting for showing pretty dates
	- Added support for SQLite database
	- Make use of message caching configurable
	- Also add attachments when forwarding a message
	- Long folder names will not flow over message list (Bug #1267232)
	- Show nested mailboxes hieracically
	- Enable IMAPS by host


	2005/08/20
	----------
	- Improved cacheing of mailbox messagecount
	- Fixed javascript bug when creating a new message folder
	- Fixed javascript bugs #1260990 and #1260992: folder selection
	- Make Trash folder configurable
	- Auto create folders Inbox, Sent and Trash (if configured)
	- Support for IMAP root folder
	- Added support fot text/enriched messages
	- Make list of special mailboxes configurable

	diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
	index 92c797b28..7641b0c9b 100644
	--- a/program/lib/Mail/mime.php
	+++ b/program/lib/Mail/mime.php
	@@ -1,1119 +1,1134 @@
	<?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>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	* @version CVS: $Id$
	* @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: @package_version@
	* @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;

	/**
	* contains the mime encoded text
	*
	* @var string
	* @access private
	*/
	var $_mime;

	/**
	* contains the multipart content
	*
	* @var string
	* @access private
	*/
	var $_multipart;

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

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

	/**
	* Build parameters
	*
	* @var array
	* @access private
	*/
	var $_build_params = array();

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

	/**
	* End Of Line sequence (for serialize)
	*
	* @var string
	* @access private
	*/
	var $_eol;


	/**
	* Constructor function.
	*
	* @param string $crlf what type of linebreak to use.
	* Defaults to "\r\n"
	*
	* @return void
	*
	* @access public
	*/
	function Mail_mime($crlf = "\r\n")
	{
	$this->_setEOL($crlf);
	$this->_build_params = array(
	'head_encoding' => 'quoted-printable',
	'text_encoding' => '7bit',
	'html_encoding' => 'quoted-printable',
	'7bit_wrap' => 998,
	'html_charset' => 'ISO-8859-1',
	'text_charset' => 'ISO-8859-1',
	'head_charset' => 'ISO-8859-1'
	);
	}

	/**
	* wakeup function called by unserialize. It re-sets the EOL constant
	*
	* @access private
	* @return void
	*/
	function __wakeup()
	{
	$this->_setEOL($this->_eol);
	}


	/**
	* 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;
	}

	/**
	* 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;
	}

	/**
	* 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
	*
	* @return bool true on success
	* @access public
	*/
	function addHTMLImage($file, $c_type='application/octet-stream',
	$name = '', $isfile = true)
	{
	$filedata = ($isfile === true) ? $this->_file2str($file)
	: $file;
	if ($isfile === true) {
	$filename = ($name == '' ? $file : $name);
	} else {
	$filename = $name;
	}
	if (PEAR::isError($filedata)) {
	return $filedata;
	}
	$this->_html_images[] = array(
	'body' => $filedata,
	'name' => $filename,
	'c_type' => $c_type,
	'cid' => md5(uniqid(time()))
	);
	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 used in the filename
	* of this attachment.
	* @param string $language The language of the attachment
	* @param string $location The RFC 2557.4 location of the attachment
	*
	* @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 = '')
	{
	$filedata = ($isfile === true) ? $this->_file2str($file)
	: $file;
	if ($isfile === true) {
	// Force the name the user supplied, otherwise use $file
	$filename = (strlen($name)) ? $name : $file;
	} else {
	$filename = $name;
	}
	if (!strlen($filename)) {
	$msg = "The supplied filename for the attachment can't be empty";
	$err = PEAR::raiseError($msg);
	return $err;
	}
	- $filename = substr('s_'.basename($filename), 2);
	+ $filename = $this->_basename($filename);
	if (PEAR::isError($filedata)) {
	return $filedata;
	}

	$this->_parts[] = array(
	'body' => $filedata,
	'name' => $filename,
	'c_type' => $c_type,
	'encoding' => $encoding,
	'charset' => $charset,
	'language' => $language,
	'location' => $location,
	'disposition' => $disposition
	);
	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()) {
	set_magic_quotes_runtime(0);
	}
	$cont = file_get_contents($file_name);
	if ($magic_quote_setting) {
	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'];
	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'];
	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';

	//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';
	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';
	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['dfilename'] = $value['name'];
	$params['cid'] = $value['cid'];

	$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['dfilename'] = $value['name'];
	$params['encoding'] = $value['encoding'];
	if ($value['charset']) {
	$params['charset'] = $value['charset'];
	}
	if ($value['language']) {
	$params['language'] = $value['language'];
	}
	if ($value['location']) {
	$params['location'] = $value['location'];
	}
	$params['content_type'] = $value['c_type'];
	$params['disposition'] = isset($value['disposition']) ?
	$value['disposition'] : 'attachment';
	$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 $xtra_headers parameter!
	*
	* @param string $separation The separation etween these two parts.
	* @param array $build_params The Build parameters passed to the
	* &get() function. See &get for more info.
	* @param array $xtra_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 string The complete e-mail.
	* @access public
	*/
	function getMessage(
	$separation = null,
	$build_params = null,
	$xtra_headers = null,
	$overwrite = false
	)
	{
	if ($separation === null) {
	$separation = MAIL_MIME_CRLF;
	}
	$body = $this->get($build_params);
	$head = $this->txtHeaders($xtra_headers, $overwrite);
	$mail = $head . $separation . $body;
	return $mail;
	}


	/**
	* Builds the multipart message from the list ($this->_parts) and
	* returns the mime content.
	*
	* @param array $build_params Build parameters that change the way the email
	* is built. Should be associative. Can contain:
	* head_encoding - What encoding to use for the headers.
	* Options: quoted-printable or base64
	* Default is quoted-printable
	* text_encoding - What encoding to use for plain text
	* Options: 7bit, 8bit,
	* base64, or quoted-printable
	* Default is 7bit
	* html_encoding - What encoding to use for html
	* Options: 7bit, 8bit,
	* base64, or quoted-printable
	* Default is quoted-printable
	* 7bit_wrap - Number of characters before text is
	* wrapped in 7bit encoding
	* Default is 998
	* html_charset - The character set to use for html.
	* Default is iso-8859-1
	* text_charset - The character set to use for text.
	* Default is iso-8859-1
	* head_charset - The character set to use for headers.
	* Default is iso-8859-1
	*
	* @return string The mime content
	* @access public
	*/
	function &get($build_params = null)
	{
	if (isset($build_params)) {
	while (list($key, $value) = each($build_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){
	$this->_html_images[$i]['cid'] = $this->_html_images[$i]['cid'] . $domainID;
	}
	}

	if (count($this->_html_images) AND 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'] =
	- substr(basename('s_'.$this->_html_images[$key]['name']), 2);
	+ $this->_basename($this->_html_images[$key]['name']);
	}
	}

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

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

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

	case $text AND $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 AND !$attachments AND !$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 AND !$attachments AND $html_images:
	$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 AND $attachments AND !$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 AND $attachments AND $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)) {
	$output = $message->encode();

	$this->_headers = array_merge($this->_headers,
	$output['headers']);
	$body = $output['body'];
	return $body;

	} else {
	$ret = false;
	return $ret;
	}
	}

	/**
	* 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.
	* @param bool $overwrite Overwrite already existing headers.
	*
	* @return array Assoc array with the mime headers
	* @access public
	*/
	function &headers($xtra_headers = null, $overwrite = false)
	{
	// Content-Type header should already be present,
	// So just add mime version header
	$headers['MIME-Version'] = '1.0';
	if (isset($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);
	}

	$encodedHeaders = $this->_encodeHeaders($this->_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.
	* @param bool $overwrite Overwrite the existing heaers with new.
	*
	* @return string Plain text headers
	* @access public
	*/
	function txtHeaders($xtra_headers = null, $overwrite = false)
	{
	$headers = $this->headers($xtra_headers, $overwrite);

	$ret = '';
	foreach ($headers as $key => $val) {
	$ret .= "$key: $val" . MAIL_MIME_CRLF;
	}
	return $ret;
	}

	/**
	* 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 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 specifiy
	* 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 a header 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;
	}
	//$hdr_name: Name of the heaer
	//$hdr_value: Full line of header value.
	//$atoms: The $hdr_value split into atoms*
	//$atom: A single atom to encode.*
	//$hdr_value_out: The recombined $hdr_val-atoms, or the encoded string.
	//Note: Atom as specified here is not exactly the same as an RFC822 atom,
	//as $atom's may contain just a single space.

	$useIconv = true;
	if (isset($build_params['ignore-iconv'])) {
	$useIconv = !$build_params['ignore-iconv'];
	}
	foreach ($input as $hdr_name => $hdr_value) {
	/*
	$parts = preg_split('/([ ])/', $hdr_value, -1, PREG_SPLIT_DELIM_CAPTURE);
	$atoms = array();
	foreach ($parts as $part){
	$atom .= $part;
	$quoteMatch = preg_match_all('\|"\|', $atom, $matches) % 2;
	if (!$quoteMatch){
	$atoms[] = $atom;
	$atom = null;
	}
	}
	if ($atom){
	$atoms[] = $atom;
	}
	foreach ($atoms as $atom){
	*/
	if (preg_match('#([\x80-\xFF]){1}#', $hdr_value)) {
	if (function_exists('iconv_mime_encode') && $useIconv) {
	$imePrefs = array();
	if ($build_params['head_encoding'] == 'base64') {
	$imePrefs['scheme'] = 'B';
	} else {
	$imePrefs['scheme'] = 'Q';
	}
	$imePrefs['input-charset'] = $build_params['head_charset'];
	$imePrefs['output-charset'] = $build_params['head_charset'];
	$imePrefs['line-length'] = 74;
	$imePrefs['line-break-chars'] = "\r\n"; //Specified in RFC2047

	$hdr_value = iconv_mime_encode($hdr_name, $hdr_value, $imePrefs);
	$hdr_value = preg_replace("#^{$hdr_name}\:\ #", "", $hdr_value);
	} elseif ($build_params['head_encoding'] == 'base64') {
	//Base64 encoding has been selected.
	//Base64 encode the entire string
	$hdr_value = base64_encode($hdr_value);

	//Generate the header using the specified params and dynamicly
	//determine the maximum length of such strings.
	//75 is the value specified in the RFC. The first -2 is there so
	//the later regexp doesn't break any of the translated chars.
	//The -2 on the first line-regexp is to compensate for the ": "
	//between the header-name and the header value
	$prefix = '=?' . $build_params['head_charset'] . '?B?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix) - 2;
	$maxLength1stLine = $maxLength - strlen($hdr_name) - 2;

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

	$cutpoint = $maxLength1stLine;
	$hdr_value_out = $hdr_value;
	$output = "";
	while ($hdr_value_out) {
	//Split translated string at every $maxLength
	$part = substr($hdr_value_out, 0, $cutpoint);
	$hdr_value_out = substr($hdr_value_out, $cutpoint);
	$cutpoint = $maxLength;
	//RFC 2047 specifies that any split header should
	//be seperated by a CRLF SPACE.
	if ($output) {
	$output .= "\r\n ";
	}
	$output .= $prefix . $part . $suffix;
	}
	$hdr_value = $output;
	} else {
	//quoted-printable encoding has been selected

	//Fix for Bug #10298, Ota Mares <om@viazenetti.de>
	//Check if there is a double quote at beginning or end of
	//the string to prevent that an open or closing quote gets
	//ignored because it is encapsuled by an encoding pre/suffix.
	//Remove the double quote and set the specific prefix or
	//suffix variable so that we can concat the encoded string and
	//the double quotes back together to get the intended string.
	$quotePrefix = $quoteSuffix = '';
	if ($hdr_value{0} == '"') {
	$hdr_value = substr($hdr_value, 1);
	$quotePrefix = '"';
	}
	if ($hdr_value{strlen($hdr_value)-1} == '"') {
	$hdr_value = substr($hdr_value, 0, -1);
	$quoteSuffix = '"';
	}

	//Generate the header using the specified params and dynamicly
	//determine the maximum length of such strings.
	//75 is the value specified in the RFC. The -2 is there so
	//the later regexp doesn't break any of the translated chars.
	//The -2 on the first line-regexp is to compensate for the ": "
	//between the header-name and the header value
	$prefix = '=?' . $build_params['head_charset'] . '?Q?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix) - 2 - 1;
	$maxLength1stLine = $maxLength - strlen($hdr_name) - 2;
	$maxLength = $maxLength - 1;

	//Replace all special characters used by the encoder.
	$search = array('=', '_', '?', ' ');
	$replace = array('=3D', '=5F', '=3F', '_');
	$hdr_value = str_replace($search, $replace, $hdr_value);

	//Replace all extended characters (\x80-xFF) with their
	//ASCII values.
	$hdr_value = preg_replace('#([\x80-\xFF])#e',
	'"=" . strtoupper(dechex(ord("\1")))',
	$hdr_value);

	//This regexp will break QP-encoded text at every $maxLength
	//but will not break any encoded letters.
	$reg1st = "\|(.{0,$maxLength1stLine}[^\=][^\=])\|";
	$reg2nd = "\|(.{0,$maxLength}[^\=][^\=])\|";
	//Fix for Bug #10298, Ota Mares <om@viazenetti.de>
	//Concat the double quotes and encoded string together
	$hdr_value = $quotePrefix . $hdr_value . $quoteSuffix;


	$hdr_value_out = $hdr_value;
	$realMax = $maxLength1stLine + strlen($prefix . $suffix);
	if (strlen($hdr_value_out) >= $realMax) {
	//Begin with the regexp for the first line.
	$reg = $reg1st;
	$output = "";
	while ($hdr_value_out) {
	//Split translated string at every $maxLength
	//But make sure not to break any translated chars.
	$found = preg_match($reg, $hdr_value_out, $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
	//$hdr_value_out variable.
	if ($found) {
	$part = $matches[0];
	$len = strlen($matches[0]);
	$hdr_value_out = substr($hdr_value_out, $len);
	} else {
	$part = $hdr_value_out;
	$hdr_value_out = "";
	}

	//RFC 2047 specifies that any split header should
	//be seperated by a CRLF SPACE
	if ($output) {
	$output .= "\r\n ";
	}
	$output .= $prefix . $part . $suffix;
	}
	$hdr_value_out = $output;
	} else {
	$hdr_value_out = $prefix . $hdr_value_out . $suffix;
	}
	$hdr_value = $hdr_value_out;
	}
	}
	$input[$hdr_name] = $hdr_value;
	}
	return $input;
	}

	/**
	* Set the object's end-of-line and define the constant if applicable.
	*
	* @param string $eol End Of Line sequence
	*
	* @return void
	* @access private
	*/
	function _setEOL($eol)
	{
	$this->_eol = $eol;
	if (!defined('MAIL_MIME_CRLF')) {
	define('MAIL_MIME_CRLF', $this->_eol, true);
	}
	}

	-
	+ /**
	+ * Get file's basename (locale independent)
	+ *
	+ * @param string 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);
	+ }

	} // End of class

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 10:25 AM (11 h, 36 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166674
Default Alt Text: (88 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions