From 306f15db84b254fe23c2c1bc4a93536e7df24a26 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 16 Jun 2010 06:29:47 +0000 Subject: - Fix base64 regexp (#1486800) --- program/steps/addressbook/delete.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'program/steps/addressbook/delete.inc') diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc index 1611ae1a1..da83757a8 100644 --- a/program/steps/addressbook/delete.inc +++ b/program/steps/addressbook/delete.inc @@ -21,12 +21,10 @@ if ($OUTPUT->ajax_call && ($cid = get_input_value('_cid', RCUBE_INPUT_POST)) && - (preg_match('/^[0-9]+(,[0-9]+)*$/', $cid) || - preg_match('/^[a-zA-Z0-9=]+(,[a-zA-Z0-9=]+)*$/', $cid)) - ) - { + preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid) +) { $plugin = $RCMAIL->plugins->exec_hook('delete_contact', array('id' => $cid, 'source' => get_input_value('_source', RCUBE_INPUT_GPC))); - + $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid) : false; if (!$deleted) { -- cgit v1.2.3