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

Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab

Browse source
This commit is contained in:
Thomas Bruederli 2014-04-03 10:21:31 +02:00
commit 4ac69cdaf4
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/kolab_folders/kolab_folders.php
View file

@ -331,16 +331,7 @@ class kolab_folders extends rcube_plugin
return $args; return $args;
} }
// Load configuration $dont_override = (array) $this->rc->config->get('dont_override', array());
$this->load_config();
// Check that configuration is not disabled
$dont_override = (array) $this->rc->config->get('dont_override', array());
// special handling for 'default_folders'
if (in_array('default_folders', $dont_override)) {
return $args;
}
// map config option name to kolab folder type annotation // map config option name to kolab folder type annotation
$opts = array( $opts = array(
@ -354,7 +345,7 @@ class kolab_folders extends rcube_plugin
foreach ($opts as $opt_name => $type) { foreach ($opts as $opt_name => $type) {
$new = $args['prefs'][$opt_name]; $new = $args['prefs'][$opt_name];
$old = $this->rc->config->get($opt_name); $old = $this->rc->config->get($opt_name);
if ($new === $old) { if (!strlen($new) || $new === $old || in_array($opt_name, $dont_override)) {
unset($opts[$opt_name]); unset($opts[$opt_name]);
} }
} }
@ -371,24 +362,22 @@ class kolab_folders extends rcube_plugin
foreach ($opts as $opt_name => $type) { foreach ($opts as $opt_name => $type) {
$foldername = $args['prefs'][$opt_name]; $foldername = $args['prefs'][$opt_name];
if (strlen($foldername)) {
// get all folders of specified type // get all folders of specified type
$folders = array_intersect($folderdata, array($type)); $folders = array_intersect($folderdata, array($type));
// folder already annotated with specified type // folder already annotated with specified type
if (!empty($folders[$foldername])) { if (!empty($folders[$foldername])) {
continue; continue;
} }
// set type to the new folder // set type to the new folder
$this->set_folder_type($foldername, $type); $this->set_folder_type($foldername, $type);
// unset old folder(s) type annotation // unset old folder(s) type annotation
list($maintype, $subtype) = explode('.', $type); list($maintype, $subtype) = explode('.', $type);
foreach (array_keys($folders) as $folder) { foreach (array_keys($folders) as $folder) {
$this->set_folder_type($folder, $maintype); $this->set_folder_type($folder, $maintype);
}
} }
} }