From a654398ea3fddf980a3916f5748d4f5ce224bb47 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sun, 26 Sep 2010 11:06:35 -0400
Subject: [PATCH] Track changes to applications' listUid methods.

Bug: 9253
---
 .../lib/Horde/ActiveSync/Driver/Horde.php          | 23 ++++++++--------------
 .../ActiveSync/Driver/Horde/Connector/Registry.php | 22 ++++++---------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
index 7db08d885..3422086f4 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
@@ -211,21 +211,19 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
             $endstamp = time() + 32140800; //60 * 60 * 24 * 31 * 12 == one year
 
             try {
-                $events = $this->_connector->calendar_listEvents($startstamp, $endstamp);
+                $events = $this->_connector->calendar_listUids($startstamp, $endstamp);
             } catch (Horde_Exception $e) {
                 $this->_logger->err($e->getMessage());
                 return array();
             }
-            foreach ($events as $day) {
-                foreach($day as $e) {
-                    $messages[] = $this->_smartStatMessage($folderid, $e->uid, false);
-                }
+            foreach ($events as $uid) {
+                $messages[] = $this->_smartStatMessage($folderid, $uid, false);
             }
             break;
 
         case self::CONTACTS_FOLDER:
             try {
-                $contacts = $this->_connector->contacts_list();
+                $contacts = $this->_connector->contacts_listUids();
             } catch (Horde_Exception $e) {
                 $this->_logger->err($e->getMessage());
                 return array();
@@ -238,7 +236,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
 
         case self::TASKS_FOLDER:
             try {
-                $tasks = $this->_connector->tasks_listTasks();
+                $tasks = $this->_connector->tasks_listUids();
             } catch (Horde_Exception $e) {
                $this->_logger->err($e->getMessage());
                return array();
@@ -279,16 +277,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
                 $startstamp = (int)$cutoffdate;
                 $endstamp = time() + 32140800; //60 * 60 * 24 * 31 * 12 == one year
                 try {
-                    $events = $this->_connector->calendar_listEvents($startstamp, $endstamp);
+                    $adds = $this->_connector->calendar_listUids($startstamp, $endstamp);
                 } catch (Horde_Exception $e) {
                     $this->_logger->err($e->getMessage());
                     return array();
                 }
-                foreach ($events as $day) {
-                    foreach($day as $e) {
-                        $adds[] = $e->uid;
-                    }
-                }
                 $edits = $deletes = array();
             } else {
                 try {
@@ -307,7 +300,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
             /* Can't use History for first sync */
             if ($from_ts == 0) {
                 try {
-                    $adds = $this->_connector->contacts_list();
+                    $adds = $this->_connector->contacts_listUids();
                 } catch (Horde_Exception $e) {
                     $this->_logger->err($e->getMessage());
                     return array();
@@ -328,7 +321,7 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
             /* Can't use History for first sync */
             if ($from_ts == 0) {
                 try {
-                    $adds = $this->_connector->tasks_listTasks();
+                    $adds = $this->_connector->tasks_listUids();
                 } catch (Horde_Exception $e) {
                     $this->_logger->err($e->getMessage());
                     return array();
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
index 5ad961a7f..0de75990d 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
@@ -47,23 +47,13 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @return array
      */
-    public function calendar_listEvents($startstamp, $endstamp)
+    public function calendar_listUids($startstamp, $endstamp)
     {
         try {
-            $result = $this->_registry->calendar->listEvents(
-                    $startstamp,   // Start
-                    $endstamp,     // End
-                    null,          // Calendar
-                    false,         // Recurrence
-                    false,         // Alarms only
-                    false,         // Show remote
-                    true,          // Hide exception events
-                    false,         // Don't return multi-day events on *each* day
-                    true);         // Return Tags
+            return $this->_registry->calendar->listUids($startstamp, $endstamp);
         } catch (Exception $e) {
             return array();
         }
-        return $result;
     }
 
     /**
@@ -172,9 +162,9 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @return array of contact UIDs
      */
-    public function contacts_list()
+    public function contacts_listUids()
     {
-        return $this->_registry->contacts->listContacts();
+        return $this->_registry->contacts->listUids();
     }
 
     /**
@@ -278,11 +268,11 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @return array  An array of task uids.
      */
-    public function tasks_listTasks()
+    public function tasks_listUids()
     {
         $app = $this->horde_hasInterface('tasks');
         $tasklist = $this->horde_getPref($app, 'default_tasklist');
-        return $this->_registry->tasks->listTaskUids($tasklist);
+        return $this->_registry->tasks->listUids($tasklist);
     }
 
     public function tasks_listTaskLists()
-- 
2.11.0