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

Final fix to status code response. Add a debug flag to limit output.

Browse Source
This commit is contained in:
Andrew McMillan 2012-04-05 14:34:43 +12:00
parent c6b95bc3f6
commit c8cde4c3da
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,8 @@ class CalDAVClient {
protected $parser; // our XML parser object protected $parser; // our XML parser object
private $debug = false; // Whether we are debugging
/** /**
* Constructor, initialises the class * Constructor, initialises the class
* *
@ -115,6 +117,23 @@ class CalDAVClient {
} }
} }
/**
* Call this to enable / disable debugging. It will return the prior value of the debugging flag.
* @param boolean $new_value The new value for debugging.
* @return boolean The previous value, in case you want to restore it later.
*/
function SetDebug( $new_value ) {
$old_value = $this->debug;
if ( $new_value )
$this->debug = true;
else
$this->debug = false;
return $old_value;
}
/** /**
* Adds an If-Match or If-None-Match header * Adds an If-Match or If-None-Match header
* *
@ -278,7 +297,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();
if ( preg_match('/HTTP\/\d\.\d (\d{3})/', $this->httpResponseHeaders, $status) ) if ( preg_match('/HTTP\/\d\.\d (\d{3})/', $this->httpResponseHeaders, $status) )
$this->httpResponseCode = intval($status); $this->httpResponseCode = intval($status[1]);
else else
$this->httpResponseCode = 0; $this->httpResponseCode = 0;
@ -401,13 +420,13 @@ class CalDAVClient {
$etag = null; $etag = null;
if ( preg_match( '{^ETag:\s+"([^"]*)"\s*$}im', $this->httpResponseHeaders, $matches ) ) $etag = $matches[1]; if ( preg_match( '{^ETag:\s+"([^"]*)"\s*$}im', $this->httpResponseHeaders, $matches ) ) $etag = $matches[1];
if ( !isset($etag) || $etag == '' ) { if ( !isset($etag) || $etag == '' ) {
printf( "No etag in:\n%s\n", $this->httpResponseHeaders ); if ( $this->debug ) printf( "No etag in:\n%s\n", $this->httpResponseHeaders );
$save_request = $this->httpRequest; $save_request = $this->httpRequest;
$save_response_headers = $this->httpResponseHeaders; $save_response_headers = $this->httpResponseHeaders;
$this->DoHEADRequest( $url ); $this->DoHEADRequest( $url );
if ( preg_match( '{^Etag:\s+"([^"]*)"\s*$}im', $this->httpResponseHeaders, $matches ) ) $etag = $matches[1]; if ( preg_match( '{^Etag:\s+"([^"]*)"\s*$}im', $this->httpResponseHeaders, $matches ) ) $etag = $matches[1];
if ( !isset($etag) || $etag == '' ) { if ( !isset($etag) || $etag == '' ) {
printf( "Still No etag in:\n%s\n", $this->httpResponseHeaders ); if ( $this->debug ) printf( "Still No etag in:\n%s\n", $this->httpResponseHeaders );
} }
$this->httpRequest = $save_request; $this->httpRequest = $save_request;
$this->httpResponseHeaders = $save_response_headers; $this->httpResponseHeaders = $save_response_headers;
@ -535,7 +554,7 @@ class CalDAVClient {
} }
} }
else { else {
printf( "xmltags[$tagname] or xmltags[$tagname][$i] is not set\n"); if ( $this->debug ) printf( "xmltags[$tagname] or xmltags[$tagname][$i] is not set\n");
} }
return null; return null;
} }