Branch 'roundcube-0.7' - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 2a92223d28bb17bf1951d338e7e5c1ca00f4b4ff
Author: Thomas B <roundcube at gmail.com>
Date:   Tue May 8 08:34:29 2012 +0200

    Send user authentication if required for free-busy download; uses PEAR HTTP_Request class

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index de5620e..2d61f02 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -908,6 +908,7 @@ class kolab_driver extends calendar_driver
   public function get_freebusy_list($email, $start, $end)
   {
     require_once('Horde/iCalendar.php');
+    require_once('HTTP/Request.php');
 
     if (empty($email)/* || $end < time()*/)
       return false;
@@ -920,7 +921,17 @@ class kolab_driver extends calendar_driver
       'OOF' => calendar::FREEBUSY_OOF);
 
     // ask kolab server first
-    $fbdata = @file_get_contents(rcube_kolab::get_freebusy_url($email));
+    $request = new HTTP_Request($url = rcube_kolab::get_freebusy_url($email));
+    $result = $request->sendRequest(true);
+
+    // authentication required
+    if (!PEAR::isError($result) && $request->getResponseCode() == 401) {
+        $request->setBasicAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
+        $result = $request->sendRequest(true);
+    }
+
+    if (!PEAR::isError($result) && $request->getResponseCode() == 200)
+        $fbdata = $request->getResponseBody();
 
     // get free-busy url from contacts
     if (!$fbdata) {