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

Improve kolab_storage_dav::folder_update()

Browse source
This commit is contained in:
Aleksander Machniak 2023-12-13 14:13:13 +01:00
parent e21f48d3ba
commit 337ac3c5d9
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
plugins/libkolab/lib/kolab_storage_dav.php
View file

@ -232,7 +232,7 @@ class kolab_storage_dav
* - subscribed: Subscribed flag (IMAP subscription) * - subscribed: Subscribed flag (IMAP subscription)
* - active: Activation flag (client-side subscription) * - active: Activation flag (client-side subscription)
* *
* @return string|false New folder ID or False on failure * @return string|false Folder ID or False on failure
*/ */
public function folder_update(&$prop) public function folder_update(&$prop)
{ {
@ -251,30 +251,32 @@ class kolab_storage_dav
if (!empty($prop['id'])) { if (!empty($prop['id'])) {
if ($folder = $this->get_folder($prop['id'], $prop['type'])) { if ($folder = $this->get_folder($prop['id'], $prop['type'])) {
$result = $this->dav->folderUpdate($folder->href, $folder->get_dav_type(), $prop); $result = $this->dav->folderUpdate($folder->href, $folder->get_dav_type(), $prop);
}
else {
$result = false;
}
}
else {
$rcube = rcube::get_instance();
$uid = rtrim(chunk_split(md5($prop['name'] . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
$type = $this->get_dav_type($prop['type']);
$home = $this->dav->discover($type);
if ($home === false) { if ($result) {
return false; return $prop['id'];
}
} }
$location = unslashify($home) . '/' . $uid; return false;
$result = $this->dav->folderCreate($location, $type, $prop);
if ($result !== false) {
$result = self::folder_id($this->dav->url, $location);
}
} }
return $result; $rcube = rcube::get_instance();
$uid = rtrim(chunk_split(md5($prop['name'] . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
$type = $this->get_dav_type($prop['type']);
$home = $this->dav->discover($type);
if ($home === false) {
return false;
}
$location = unslashify($home) . '/' . $uid;
$result = $this->dav->folderCreate($location, $type, $prop);
if ($result) {
return self::folder_id($this->dav->url, $location);
}
return false;
} }
/** /**