From a13fec8ae1b808890da58ea231681bf4e229fe3a Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 29 May 2009 14:13:50 +0000 Subject: [PATCH] further work, regarding the display of HTML messages, ... --- felamimail/inc/class.bofelamimail.inc.php | 7 +++++-- felamimail/inc/class.uidisplay.inc.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/felamimail/inc/class.bofelamimail.inc.php b/felamimail/inc/class.bofelamimail.inc.php index 25d13e018e..76514baa86 100644 --- a/felamimail/inc/class.bofelamimail.inc.php +++ b/felamimail/inc/class.bofelamimail.inc.php @@ -856,7 +856,8 @@ "style",array( "type" => array('maxlen' => 20), "color" => array('maxlen' => 20), - "background-color" => array('maxlen' => 20) + "background-color" => array('maxlen' => 20), + "background" => array('maxlen' => 5), ) ); @@ -968,7 +969,9 @@ // no scripts allowed // clean out comments $search = array('@]*?>.*?@si', // Strip out javascript - '@@' // Strip multi-line comments including CDATA + '@@', // Strip multi-line comments including CDATA + '@]*?>.*?@si', // Strip out head tag + '@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions ); $_html = preg_replace($search,"",$_html); diff --git a/felamimail/inc/class.uidisplay.inc.php b/felamimail/inc/class.uidisplay.inc.php index cc6a2f9009..1f5e396ea1 100644 --- a/felamimail/inc/class.uidisplay.inc.php +++ b/felamimail/inc/class.uidisplay.inc.php @@ -165,8 +165,8 @@ $sbody = $body; while(@eregi($pattern, $sbody, $regs)) { #_debug_array($regs); - $key=$regs[3].$regs[4].$regs[5]; - $addresses[$key] = $regs[1].$regs[2].$regs[3].$regs[4].$regs[5]; + $key=$regs[1].$regs[3].$regs[4].$regs[5]; + $addresses[$key] = $regs[1].$regs[3].$regs[4].$regs[5]; $start = strpos($sbody, $regs[0]) + strlen($regs[0]); $sbody = substr($sbody, $start); }