No OneTemporary
Actions

Size

84 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index b2f71e9e9..0e6d676cb 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1410 +1,1411 @@
	CHANGELOG RoundCube Webmail
	---------------------------

	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/steps/mail/func.inc b/program/steps/mail/func.inc
	index 7607cccd3..70cd2c45e 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1231 +1,1238 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/func.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide webmail functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	require_once('lib/enriched.inc');
	require_once('include/rcube_smtp.inc');


	$EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9]\\.[a-z]{2,5})/i';

	if (empty($_SESSION['mbox']))
	$_SESSION['mbox'] = $IMAP->get_mailbox_name();

	// set imap properties and session vars
	if ($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC))
	$IMAP->set_mailbox(($_SESSION['mbox'] = $mbox));

	if (!empty($_GET['_page']))
	$IMAP->set_page(($_SESSION['page'] = intval($_GET['_page'])));

	// set mailbox to INBOX if not set
	if (empty($_SESSION['mbox']))
	$_SESSION['mbox'] = $IMAP->get_mailbox_name();

	// set default sort col/order to session
	if (!isset($_SESSION['sort_col']))
	$_SESSION['sort_col'] = $CONFIG['message_sort_col'];
	if (!isset($_SESSION['sort_order']))
	$_SESSION['sort_order'] = $CONFIG['message_sort_order'];

	// set message set for search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
	{
	$IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
	$OUTPUT->set_env('search_request', $_REQUEST['_search']);
	$OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
	}


	// set current mailbox in client environment
	$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
	$OUTPUT->set_env('quota', $IMAP->get_capability('quota'));
	$OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());

	if ($CONFIG['trash_mbox'])
	$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
	if ($CONFIG['drafts_mbox'])
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	if ($CONFIG['junk_mbox'])
	$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);

	if (!$OUTPUT->ajax_call)
	rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');

	// set page title
	if (empty($RCMAIL->action) \|\| $RCMAIL->action == 'list')
	$OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name()));


	/**
	* return the message list as HTML table
	*/
	function rcmail_message_list($attrib)
	{
	global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT;

	$skin_path = $CONFIG['skin_path'];
	$image_tag = '<img src="%s%s" alt="%s" />';

	// check to see if we have some settings for sorting
	$sort_col = $_SESSION['sort_col'];
	$sort_order = $_SESSION['sort_order'];

	// add some labels to client
	rcube_add_label('from', 'to');

	// get message headers
	$a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcubemessagelist';

	// allow the following attributes to be added to the <table> tag
	$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));

	$out = '<table' . $attrib_str . ">\n";

	// define list of cols to be displayed
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	$a_sort_cols = array('subject', 'date', 'from', 'to', 'size');

	$mbox = $IMAP->get_mailbox_name();

	// show 'to' instead of from in sent messages
	if (($mbox==$CONFIG['sent_mbox'] \|\| $mbox==$CONFIG['drafts_mbox']) && ($f = array_search('from', $a_show_cols))
	&& !array_search('to', $a_show_cols))
	$a_show_cols[$f] = 'to';

	// add col definition
	$out .= '<colgroup>';
	$out .= '<col class="icon" />';

	foreach ($a_show_cols as $col)
	$out .= sprintf('<col class="%s" />', $col);

	$out .= '<col class="icon" />';
	$out .= "</colgroup>\n";

	// add table title
	$out .= "<thead><tr>\n<td class=\"icon\"> </td>\n";

	$javascript = '';
	foreach ($a_show_cols as $col)
	{
	// get column name
	$col_name = $col != 'flag' ? Q(rcube_label($col)) : sprintf($image_tag, $skin_path, $attrib['unflaggedicon'], '');

	// make sort links
	$sort = '';
	if (in_array($col, $a_sort_cols))
	{
	// have buttons configured
	if (!empty($attrib['sortdescbutton']) \|\| !empty($attrib['sortascbutton']))
	{
	$sort = '  ';

	// asc link
	if (!empty($attrib['sortascbutton']))
	{
	$sort .= $OUTPUT->button(array(
	'command' => 'sort',
	'prop' => $col.'_ASC',
	'image' => $attrib['sortascbutton'],
	'align' => 'absmiddle',
	'title' => 'sortasc'));
	}

	// desc link
	if (!empty($attrib['sortdescbutton']))
	{
	$sort .= $OUTPUT->button(array(
	'command' => 'sort',
	'prop' => $col.'_DESC',
	'image' => $attrib['sortdescbutton'],
	'align' => 'absmiddle',
	'title' => 'sortdesc'));
	}
	}
	// just add a link tag to the header
	else
	{
	$col_name = sprintf(
	'<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
	JS_OBJECT_NAME,
	$col,
	rcube_label('sortby'),
	$col_name);
	}
	}

	$sort_class = $col==$sort_col ? " sorted$sort_order" : '';

	// put it all together
	$out .= '<td class="'.$col.$sort_class.'" id="rcmHead'.$col.'">' . "$col_name$sort</td>\n";
	}

	$out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
	$out .= "</tr></thead>\n<tbody>\n";

	// no messages in this mailbox
	if (!sizeof($a_headers))
	$OUTPUT->show_message('nomessagesfound', 'notice');


	$a_js_message_arr = array();

	// create row for each message
	foreach ($a_headers as $i => $header) //while (list($i, $header) = each($a_headers))
	{
	$message_icon = $attach_icon = $flagged_icon = '';
	$js_row_arr = array();
	$zebra_class = $i%2 ? 'even' : 'odd';

	// set messag attributes to javascript array
	if ($header->deleted)
	$js_row_arr['deleted'] = true;
	if (!$header->seen)
	$js_row_arr['unread'] = true;
	if ($header->answered)
	$js_row_arr['replied'] = true;
	if ($header->flagged)
	$js_row_arr['flagged'] = true;

	// set message icon
	if ($attrib['deletedicon'] && $header->deleted)
	$message_icon = $attrib['deletedicon'];
	else if ($attrib['unreadicon'] && !$header->seen)
	$message_icon = $attrib['unreadicon'];
	else if ($attrib['repliedicon'] && $header->answered)
	$message_icon = $attrib['repliedicon'];
	else if ($attrib['messageicon'])
	$message_icon = $attrib['messageicon'];

	if ($attrib['flaggedicon'] && $header->flagged)
	$flagged_icon = $attrib['flaggedicon'];
	else if ($attrib['unflaggedicon'] && !$header->flagged)
	$flagged_icon = $attrib['unflaggedicon'];

	// set attachment icon
	if ($attrib['attachmenticon'] && preg_match("/multipart\/[mr]/i", $header->ctype))
	$attach_icon = $attrib['attachmenticon'];

	$out .= sprintf('<tr id="rcmrow%d" class="message%s%s %s">'."\n",
	$header->uid,
	$header->seen ? '' : ' unread',
	$header->deleted ? ' deleted' : '',
	$header->flagged ? ' flagged' : '',
	$zebra_class);

	$out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');


	if (!empty($header->charset))
	$IMAP->set_charset($header->charset);

	// format each col
	foreach ($a_show_cols as $col)
	{
	if ($col=='from' \|\| $col=='to')
	$cont = Q(rcmail_address_string($header->$col, 3, false, $attrib['addicon']), 'show');
	else if ($col=='subject')
	{
	$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
	$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
	$cont = Q($IMAP->decode_header($header->$col));
	if (empty($cont)) $cont = Q(rcube_label('nosubject'));
	$cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
	}
	else if ($col=='flag')
	$cont = $flagged_icon ? sprintf($image_tag, $skin_path, $flagged_icon, '') : '';
	else if ($col=='size')
	$cont = show_bytes($header->$col);
	else if ($col=='date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$out .= '<td class="'.$col.'">' . $cont . "</td>\n";
	}

	$out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '');
	$out .= "</tr>\n";

	if (sizeof($js_row_arr))
	$a_js_message_arr[$header->uid] = $js_row_arr;
	}

	// complete message table
	$out .= "</tbody></table>\n";


	$message_count = $IMAP->messagecount();

	// set client env
	$OUTPUT->add_gui_object('mailcontframe', 'mailcontframe');
	$OUTPUT->add_gui_object('messagelist', $attrib['id']);
	$OUTPUT->set_env('messagecount', $message_count);
	$OUTPUT->set_env('current_page', $IMAP->list_page);
	$OUTPUT->set_env('pagecount', ceil($message_count/$IMAP->page_size));
	$OUTPUT->set_env('sort_col', $sort_col);
	$OUTPUT->set_env('sort_order', $sort_order);

	if ($attrib['messageicon'])
	$OUTPUT->set_env('messageicon', $skin_path . $attrib['messageicon']);
	if ($attrib['deletedicon'])
	$OUTPUT->set_env('deletedicon', $skin_path . $attrib['deletedicon']);
	if ($attrib['unreadicon'])
	$OUTPUT->set_env('unreadicon', $skin_path . $attrib['unreadicon']);
	if ($attrib['repliedicon'])
	$OUTPUT->set_env('repliedicon', $skin_path . $attrib['repliedicon']);
	if ($attrib['attachmenticon'])
	$OUTPUT->set_env('attachmenticon', $skin_path . $attrib['attachmenticon']);
	if ($attrib['flaggedicon'])
	$OUTPUT->set_env('flaggedicon', $skin_path . $attrib['flaggedicon']);
	if ($attrib['unflaggedicon'])
	$OUTPUT->set_env('unflaggedicon', $skin_path . $attrib['unflaggedicon']);

	$OUTPUT->set_env('messages', $a_js_message_arr);
	$OUTPUT->set_env('coltypes', $a_show_cols);

	$OUTPUT->include_script('list.js');

	return $out;
	}


	/**
	* return javascript commands to add rows to the message list
	*/
	function rcmail_js_message_list($a_headers, $insert_top=FALSE)
	{
	global $CONFIG, $IMAP, $OUTPUT;

	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	$mbox = $IMAP->get_mailbox_name();

	// show 'to' instead of from in sent messages
	if (($mbox == $CONFIG['sent_mbox'] \|\| $mbox == $CONFIG['drafts_mbox'])
	&& (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
	$a_show_cols[$f] = 'to';

	$OUTPUT->command('set_message_coltypes', $a_show_cols);

	// loop through message headers
	foreach ($a_headers as $n => $header)
	{
	$a_msg_cols = array();
	$a_msg_flags = array();

	if (empty($header))
	continue;

	if (!empty($header->charset))
	$IMAP->set_charset($header->charset);

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col)
	{
	if ($col=='from' \|\| $col=='to')
	$cont = Q(rcmail_address_string($header->$col, 3), 'show');
	else if ($col=='subject')
	{
	$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
	$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
	$cont = Q($IMAP->decode_header($header->$col));
	if (!$cont) $cont = Q(rcube_label('nosubject'));
	$cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
	}
	else if ($col=='size')
	$cont = show_bytes($header->$col);
	else if ($col=='date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$a_msg_cols[$col] = $cont;
	}

	$a_msg_flags['deleted'] = $header->deleted ? 1 : 0;
	$a_msg_flags['unread'] = $header->seen ? 0 : 1;
	$a_msg_flags['replied'] = $header->answered ? 1 : 0;
	$a_msg_flags['flagged'] = $header->flagged ? 1 : 0;

	$OUTPUT->command('add_message_row',
	$header->uid,
	$a_msg_cols,
	$a_msg_flags,
	preg_match("/multipart\/m/i", $header->ctype),
	$insert_top);
	}
	}


	/**
	* return an HTML iframe for loading mail content
	*/
	function rcmail_messagecontent_frame($attrib)
	{
	global $OUTPUT;

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmailcontentwindow';

	// allow the following attributes to be added to the <iframe> tag
	$attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder'));
	$framename = $attrib['id'];

	$out = sprintf('<iframe name="%s"%s></iframe>'."\n",
	$framename,
	$attrib_str);

	$OUTPUT->set_env('contentframe', $framename);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');

	return $out;
	}


	/**
	*
	*/
	function rcmail_messagecount_display($attrib)
	{
	global $IMAP, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$OUTPUT->add_gui_object('countdisplay', $attrib['id']);

	// allow the following attributes to be added to the <span> tag
	$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));


	$out = '<span' . $attrib_str . '>';
	$out .= rcmail_get_messagecount_text();
	$out .= '</span>';
	return $out;
	}


	/**
	*
	*/
	function rcmail_quota_display($attrib)
	{
	global $OUTPUT, $COMM_PATH;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmquotadisplay';

	if(isset($attrib['display']))
	$_SESSION['quota_display'] = $attrib['display'];

	$OUTPUT->add_gui_object('quotadisplay', $attrib['id']);

	// allow the following attributes to be added to the <span> tag
	$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'display'));

	$out = '<span' . $attrib_str . '>';
	$out .= rcmail_quota_content();
	$out .= '</span>';
	return $out;
	}


	/**
	*
	*/
	function rcmail_quota_content($quota=NULL)
	{
	global $IMAP, $COMM_PATH, $RCMAIL;

	$display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';

	if (is_array($quota) && !empty($quota['used']) && !empty($quota['total']))
	{
	if (!isset($quota['percent']))
	$quota['percent'] = $quota['used'] / $quota['total'];
	}
	elseif (!$IMAP->get_capability('QUOTA'))
	return rcube_label('unknown');
	else
	$quota = $IMAP->get_quota();

	if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
	{
	$quota_text = sprintf('%s / %s (%.0f%%)',
	show_bytes($quota['used'] * 1024),
	show_bytes($quota['total'] * 1024),
	$quota['percent']);

	// show quota as image (by Brett Patterson)
	if ($display == 'image' && function_exists('imagegif'))
	{
	$attrib = array('width' => 100, 'height' => 14);
	$quota_text = sprintf('<img src="./bin/quotaimg.php?u=%s&q=%d&w=%d&h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
	$quota['used'], $quota['total'],
	$attrib['width'], $attrib['height'],
	$attrib['width'], $attrib['height'],
	$quota_text,
	show_bytes($quota["used"] * 1024),
	show_bytes($quota["total"] * 1024));
	}
	}
	else
	$quota_text = rcube_label('unlimited');

	return $quota_text;
	}


	/**
	*
	*/
	function rcmail_get_messagecount_text($count=NULL, $page=NULL)
	{
	global $IMAP, $MESSAGE;

	if (isset($MESSAGE->index))
	{
	return rcube_label(array('name' => 'messagenrof',
	'vars' => array('nr' => $MESSAGE->index+1,
	'count' => $count!==NULL ? $count : $IMAP->messagecount())));
	}

	if ($page===NULL)
	$page = $IMAP->list_page;

	$start_msg = ($page-1) * $IMAP->page_size + 1;
	$max = $count!==NULL ? $count : $IMAP->messagecount();

	if ($max==0)
	$out = rcube_label('mailboxempty');
	else
	$out = rcube_label(array('name' => 'messagesfromto',
	'vars' => array('from' => $start_msg,
	'to' => min($max, $start_msg + $IMAP->page_size - 1),
	'count' => $max)));

	return Q($out);
	}

	/**
	*
	*/
	function rcmail_mailbox_name_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmmailboxname';

	$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);

	return html::span($attrib, rcmail_get_mailbox_name_text());
	}

	function rcmail_get_mailbox_name_text()
	{
	global $RCMAIL;
	return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
	}


	/**
	* Convert the given message part to proper HTML
	* which can be displayed the message view
	*
	* @param object rcube_message_part Message part
	* @param bool True if external objects (ie. images ) are allowed
	* @param bool True if part should be converted to plaintext
	* @return string Formatted HTML string
	*/
	function rcmail_print_body($part, $p = array())
	{
	global $REMOTE_OBJECTS;

	$p += array('safe' => false, 'plain' => false, 'inline_html' => true);

	// convert html to text/plain
	if ($part->ctype_secondary == 'html' && $p['plain']) {
	$txt = new html2text($part->body, false, true);
	$body = $txt->get_text();
	$part->ctype_secondary = 'plain';
	}
	// text/html
	else if ($part->ctype_secondary == 'html') {
	// charset was converted to UTF-8 in rcube_imap::get_message_part() -> change charset specification in HTML accordingly
	$html = $part->body;
	if (preg_match('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i', $html))
	$html = preg_replace('/(\s+content=[\'"]\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i', '\\1='.RCMAIL_CHARSET, $html);
	else {
	// add <head> for malformed messages, washtml cannot work without that
	if (!preg_match('/<head>(.*)<\\/head>/Uims', $html))
	$html = '<head></head>' . $html;
	$html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '</head>')), 0);
	}

	// PHP bug #32547 workaround: remove title tag
	$html = preg_replace('/<title>.*<\/title>/', '', $html);

	// clean HTML with washhtml by Frederic Motte
	$wash_opts = array(
	'show_washed' => false,
	'allow_remote' => $p['safe'],
	'blocked_src' => "./program/blocked.gif",
	'charset' => RCMAIL_CHARSET,
	'cid_map' => $part->replaces,
	'html_elements' => array('body'),
	);

	if (!$p['inline_html']) {
	$wash_opts['html_elements'] = array('html','head','title','body');
	}

	/* CSS styles need to be sanitized!
	if ($p['safe']) {
	$wash_opts['html_elements'][] = 'style';
	$wash_opts['html_attribs'] = array('type');
	}
	*/

	$washer = new washtml($wash_opts);
	$washer->add_callback('form', 'rcmail_washtml_callback');
	$body = $washer->wash($html);
	$REMOTE_OBJECTS = $washer->extlinks;

	return $body;
	}
	// text/enriched
	else if ($part->ctype_secondary=='enriched') {
	$part->ctype_secondary = 'html';
	return Q(enriched_to_html($part->body), 'show');
	}
	else
	$body = $part->body;


	/** assert plaintext **/

	// make links and email-addresses clickable
	$convert_patterns = $convert_replaces = $replace_strings = array();

	$url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;';
	$url_chars_within = '\?\.~,!';

	$convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
	$convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', \$replace_strings)";

	$convert_patterns[] = "/([^\/:]\|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
	$convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', \$replace_strings)";

	$convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9]\\.[a-z]{2,5})/ie';
	$convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return ".JS_OBJECT_NAME.".command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";

	// if ($part->ctype_parameters['format'] != 'flowed')
	// $body = wordwrap(trim($body), 80);

	// search for patterns like links and e-mail addresses
	$body = preg_replace($convert_patterns, $convert_replaces, $body);

	// split body into single lines
	$a_lines = preg_split('/\r?\n/', $body);
	$quote_level = 0;

	// colorize quoted parts
	for ($n=0; $n < sizeof($a_lines); $n++) {
	$line = $a_lines[$n];
	$quotation = '';
	$q = 0;

	if (preg_match('/^(>+\s*)+/', $line, $regs)) {
	$q = strlen(preg_replace('/\s/', '', $regs[0]));
	$line = substr($line, strlen($regs[0]));

	if ($q > $quote_level)
	$quotation = str_repeat('<blockquote>', $q - $quote_level);
	else if ($q < $quote_level)
	$quotation = str_repeat("</blockquote>", $quote_level - $q);
	}
	else if ($quote_level > 0)
	$quotation = str_repeat("</blockquote>", $quote_level);

	$quote_level = $q;
	$a_lines[$n] = $quotation . Q($line, 'replace', false); // htmlquote plaintext
	}

	// insert the links for urls and mailtos
	$body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));

	return "<div class=\"pre\">".$body."\n</div>";
	}

	/**
	* add a string to the replacement array and return a replacement string
	*/
	function rcmail_str_replacement($str, &$rep)
	{
	static $count = 0;
	$rep[$count] = stripslashes($str);
	return "##string_replacement{".($count++)."}##";
	}


	/**
	* Callback function for washtml cleaning class
	*/
	function rcmail_washtml_callback($tagname, $attrib, $content)
	{
	switch ($tagname) {
	case 'form':
	$out = html::div('form', $content);
	break;

	default:
	$out = '';
	}

	return $out;
	}


	/**
	* return table with message headers
	*/
	function rcmail_message_headers($attrib, $headers=NULL)
	{
	global $IMAP, $OUTPUT, $MESSAGE, $PRINT_MODE, $CONFIG;
	static $sa_attrib;

	// keep header table attrib
	if (is_array($attrib) && !$sa_attrib)
	$sa_attrib = $attrib;
	else if (!is_array($attrib) && is_array($sa_attrib))
	$attrib = $sa_attrib;


	if (!isset($MESSAGE))
	return FALSE;

	// get associative array of headers object
	if (!$headers)
	$headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers;

	// add empty subject if none exsists
	if (empty($headers['subject']))
	$headers['subject'] = rcube_label('nosubject');

	$header_count = 0;

	// allow the following attributes to be added to the <table> tag
	$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
	$out = '<table' . $attrib_str . ">\n";

	// show these headers
	- $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'reply-to', 'date');
	+ $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'replyto', 'date');

	foreach ($standard_headers as $hkey)
	{
	if (!$headers[$hkey])
	continue;

	- if ($hkey=='date' && !empty($headers[$hkey]))
	+ if ($hkey == 'date')
	{
	if ($PRINT_MODE)
	$header_value = format_date($headers[$hkey], $CONFIG['date_long'] ? $CONFIG['date_long'] : 'x');
	else
	$header_value = format_date($headers[$hkey]);
	}
	- else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to')))
	+ else if ($hkey == 'replyto')
	+ {
	+ if ($headers['replyto'] != $headers['from'])
	+ $header_value = Q(rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']), 'show');
	+ else
	+ continue;
	+ }
	+ else if (in_array($hkey, array('from', 'to', 'cc', 'bcc')))
	$header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show');
	else
	$header_value = Q($IMAP->decode_header($headers[$hkey]));

	$out .= "\n<tr>\n";
	$out .= '<td class="header-title">'.Q(rcube_label($hkey)).": </td>\n";
	$out .= '<td class="'.$hkey.'" width="90%">'.$header_value."</td>\n</tr>";
	$header_count++;
	}

	$out .= "\n</table>\n\n";

	return $header_count ? $out : '';
	}


	/**
	* Handler for the 'messagebody' GUI object
	*
	* @param array Named parameters
	* @return string HTML content showing the message body
	*/
	function rcmail_message_body($attrib)
	{
	global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $REMOTE_OBJECTS;

	if (!is_array($MESSAGE->parts) && empty($MESSAGE->body))
	return '';

	if (!$attrib['id'])
	$attrib['id'] = 'rcmailMsgBody';

	$safe_mode = $MESSAGE->is_safe \|\| intval($_GET['_safe']);
	$out = '';

	$header_attrib = array();
	foreach ($attrib as $attr => $value)
	if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs))
	$header_attrib[$regs[1]] = $value;

	if (!empty($MESSAGE->parts))
	{
	foreach ($MESSAGE->parts as $i => $part)
	{
	if ($part->type == 'headers')
	$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
	else if ($part->type == 'content')
	{
	if (empty($part->ctype_parameters) \|\| empty($part->ctype_parameters['charset']))
	$part->ctype_parameters['charset'] = $MESSAGE->headers->charset;

	// fetch part if not available
	if (!isset($part->body))
	$part->body = $MESSAGE->get_part_content($part->mime_id);

	$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));

	if ($part->ctype_secondary == 'html')
	$out .= html::div('message-htmlpart', rcmail_html4inline($body, $attrib['id']));
	else
	$out .= html::div('message-part', $body);
	}
	}
	}
	else
	$out .= html::div('message-part', html::div('pre', Q($MESSAGE->body)));


	$ctype_primary = strtolower($MESSAGE->structure->ctype_primary);
	$ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary);

	// list images after mail body
	if (get_boolean($attrib['showimages'])
	&& $CONFIG['inline_images']
	&& $ctype_primary == 'multipart'
	&& !empty($MESSAGE->attachments)
	&& !strstr($message_body, '<html'))
	{
	foreach ($MESSAGE->attachments as $attach_prop) {
	if (strpos($attach_prop->mimetype, 'image/') === 0) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	)));
	}
	}
	}

	// tell client that there are blocked remote objects
	if ($REMOTE_OBJECTS && !$safe_mode)
	$OUTPUT->set_env('blockedobjects', true);

	return html::div($attrib, $out);
	}



	/**
	* modify a HTML message that it can be displayed inside a HTML page
	*/
	function rcmail_html4inline($body, $container_id)
	{
	$base_url = "";
	$last_style_pos = 0;
	$body_lc = strtolower($body);

	// check for <base href>
	if (preg_match(($base_reg = '/(<base.href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]>)/i'), $body, $base_regs))
	$base_url = $base_regs[2];

	// find STYLE tags
	while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos)))
	{
	$pos = strpos($body_lc, '>', $pos)+1;

	// replace all css definitions with #container [def]
	$styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id, $base_url);

	$body = substr($body, 0, $pos) . $styles . substr($body, $pos2);
	$body_lc = strtolower($body);
	$last_style_pos = $pos2;
	}

	// resolve <base href>
	if ($base_url)
	{
	$body = preg_replace('/(src\|background\|href)=(["\']?)([\.\/]+[^"\'\s]+)(\2\|\s\|>)/Uie', "'\\1=\"'.make_absolute_url('\\3', '$base_url').'\"'", $body);
	$body = preg_replace('/(url\s*$)(["\']?)([\.\/]+[^"\'$\s]+)(\2)\)/Uie', "'\\1\''.make_absolute_url('\\3', '$base_url').'\')'", $body);
	$body = preg_replace($base_reg, '', $body);
	}

	// modify HTML links to open a new window if clicked
	$body = preg_replace('/<(a\|link)\s+([^>]+)>/Uie', "rcmail_alter_html_link('\\1','\\2', '$container_id');", $body);

	// add comments arround html and other tags
	$out = preg_replace(array(
	'/(<!DOCTYPE[^>]*>)/i',
	'/(<\?xml[^>]*>)/i',
	'/(<\/?html[^>]*>)/i',
	'/(<\/?head[^>]*>)/i',
	'/(<title[^>]>.<\/title>)/Ui',
	'/(<\/?meta[^>]*>)/i'),
	'<!--\\1-->',
	$body);

	$out = preg_replace(
	array('/<body([^>]*)>/i', '/<\/body>/i'),
	array('<div class="rcmBody"\\1>', '</div>'),
	$out);

	// quote <? of php and xml files that are specified as text/html
	$out = preg_replace(array('/<\?/', '/\?>/'), array('<?', '?>'), $out);

	return $out;
	}


	/**
	* parse link attributes and set correct target
	*/
	function rcmail_alter_html_link($tag, $attrs, $container_id)
	{
	$attrib = parse_attrib_string($attrs);

	if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href']))
	$attrib['href'] = "./bin/modcss.php?u=" . urlencode($attrib['href']) . "&c=" . urlencode($container_id);

	else if (stristr((string)$attrib['href'], 'mailto:'))
	$attrib['onclick'] = sprintf(
	"return %s.command('compose','%s',this)",
	JS_OBJECT_NAME,
	JQ(substr($attrib['href'], 7)));

	else if (!empty($attrib['href']) && $attrib['href']{0}!='#')
	$attrib['target'] = '_blank';

	return "<$tag" . create_attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . ' />';
	}


	/**
	* decode address string and re-format it as HTML links
	*/
	function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
	{
	global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $EMAIL_ADDRESS_PATTERN;

	$a_parts = $IMAP->decode_address_list($input);

	if (!sizeof($a_parts))
	return $input;

	$c = count($a_parts);
	$j = 0;
	$out = '';

	foreach ($a_parts as $part) {
	$j++;
	if ($PRINT_MODE) {
	$out .= sprintf('%s <%s>', Q($part['name']), $part['mailto']);
	}
	else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto'])) {
	if ($linked) {
	$out .= html::a(array(
	'href' => 'mailto:'.$part['mailto'],
	'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($part['mailto'])),
	'title' => $part['mailto'],
	'class' => "rcmContactAddress",
	),
	Q($part['name']));
	}
	else {
	$out .= html::span(array('title' => $part['mailto'], 'class' => "rcmContactAddress"), Q($part['name']));
	}

	if ($addicon) {
	$out .= ' ' . html::a(array(
	'href' => "#add",
	'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($part['string'])),
	'title' => rcube_label('addtoaddressbook'),
	),
	html::img(array(
	'src' => $CONFIG['skin_path'] . $addicon,
	'alt' => "Add contact",
	'border' => 0,
	)));
	}
	}
	else {
	if ($part['name'])
	$out .= Q($part['name']);
	if ($part['mailto'])
	$out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($part['mailto']));
	}

	if ($c>$j)
	$out .= ','.($max ? ' ' : ' ');

	if ($max && $j==$max && $c>$j) {
	$out .= '...';
	break;
	}
	}

	return $out;
	}


	function rcmail_message_part_controls()
	{
	global $MESSAGE;

	$part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC));
	if (!is_object($MESSAGE) \|\| !is_array($MESSAGE->parts) \|\| !($_GET['_uid'] && $_GET['_part']) \|\| !$MESSAGE->mime_parts[$part])
	return '';

	$part = $MESSAGE->mime_parts[$part];
	$table = new html_table(array('cols' => 3));

	if (!empty($part->filename)) {
	$table->add('title', Q(rcube_label('filename')));
	$table->add(null, Q($part->filename));
	$table->add(null, '[' . html::a('?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q(rcube_label('download'))) . ']');
	}

	if (!empty($part->size)) {
	$table->add('title', Q(rcube_label('filesize')));
	$table->add(null, Q(show_bytes($part->size)));
	}

	return $table->show($attrib);
	}



	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE;

	$part = $MESSAGE->mime_parts[asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))];
	$ctype_primary = strtolower($part->ctype_primary);

	$attrib['src'] = Q('./?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']));

	$attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height'));
	$out = '<iframe '. $attrib_str . "></iframe>";

	return $out;
	}


	/**
	* clear message composing settings
	*/
	function rcmail_compose_cleanup()
	{
	if (!isset($_SESSION['compose']))
	return;

	// remove attachment files from temp dir
	if (is_array($_SESSION['compose']['attachments']))
	foreach ($_SESSION['compose']['attachments'] as $attachment)
	@unlink($attachment['path']);

	unset($_SESSION['compose']);
	}


	/**
	* Send the given message compose object using the configured method
	*/
	function rcmail_deliver_message(&$message, $from, $mailto)
	{
	global $CONFIG;

	$msg_body = $message->get();
	$headers = $message->headers();

	// send thru SMTP server using custom SMTP library
	if ($CONFIG['smtp_server'])
	{
	// generate list of recipients
	$a_recipients = array($mailto);

	if (strlen($headers['Cc']))
	$a_recipients[] = $headers['Cc'];
	if (strlen($headers['Bcc']))
	$a_recipients[] = $headers['Bcc'];

	// clean Bcc from header for recipients
	$send_headers = $headers;
	unset($send_headers['Bcc']);
	// here too, it because txtHeaders() below use $message->_headers not only $send_headers
	unset($message->_headers['Bcc']);

	// send message
	$smtp_response = array();
	$sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body, $smtp_response);

	// log error
	if (!$sent)
	raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__,
	'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE);
	}

	// send mail using PHP's mail() function
	else
	{
	// unset some headers because they will be added by the mail() function
	$headers_enc = $message->headers($headers);
	$headers_php = $message->_headers;
	unset($headers_php['To'], $headers_php['Subject']);

	// reset stored headers and overwrite
	$message->_headers = array();
	$header_str = $message->txtHeaders($headers_php);

	if (ini_get('safe_mode'))
	$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
	else
	$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
	}

	if ($sent)
	{
	// remove MDN headers after sending
	unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);

	if ($CONFIG['smtp_log'])
	write_log('sendmail', sprintf("[%s] User: %d on %s; Message for %s; %s",
	date("d-M-Y H:i:s O", mktime()),
	$_SESSION['user_id'],
	$_SERVER['REMOTE_ADDR'],
	$mailto,
	!empty($smtp_response) ? join('; ', $smtp_response) : ''));
	}

	$message->_headers = array();
	$message->headers($headers);

	return $sent;
	}


	function rcmail_send_mdn($uid)
	{
	global $RCMAIL, $IMAP;

	$message = new rcube_message($uid);

	if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT'))
	{
	$identity = $RCMAIL->user->get_identity();
	$sender = format_email_recipient($identity['email'], $identity['name']);
	$recipient = array_shift($IMAP->decode_address_list($message->headers->mdn_to));
	$mailto = $recipient['mailto'];

	$compose = new rcube_mail_mime($RCMAIL->config->header_delimiter());
	$compose->setParam(array(
	'text_encoding' => 'quoted-printable',
	'html_encoding' => 'quoted-printable',
	'head_encoding' => 'quoted-printable',
	'head_charset' => RCMAIL_CHARSET,
	'html_charset' => RCMAIL_CHARSET,
	'text_charset' => RCMAIL_CHARSET,
	));

	// compose headers array
	$headers = array(
	'Date' => date('r'),
	'From' => $sender,
	'To' => $message->headers->mdn_to,
	'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
	'Message-ID' => sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host'])),
	'X-Sender' => $identity['email'],
	'Content-Type' => 'multipart/report; report-type=disposition-notification',
	);

	if ($agent = $RCMAIL->config->get('useragent'))
	$headers['User-Agent'] = $agent;

	$body = rcube_label("yourmessage") . "\r\n\r\n" .
	"\t" . rcube_label("to") . ': ' . rcube_imap::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
	"\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
	"\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
	"\r\n" . rcube_label("receiptnote") . "\r\n";

	$ua = $RCMAIL->config->get('useragent', "RoundCube Webmail (Version ".RCMAIL_VERSION.")");
	$report = "Reporting-UA: $ua\r\n";

	if ($message->headers->to)
	$report .= "Original-Recipient: {$message->headers->to}\r\n";

	$report .= "Final-Recipient: rfc822; {$identity['email']}\r\n" .
	"Original-Message-ID: {$message->headers->messageID}\r\n" .
	"Disposition: manual-action/MDN-sent-manually; displayed\r\n";

	$compose->headers($headers);
	$compose->setTXTBody(wordwrap($body, 75, "\r\n"));
	$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');

	$sent = rcmail_deliver_message($compose, $identity['email'], $mailto);

	if ($sent)
	{
	$IMAP->set_flag($message->uid, 'MDNSENT');
	return true;
	}
	}

	return false;
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'mailboxlist' => 'rcmail_mailbox_list',
	'messages' => 'rcmail_message_list',
	'messagecountdisplay' => 'rcmail_messagecount_display',
	'quotadisplay' => 'rcmail_quota_display',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageheaders' => 'rcmail_message_headers',
	'messagebody' => 'rcmail_message_body',
	'messagecontentframe' => 'rcmail_messagecontent_frame',
	'messagepartframe' => 'rcmail_message_part_frame',
	'messagepartcontrols' => 'rcmail_message_part_controls',
	'searchform' => array($OUTPUT, 'search_form'),
	));

	?>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 8:44 AM (1 d, 16 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166434
Default Alt Text: (84 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions