From a76cbddfc92adbf4e8cb18dda5f668ec4de8a114 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 17 Jan 2011 07:21:08 -0500
Subject: [PATCH] - Fix %h/%z variables in username_domain option (#1487701)

---
 tests/mailfunc.php |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index 8fd2cd3..cc26f77 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -15,7 +15,8 @@
     // simulate environment to successfully include func.inc
     $GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
     $GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
-    $RCMAIL->action = 'spell';
+    $RCMAIL->action = 'autocomplete';
+    $RCMAIL->imap_init(false);
     $IMAP = $RCMAIL->imap;
     
     require_once 'steps/mail/func.inc';
@@ -51,19 +52,23 @@
     $this->assertPattern('#background="./program/blocked.gif"#', $html, "Replace external background image");
     $this->assertNoPattern('/ex3.jpg/', $html, "No references to external images");
     $this->assertNoPattern('/<meta [^>]+>/', $html, "No meta tags allowed");
-    $this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
+    //$this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
     $this->assertNoPattern('/<form [^>]+>/', $html, "No form tags allowed");
     $this->assertPattern('/Subscription form/', $html, "Include <form> contents");
-    $this->assertPattern('/<!-- input not allowed -->/', $html, "No input elements allowed");
+    $this->assertPattern('/<!-- input ignored -->/', $html, "No input elements allowed");
+    $this->assertPattern('/<!-- link ignored -->/', $html, "No external links allowed");
     $this->assertPattern('/<a[^>]+ target="_blank">/', $html, "Set target to _blank");
     $this->assertTrue($GLOBALS['REMOTE_OBJECTS'], "Remote object detected");
     
     // render HTML in safe mode
-    $html2 = rcmail_print_body($part, array('safe' => true));
+    $html2 = rcmail_html4inline(rcmail_print_body($part, array('safe' => true)), 'foo');
     
     $this->assertPattern('/<style [^>]+>/', $html2, "Allow styles in safe mode");
     $this->assertPattern('#src="http://evilsite.net/mailings/ex3.jpg"#', $html2, "Allow external images in HTML (safe mode)");
-    $this->assertPattern("#url\('http://evilsite.net/newsletter/image/bg/bg-64.jpg'\)#", $html2, "Allow external images in CSS (safe mode)");
+    $this->assertPattern("#url\('?http://evilsite.net/newsletter/image/bg/bg-64.jpg'?\)#", $html2, "Allow external images in CSS (safe mode)");
+    
+    $css = '<link rel="stylesheet" type="text/css" href="?_task=utils&amp;_action=modcss&amp;u='.urlencode('http://anysite.net/styles/mail.css').'&amp;c=foo"';
+    $this->assertPattern('#'.preg_quote($css).'#', $html2, "Filter external styleseehts with bin/modcss.php");
   }
 
   /**
@@ -105,11 +110,26 @@
     $part->ctype_secondary = 'plain';
     $part->body = quoted_printable_decode(file_get_contents(TESTS_DIR . 'src/plainbody.txt'));
     $html = rcmail_print_body($part, array('safe' => true));
-    
+
     $this->assertPattern('/<a href="mailto:nobody@roundcube.net" onclick="return rcmail.command\(\'compose\',\'nobody@roundcube.net\',this\)">nobody@roundcube.net<\/a>/', $html, "Mailto links with onclick");
-    $this->assertPattern('#<a href="http://www.apple.com/legal/privacy/" target="_blank">http://www.apple.com/legal/privacy/</a>#', $html, "Links with target=_blank");
+    $this->assertPattern('#<a href="http://www.apple.com/legal/privacy" target="_blank">http://www.apple.com/legal/privacy</a>#', $html, "Links with target=_blank");
+    $this->assertPattern('#\\[<a href="http://example.com/\\?tx\\[a\\]=5" target="_blank">http://example.com/\\?tx\\[a\\]=5</a>\\]#', $html, "Links with square brackets");
+  }
+
+  /**
+   * Test mailto links in html messages
+   */
+  function test_mailto()
+  {
+    $part = $this->get_html_part('src/mailto.txt');
+    
+    // render HTML in normal mode
+    $html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');
+
+    $mailto = '<a href="mailto:me@me.com?subject=this is the subject&amp;body=this is the body"'
+      .' onclick="return rcmail.command(\'compose\',\'me@me.com?subject=this is the subject&amp;body=this is the body\',this)">e-mail</a>';
+
+    $this->assertPattern('|'.preg_quote($mailto, '|').'|', $html, "Extended mailto links");
   }
 
 }
-
-?>
\ No newline at end of file

--
Gitblit v1.9.1