Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar/lib/HTTP/CalDAV Server.php,1.1,1.2
|
From: <ja...@us...> - 2006-04-13 05:10:27
|
Update of /cvsroot/phpicalendar/phpicalendar/lib/HTTP/CalDAV In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22568/lib/HTTP/CalDAV Modified Files: Server.php Log Message: * Almost working preliminary REPORT support * ReportParser successfully parses calendar-data request values * _componentParser almost parses iCalendar files & limits by calendar-data request value * TODO Determine whether _componentParser is rejecting valid iCalendar files * TODO Reduce duplicate code by factoring special property handling out of propfind_response_helper * TODO Push filtering parser into bennu? Index: Server.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/lib/HTTP/CalDAV/Server.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Server.php 9 Apr 2006 19:43:59 -0000 1.1 --- Server.php 13 Apr 2006 05:10:24 -0000 1.2 *************** *** 26,29 **** --- 26,31 ---- */ + require_once 'Tools/ReportParser.php'; + /** * CalDav Server class *************** *** 42,45 **** --- 44,60 ---- class HTTP_CalDAV_Server extends HTTP_WebDAV_Server { + /** + * Make a property in the CalDAV namespace + * + * @param string property name + * @param string property value + * @return array string property namespace + * string property name + * string property value + */ + function calDavProp($name, $value=null, $status=null) { + return $this->mkprop('urn:ietf:params:xml:ns:caldav', $name, $value, + $status); + } /** *************** *** 53,56 **** --- 68,85 ---- { $options = array(); + $options['path'] = $this->path; + + $options['depth'] = 'infinity'; + if (isset($_SERVER['HTTP_DEPTH'])) { + $options['depth'] = $_SERVER['HTTP_DEPTH']; + } + + $parser = new ReportParser('php://input'); + if (!$parser->success) { + $this->http_status('400 Bad Request'); + return; + } + + $options['props'] = $parser->props; return true; *************** *** 64,69 **** * @access public */ ! function report_response_helper($options, $responses) { $this->_multistatus($responses); } --- 93,258 ---- * @access public */ ! function report_response_helper($options, $files) { + $responses = array(); + + // now loop over all returned files + foreach ($files as $file) { + + // collect namespaces here + $ns_hash = array('urn:ietf:params:xml:ns:caldav' => 'C'); + + $response = array(); + + $response['href'] = $this->getHref($file['path']); + if (isset($file['href'])) { + $response['href'] = $file['href']; + } + + $response['propstat'] = array(); + + // nothing to do if no properties were returend + if (isset($file['props']) && is_array($file['props'])) { + + // now loop over all returned properties + foreach ($file['props'] as $prop) { + $status = '200 OK'; + + // as a convenience feature we do not require user handlers + // restrict returned properties to the requested ones + // here we ignore unrequested entries + switch ($options['props']) { + case 'propname': + + // only names of all existing properties were requested + // so remove values + unset($prop['value']); + + case 'allprop': + if (isset($prop['status'])) { + $status = $prop['status']; + } + + if (!isset($response['propstat'][$status])) { + $response['propstat'][$status] = array(); + } + + $response['propstat'][$status][] = $prop; + break; + + default: + + // search property name in requested properties + foreach($options['props'] as $reqprop) { + if ($reqprop['name'] == $prop['name'] && + $reqprop['ns'] == $prop['ns']) { + if (isset($prop['status'])) { + $status = $prop['status']; + } + + if (!isset($response['propstat'][$status])) { + $response['propstat'][$status] = array(); + } + + $response['propstat'][$status][] = $prop; + break (2); + } + } + + continue (2); + } + + // namespace handling + if (empty($prop['ns']) || // empty namespace + $prop['ns'] == 'DAV:' || // default namespace + isset($ns_hash[$prop['ns']])) { // already known + continue; + } + + // register namespace + $ns_hash[$prop['ns']] = 'ns' . count($ns_hash); + } + } + + // also need empty entries for properties requested + // but for which no values where returned + if (isset($options['props']) && is_array($options['props'])) { + + // now loop over all requested properties + foreach ($options['props'] as $reqprop) { + $status = '404 Not Found'; + + // check if property exists in result + foreach ($file['props'] as $prop) { + if ($reqprop['name'] == $prop['name'] && + $reqprop['ns'] == $prop['ns']) { + continue (2); + } + } + + if ($reqprop['name'] == 'lockdiscovery' && + $reqprop['ns'] == 'DAV:' && + method_exists($this, 'getLocks')) { + + $status = '200 OK'; + if (!isset($response['propstat'][$status])) { + $response['propstat'][$status] = array(); + } + + $response['propstat'][$status][] = + $this->mkprop('DAV:', 'lockdiscovery', + $this->getLocks($file['path'])); + continue; + } + + if ($reqprop['name'] == 'calendar-data' && + $reqprop['ns'] == 'urn:ietf:params:xml:ns:caldav' && + method_exists($this, 'get')) { + + $prop = $this->_calendarData($file['path'], + $reqprop['value']); + if (isset($prop)) { + $status = '200 OK'; + if (isset($prop['status'])) { + $status = $prop['status']; + } + } else { + $prop = HTTP_CalDAV_Server::calDavProp( + 'calendar-data'); + } + + if (!isset($response['propstat'][$status])) { + $response['propstat'][$status] = array(); + } + + $response['propstat'][$status][] = $prop; + continue; + } + + if (!isset($response['propstat'][$status])) { + $response['propstat'][$status] = array(); + } + + // add empty value for this property + $response['propstat'][$status][] = + $this->mkprop($reqprop['ns'], $reqprop['name'], + null); + + // namespace handling + if (empty($reqprop['ns']) || // empty namespace + $reqprop['ns'] == 'DAV:' || // default namespace + isset($ns_hash[$reqprop['ns']])) { // already known + continue; + } + + // register namespace + $ns_hash[$reqprop['ns']] = 'ns' . count($ns_hash); + } + } + + $response['ns_hash'] = $ns_hash; + $responses[] = $response; + } + $this->_multistatus($responses); } *************** *** 78,106 **** function report_wrapper() { ! // prepare data-structure from REPORT request if (!$this->report_request_helper($options)) { return; } ! // call user handler ! if (!$this->report($options, $responses)) { return; } ! // format REPORT response ! $this->report_response_helper($options, $responses); } ! /** ! * Make a property in the CalDAV namespace ! * ! * @param string property name ! * @param string property value ! * @return array string property namespace ! * string property name ! * string property value ! */ ! function calDavProp($name, $value=null) { ! return $this->mkprop('urn:ietf:params:xml:ns:caldav', $name, $value); } } --- 267,559 ---- function report_wrapper() { ! /* Prepare data-structure from REPORT request */ if (!$this->report_request_helper($options)) { return; } ! /* Call user handler */ ! if (method_exists($this, 'report')) { ! if (!$this->report($options, $files)) { ! return; ! } ! } else { ! ! /* Empulate REPORT using PROPFIND */ ! if (!$this->propfind($options, $files)) { ! return; ! } ! } ! ! /* Format REPORT response */ ! $this->report_response_helper($options, $files); ! } ! ! function _calendarData($path, $data=null, $filter=null) ! { ! if (is_array($data['comps']) && ! !isset($data['comps']['VCALENDAR'])) { ! return HTTP_CalDAV_Server::calDavProp('calendar-data'); ! } ! ! $options = array(); ! $options['path'] = $path; ! ! $status = $this->get($options); ! if (empty($status)) { ! $status = '403 Forbidden'; ! } ! ! if ($status !== true) { ! return HTTP_CalDAV_Server::calDavProp('calendar-data', null, ! $status); ! } ! ! if ($options['mimetype'] != 'text/calendar') { ! return HTTP_CalDAV_Server::calDavProp('calendar-data', null, ! '403 Forbidden'); ! } ! ! if ($options['stream']) { ! $handle = $options['stream']; ! } else if ($options['data']) { ! // What about data? ! } else { return; } ! if (($line = fgets($handle, 4096)) === false) { ! return; ! } ! ! if (trim($line) != 'BEGIN:VCALENDAR') { ! return; ! } ! ! if (!($value = HTTP_CalDAV_Server::_parseComponent($handle, ! 'VCALENDAR', is_array($data['comps']) ? ! $data['comps']['VCALENDAR'] : null))) { ! return; ! } ! ! return HTTP_CalDAV_Server::calDavProp('calendar-data', $value); } ! function _parseComponent($handle, $name, $data=null, $filter=null) ! { ! $className = 'iCalendar_' . ltrim(strtolower($name), 'v'); ! if ($name == 'VCALENDAR') { ! $className = 'iCalendar'; ! } ! ! if (!class_exists($className)) { ! return; ! } ! $component = new $className; ! ! while (($line = fgets($handle, 4096)) !== false) { ! $line = explode(':', trim($line)); ! ! if ($line[0] == 'END') { ! if ($line[1] != $name) { ! return; ! } ! ! return $component; ! } ! ! if ($line[0] == 'BEGIN') { ! if (is_array($data['comps']) && ! !isset($data['comps'][$line[1]])) { ! while (($l = fgets($handle, 4096)) !== false) { ! if (trim($l) == "END:$line[1]") { ! continue (2); ! } ! } ! ! return; ! } ! ! if (!($childComponent = HTTP_CalDAV_Server::_parseComponent( ! $handle, $line[1], is_array($data['comps']) ? ! $data['comps'][$line[1]] : null))) { ! while (($l = fgets($handle, 4096)) !== false) { ! if (trim($l) == "END:$line[1]") { ! continue (2); ! } ! } ! ! return; ! } ! ! if (!$component->add_component($childComponent)) { ! return; ! } ! ! continue; ! } ! ! $line[0] = explode(';=', $line[0]); ! $prop_name = array_shift($line[0]); ! if (is_array($data['props']) && ! !in_array($prop_name, $data['props'])) { ! continue; ! } ! ! $params = array(); ! while (($param_name = array_shift($line[0])) && ! ($param_value = array_shift($line[0]))) { ! $params[$param_name] = $param_value; ! } ! $component->add_property($prop_name, $line[1], $params); ! } ! } ! ! function _multistatus($responses) ! { ! // now we generate the response header... ! $this->http_status('207 Multi-Status'); ! header('Content-Type: text/xml; charset="utf-8"'); ! ! // ...and payload ! echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; ! echo "<D:multistatus xmlns:D=\"DAV:\">\n"; ! ! foreach ($responses as $response) { ! ! // ignore empty or incomplete entries ! if (!is_array($response) || empty($response)) { ! continue; ! } ! ! $ns_defs = array(); ! foreach ($response['ns_hash'] as $name => $prefix) { ! $ns_defs[] = "xmlns:$prefix=\"$name\""; ! } ! echo ' <D:response ' . implode(' ', $ns_defs) . ">\n"; ! echo " <D:href>$response[href]</D:href>\n"; ! ! // report all found properties and their values (if any) ! // nothing to do if no properties were returend for a file ! if (isset($response['propstat']) && ! is_array($response['propstat'])) { ! ! foreach ($response['propstat'] as $status => $props) { ! echo " <D:propstat>\n"; ! echo " <D:prop>\n"; ! ! foreach ($props as $prop) { ! if (!is_array($prop) || !isset($prop['name'])) { ! continue; ! } ! ! // empty properties (cannot use empty for check as '0' ! // is a legal value here) ! if (!isset($prop['value']) || empty($prop['value']) && ! $prop['value'] !== 0) { ! if ($prop['ns'] == 'DAV:') { ! echo " <D:$prop[name]/>\n"; ! continue; ! } ! ! if (!empty($prop['ns'])) { ! echo ' <' . ! $response['ns_hash'][$prop['ns']] . ! ":$prop[name]/>\n"; ! continue; ! } ! ! echo " <$prop[name] xmlns=\"\"/>"; ! continue; ! } ! ! // some WebDAV properties need special treatment ! if ($prop['ns'] == 'DAV:') { ! ! switch ($prop['name']) { ! case 'creationdate': ! echo " <D:creationdate ns0:dt=\"dateTime.tz\">\n"; ! echo ' ' . gmdate('Y-m-d\TH:i:s\Z', $prop['value']) . "\n"; ! echo " </D:creationdate>\n"; ! break; ! ! case 'getlastmodified': ! echo " <D:getlastmodified ns0:dt=\"dateTime.rfc1123\">\n"; ! echo ' ' . gmdate('D, d M Y H:i:s', $prop['value']) . " GMT\n"; ! echo " </D:getlastmodified>\n"; ! break; ! ! case 'resourcetype': ! echo " <D:resourcetype>\n"; ! echo " <D:$prop[value]/>\n"; ! echo " </D:resourcetype>\n"; ! break; ! ! case 'supportedlock': ! ! if (is_array($prop[value])) { ! $prop[value] = $this->_lockentries($prop[value]); ! } ! echo " <D:supportedlock>\n"; ! echo " $prop[value]\n"; ! echo " </D:supportedlock>\n"; ! break; ! ! case 'lockdiscovery': ! ! if (is_array($prop[value])) { ! $prop[value] = $this->_activelocks($prop[value]); ! } ! echo " <D:lockdiscovery>\n"; ! echo " $prop[value]\n"; ! echo " </D:lockdiscovery>\n"; ! break; ! ! default: ! echo " <D:$prop[name]>\n"; ! echo ' ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n"; ! echo " </D:$prop[name]>\n"; ! } ! ! continue; ! } ! ! if ($prop['name'] == 'calendar-data' && ! is_object($prop['value'])) { ! $prop['value'] = $prop['value']->serialize(); ! } ! ! if (!empty($prop['ns'])) { ! echo ' <' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n"; ! echo ' ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n"; ! echo ' </' . $response['ns_hash'][$prop['ns']] . ":$prop[name]>\n"; ! ! continue; ! } ! ! echo " <$prop[name] xmlns=\"\">\n"; ! echo ' ' . $this->_prop_encode(htmlspecialchars($prop['value'])) . "\n"; ! echo " </$prop[name]>\n"; ! } ! ! echo " </D:prop>\n"; ! echo " <D:status>HTTP/1.1 $status</D:status>\n"; ! echo " </D:propstat>\n"; ! } ! } ! ! if (isset($response['status'])) { ! echo " <D:status>HTTP/1.1 $status</D:status>\n"; ! } ! ! if (isset($response['responsedescription'])) { ! echo " <D:responsedescription>\n"; ! echo ' ' . $this->_prop_encode(htmlspecialchars($response['responsedescription'])) . "\n"; ! echo " </D:responsedescription>\n"; ! } ! ! echo " </D:response>\n"; ! } ! ! echo "</D:multistatus>\n"; } } |
