plugins/calendar plugins/kolab_delegation plugins/libcalendaring plugins/tasklist

[Aleksander Machniak]

 plugins/calendar/calendar.php                        |    2 -
 plugins/calendar/lib/calendar_ui.php                 |    2 -
 plugins/kolab_delegation/kolab_delegation_engine.php |   26 ++-----------------
 plugins/libcalendaring/libcalendaring.php            |    2 -
 plugins/tasklist/tasklist_ui.php                     |    4 +-
 5 files changed, 9 insertions(+), 27 deletions(-)

New commits:
commit 62ac800db735462cd74a5cf66c0ac23605aa816e
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Nov 27 10:44:38 2014 +0100

    Use new rcube_user::list_emails() for better performance (#3970)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 4a8cb92..d7931ae 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1588,7 +1588,7 @@ class calendar extends rcube_plugin
 
     // get user identity to create default attendee
     if ($this->ui->screen == 'calendar') {
-      foreach ($this->rc->user->list_identities() as $rec) {
+      foreach ($this->rc->user->list_emails() as $rec) {
         if (!$identity)
           $identity = $rec;
         $identity['emails'][] = $rec['email'];
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index e01ecd8..15d24d5 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -375,7 +375,7 @@ class calendar_ui
   {
     $attrib['name'] = 'identity';
     $select         = new html_select($attrib);
-    $identities     = $this->rc->user->list_identities();
+    $identities     = $this->rc->user->list_emails();
 
     foreach ($identities as $ident) {
         $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index b5dc759..52dec8c 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -540,21 +540,6 @@ class kolab_delegation_engine
     }
 
     /**
-     * Returns current user identities
-     *
-     * @return array List of identities
-     */
-    public function user_identities()
-    {
-        // cache result in-memory, we need it more than once
-        if ($this->identities === null) {
-            $this->identities = $this->rc->user->list_identities();
-        }
-
-        return $this->identities;
-    }
-
-    /**
      * Update LDAP record of current user
      *
      * @param array List of delegates
@@ -596,7 +581,7 @@ class kolab_delegation_engine
 
         $delegators = $this->list_delegators();
         $use_subs   = $this->rc->config->get('kolab_use_subscriptions');
-        $identities = $this->user_identities();
+        $identities = $this->rc->user->list_emails();
         $emails     = array();
         $uids       = array();
 
@@ -611,10 +596,7 @@ class kolab_delegation_engine
             // get user name from default identity
             if (!$idx) {
                 $default = array(
-                    'name'           => $ident['name'],
-//                    'organization'   => $ident['organization'],
-//                    'signature'      => $ident['signature'],
-//                    'html_signature' => $ident['html_signature'],
+                    'name' => $ident['name'],
                 );
             }
             $emails[$ident['identity_id']] = $ident['email'];
@@ -738,7 +720,7 @@ class kolab_delegation_engine
             return;
         }
 
-        $identities = $this->user_identities();
+        $identities = $this->rc->user->list_emails();
         $emails     = $_SESSION['delegators'][$context];
 
         foreach ($identities as $ident) {
@@ -768,7 +750,7 @@ class kolab_delegation_engine
         }
         // return only user addresses (exclude all delegators addresses)
         else if (!empty($_SESSION['delegators'])) {
-            $identities = $this->user_identities();
+            $identities = $this->rc->user->list_emails();
             $emails[]   = $this->rc->user->get_username();
 
             foreach ($identities as $identity) {
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 78eaa24..95cbffb 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -381,7 +381,7 @@ class libcalendaring extends rcube_plugin
         }
 
         $emails[] = $this->rc->user->get_username();
-        foreach ($this->rc->user->list_identities() as $identity) {
+        foreach ($this->rc->user->list_emails() as $identity) {
             $emails[] = strtolower($identity['email']);
         }
 
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 912514e..3258418 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -77,7 +77,7 @@ class tasklist_ui
         $settings['sort_order']    = $this->rc->config->get('tasklist_sort_order', 'asc');
 
         // get user identity to create default attendee
-        foreach ($this->rc->user->list_identities() as $rec) {
+        foreach ($this->rc->user->list_emails() as $rec) {
             if (!$identity)
                 $identity = $rec;
 
@@ -118,7 +118,7 @@ class tasklist_ui
     {
         $attrib['name'] = 'identity';
         $select         = new html_select($attrib);
-        $identities     = $this->rc->user->list_identities();
+        $identities     = $this->rc->user->list_emails();
 
         foreach ($identities as $ident) {
             $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);