Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Really fix the ID decoding check

Browse source
This commit is contained in:
Thomas Bruederli 2014-06-27 12:24:44 +02:00
parent 6665b7877b
commit cf30c52cb2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -371,10 +371,10 @@ class kolab_addressbook extends rcube_plugin
} }
else { else {
$id = kolab_storage::id_decode($p['id']); $id = kolab_storage::id_decode($p['id']);
if (preg_match('![^A-Za-z0-9/+=]!', $id)) // check for falsely base64 decoded identifier if (preg_match('![^A-Za-z0-9=/+&._ -]!', $id)) // check for falsely base64 decoded identifier
$id = $p['id']; $id = $p['id'];
$folder = kolab_storage::get_folder($id); $folder = kolab_storage::get_folder($id);
if (!$folder->type && $id != $p['id']) { // try with unencoded (old-style) identifier if ($folder->type != 'contact' && $id != $p['id']) { // try with unencoded (old-style) identifier
$folder = kolab_storage::get_folder($p['id']); $folder = kolab_storage::get_folder($p['id']);
} }
if ($folder->type) { if ($folder->type) {