From c5ee036866791ad1c5ab8281f25179169df9e042 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 05 Jun 2009 14:03:21 -0400
Subject: [PATCH] - fix rcmail_temp_gc() + small code cleanups
---
program/steps/mail/func.inc | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 154fd7e..aad8c7d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -861,7 +861,7 @@
case 'style':
// decode all escaped entities and reduce to ascii strings
- $stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entitiy_decode($content));
+ $stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entity_decode($content));
// now check for evil strings like expression, behavior or url()
if (!preg_match('/expression|behavior|url\(|import/', $stripped)) {
@@ -1446,7 +1446,7 @@
function rcmail_search_filter($attrib)
{
- global $OUTPUT;
+ global $OUTPUT, $CONFIG;
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmlistfilter';
@@ -1466,6 +1466,8 @@
$select_filter->add(rcube_label('unread'), 'UNSEEN');
$select_filter->add(rcube_label('flagged'), 'FLAGGED');
$select_filter->add(rcube_label('unanswered'), 'UNANSWERED');
+ if (!$CONFIG['skip_deleted'])
+ $select_filter->add(rcube_label('deleted'), 'DELETED');
$out = $select_filter->show($_SESSION['search_filter']);
--
Gitblit v1.9.1