diff options
author | alecpl <alec@alec.pl> | 2010-06-16 06:29:47 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2010-06-16 06:29:47 +0000 |
commit | 306f15db84b254fe23c2c1bc4a93536e7df24a26 (patch) | |
tree | b3848b4a0b2887ecde735c143be0f601693f354e /program/steps/addressbook/delete.inc | |
parent | 330a10b95294bcc082b880f30d9548891d63a1b0 (diff) |
- Fix base64 regexp (#1486800)
Diffstat (limited to 'program/steps/addressbook/delete.inc')
-rw-r--r-- | program/steps/addressbook/delete.inc | 8 |
1 files changed, 3 insertions, 5 deletions
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) { |