nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-07-28 13:09:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply some careful URL encoding.

Browse Source
This commit is contained in:
Andrew McMillan 2010-08-18 21:31:59 +12:00
parent f6fd2d39aa
commit 55cb133bb9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,9 +246,14 @@ class CalDAVClient {
$this->request_url = $url;
$url = preg_replace('{^https?://[^/]+}', '', $url);
// URLencode if it isn't already
/* if ( !preg_match( '{(%\x\x)}', $url) && preg_match( '{[^.-_/a-z0-9]}', $url ) ) {
if ( preg_match( '{[^%?&=+,.-_/a-z0-9]}', $url ) ) {
$url = str_replace(rawurlencode('/'),'/',rawurlencode($url));
}*/
$url = str_replace(rawurlencode('?'),'?',$url);
$url = str_replace(rawurlencode('&'),'&',$url);
$url = str_replace(rawurlencode('='),'=',$url);
$url = str_replace(rawurlencode('+'),'+',$url);
$url = str_replace(rawurlencode(','),',',$url);
}
$headers[] = $this->requestMethod." ". $url . " HTTP/1.1";
$headers[] = "Authorization: Basic ".base64_encode($this->user .":". $this->pass );
$headers[] = "Host: ".$this->server .":".$this->port;
@ -389,7 +394,7 @@ class CalDAVClient {
if ( $etag != null ) {
$this->SetMatch( ($etag != '*'), $etag );
}
$this->SetContentType('text/icalendar; encoding="utf-8"');
$this->SetContentType('text/calendar; encoding="utf-8"');
$this->DoRequest($url);
$etag = null;
@ -571,6 +576,9 @@ class CalDAVClient {
if ( $status == 'HTTP/1.1 200 OK' ) break;
}
}
elseif ( !isset($this->xmlnodes[$nodenum]) || !is_array($this->xmlnodes[$nodenum]) ) {
break;
}
elseif ( $this->xmlnodes[$nodenum]['tag'] == 'DAV::status' ) {
$status = $this->xmlnodes[$nodenum]['value'];
}