If mailto: string isn't double URL encoded, the values don't correctly get

fed to compose.php.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8884 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 8c80c43bced50df298ad4c6dcdaa43c317b13d5e..59fad2435c6770afaa887d32b06b63ac088abe73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -231,6 +231,8 @@ Version 1.5.1 -- CVS
     option includes.
   - Fixed bug #1124764, view unsafe images inside printer friendly view.
   - Fixed bug #1032366, remove NUL characters in text attachments on sent.
+  - URL Encode required for string being passed in mailto: links to pass on
+    additional values (cc, body, subject etc).
 
 Version 1.5.0
 --------------------

diff --git a/src/redirect.php b/src/redirect.php
index 83bec69075c22cf1813fc0394c461ecbf5ad6925..9a9a0086d37dce76a0ba4077f8eb2bf73a87c454 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -141,7 +141,7 @@ if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SE
 }
 if($mailto != '') {
     $redirect_url  = $location . '/webmail.php?right_frame=compose.php&mailto=';
-    $redirect_url .= $mailto;
+    $redirect_url .= urlencode($mailto);
 }
 
 /* Write session data and send them off to the appropriate page. */
@@ -176,4 +176,4 @@ function attachment_common_parse($str, $debug) {
     sqsession_register($attachment_common_types, 'attachment_common_types');
 }
 
-?>
\ No newline at end of file
+?>