From c792b5216eac546abc284b0da008dbe09efea0a4 Mon Sep 17 00:00:00 2001
From: root <root@alec-desktop.(none)>
Date: Tue, 08 May 2012 03:45:49 -0400
Subject: [PATCH] Simplified code
---
tests/mailfunc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index d8111c7..ed63788 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -16,8 +16,7 @@
$GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
$GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
$RCMAIL->action = 'autocomplete';
- $RCMAIL->imap_init(false);
- $IMAP = $RCMAIL->imap;
+ $RCMAIL->storage_init(false);
require_once INSTALL_PATH . 'program/steps/mail/func.inc';
@@ -92,7 +91,7 @@
function test_html_xss2()
{
$part = $this->get_html_part('src/BID-26800.txt');
- $washed = rcmail_print_body($part, array('safe' => true));
+ $washed = rcmail_html4inline(rcmail_print_body($part, array('safe' => true)), 'dabody', '', $attr, true);
$this->assertNoPattern('/alert|expression|javascript|xss/', $washed, "Remove evil style blocks");
$this->assertNoPattern('/font-style:italic/', $washed, "Allow valid styles");
@@ -166,5 +165,9 @@
$this->assertPattern('|src="http://alec\.pl/dir/img1\.gif"|', $html, "URI base resolving [1]");
$this->assertPattern('|src="http://alec\.pl/dir/img2\.gif"|', $html, "URI base resolving [2]");
$this->assertPattern('|src="http://alec\.pl/img3\.gif"|', $html, "URI base resolving [3]");
+
+ // base resolving exceptions
+ $this->assertPattern('|src="cid:theCID"|', $html, "URI base resolving exception [1]");
+ $this->assertPattern('|src="http://other\.domain\.tld/img3\.gif"|', $html, "URI base resolving exception [2]");
}
}
--
Gitblit v1.9.1