From fc73746eb48c4b3bfad9ee04f1fb229788062ffc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 10 Aug 2007 13:51:53 +0000
Subject: Fix compose function from address book + mozilla compatibility

---
 CHANGELOG                            | 3 ++-
 program/js/app.js                    | 2 +-
 program/steps/addressbook/mailto.inc | 2 ++
 skins/default/mail.css               | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3b1969d91..629ca9a08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG RoundCube Webmail
 - 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)
 
 
 2007/08/09 (richs)
@@ -19,7 +20,7 @@ CHANGELOG RoundCube Webmail
 - 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 
+- 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
 
 
diff --git a/program/js/app.js b/program/js/app.js
index 78e2b1afa..48597c57d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2289,7 +2289,7 @@ function rcube_webmail()
     this.enable_command('delete', 'compose', false);
 
     // send request to server
-    var url = (src ? '&_source='+urlencode(src) : '') + (page ? '&_page='+page : '');
+    var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
     this.env.source = src;
     
     // also send search request to get the right messages 
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 27217e5c8..101b7c043 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -25,6 +25,8 @@ $mailto = array();
 
 if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && $CONTACTS->ready)
 {
+  $CONTACTS->set_page(1);
+  $CONTACTS->set_pagesize(100);
   $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid);
 
   while (is_object($recipients) && ($rec = $recipients->iterate()))
diff --git a/skins/default/mail.css b/skins/default/mail.css
index ed3b1fcd7..c37a7b993 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -655,6 +655,7 @@ div.message-part div.pre
 {
   margin: 0px;
   padding: 0px;
+  white-space: -moz-pre-wrap !important;
   white-space: pre;
   font-family: monospace;
 }
-- 
cgit v1.2.3