Update patch to use packaged tinymce.

diff --git a/debian/changelog b/debian/changelog
index ed925d1815839035b4015160e72f3a3af68a7e77..cdbe1a10e5156412012d11b8c01e4f2cbcd8b2ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ roundcube (0.2~stable-1) unstable; urgency=low
       + Remove patch fixing login issue. This is fixed upstream.
       + Remove patch setting the default backend to db instead of mdb2:
         this is not possible any more. We depend on php-mdb2 now.
+      + Update patch to use packaged tinymce.
   * Upload to unstable since Lenny is out.
   * Apply fix for XSS issue (CVE-2009-0413). Closes: #514179.
   * Fix pending l10n issues:

diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch
index 290afb9fea1c93afc9a5b472436d38a2259e194a..7b3a1ffc00535fffda5d737e47a6fe77dff85b99 100644 (file)
--- a/debian/patches/use_packaged_tinymce.patch
+++ b/debian/patches/use_packaged_tinymce.patch
@@ -1,38 +1,13 @@
 Use tinymce from tinycme package instead of the shipped one.
 
-Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
-===================================================================
---- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
-+++ a/program/steps/mail/sendmail.inc  2008-06-22 13:51:33.000000000 +0200
-@@ -74,7 +74,7 @@
-   
-   $last_img_pos = 0;
- 
--  $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
-+  $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
- 
-   // keep track of added images, so they're only added once
-   $included_images = array();
 --- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc     2007-11-26 11:42:36.000000000 +0100
 +++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc  2007-11-26 11:44:04.000000000 +0100
-@@ -108,7 +108,7 @@
-     if (! in_array($image_name, $included_images))
-       {
-       // add the image to the MIME message
--      $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
-+      $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
--      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
-+      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
-         $OUTPUT->show_message("emoticonerror", 'error');
+@@ -123,7 +123,7 @@
  
---- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
-+++ a/program/steps/mail/sendmail.inc  2008-06-22 14:10:24.000000000 +0200
-@@ -102,7 +102,7 @@
-       array_push($included_images, $image_name);
-       }
+     // sanitize image name so resulting attachment doesn't leave images dir
+     $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i','',$image_name);
+-    $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
++    $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
  
--    $body = $body_pre . 'cid:_' . $image_name . $body_post;
-+    $body = $body_pre . $img_file . $body_post;
- 
-     $last_img_pos = $pos2;
-     }
+     if (! in_array($image_name, $included_images))
+       {