2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |    3 +--
 plugins/calendar/lib/calendar_ical.php          |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f5eea012d1495ad4f7f5527f042ce8b8a96b047d
Merge: 5efdcbb 035534e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jul 4 11:20:13 2012 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit 5efdcbb2fb4a1c18f0e77f5392f8174052d2703f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jul 2 17:43:19 2012 +0200

    Use common methods calendar->get_ical()->get_parser() to access Horde-based ical parser (#865)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 09117f5..e54e083 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -803,7 +803,6 @@ class kolab_driver extends calendar_driver
    */
   public function get_freebusy_list($email, $start, $end)
   {
-    require_once('Horde/iCalendar.php');
     require_once('HTTP/Request2.php');
 
     if (empty($email)/* || $end < time()*/)
@@ -865,7 +864,7 @@ class kolab_driver extends calendar_driver
 
     // parse free-busy information using Horde classes
     if ($fbdata) {
-      $fbcal = new Horde_iCalendar;
+      $fbcal = $this->cal->get_ical()->get_parser();
       $fbcal->parsevCalendar($fbdata);
       if ($fb = $fbcal->findComponent('vfreebusy')) {
         $result = array();
diff --git a/plugins/calendar/lib/calendar_ical.php b/plugins/calendar/lib/calendar_ical.php
index 5aa5195..db803ef 100644
--- a/plugins/calendar/lib/calendar_ical.php
+++ b/plugins/calendar/lib/calendar_ical.php
@@ -121,7 +121,7 @@ class calendar_ical
   /**
    * Load iCal parser from the Horde lib
    */
-  private function get_parser()
+  public function get_parser()
   {
     // use Horde:iCalendar to parse vcalendar file format
     @include_once('Horde/iCalendar.php');