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

Fix filtering emails/folders list when not in delegator context

Browse source
This commit is contained in:
Aleksander Machniak 2012-12-17 15:53:38 +01:00
parent 343a4371ab
commit 0745ebf406
3 changed files with 73 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -1820,7 +1820,7 @@ class calendar extends rcube_plugin
$event['calendar'] = $calendar['id']; $event['calendar'] = $calendar['id'];
// check for existing event with the same UID // check for existing event with the same UID
$existing = $this->driver->get_event($event['uid'], true); $existing = $this->driver->get_event($event['uid'], true, false, true);
if ($existing) { if ($existing) {
// only update attendee status // only update attendee status

23
plugins/kolab_delegation/kolab_delegation.php
View file

@ -166,11 +166,9 @@ class kolab_delegation extends rcube_plugin
// In delegator context we'll use delegator's addresses // In delegator context we'll use delegator's addresses
// instead of current user addresses // instead of current user addresses
$engine = $this->engine(); if (!empty($_SESSION['delegators'])) {
$engine = $this->engine();
if ($context = $engine->delegator_context()) { $engine->delegator_emails_filter($args);
$args['emails'] = $_SESSION['delegators'][$context];
$args['abort'] = true;
} }
return $args; return $args;
@ -184,11 +182,9 @@ class kolab_delegation extends rcube_plugin
// In delegator context we'll use delegator's folders // In delegator context we'll use delegator's folders
// instead of current user folders // instead of current user folders
$engine = $this->engine(); if (!empty($_SESSION['delegators'])) {
$engine = $this->engine();
if ($engine->delegator_context()) { $engine->delegator_folder_filter($args);
$args['calendars'] = $engine->delegator_folder_filter($args);
$args['abort'] = true;
} }
return $args; return $args;
@ -202,10 +198,9 @@ class kolab_delegation extends rcube_plugin
// In delegator context we'll use delegator's address/name // In delegator context we'll use delegator's address/name
// for invitation responses // for invitation responses
$engine = $this->engine(); if (!empty($_SESSION['delegators'])) {
$engine = $this->engine();
if ($engine->delegator_context()) { $engine->delegator_identity_filter($args);
$args['identity'] = $engine->delegator_identity();
} }
return $args; return $args;

85
plugins/kolab_delegation/kolab_delegation_engine.php
View file

@ -681,39 +681,72 @@ class kolab_delegation_engine
} }
/** /**
* Return identity of the current delegator * Set user identity according to delegator delegator
* *
* @return array Identity data (name and email) * @param array $args Reference to plugin hook arguments
*/ */
public function delegator_identity() public function delegator_identity_filter(&$args)
{ {
if (!$this->context) { $context = $this->delegator_context();
if (!$context) {
return; return;
} }
$identities = $this->rc->user->list_identities(); $identities = $this->rc->user->list_identities();
$emails = $_SESSION['delegators'][$this->context]; $emails = $_SESSION['delegators'][$context];
foreach ($identities as $ident) { foreach ($identities as $ident) {
if (in_array($ident['email'], $emails)) { if (in_array($ident['email'], $emails)) {
return $ident; $args['identity'] = $ident;
return;
} }
} }
// fallback to default identity
$args['identity'] = array_shift($identities);
}
/**
* Filter user emails according to delegator context
*
* @param array $args Reference to plugin hook arguments
*/
public function delegator_emails_filter(&$args)
{
$context = $this->delegator_context();
// return delegator's addresses
if ($context) {
$args['emails'] = $_SESSION['delegators'][$context];
$args['abort'] = true;
}
// return only user addresses (exclude all delegators addresses)
else if (!empty($_SESSION['delegators'])) {
$identities = $this->rc->user->list_identities();
$emails[] = $this->rc->user->get_username();
foreach ($this->rc->user->list_identities() as $identity) {
$emails[] = $identity['email'];
}
foreach ($_SESSION['delegators'] as $delegator_emails) {
$emails = array_diff($emails, $delegator_emails);
}
$args['emails'] = array_unique($emails);
$args['abort'] = true;
}
} }
/** /**
* Filters list of calendars according to delegator context * Filters list of calendars according to delegator context
* *
* @param array $args Plugin hook arguments * @param array $args Reference to plugin hook arguments
*
* @return array List of calendars
*/ */
public function delegator_folder_filter($args) public function delegator_folder_filter(&$args)
{ {
if (empty($this->context)) { $context = $this->delegator_context();
return;
}
$storage = $this->rc->get_storage(); $storage = $this->rc->get_storage();
$other_ns = $storage->get_namespace('other'); $other_ns = $storage->get_namespace('other');
$delim = $storage->get_hierarchy_delimiter(); $delim = $storage->get_hierarchy_delimiter();
@ -734,22 +767,30 @@ class kolab_delegation_engine
$ns = $cal->get_namespace(); $ns = $cal->get_namespace();
$name = $cal->get_realname(); // UTF-7 IMAP folder name $name = $cal->get_realname(); // UTF-7 IMAP folder name
if ($ns != 'other') { if (empty($context)) {
continue; if ($ns != 'personal') {
}
foreach ($other_ns as $ns) {
$folder = $ns[0] . $this->context . $delim;
if (strpos($name, $folder) !== 0) {
continue; continue;
} }
} }
else {
if ($ns != 'other') {
continue;
}
foreach ($other_ns as $ns) {
$folder = $ns[0] . $context . $delim;
if (strpos($name, $folder) !== 0) {
continue;
}
}
}
} }
$calendars[$cal->id] = $cal; $calendars[$cal->id] = $cal;
} }
return $calendars; $args['calendars'] = $calendars;
$args['abort'] = true;
} }
/** /**