* BC Break: Sabre_CalDAV_Schedule_IMip::sendMessage now has an extra
argument. If you extended this class, you should fix this method. It's
only used for informational purposes.
+ * BC Break: The DAV: namespace is no longer converted to urn:DAV. This was
+ a workaround for a bug in older PHP versions (pre-5.3).
* New feature: Support for caldav notifications!
* Changed: Responsibility for dealing with the calendar-query is now
moved from the CalDAV plugin to the CalDAV backends. This allows for
supported-calendar-component list. (thanks Armin!)
* Fixed: Workaround for 10.8 Mountain Lion vCards, as it needs \r line
endings to parse them correctly.
+ * Fixed: Issue 219: serialize() now reorders correctly.
+ * Fixed: Sabre_DAV_XMLUtil no longer returns empty $dom->childNodes
+ if there is whitespace in $dom.
1.6.4-stable (2012-??-??)
* Fixed: Issue 220: Calendar-query filters may fail when filtering on
$this->xpath = new DOMXPath($dom);
$this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
- $this->xpath->registerNameSpace('dav','urn:DAV');
+ $this->xpath->registerNameSpace('dav','DAV:');
}
public function calendarMultiGetReport($dom) {
$properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
- $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+ $hrefElems = $dom->getElementsByTagNameNS('DAV:','href');
$xpath = new DOMXPath($dom);
$xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
- $xpath->registerNameSpace('dav','urn:DAV');
+ $xpath->registerNameSpace('dav','DAV:');
$expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
if ($expand->length>0) {
$properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
- $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+ $hrefElems = $dom->getElementsByTagNameNS('DAV:','href');
$propertyList = array();
foreach($hrefElems as $elem) {
*/
public function parseMultiStatus($body) {
- $body = Sabre_DAV_XMLUtil::convertDAVNamespace($body);
-
$responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
if ($responseXML===false) {
throw new InvalidArgumentException('The passed data is not valid XML');
}
- $responseXML->registerXPathNamespace('d', 'urn:DAV');
+ $responseXML->registerXPathNamespace('d', 'DAV:');
$propResult = array();
foreach($responseXML->xpath('d:response') as $response) {
- $response->registerXPathNamespace('d', 'urn:DAV');
+ $response->registerXPathNamespace('d', 'DAV:');
$href = $response->xpath('d:href');
$href = (string)$href[0];
foreach($response->xpath('d:propstat') as $propStat) {
- $propStat->registerXPathNamespace('d', 'urn:DAV');
+ $propStat->registerXPathNamespace('d', 'DAV:');
$status = $propStat->xpath('d:status');
list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
if (!$body) return array();
$dom = Sabre_DAV_XMLUtil::loadDOMDocument($body);
- $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
+ $elem = $dom->getElementsByTagNameNS('DAV:','propfind')->item(0);
return array_keys(Sabre_DAV_XMLUtil::parseProperties($elem));
}
* {http://www.example.org}myelem
*
* This format is used throughout the SabreDAV sourcecode.
- * Elements encoded with the urn:DAV namespace will
- * be returned as if they were in the DAV: namespace. This is to avoid
- * compatibility problems.
*
* This function will return null if a nodetype other than an Element is passed.
*
if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
- // Mapping back to the real namespace, in case it was dav
- if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
+ $ns = $dom->namespaceURI;
// Mapping to clark notation
return '{' . $ns . '}' . $dom->localName;
}
- /**
- * This method takes an XML document (as string) and converts all instances of the
- * DAV: namespace to urn:DAV
- *
- * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
- * spec, and causes the DOM to throw errors
- *
- * @param string $xmlDocument
- * @return array|string|null
- */
- static function convertDAVNamespace($xmlDocument) {
-
- // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
- // namespace is actually a violation of the XML namespaces specification, and will cause errors
- return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
-
- }
-
/**
* This method provides a generic way to load a DOMDocument for WebDAV use.
*
* This method throws a Sabre_DAV_Exception_BadRequest exception for any xml errors.
- * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
+ * It does not preserve whitespace.
*
* @param string $xml
* @throws Sabre_DAV_Exception_BadRequest
libxml_clear_errors();
$dom = new DOMDocument();
- $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
// We don't generally care about any whitespace
$dom->preserveWhiteSpace = false;
+
+ $dom->loadXML($xml,LIBXML_NOWARNING | LIBXML_NOERROR);
if ($error = libxml_get_last_error()) {
libxml_clear_errors();
static public function unserialize(DOMElement $dom) {
$privileges = array();
- $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
+ $xaces = $dom->getElementsByTagNameNS('DAV:','ace');
for($ii=0; $ii < $xaces->length; $ii++) {
$xace = $xaces->item($ii);
- $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
+ $principal = $xace->getElementsByTagNameNS('DAV:','principal');
if ($principal->length !== 1) {
throw new Sabre_DAV_Exception_BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
}
$protected = false;
- if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
+ if ($xace->getElementsByTagNameNS('DAV:','protected')->length > 0) {
$protected = true;
}
- $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
+ $grants = $xace->getElementsByTagNameNS('DAV:','grant');
if ($grants->length < 1) {
throw new Sabre_DAV_Exception_NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
}
$grant = $grants->item(0);
- $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
+ $xprivs = $grant->getElementsByTagNameNS('DAV:','privilege');
for($jj=0; $jj<$xprivs->length; $jj++) {
$xpriv = $xprivs->item($jj);
public $children = array();
/**
- * If coponents are added to this map, they will be automatically mapped
+ * If components are added to this map, they will be automatically mapped
* to their respective classes, if parsed by the reader or constructed with
* the 'create' method.
*
*
* This is solely used by the childrenSort method.
*
- * A higher score means the item will be higher in the list
+ * A higher score means the item will be lower in the list.
+ * To avoid score collisions, each "score category" has a reasonable
+ * space to accomodate elements. The $key is added to the $score to
+ * preserve the original relative order of elements.
*
- * @param Sabre_VObject_Node $n
+ * @param int $key
+ * @param Sabre_VObject $array
* @return int
*/
- $sortScore = function($n) {
-
- if ($n instanceof Sabre_VObject_Component) {
+ $sortScore = function($key, $array) {
+
+ if ($array[$key] instanceof Sabre_VObject_Component) {
// We want to encode VTIMEZONE first, this is a personal
// preference.
- if ($n->name === 'VTIMEZONE') {
- return 1;
+ if ($array[$key]->name === 'VTIMEZONE') {
+ $score=300000000;
+ return $score+$key;
} else {
- return 0;
+ $score=400000000;
+ return $score+$key;
}
} else {
+ // Properties get encoded first
// VCARD version 4.0 wants the VERSION property to appear first
- if ($n->name === 'VERSION') {
- return 3;
- } else {
- return 2;
+ if ($array[$key] instanceof Sabre_VObject_Property) {
+ if ($array[$key]->name === 'VERSION') {
+ $score=100000000;
+ return $score+$key;
+ } else {
+ // All other properties
+ $score=200000000;
+ return $score+$key;
+ }
}
}
+ next($children);
};
- usort($this->children, function($a, $b) use ($sortScore) {
+ $tmp = $this->children;
+ uksort($this->children, function($a, $b) use ($sortScore, $tmp) {
- $sA = $sortScore($a);
- $sB = $sortScore($b);
+ $sA = $sortScore($a, $tmp);
+ $sB = $sortScore($b, $tmp);
if ($sA === $sB) return 0;
- return ($sA > $sB) ? -1 : 1;
+ return ($sA < $sB) ? -1 : 1;
});
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Invalid HTTP status received. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Invalid HTTP status received. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Received an unexpected status. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Received an unexpected status. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Received an unexpected status. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'Received an unexpected status. Full response body: ' . $this->response->body);
- $xml = simplexml_load_string(Sabre_DAV_XMLUtil::convertDAVNamespace($this->response->body));
+ $xml = simplexml_load_string($this->response->body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:caldav');
$check = array(
$this->assertEquals('HTTP/1.1 200 OK',$this->response->status,'Got an incorrect status back. Response body: ' . $this->response->body);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$elements = array(
'/d:prop',
function testUnserialize() {
$xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="urn:DAV"><d:href>/bla/foo</d:href><d:href>/bla/bar</d:href></d:anything>
+<d:anything xmlns:d="DAV:"><d:href>/bla/foo</d:href><d:href>/bla/bar</d:href></d:anything>
';
$dom = new DOMDocument();
function testUnserializeIncompatible() {
$xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="urn:DAV"><d:href2>/bla/foo</d:href2></d:anything>
+<d:anything xmlns:d="DAV:"><d:href2>/bla/foo</d:href2></d:anything>
';
$dom = new DOMDocument();
function testUnserialize() {
$xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="urn:DAV"><d:href>/bla/path</d:href></d:anything>
+<d:anything xmlns:d="DAV:"><d:href>/bla/path</d:href></d:anything>
';
$dom = new DOMDocument();
function testUnserializeIncompatible() {
$xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="urn:DAV"><d:href2>/bla/path</d:href2></d:anything>
+<d:anything xmlns:d="DAV:"><d:href2>/bla/path</d:href2></d:anything>
';
$dom = new DOMDocument();
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'We expected a multi-status response. Full response body: ' . $this->response->body);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop');
$this->assertEquals(1,count($data),'We expected 1 \'d:prop\' element');
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'We expected a multi-status response. Full response body: ' . $this->response->body);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('x','http://www.rooftopsolutions.nl/testnamespace');
$data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop');
}
-
/**
* @depends testMKCOLIncorrectResourceType2
*/
}
+ /**
+ * @depends testMKCOLIncorrectResourceType2
+ */
+ function testMKCOLWhiteSpaceResourceType() {
+
+ $serverVars = array(
+ 'REQUEST_URI' => '/testcol',
+ 'REQUEST_METHOD' => 'MKCOL',
+ 'HTTP_CONTENT_TYPE' => 'application/xml',
+ );
+
+ $request = new Sabre_HTTP_Request($serverVars);
+ $request->setBody('<?xml version="1.0"?>
+<mkcol xmlns="DAV:">
+ <set>
+ <prop>
+ <resourcetype>
+ <collection />
+ </resourcetype>
+ </prop>
+ </set>
+</mkcol>');
+ $this->server->httpRequest = ($request);
+ $this->server->exec();
+
+ $this->assertEquals(array(
+ 'Content-Length' => '0',
+ ),$this->response->headers);
+
+ $this->assertEquals('HTTP/1.1 201 Created',$this->response->status,'Wrong statuscode received. Full response body: ' .$this->response->body);
+
+ }
/**
* @depends testMKCOLIncorrectResourceType2
$this->response->headers
);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
$this->assertEquals('/',(string)$data,'href element should have been /');
$this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry');
$this->assertEquals(2,count($data),'We expected two \'d:lockentry\' tags');
$this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:lockdiscovery');
$this->assertEquals(1,count($data),'We expected a \'d:lockdiscovery\' tag');
</d:propfind>';
$this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$pathTests = array(
'/d:multistatus',
'/d:multistatus/d:response',
$this->assertEquals('HTTP/1.1 207 Multi-Status',$this->response->status,'We got the wrong status. Full XML response: ' . $this->response->body);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('bla','http://www.rooftopsolutions.nl/testnamespace');
$data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop');
$this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
$xml->registerXPathNamespace('bla','http://www.rooftopsolutions.nl/testnamespace');
$xpath='//bla:someprop';
'Content-Type' => 'application/xml; charset=utf-8',
),$this->response->headers);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+ $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"DAV:\"",$this->response->body);
$xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d','urn:DAV');
+ $xml->registerXPathNamespace('d','DAV:');
list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
$this->assertEquals('/._testput.txt',(string)$data,'href element should have been /._testput.txt');
function testToClarkNotationDAVNamespace() {
$dom = new DOMDocument();
- $dom->loadXML('<?xml version="1.0"?><s:test1 xmlns:s="urn:DAV">Testdoc</s:test1>');
+ $dom->loadXML('<?xml version="1.0"?><s:test1 xmlns:s="DAV:">Testdoc</s:test1>');
$this->assertEquals(
'{DAV:}test1',
function testToClarkNotationNoElem() {
$dom = new DOMDocument();
- $dom->loadXML('<?xml version="1.0"?><s:test1 xmlns:s="urn:DAV">Testdoc</s:test1>');
+ $dom->loadXML('<?xml version="1.0"?><s:test1 xmlns:s="DAV:">Testdoc</s:test1>');
$this->assertNull(
Sabre_DAV_XMLUtil::toClarkNotation($dom->firstChild->firstChild)
}
- function testConvertDAVNamespace() {
-
- $xml='<?xml version="1.0"?><document xmlns="DAV:">blablabla</document>';
- $this->assertEquals(
- '<?xml version="1.0"?><document xmlns="urn:DAV">blablabla</document>',
- Sabre_DAV_XMLUtil::convertDAVNamespace($xml)
- );
-
- }
-
- function testConvertDAVNamespace2() {
-
- $xml='<?xml version="1.0"?><s:document xmlns:s="DAV:">blablabla</s:document>';
- $this->assertEquals(
- '<?xml version="1.0"?><s:document xmlns:s="urn:DAV">blablabla</s:document>',
- Sabre_DAV_XMLUtil::convertDAVNamespace($xml)
- );
-
- }
-
- function testConvertDAVNamespace3() {
-
- $xml='<?xml version="1.0"?><s:document xmlns="http://bla" xmlns:s="DAV:" xmlns:z="http://othernamespace">blablabla</s:document>';
- $this->assertEquals(
- '<?xml version="1.0"?><s:document xmlns="http://bla" xmlns:s="urn:DAV" xmlns:z="http://othernamespace">blablabla</s:document>',
- Sabre_DAV_XMLUtil::convertDAVNamespace($xml)
- );
-
- }
-
- function testConvertDAVNamespace4() {
-
- $xml='<?xml version="1.0"?><document xmlns=\'DAV:\'>blablabla</document>';
- $this->assertEquals(
- '<?xml version="1.0"?><document xmlns=\'urn:DAV\'>blablabla</document>',
- Sabre_DAV_XMLUtil::convertDAVNamespace($xml)
- );
-
- }
-
- function testConvertDAVNamespaceMixedQuotes() {
-
- $xml='<?xml version="1.0"?><document xmlns=\'DAV:" xmlns="Another attribute\'>blablabla</document>';
- $this->assertEquals(
- $xml,
- Sabre_DAV_XMLUtil::convertDAVNamespace($xml)
- );
-
- }
-
- /**
- * @depends testConvertDAVNamespace
- */
function testLoadDOMDocument() {
$xml='<?xml version="1.0"?><document></document>';
}
/**
- * @depends testConvertDAVNamespace
* @expectedException Sabre_DAV_Exception_BadRequest
*/
function testLoadDOMDocumentInvalid() {
new Sabre_VObject_Component('VEVENT'),
new Sabre_VObject_Component('VTODO')
);
- $this->assertEquals("BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", $comp->serialize());
+
+ $str = $comp->serialize();
+
+ $this->assertEquals("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n", $str);
}
- function testSerializeOrder() {
+ function testSerializeOrderCompAndProp() {
$comp = new Sabre_VObject_Component('VCALENDAR');
$comp->add(new Sabre_VObject_Component('VEVENT'));
}
+ function testAnotherSerializeOrderProp() {
+
+ $prop4s=array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10');
+
+ $comp = new Sabre_VObject_Component('VCARD');
+ $comp->__set('SOMEPROP','FOO');
+ $comp->__set('ANOTHERPROP','FOO');
+ $comp->__set('THIRDPROP','FOO');
+ foreach ($prop4s as $prop4) {
+ $comp->add('PROP4', 'FOO '.$prop4);
+ }
+ $comp->__set('PROPNUMBERFIVE', 'FOO');
+ $comp->__set('PROPNUMBERSIX', 'FOO');
+ $comp->__set('PROPNUMBERSEVEN', 'FOO');
+ $comp->__set('PROPNUMBEREIGHT', 'FOO');
+ $comp->__set('PROPNUMBERNINE', 'FOO');
+ $comp->__set('PROPNUMBERTEN', 'FOO');
+ $comp->__set('VERSION','2.0');
+ $comp->__set('UID', 'FOO');
+
+ $str = $comp->serialize();
+
+ $this->assertEquals("BEGIN:VCARD\r\nVERSION:2.0\r\nSOMEPROP:FOO\r\nANOTHERPROP:FOO\r\nTHIRDPROP:FOO\r\nPROP4:FOO 1\r\nPROP4:FOO 2\r\nPROP4:FOO 3\r\nPROP4:FOO 4\r\nPROP4:FOO 5\r\nPROP4:FOO 6\r\nPROP4:FOO 7\r\nPROP4:FOO 8\r\nPROP4:FOO 9\r\nPROP4:FOO 10\r\nPROPNUMBERFIVE:FOO\r\nPROPNUMBERSIX:FOO\r\nPROPNUMBERSEVEN:FOO\r\nPROPNUMBEREIGHT:FOO\r\nPROPNUMBERNINE:FOO\r\nPROPNUMBERTEN:FOO\r\nUID:FOO\r\nEND:VCARD\r\n", $str);
+
+ }
+
}
$vcard = new Sabre_VObject_Component('VCARD');
$vcard->VERSION = '3.0';
- $vcard->UID = 'foo-bar';
$vcard->PHOTO = base64_encode('random_stuff');
$vcard->PHOTO->add('BASE64',null);
+ $vcard->UID = 'foo-bar';
$result = $vcard->serialize();
$expected = array(
* @param Sabre_CalDAV_Calendar $calendar
* @param string $calendarobject_uri
* @param string $with_privilege
- * @return null|Sabre_VObject_Component_VEvent
+ * @return null|Sabre_VObject_Component_VCalendar
*/
function dav_get_current_user_calendarobject(&$server, &$calendar, $calendarobject_uri, $with_privilege = "")
{
{
$trigger = $alarm->__get("TRIGGER");
if (!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
- $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($trigger);
+ $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($trigger->value);
$related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
$(this).data("orig", $(this).text());
});
+ $("#new_alarm_adder a").click(function(ev) {
+ $("#new_alarm").val("1");
+ $("#noti_new_row").show();
+ $("#new_alarm_adder").hide();
+ ev.preventDefault();
+ });
+
wdcal_edit_recur_recalc();
$(document).on("click", ".exception_remover", function(ev) {
/**
* @param wdcal_local $localization
* @param string $baseurl
- * @param int $uid
* @param int $calendar_id
* @param int $uri
- * @param string $recurr_uri
* @return string
*/
-function wdcal_getEditPage_str(&$localization, $baseurl, $uid, $calendar_id, $uri, $recurr_uri = "")
+function wdcal_getEditPage_str(&$localization, $baseurl, $calendar_id, $uri)
{
$server = dav_create_server(true, true, false);
foreach ($z as $y) $recurrentce_exdates[] = $y->getTimeStamp();
}
+ $notifications = array();
+ $alarms = $component->select("VALARM");
+ foreach ($alarms as $alarm) {
+ /** @var Sabre_VObject_Component_VAlarm $alarm */
+ $action = $alarm->__get("ACTION")->value;
+ $trigger = $alarm->__get("TRIGGER");
+
+ if(isset($trigger['VALUE']) && strtoupper($trigger['VALUE']) !== 'DURATION') {
+ notice("The notification of this event cannot be parsed");
+ continue;
+ }
+
+ /** @var DateInterval $triggerDuration */
+ $triggerDuration = Sabre_VObject_DateTimeParser::parseDuration($trigger);
+ $unit = "hour";
+ $value = 1;
+ if ($triggerDuration->s > 0) {
+ $unit = "second";
+ $value = $triggerDuration->s + $triggerDuration->i * 60 + $triggerDuration->h * 3600 + $triggerDuration->d * 3600 * 24; // @TODO support more than days?
+ } elseif ($triggerDuration->m) {
+ $unit = "minute";
+ $value = $triggerDuration->i + $triggerDuration->h * 60 + $triggerDuration->d * 60 * 24;
+ } elseif ($triggerDuration->h) {
+ $unit = "hour";
+ $value = $triggerDuration->h + $triggerDuration->d * 24;
+ } elseif ($triggerDuration->d > 0) {
+ $unit = "day";
+ $value = $triggerDuration->d;
+ }
+
+ $rel = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'end' : 'start';
+
+
+ $notifications[] = array(
+ "action" => strtolower($action),
+ "rel" => $rel,
+ "trigger_unit" => $unit,
+ "trigger_value" => $value,
+ );
+ }
+
if ($component->select("RRULE")) $recurrence = new Sabre_VObject_RecurrenceIterator($vObject, (string)$component->__get("UID"));
else $recurrence = null;
} elseif (isset($_REQUEST["start"]) && $_REQUEST["start"] > 0) {
$calendars = dav_get_current_user_calendars($server, DAV_ACL_WRITE);
- $calendar = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_WRITE);
+ //$calendar = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_WRITE);
$event = array(
"id" => 0,
"Color" => null,
);
if ($_REQUEST["isallday"]) {
- $notifications = array(array("rel" => "start", "type" => "duration", "period" => "hour", "period_val" => 24));
+ $notifications = array();
} else {
- $notifications = array(array("rel" => "start", "type" => "duration", "period" => "hour", "period_val" => 1));
+ $notifications = array(array("action" => "email", "rel" => "start", "trigger_unit" => "hour", "trigger_value" => 1));
}
$recurrence = null;
$recurrentce_exdates = array();
} else {
$calendars = dav_get_current_user_calendars($server, DAV_ACL_WRITE);
- $calendar = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_WRITE);
+ //$calendar = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_WRITE);
$event = array(
"id" => 0,
"Location" => "",
"Color" => null,
);
- $notifications = array(array("rel" => "start", "type" => "duration", "period" => "hour", "period_val" => 1));
+ $notifications = array(array("action" => "email", "rel" => "start", "trigger_unit" => "hour", "trigger_value" => 1));
$recurrence = null;
$recurrentce_exdates = array();
}
$out .= "</div>";
$monthly_rule = "";
- if ($recurrence->frequency == "monthly" || $recurrence->frequency == "yearly") {
+ if ($recurrence && ($recurrence->frequency == "monthly" || $recurrence->frequency == "yearly")) {
if (is_null($recurrence->byDay) && !is_null($recurrence->byMonthDay) && count($recurrence->byMonthDay) == 1) {
$day = date("j", $event["StartTime"]);
if ($recurrence->byMonthDay[0] == $day) $monthly_rule = "bymonthday";
$out .= "</select>";
$out .= "</div>\n";
- if ($recurrence->frequency == "yearly") {
+ if ($recurrence && $recurrence->frequency == "yearly") {
if (count($recurrence->byMonth) != 1 || $recurrence->byMonth[0] != date("n", $event["StartTime"])) notice("The recurrence of this event cannot be parsed!");
}
$out .= "<h2>" . t("Notification") . "</h2>";
- /*
- $out .= '<input type="checkbox" name="notification" id="notification" ';
- if ($notification) $out .= "checked";
- $out .= '> ';
- $out .= '<span id="notification_detail" style="display: none;">
- <input name="notification_value" value="' . $notification_value . '" size="3">
- <select name="notification_type" size="1">
- <option value="minute" ';
- if ($notification_type == "minute") $out .= "selected";
- $out .= '> ' . t('Minutes') . '</option>
- <option value="hour" ';
- if ($notification_type == "hour") $out .= "selected";
- $out .= '> ' . t('Hours') . '</option>
- <option value="day" ';
- if ($notification_type == "day") echo "selected";
- $out .= '> ' . t('Days') . '</option>
- </select> ' . t('before') . '
- </span><br><br>';
- */
+ if (!$notifications) $notifications = array();
+ $notifications["new"] = array(
+ "action" => "email",
+ "trigger_value" => 60,
+ "trigger_unit" => "minute",
+ "rel" => "start",
+ );
+
+ foreach ($notifications as $index => $noti) {
+
+ $unparsable = false;
+ if (!in_array($noti["action"], array("email", "display"))) $unparsable = true;
+
+ $out .= "<div class='noti_holder' ";
+ if (!is_numeric($index) && $index == "new") $out .= "style='display: none;' id='noti_new_row'";
+ $out .= "><label class='plain'>" . t("Notify by");
+ $out .= "<select name='noti_type[$index]' size='1'>";
+ $out .= "<option value=''>- " . t("Remove") . " -</option>\n";
+ $out .= "<option value='email' "; if (!$unparsable && $noti["action"] == "email") $out .= "selected"; $out .= ">" . t("E-Mail") . "</option>\n";
+ $out .= "<option value='display' "; if (!$unparsable && $noti["action"] == "display") $out .= "selected"; $out .= ">" . t("On Friendica / Display") . "</option>\n";
+ //$out .= "<option value='other' "; if ($unparsable) $out .= "selected"; $out .= ">- " . t("other (leave it untouched)") . " -</option>\n"; // @TODO
+ $out .= "</select></label>";
+
+ $out .= "<input name='noti_value[$index]' size='5' style='width: 5em;' value='" . $noti["trigger_value"] . "'>";
+
+ $out .= "<select name='noti_unit[$index]' size='1'>";
+ $out .= "<option value='H' "; if ($noti["trigger_unit"] == "hour") $out .= "selected"; $out .= ">" . t("Hours") . "</option>\n";
+ $out .= "<option value='M' "; if ($noti["trigger_unit"] == "minute") $out .= "selected"; $out .= ">" . t("Minutes") . "</option>\n";
+ $out .= "<option value='S' "; if ($noti["trigger_unit"] == "second") $out .= "selected"; $out .= ">" . t("Seconds") . "</option>\n";
+ $out .= "<option value='D' "; if ($noti["trigger_unit"] == "day") $out .= "selected"; $out .= ">" . t("Days") . "</option>\n";
+ $out .= "<option value='W' "; if ($noti["trigger_unit"] == "week") $out .= "selected"; $out .= ">" . t("Weeks") . "</option>\n";
+ $out .= "</select>";
+
+ $out .= " <label class='plain'>" . t("before the") . " <select name='noti_ref[$index]' size='1'>";
+ $out .= "<option value='start' "; if ($noti["rel"] == "start") $out .= "selected"; $out .= ">" . t("start of the event") . "</option>\n";
+ $out .= "<option value='end' "; if ($noti["rel"] == "end") $out .= "selected"; $out .= ">" . t("end of the event") . "</option>\n";
+ $out .= "</select></label>\n";
+
+ $out .= "</div>";
+ }
+ $out .= "<input type='hidden' name='new_alarm' id='new_alarm' value='0'><div id='new_alarm_adder'><a href='#'>" . t("Add a notification") . "</a></div>";
$out .= "<script>\$(function() {
wdcal_edit_init('" . $localization->dateformat_datepicker_js() . "', '${baseurl}/dav/');
});</script>";
- $out .= "<input type='submit' name='save' value='Save'></form>";
+ $out .= "<br><input type='submit' name='save' value='Save'></form>";
return $out;
}
/**
* @param Sabre_VObject_Component_VEvent $component
* @param wdcal_local $localization
+ * @return int
*/
function wdcal_set_component_date(&$component, &$localization)
{
$component->__unset("DTEND");
$component->add($datetime_start);
$component->add($datetime_end);
+
+ return $ts_start;
}
/**
default:
$part_freq = "";
}
-/*
- echo "<pre>!";
- echo $part_freq . "\n";
- var_dump($_REQUEST);
- echo "</pre>";
- die();
-*/
if ($part_freq == "") return;
}
-/**
+ /**
+ * @param Sabre_VObject_Component_VEvent $component
+ * @param wdcal_local $localization
+ * @param string $summary
+ * @param int $dtstart
+ */
+function wdcal_set_component_alerts(&$component, &$localization, $summary, $dtstart)
+{
+ $a = get_app();
+
+ $prev_alarms = $component->select("VALARM");
+ $component->__unset("VALARM");
+
+ foreach ($prev_alarms as $al) {
+ /** @var Sabre_VObject_Component_VAlarm $al */
+ }
+
+ foreach (array_keys($_REQUEST["noti_type"]) as $key) if (is_numeric($key) || ($key == "new" && $_REQUEST["new_alarm"] == 1)) {
+ $alarm = new Sabre_VObject_Component_VAlarm("VALARM");
+
+ switch ($_REQUEST["noti_type"][$key]) {
+ case "email":
+ $mailtext = str_replace(array(
+ "#date#", "#name",
+ ), array(
+ $localization->date_timestamp2local($dtstart), $summary,
+ ), t("The event #name# will start at #date"));
+
+ $alarm->add(new Sabre_VObject_Property("ACTION", "EMAIL"));
+ $alarm->add(new Sabre_VObject_Property("SUMMARY", $summary));
+ $alarm->add(new Sabre_VObject_Property("DESCRIPTION", $mailtext));
+ $alarm->add(new Sabre_VObject_Property("ATTENDEE", "MAILTO:" . $a->user["email"]));
+ break;
+ case "display":
+ $alarm->add(new Sabre_VObject_Property("ACTION", "DISPLAY"));
+ $text = str_replace("#name#", $summary, t("#name# is about to begin."));
+ $alarm->add(new Sabre_VObject_Property("DESCRIPTION", $text));
+ break;
+ default:
+ continue;
+ }
+
+ $trigger_name = "TRIGGER";
+ $trigger_val = ""; // @TODO Bugfix : und ; sind evtl. vertauscht vgl. http://www.kanzaki.com/docs/ical/trigger.html
+ if ($_REQUEST["noti_ref"][$key] == "end") $trigger_name .= ";RELATED=END";
+ $trigger_val .= "-P";
+ if (in_array($_REQUEST["noti_unit"][$key], array("H", "M", "S"))) $trigger_val .= "T";
+ $trigger_val .= IntVal($_REQUEST["noti_value"][$key]) . $_REQUEST["noti_unit"][$key];
+ $alarm->add(new Sabre_VObject_Property($trigger_name, $trigger_val));
+
+ $component->add($alarm);
+ }
+
+}
+
+ /**
* @param string $uri
- * @param string $recurr_uri
* @param int $uid
* @param string $timezone
* @param string $goaway_url
* @return array
*/
-function wdcal_postEditPage($uri, $recurr_uri = "", $uid = 0, $timezone = "", $goaway_url = "")
+function wdcal_postEditPage($uri, $uid = 0, $timezone = "", $goaway_url = "")
{
$uid = IntVal($uid);
$localization = wdcal_local::getInstanceByUser($uid);
$obj_uri = $component->__get("UID");
}
- wdcal_set_component_date($component, $localization);
+ $ts_start = wdcal_set_component_date($component, $localization);
wdcal_set_component_recurrence($component, $localization);
+ wdcal_set_component_alerts($component, $localization, icalendar_sanitize_string(dav_compat_parse_text_serverside("summary")), $ts_start);
$component->__unset("LOCATION");
$component->__unset("SUMMARY");
/**
* @param int $calendar_id
* @param int $calendarobject_id
- * @param string $recurr_uri
* @return string
*/
-function wdcal_getDetailPage($calendar_id, $calendarobject_id, $recurr_uri)
+function wdcal_getDetailPage($calendar_id, $calendarobject_id)
{
$a = get_app();
/**
* @param int $calendar_id
* @param int $uri
- * @param string $recurr_uri
* @return string
*/
-function wdcal_getEditPage($calendar_id, $uri, $recurr_uri = "")
+function wdcal_getEditPage($calendar_id, $uri)
{
$a = get_app();
$localization = wdcal_local::getInstanceByUser($a->user["uid"]);
- return wdcal_getEditPage_str($localization, $a->get_baseurl(), $a->user["uid"], $calendar_id, $uri, $recurr_uri);
+ return wdcal_getEditPage_str($localization, $a->get_baseurl(), $calendar_id, $uri);
}
/**
$a = get_app();
$localization = wdcal_local::getInstanceByUser($a->user["uid"]);
- return wdcal_getEditPage_str($localization, $a->get_baseurl(), $a->user["uid"], 0, 0);
+ return wdcal_getEditPage_str($localization, $a->get_baseurl(), 0, 0);
}
function dav_include_files()
{
- /*
- require_once (__DIR__ . "/SabreDAV/lib/Sabre.includes.php");
- require_once (__DIR__ . "/SabreDAV/lib/Sabre/VObject/includes.php");
- require_once (__DIR__ . "/SabreDAV/lib/Sabre/DAVACL/includes.php");
- require_once (__DIR__ . "/SabreDAV/lib/Sabre/CalDAV/includes.php");
- */
require_once (__DIR__ . "/SabreDAV/lib/Sabre/autoload.php");
require_once (__DIR__ . "/common/calendar.fnk.php");
} elseif (isset($a->argv[3]) && $a->argv[3] == "ics-import") {
return wdcal_import_user_ics($calendar_id);
} elseif (isset($a->argv[3]) && $a->argv[3] > 0) {
- $recurr_uri = ""; // @TODO
if (isset($a->argv[4]) && $a->argv[4] == "edit") {
$o = "";
if (isset($_REQUEST["save"])) {
check_form_security_token_redirectOnErr($a->get_baseurl() . "/dav/wdcal/", "caledit");
- $ret = wdcal_postEditPage($a->argv[3], $recurr_uri, $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/");
+ $ret = wdcal_postEditPage($a->argv[3], $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/");
if ($ret["ok"]) notice($ret["msg"]);
else info($ret["msg"]);
goaway($a->get_baseurl() . "/dav/wdcal/");
}
- $o .= wdcal_getEditPage($calendar_id, $a->argv[3], $recurr_uri);
+ $o .= wdcal_getEditPage($calendar_id, $a->argv[3]);
return $o;
} else {
- return wdcal_getDetailPage($calendar_id, $a->argv[3], $recurr_uri);
+ return wdcal_getDetailPage($calendar_id, $a->argv[3]);
}
} else {
// @TODO Edit Calendar
projects / friendica-addons.git / commitdiff