No OneTemporary
Actions

Size

76 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index 02a2900b0..dbf62244e 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,1459 +1,1460 @@
	CHANGELOG RoundCube Webmail
	---------------------------

	2008/09/16 (alec)
	----------
	- Reduced memory footprint when forwarding attachments (#1485345)
	+- Fix inline images handling when replying/forwarding html messages

	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/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index b25a7dee6..02d062c1f 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,913 +1,943 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 0x0106);
	define('RCUBE_COMPOSE_FORWARD', 0x0107);
	define('RCUBE_COMPOSE_DRAFT', 0x0108);


	// remove an attachment
	if ($RCMAIL->action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
	{
	$id = $regs[1];
	if (is_array($_SESSION['compose']['attachments'][$id]))
	{
	@unlink($_SESSION['compose']['attachments'][$id]['path']);
	unset($_SESSION['compose']['attachments'][$id]);
	$OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
	$OUTPUT->send();
	- exit;
	}
	+ exit;
	}

	if ($RCMAIL->action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
	{
	$id = $regs[1];
	if (is_array($_SESSION['compose']['attachments'][$id]))
	{
	$apath = $_SESSION['compose']['attachments'][$id]['path'];
	header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']);
	header('Content-Length: ' . filesize($apath));
	readfile($apath);
	}
	exit;
	}

	$MESSAGE_FORM = NULL;
	$MESSAGE = NULL;

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
	// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear

	if (!is_array($_SESSION['compose']) \|\| $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
	{
	rcmail_compose_cleanup();
	$_SESSION['compose'] = array('id' => uniqid(rand()), 'param' => array_map('strip_tags', $_GET));

	// process values like "mailto:foo@bar.com?subject=new+message&cc=another"
	if ($_SESSION['compose']['param']['_to']) {
	$mailto = explode('?', $_SESSION['compose']['param']['_to']);
	if (count($mailto) > 1) {
	$_SESSION['compose']['param']['_to'] = $mailto[0];
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val)
	$_SESSION['compose']['param']["_$f"] = $val;
	}
	}

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array('_action' => 'compose', '_id' => $_SESSION['compose']['id']));
	}

	// add some labels to client
	rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting');

	// add config parameter to client script
	$OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0);


	// get reference message and set compose mode
	if ($msg_uid = $_SESSION['compose']['param']['_reply_uid'])
	$compose_mode = RCUBE_COMPOSE_REPLY;
	else if ($msg_uid = $_SESSION['compose']['param']['_forward_uid'])
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid'])
	$compose_mode = RCUBE_COMPOSE_DRAFT;

	if (!empty($msg_uid))
	{
	// similar as in program/steps/mail/show.inc
	$MESSAGE = new rcube_message($msg_uid);

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

	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	{
	$_SESSION['compose']['reply_uid'] = $msg_uid;
	$_SESSION['compose']['reply_msgid'] = $MESSAGE->headers->messageID;
	$_SESSION['compose']['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	if (!empty($_SESSION['compose']['param']['_all']))
	$MESSAGE->reply_all = 1;
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	if($MESSAGE->headers->in_reply_to)
	{
	// TODO: how to get reply_uid/forward_uid value, maybe we must set X-Reply-UID/X-Forward-UID
	// $_SESSION['compose']['reply_uid'] = ?
	// $_SESSION['compose']['forward_uid'] = ?
	$_SESSION['compose']['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
	}
	$_SESSION['compose']['references'] = $MESSAGE->headers->references;
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	{
	$_SESSION['compose']['forward_uid'] = $msg_uid;
	}
	}

	/**** compose mode functions ******/


	function rcmail_compose_headers($attrib)
	{
	global $IMAP, $MESSAGE, $DB, $compose_mode;
	static $sa_recipients = array();

	list($form_start, $form_end) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part)
	{
	case 'from':
	return rcmail_compose_header_from($attrib);

	case 'to':
	$fname = '_to';
	$header = 'to';

	// we have a set of recipients stored is session
	if (($mailto_id = $_SESSION['compose']['param']['_mailto']) && $_SESSION['mailto'][$mailto_id])
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);

	case 'cc':
	if (!$fname)
	{
	$fname = '_cc';
	$header = 'cc';
	}
	case 'bcc':
	if (!$fname)
	{
	$fname = '_bcc';
	$header = 'bcc';
	}

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

	case 'replyto':
	case 'reply-to':
	$fname = '_replyto';
	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

	if ($fname && !empty($_POST[$fname]))
	$fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE);
	else if ($fname && !$fvalue && !empty($_SESSION['compose']['param'][$fname]))
	$fvalue = $_SESSION['compose']['param'][$fname];

	else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY)
	{
	// get recipent address(es) out of the message headers
	if ($header=='to' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->headers->replyto;

	else if ($header=='to' && !empty($MESSAGE->headers->from))
	$fvalue = $MESSAGE->headers->from;

	// add recipent of original message if reply to all
	else if ($header=='cc' && !empty($MESSAGE->reply_all))
	{
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;

	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue))
	{
	$to_addresses = $IMAP->decode_address_list($fvalue);
	$fvalue = '';

	foreach ($to_addresses as $addr_part)
	{
	if (!empty($addr_part['mailto'])
	&& !in_array($addr_part['mailto'], $sa_recipients)
	&& (!$MESSAGE->compose_from
	\|\| !in_array($addr_part['mailto'], $MESSAGE->compose_from)
	\|\| count($to_addresses)==1)) // allow reply to yourself
	{
	$fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
	$sa_recipients[] = $addr_part['mailto'];
	}
	}
	}
	}
	else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to');

	if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc');

	if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc');
	}


	if ($fname && $field_type)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => $fname);
	foreach ($attrib as $attr => $value)
	if (in_array($attr, $allow_attrib))
	$field_attrib[$attr] = $value;

	// create teaxtarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($fvalue);
	}

	if ($form_start)
	$out = $form_start.$out;

	return $out;
	}



	function rcmail_compose_header_from($attrib)
	{
	global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode;

	// pass the following attributes to the form class
	$field_attrib = array('name' => '_from');
	foreach ($attrib as $attr => $value)
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex')))
	$field_attrib[$attr] = $value;

	// extract all recipients of the reply-message
	$a_recipients = array();
	if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE->headers))
	{
	$MESSAGE->compose_from = array();

	$a_to = $IMAP->decode_address_list($MESSAGE->headers->to);
	foreach ($a_to as $addr)
	{
	if (!empty($addr['mailto']))
	$a_recipients[] = $addr['mailto'];
	}

	if (!empty($MESSAGE->headers->cc))
	{
	$a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc);
	foreach ($a_cc as $addr)
	{
	if (!empty($addr['mailto']))
	$a_recipients[] = $addr['mailto'];
	}
	}
	}

	// get this user's identities
	$sql_result = $USER->list_identities();

	if ($DB->num_rows($sql_result))
	{
	$from_id = 0;
	$a_signatures = array();

	$field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
	$select_from = new html_select($field_attrib);

	while ($sql_arr = $DB->fetch_assoc($sql_result))
	{
	$identity_id = $sql_arr['identity_id'];
	$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);

	// add signature to array
	if (!empty($sql_arr['signature']))
	{
	$a_signatures[$identity_id]['text'] = $sql_arr['signature'];
	$a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false;
	if ($a_signatures[$identity_id]['is_html'])
	{
	$h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
	$plainTextPart = $h2t->get_text();
	$a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
	}
	}

	// set identity if it's one of the reply-message recipients
	if (in_array($sql_arr['email'], $a_recipients))
	$from_id = $sql_arr['identity_id'];

	if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
	$MESSAGE->compose_from[] = $sql_arr['email'];

	if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
	$from_id = $sql_arr['identity_id'];
	}

	// overwrite identity selection with post parameter
	if (isset($_POST['_from']))
	$from_id = get_input_value('_from', RCUBE_INPUT_POST);

	$out = $select_from->show($from_id);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	}
	else
	{
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($_POST['_from']);
	}

	if ($form_start)
	$out = $form_start.$out;

	return $out;
	}


	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_message';

	if ($CONFIG['htmleditor'])
	$isHtml = true;
	else
	$isHtml = false;

	$body = '';

	// use posted message body
	if (!empty($_POST['_message']))
	{
	$body = get_input_value('_message', RCUBE_INPUT_POST, true);
	}
	else if ($compose_mode)
	{
	if ($isHtml && $MESSAGE->has_html_part())
	{
	$body = $MESSAGE->first_html_part();
	$isHtml = true;
	}
	else
	{
	$body = $MESSAGE->first_text_part();
	$isHtml = false;
	}

	// compose reply-body
	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	$body = rcmail_create_reply_body($body, $isHtml);
	// forward message body inline
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	$body = rcmail_create_forward_body($body, $isHtml);
	// load draft message body
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	$body = rcmail_create_draft_body($body, $isHtml);
	+
	+ if ($isHtml) {
	+ // replace cid with href in inline images links
	+ foreach ((array)$_SESSION['compose']['attachments'] as $pid => $attachment) {
	+ if ($attachment['content_id']) {
	+ $body = str_replace('cid:'. $attachment['content_id'],
	+ $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$pid, $body);
	+ }
	+ }
	+ }
	}
	else if (!empty($_SESSION['compose']['param']['_body']))
	{
	$body = $_SESSION['compose']['param']['_body'];
	}

	$lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2));
	if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js'))
	$tinylang = 'en';

	$OUTPUT->include_script('tiny_mce/tiny_mce.js');
	$OUTPUT->include_script("editor.js");
	$OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).');');

	$out = $form_start ? "$form_start\n" : '';

	$saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
	$out .= $saveid->show();

	$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
	$out .= $drafttoggle->show();

	$msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
	$out .= $msgtype->show();

	- // If desired, set this text area to be editable by TinyMCE
	- if ($isHtml) $attrib['class'] = "mce_editor";
	+ // If desired, set this textarea to be editable by TinyMCE
	+ if ($isHtml) $attrib['class'] = 'mce_editor';
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($body);
	$out .= $form_end ? "\n$form_end" : '';

	// include GoogieSpell
	if (!empty($CONFIG['enable_spellcheck'])) {
	$spellcheck_langs = (array)$RCMAIL->config->get('spellcheck_languages', array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español', 'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski', 'pt'=>'Português', 'fi'=>'Suomi', 'sv'=>'Svenska'));
	if (!$spellcheck_langs[$lang])
	$lang = 'en';

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
	}

	$OUTPUT->include_script('googiespell.js');
	$OUTPUT->add_script(sprintf(
	"var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
	"googie.lang_chck_spell = \"%s\";\n".
	"googie.lang_rsm_edt = \"%s\";\n".
	"googie.lang_close = \"%s\";\n".
	"googie.lang_revert = \"%s\";\n".
	"googie.lang_no_error_found = \"%s\";\n".
	"googie.setLanguages(%s);\n".
	"googie.setCurrentLanguage('%s');\n".
	"googie.decorateTextarea('%s');\n".
	"%s.set_env('spellcheck', googie);",
	$RCMAIL->comm_path,
	JQ(Q(rcube_label('checkspelling'))),
	JQ(Q(rcube_label('resumeediting'))),
	JQ(Q(rcube_label('close'))),
	JQ(Q(rcube_label('revertto'))),
	JQ(Q(rcube_label('nospellerrors'))),
	json_serialize($spellcheck_langs),
	$lang,
	$attrib['id'],
	JS_OBJECT_NAME), 'foot');

	rcube_add_label('checking');
	$OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
	}

	$out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $IMAP, $MESSAGE, $OUTPUT;

	if (! $bodyIsHtml)
	{
	// soft-wrap message first
	$body = rcmail_wrap_quoted($body, 75);

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

	// add > to each line
	for($n=0; $n<sizeof($a_lines); $n++)
	{
	if (strpos($a_lines[$n], '>')===0)
	$a_lines[$n] = '>'.$a_lines[$n];
	else
	$a_lines[$n] = '> '.$a_lines[$n];
	}

	$body = join("\n", $a_lines);

	// add title line
	- $prefix = sprintf("\n\n\nOn %s, %s wrote:\n",
	+ $prefix = sprintf("On %s, %s wrote:\n",
	$MESSAGE->headers->date,
	$MESSAGE->get_header('from'));

	// try to remove the signature
	if ($sp = strrpos($body, '-- '))
	{
	if ($body{$sp+3}==' ' \|\| $body{$sp+3}=="\n" \|\| $body{$sp+3}=="\r")
	$body = substr($body, 0, $sp-1);
	}
	$suffix = '';
	}
	else
	{
	- $prefix = sprintf("<br /><br />On %s, %s wrote:<br />\n",
	+ $prefix = sprintf("On %s, %s wrote:<br />\n",
	$MESSAGE->headers->date,
	htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));
	$prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
	$suffix = "</blockquote>";
	+
	+ rcmail_write_inline_attachments($MESSAGE);
	}

	return $prefix.$body.$suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $IMAP, $MESSAGE, $OUTPUT;

	if (!$bodyIsHtml)
	{
	$prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
	$MESSAGE->subject,
	$MESSAGE->headers->date,
	$MESSAGE->get_header('from'),
	$MESSAGE->get_header('to'));
	}
	else
	{
	$prefix = sprintf(
	"<br><br>-------- Original Message --------" .
	"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>" .
	"</tbody></table><br>",
	Q($MESSAGE->subject),
	Q($MESSAGE->headers->date),
	htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true),
	htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));
	}

	// add attachments
	if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
	rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	return $prefix.$body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE;

	/**
	* add attachments
	* sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	*/
	if (!isset($_SESSION['compose']['forward_attachments'])
	&& is_array($MESSAGE->mime_parts)
	&& count($MESSAGE->mime_parts) > 0)
	rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	- global $RCMAIL, $IMAP;
	-
	- $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	-
	- if (!is_array($_SESSION['compose']['attachments']))
	- $_SESSION['compose']['attachments'] = array();
	-
	foreach ((array)$message->mime_parts as $pid => $part)
	{
	if (($part->ctype_primary != 'message' \|\| !$bodyIsHtml) &&
	- ($part->disposition=='attachment' \|\| $part->disposition=='inline' \|\| $part->headers['content-id'] \|\|
	- (empty($part->disposition) && $part->filename)))
	+ ($part->disposition=='attachment' \|\| $part->disposition=='inline' \|\| $part->headers['content-id']
	+ \|\| (empty($part->disposition) && $part->filename)))
	{
	- $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
	- if ($fp = fopen($tmp_path, 'w'))
	- {
	- $message->get_part_content($pid, $fp);
	- fclose($fp);
	-
	- $_SESSION['compose']['attachments'][] = array(
	- 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
	- 'name' => $part->filename,
	- 'path' => $tmp_path
	- );
	- }
	+ if ($attachment = rcmail_save_attachment($message, $pid))
	+ $_SESSION['compose']['attachments'][] = $attachment;
	}
	}

	$_SESSION['compose']['forward_attachments'] = true;
	}


	+function rcmail_write_inline_attachments(&$message)
	+{
	+ foreach ((array)$message->mime_parts as $pid => $part)
	+ {
	+ if ($part->content_id && $part->filename)
	+ {
	+ if ($attachment = rcmail_save_attachment($message, $pid))
	+ $_SESSION['compose']['attachments'][] = $attachment;
	+ }
	+ }
	+}
	+
	+function rcmail_save_attachment(&$message, $pid)
	+{
	+ global $RCMAIL;
	+
	+ $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	+ $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
	+ $part = $message->mime_parts[$pid];
	+
	+ if ($fp = fopen($tmp_path, 'w'))
	+ {
	+ $message->get_part_content($pid, $fp);
	+ fclose($fp);
	+
	+ return array(
	+ 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
	+ 'name' => $part->filename,
	+ 'path' => $tmp_path,
	+ 'content_id' => $part->content_id
	+ );
	+ }
	+}
	+
	+
	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_subject';
	$textfield = new html_inputfield($attrib);

	$subject = '';

	// use subject from post
	if (isset($_POST['_subject'])) {
	$subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
	}
	// create a reply-subject
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	if (eregi('^re:', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (eregi('^fwd:', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
	$subject = $MESSAGE->subject;
	}
	else if (!empty($_SESSION['compose']['param']['_subject'])) {
	$subject = $_SESSION['compose']['param']['_subject'];
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $textfield->show($subject);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_compose_attachment_list($attrib)
	{
	global $OUTPUT, $CONFIG;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";

	if (is_array($_SESSION['compose']['attachments']))
	{
	if ($attrib['deleteicon'])
	$button = html::img(array(
	'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
	'alt' => rcube_label('delete'),
	'style' => "border:0;padding-right:2px;vertical-align:middle"));
	else
	$button = Q(rcube_label('delete'));

	foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
	{
	if (empty($a_prop))
	continue;

	$out .= html::tag('li', array('id' => "rcmfile".$id),
	html::a(array(
	'href' => "#delete",
	'title' => rcube_label('delete'),
	'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id)),
	$button) . Q($a_prop['name']));
	}
	}

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

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmUploadbox';

	$button = new html_inputfield(array('type' => 'button', 'class' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) .
	html::div(null, rcmail_compose_attachment_field(array())) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))))) .
	html::div('buttons',
	$button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
	$button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")))
	);


	$OUTPUT->add_gui_object('uploadbox', $attrib['id']);
	return $out;
	}


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

	$out = '<input type="file" name="_attachments[]"'. $attrib_str . " />";
	return $out;
	}


	function rcmail_priority_selector($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$selector = new html_select($attrib);

	$selector->add(array(rcube_label('lowest'),
	rcube_label('low'),
	rcube_label('normal'),
	rcube_label('high'),
	rcube_label('highest')),
	array(5, 4, 0, 2, 1));

	$sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE->headers->priority);

	$out = $form_start ? "$form_start\n" : '';
	$out .= $selector->show($sel);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

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

	$attrib['name'] = '_receipt';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show(
	$compose_mode == RCUBE_COMPOSE_DRAFT && $MESSAGE->headers->mdn_to ? 1 : 0);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	global $CONFIG, $MESSAGE, $compose_mode;

	$choices = array(
	'html' => 'htmltoggle',
	'plain' => 'plaintoggle'
	);

	// determine whether HTML or plain text should be checked
	$useHtml = $CONFIG['htmleditor'] ? true : false;

	if ($compose_mode)
	$useHtml = ($useHtml && $MESSAGE->has_html_part());

	$selector = '';
	$chosenvalue = $useHtml ? 'html' : 'plain';
	$radio = new html_radiobutton(array('name' => '_editorSelect', 'onclick' => 'return rcmail_toggle_editor(this)'));
	foreach ($choices as $value => $text)
	{
	$attrib['id'] = '_' . $value;
	$attrib['value'] = $value;
	$selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
	}

	return $selector;
	}


	function rcmail_store_target_selection($attrib)
	{
	$attrib['name'] = '_store_target';
	$select = rcmail_mailbox_select(array_merge($attrib, array('noselection' => '- '.rcube_label('dontsave').' -')));
	return $select->show(rcmail::get_instance()->config->get('sent_mbox'), $attrib);
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM;

	$form_start = '';
	if (!strlen($MESSAGE_FORM))
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

	$form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';

	if (!strlen($MESSAGE_FORM))
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'composeheaders' => 'rcmail_compose_headers',
	'composesubject' => 'rcmail_compose_subject',
	'composebody' => 'rcmail_compose_body',
	'composeattachmentlist' => 'rcmail_compose_attachment_list',
	'composeattachmentform' => 'rcmail_compose_attachment_form',
	'composeattachment' => 'rcmail_compose_attachment_field',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	));

	/**** get contacts for this user and add them to client scripts ******/

	$CONTACTS = new rcube_contacts($DB, $USER->ID);
	$CONTACTS->set_pagesize(1000);

	$a_contacts = array();

	if ($result = $CONTACTS->list_records())
	{
	while ($sql_arr = $result->iterate())
	if ($sql_arr['email'])
	$a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
	}
	if (!empty($CONFIG['ldap_public']) && is_array($CONFIG['ldap_public']))
	{
	/* LDAP autocompletion */
	foreach ($CONFIG['ldap_public'] as $ldapserv_config)
	{
	if ($ldapserv_config['fuzzy_search'] != 1 \|\|
	$ldapserv_config['global_search'] != 1)
	{
	continue;
	}

	$LDAP = new rcube_ldap($ldapserv_config);
	$LDAP->connect();
	$LDAP->set_pagesize(1000);

	$results = $LDAP->search($ldapserv_config['mail_field'], "");

	for ($i = 0; $i < $results->count; $i++)
	{
	if ($results->records[$i]['email'] != '')
	{
	$email = $results->records[$i]['email'];
	$name = $results->records[$i]['name'];

	$a_contacts[] = format_email_recipient($email, $name);
	}
	}
	$LDAP->close();
	}
	}
	if ($a_contacts)
	{
	$OUTPUT->set_env('contacts', $a_contacts);
	}

	$OUTPUT->send('compose');

	?>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 9:51 AM (14 h, 22 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166587
Default Alt Text: (76 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions