holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapted to updated spec using action=capabilities

Browse Source
This commit is contained in:
Ralf Becker 2012-10-03 10:08:09 +00:00
parent 0d5ae0e2c2
commit 19f25f2012
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.ischedule_client.inc.php
View File

@ -189,7 +189,9 @@ class ischedule_client
array(
'method' => 'POST',
'header' => $header_string,
//'timeout' => $timeout, // max timeout in seconds
'user_agent' => 'EGroupware iSchedule client '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'].' $Id$',
//'follow_location' => 1, // default 1=follow
//'timeout' => $timeout, // max timeout in seconds (float)
'content' => $content,
)
);
@ -252,7 +254,7 @@ class ischedule_client
if (!isset($this->capabilities))
{
$reader = new XMLReader();
if (!$reader->open($this->url.'?query=capabilities'))
if (!$reader->open($this->url.'?action=capabilities'))
{
throw new Exception("Could not read iSchedule server capabilities $this->url!");
}

8
phpgwapi/inc/class.ischedule_server.inc.php
View File

@ -377,9 +377,9 @@ class ischedule_server
}
/**
* Serve an iSchedule GET request, currently only query=capabilities
* Serve an iSchedule GET request, currently only action=capabilities
*
* GET /.well-known/ischedule?query=capabilities HTTP/1.1
* GET /.well-known/ischedule?action=capabilities HTTP/1.1
* Host: cal.example.com
*
* HTTP/1.1 200 OK
@ -426,9 +426,9 @@ class ischedule_server
*/
protected function get()
{
if (!isset($_GET['query']) || $_GET['query'] !== 'capabilities')
if (!isset($_GET['query']) || $_GET['action'] !== 'capabilities')
{
error_log(__METHOD__."() invalid iSchedule request using GET without query=capabilities!");
error_log(__METHOD__."() invalid iSchedule request using GET without action=capabilities!");
header("HTTP/1.1 400 Bad Request");
return;
}