nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-19 01:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract HTTP response code for DELETE. Delete unused attribute, mark

Browse Source 
httpResponseHeaders / httpResponseBody as protected.
This commit is contained in:
Andrew McMillan 2012-04-04 23:12:46 +12:00
parent cfbb0bd6f3
commit b3c2c9db3c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/caldav-client-v2.php
View File

@ -76,8 +76,10 @@ class CalDAVClient {
protected $requestMethod = "GET"; protected $requestMethod = "GET";
protected $httpRequest = ""; // for debugging http headers sent protected $httpRequest = ""; // for debugging http headers sent
protected $xmlRequest = ""; // for debugging xml sent protected $xmlRequest = ""; // for debugging xml sent
protected $httpResponse = ""; // http headers received
protected $xmlResponse = ""; // xml received protected $xmlResponse = ""; // xml received
protected $httpResponseCode = 0; // http response code
protected $httpResponseHeaders = "";
protected $httpResponseBody = "";
protected $parser; // our XML parser object protected $parser; // our XML parser object
@ -167,11 +169,7 @@ class CalDAVClient {
*/ */
function ParseResponse( $response ) { function ParseResponse( $response ) {
$pos = strpos($response, '<?xml'); $pos = strpos($response, '<?xml');
if ($pos === false) { if ($pos !== false) {
$this->httpResponse = trim($response);
}
else {
$this->httpResponse = trim(substr($response, 0, $pos));
$this->xmlResponse = trim(substr($response, $pos)); $this->xmlResponse = trim(substr($response, $pos));
$this->xmlResponse = preg_replace('{>[^>]*$}s', '>',$this->xmlResponse ); $this->xmlResponse = preg_replace('{>[^>]*$}s', '>',$this->xmlResponse );
$parser = xml_parser_create_ns('UTF-8'); $parser = xml_parser_create_ns('UTF-8');
@ -268,7 +266,6 @@ class CalDAVClient {
$this->httpRequest = join("\r\n",$headers); $this->httpRequest = join("\r\n",$headers);
$this->xmlRequest = $this->body; $this->xmlRequest = $this->body;
$this->httpResponse = '';
$this->xmlResponse = ''; $this->xmlResponse = '';
$fip = fsockopen( $this->protocol . '://' . $this->server, $this->port, $errno, $errstr, _FSOCK_TIMEOUT); //error handling? $fip = fsockopen( $this->protocol . '://' . $this->server, $this->port, $errno, $errstr, _FSOCK_TIMEOUT); //error handling?
@ -280,6 +277,7 @@ class CalDAVClient {
list( $this->httpResponseHeaders, $this->httpResponseBody ) = preg_split( '{\r?\n\r?\n}s', $response, 2 ); list( $this->httpResponseHeaders, $this->httpResponseBody ) = preg_split( '{\r?\n\r?\n}s', $response, 2 );
if ( preg_match( '{Transfer-Encoding: chunked}i', $this->httpResponseHeaders ) ) $this->Unchunk(); if ( preg_match( '{Transfer-Encoding: chunked}i', $this->httpResponseHeaders ) ) $this->Unchunk();
$this->httpResponseCode = intval(substr($this->httpResponseHeaders,0,3));
$this->headers = array(); // reset the headers array for our next request $this->headers = array(); // reset the headers array for our next request
$this->ParseResponse($this->httpResponseBody); $this->ParseResponse($this->httpResponseBody);
@ -431,7 +429,7 @@ class CalDAVClient {
$this->SetMatch( true, $etag ); $this->SetMatch( true, $etag );
} }
$this->DoRequest($url); $this->DoRequest($url);
return $this->resultcode; return $this->httpResponseCode;
} }