Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated PEAR::HTTP_Request with its successor HTTP_Request2 (#822)

Browse source
This commit is contained in:
Thomas Bruederli 2012-06-04 22:19:57 +02:00
parent 44465cb2b0
commit 8cb599bd96
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -907,7 +907,7 @@ class kolab_driver extends calendar_driver
public function get_freebusy_list($email, $start, $end) public function get_freebusy_list($email, $start, $end)
{ {
require_once('Horde/iCalendar.php'); require_once('Horde/iCalendar.php');
require_once('HTTP/Request.php'); require_once('HTTP/Request2.php');
if (empty($email)/* || $end < time()*/) if (empty($email)/* || $end < time()*/)
return false; return false;
@ -920,17 +920,31 @@ class kolab_driver extends calendar_driver
'OOF' => calendar::FREEBUSY_OOF); 'OOF' => calendar::FREEBUSY_OOF);
// ask kolab server first // ask kolab server first
$request = new HTTP_Request($url = rcube_kolab::get_freebusy_url($email)); try {
$result = $request->sendRequest(true); $rcmail = rcube::get_instance();
$request = new HTTP_Request2(kolab_storage::get_freebusy_url($email));
$request->setConfig(array(
'store_body' => true,
'follow_redirects' => true,
'ssl_verify_peer' => $rcmail->config->get('kolab_ssl_verify_peer', true),
));
// authentication required $response = $request->send();
if (!PEAR::isError($result) && $request->getResponseCode() == 401) {
$request->setBasicAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password'])); // authentication required
$result = $request->sendRequest(true); if ($response->getStatus() == 401) {
$request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
$response = $request->send();
}
if ($response->getStatus() == 200)
$fbdata = $response->getBody();
unset($request, $response);
}
catch (Exception $e) {
PEAR::raiseError("Error fetching free/busy information: " . $e->getMessage());
} }
if (!PEAR::isError($result) && $request->getResponseCode() == 200)
$fbdata = $request->getResponseBody();
// get free-busy url from contacts // get free-busy url from contacts
if (!$fbdata) { if (!$fbdata) {