[Svn] r3755 - trunk/roundcubemail/program/steps/addressbook

trac at roundcube.net trac at roundcube.net
Wed Jun 16 08:29:47 CEST 2010


Author: alec
Date: 2010-06-16 01:29:47 -0500 (Wed, 16 Jun 2010)
New Revision: 3755

Modified:
   trunk/roundcubemail/program/steps/addressbook/copy.inc
   trunk/roundcubemail/program/steps/addressbook/delete.inc
   trunk/roundcubemail/program/steps/addressbook/mailto.inc
Log:
- Fix base64 regexp (#1486800)


Modified: trunk/roundcubemail/program/steps/addressbook/copy.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/copy.inc	2010-06-15 10:15:41 UTC (rev 3754)
+++ trunk/roundcubemail/program/steps/addressbook/copy.inc	2010-06-16 06:29:47 UTC (rev 3755)
@@ -27,7 +27,7 @@
 $target = get_input_value('_to', RCUBE_INPUT_POST);
 $target_group = get_input_value('_togid', RCUBE_INPUT_POST);
 
-if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($target) && $target !== $source)
+if ($cid && preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid) && strlen($target) && $target !== $source)
 {
   $success = 0;
   $TARGET = $RCMAIL->get_address_book($target);

Modified: trunk/roundcubemail/program/steps/addressbook/delete.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/delete.inc	2010-06-15 10:15:41 UTC (rev 3754)
+++ trunk/roundcubemail/program/steps/addressbook/delete.inc	2010-06-16 06:29:47 UTC (rev 3755)
@@ -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)
     {

Modified: trunk/roundcubemail/program/steps/addressbook/mailto.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/mailto.inc	2010-06-15 10:15:41 UTC (rev 3754)
+++ trunk/roundcubemail/program/steps/addressbook/mailto.inc	2010-06-16 06:29:47 UTC (rev 3755)
@@ -23,7 +23,7 @@
 $recipients = null;
 $mailto = array();
 
-if ($cid && preg_match('/^[a-z0-9\-\+\/_=]+(,[a-z0-9\-\+\/_=]+)*$/i', $cid) && $CONTACTS->ready)
+if ($cid && preg_match('/^[a-z0-9\+\/=_-]+(,[a-z0-9\+\/=_-]+)*$/i', $cid) && $CONTACTS->ready)
 {
   $CONTACTS->set_page(1);
   $CONTACTS->set_pagesize(100);

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list