From 94a62dc6768db158fbbad97a0c360248fb778afe Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sun, 18 Apr 2010 13:44:41 -0400
Subject: [PATCH] AS doesn't support more then one calendar, no need to allow
 specifying one

---
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php |  2 +-
 .../Horde/ActiveSync/Driver/Horde/Connector/Registry.php   | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
index 79cbe24cd..e10da4242 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
@@ -213,7 +213,7 @@ 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, null);
+                $events = $this->_connector->calendar_listEvents($startstamp, $endstamp);
             } 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 9b4f4b6ea..209937d07 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde/Connector/Registry.php
@@ -36,16 +36,15 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @param timestamp $startstamp    The start of time period.
      * @param timestamp $endstamp      The end of time period
-     * @param string $calendar         The calendar(s) to get events for
      *
      * @return array
      */
-    public function calendar_listEvents($startstamp, $endstamp, $calendar)
+    public function calendar_listEvents($startstamp, $endstamp)
     {
         $result = $this->_registry->calendar->listEvents(
                 $startstamp,   // Start
                 $endstamp,     // End
-                $calendar,     // Calendar
+                null,          // Calendar
                 false,         // Recurrence
                 false,         // Alarms only
                 false,         // Show remote
@@ -60,13 +59,12 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @param string $action      The action to check for (add, modify, delete)
      * @param timestamp $from_ts  The timestamp to start checking from
-     * @param string $calendar    The calendar to limit results to
      *
      * @return array  An array of event uids
      */
-    public function calendar_listBy($action, $from_ts, $calendar = null)
+    public function calendar_listBy($action, $from_ts)
     {
-        return $this->_registry->calendar->listBy($action, $from_ts, $calendar);
+        return $this->_registry->calendar->listBy($action, $from_ts);
     }
 
     /**
@@ -89,9 +87,9 @@ class Horde_ActiveSync_Driver_Horde_Connector_Registry
      *
      * @return string  The event's UID
      */
-    public function calendar_import($content, $calendar = null)
+    public function calendar_import($content)
     {
-        return $this->_registry->calendar->import($content, 'activesync', $calendar);
+        return $this->_registry->calendar->import($content, 'activesync');
     }
 
     /**
-- 
2.11.0