smtech / canvas-ics-sync

phpicalendar/lib/HTTP/CalDAV/Tools/ReportParser.php

Indentation +226 added lines, -226 removed lines

@@ -41,232 +41,232 @@
  */
 class ReportParser
 {
-    /**
-     * Success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * Name of the requested report
-     *
-     * @var string
-     * @access public
-     */
-    var $report;
-
-    /**
-     * Found properties are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $props = array();
-
-    /**
-     * Found filters are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $filters = array();
-
-    /**
-     * Stack of ancestor tag names
-     *
-     * @var array
-     * @access private
-     */
-    var $_names = array();
-
-    /**
-     * Stack of component data
-     *
-     * @var array
-     * @access private
-     */
-    var $_comps = array();
-
-    /**
-     * Constructor
-     *
-     * @param string path to report input data
-     * @access public
-     */
-    function ReportParser($input)
-    {
-        // FIXME Take a handle, not a path
-        $handle = fopen($input, 'r');
-        if (!$handle) {
-            return;
-        }
-
-        $parser = xml_parser_create_ns('UTF-8', ' ');
-        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
-        xml_set_element_handler($parser, array(&$this, '_startElement'),
-            array(&$this, '_endElement'));
-
-        $this->success = true;
-        while (($line = fgets($handle, 4096)) !== false) {
-            $this->success = xml_parse($parser, $line);
-            if (!$this->success) {
-                return;
-            }
-        }
-
-        if (!feof($handle)) {
-            $this->success = false;
-            return;
-        }
-
-        xml_parser_free($parser);
-        fclose($handle);
-
-        if (empty($this->props)) {
-            $this->props = 'allprop';
-        }
-    }
-
-    /**
-     * Start tag handler
-     *
-     * @param object parser
-     * @param string tag name
-     * @param array tag attributes
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        $nameComponents = explode(' ', $name);
-        if (count($nameComponents) > 2) {
-            $this->success = false;
-            return;
-        }
-
-        if (count($nameComponents) == 2) {
-            list ($ns, $name) = $nameComponents;
-            if (empty($ns)) {
-                $this->success = false;
-                return;
-            }
-        }
-
-        if (empty($this->_names)) {
-            $this->report = $name;
-            $this->_names[] = $name;
-            return;
-        }
-
-        if (count($this->_names) == 1 &&
-                ($name == 'allprop' || $name == 'propname')) {
-            $this->props = $name;
-            $this->_names[] = $name;
-            return;
-        }
-
-        if (count($this->_names) == 2 && end($this->_names) == 'prop') {
-            $prop = array('name' => $name, 'ns' => $ns);
-
-            if ($name == 'calendar-data') {
-                $prop['value'] = array();
-                $this->_comps[] =& $prop['value'];
-            }
-
-            $this->props[] = $prop;
-            $this->_names[] = $name;
-            return;
-        }
-
-        if ($name == 'comp') {
-            if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
-                $this->_comps[count($this->_comps) - 1]['comps'] = array();
-            }
-
-            $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
-                array();
-            $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
-                [$attrs['name']];
-            $this->_names[] = $name;
-            return;
-        }
-
-        if (end($this->_names) == 'comp' && $name == 'prop') {
-            if (!is_array($this->_comps[count($this->_comps) - 1]['props'])) {
-                $this->_comps[count($this->_comps) - 1]['props'] = array();
-            }
-
-            $this->_comps[count($this->_comps) - 1]['props'][] = $attrs['name'];
-            $this->_names[] = $name;
-            return;
-        }
-
-        if (count($this->_names) == 1 && $name == 'filter') {
-            $this->_comps[] =& $this->filters;
-            $this->_names[] = $name;
-            return;
-        }
-
-        if ($name == 'comp-filter') {
-            if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
-                $this->_comps[count($this->_comps) - 1]['comps'] = array();
-            }
-
-            $this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
-                array();
-            $this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
-                [$attrs['name']];
-            $this->_names[] = $name;
-            return;
-        }
-
-        if (end($this->_names) == 'comp-filter') {
-            if (!is_array($this->_comps[count($this->_comps) - 1]['filters'])) {
-                $this->_comps[count($this->_comps) - 1]['filters'] = array();
-            }
-
-            $this->_comps[count($this->_comps) - 1]['filters'][] =
-                array('name' => $name, 'value' => $attrs);
-            $this->_names[] = $name;
-            return;
-        }
-
-        $this->_names[] = $name;
-    }
-
-    /**
-     * End tag handler
-     *
-     * @param object parser
-     * @param string tag name
-     * @param array tag attributes
-     * @access private
-     */
-    function _endElement($parser, $name) {
-        $nameComponents = explode(' ', $name);
-        if (count($nameComponents) > 2) {
-            $this->success = false;
-            return;
-        }
-
-        if (count($nameComponents) == 2) {
-            list ($ns, $name) = $nameComponents;
-            if (empty($ns)) {
-                $this->success = false;
-                return;
-            }
-        }
-
-        // Any need to pop at end of calendar-data?
-        // Yes - $this->_comps is re-used for parsing filters
-        if ($name == 'comp' || $name == 'calendar-data' ||
-                $name == 'comp-filter' || $name == 'filter') {
-            array_pop($this->_comps);
-        }
-
-        array_pop($this->_names);
-    }
+	/**
+	 * Success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * Name of the requested report
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $report;
+
+	/**
+	 * Found properties are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $props = array();
+
+	/**
+	 * Found filters are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $filters = array();
+
+	/**
+	 * Stack of ancestor tag names
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_names = array();
+
+	/**
+	 * Stack of component data
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_comps = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param string path to report input data
+	 * @access public
+	 */
+	function ReportParser($input)
+	{
+		// FIXME Take a handle, not a path
+		$handle = fopen($input, 'r');
+		if (!$handle) {
+			return;
+		}
+
+		$parser = xml_parser_create_ns('UTF-8', ' ');
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
+		xml_set_element_handler($parser, array(&$this, '_startElement'),
+			array(&$this, '_endElement'));
+
+		$this->success = true;
+		while (($line = fgets($handle, 4096)) !== false) {
+			$this->success = xml_parse($parser, $line);
+			if (!$this->success) {
+				return;
+			}
+		}
+
+		if (!feof($handle)) {
+			$this->success = false;
+			return;
+		}
+
+		xml_parser_free($parser);
+		fclose($handle);
+
+		if (empty($this->props)) {
+			$this->props = 'allprop';
+		}
+	}
+
+	/**
+	 * Start tag handler
+	 *
+	 * @param object parser
+	 * @param string tag name
+	 * @param array tag attributes
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		$nameComponents = explode(' ', $name);
+		if (count($nameComponents) > 2) {
+			$this->success = false;
+			return;
+		}
+
+		if (count($nameComponents) == 2) {
+			list ($ns, $name) = $nameComponents;
+			if (empty($ns)) {
+				$this->success = false;
+				return;
+			}
+		}
+
+		if (empty($this->_names)) {
+			$this->report = $name;
+			$this->_names[] = $name;
+			return;
+		}
+
+		if (count($this->_names) == 1 &&
+				($name == 'allprop' || $name == 'propname')) {
+			$this->props = $name;
+			$this->_names[] = $name;
+			return;
+		}
+
+		if (count($this->_names) == 2 && end($this->_names) == 'prop') {
+			$prop = array('name' => $name, 'ns' => $ns);
+
+			if ($name == 'calendar-data') {
+				$prop['value'] = array();
+				$this->_comps[] =& $prop['value'];
+			}
+
+			$this->props[] = $prop;
+			$this->_names[] = $name;
+			return;
+		}
+
+		if ($name == 'comp') {
+			if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
+				$this->_comps[count($this->_comps) - 1]['comps'] = array();
+			}
+
+			$this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
+				array();
+			$this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
+				[$attrs['name']];
+			$this->_names[] = $name;
+			return;
+		}
+
+		if (end($this->_names) == 'comp' && $name == 'prop') {
+			if (!is_array($this->_comps[count($this->_comps) - 1]['props'])) {
+				$this->_comps[count($this->_comps) - 1]['props'] = array();
+			}
+
+			$this->_comps[count($this->_comps) - 1]['props'][] = $attrs['name'];
+			$this->_names[] = $name;
+			return;
+		}
+
+		if (count($this->_names) == 1 && $name == 'filter') {
+			$this->_comps[] =& $this->filters;
+			$this->_names[] = $name;
+			return;
+		}
+
+		if ($name == 'comp-filter') {
+			if (!is_array($this->_comps[count($this->_comps) - 1]['comps'])) {
+				$this->_comps[count($this->_comps) - 1]['comps'] = array();
+			}
+
+			$this->_comps[count($this->_comps) - 1]['comps'][$attrs['name']] =
+				array();
+			$this->_comps[] =& $this->_comps[count($this->_comps) - 1]['comps']
+				[$attrs['name']];
+			$this->_names[] = $name;
+			return;
+		}
+
+		if (end($this->_names) == 'comp-filter') {
+			if (!is_array($this->_comps[count($this->_comps) - 1]['filters'])) {
+				$this->_comps[count($this->_comps) - 1]['filters'] = array();
+			}
+
+			$this->_comps[count($this->_comps) - 1]['filters'][] =
+				array('name' => $name, 'value' => $attrs);
+			$this->_names[] = $name;
+			return;
+		}
+
+		$this->_names[] = $name;
+	}
+
+	/**
+	 * End tag handler
+	 *
+	 * @param object parser
+	 * @param string tag name
+	 * @param array tag attributes
+	 * @access private
+	 */
+	function _endElement($parser, $name) {
+		$nameComponents = explode(' ', $name);
+		if (count($nameComponents) > 2) {
+			$this->success = false;
+			return;
+		}
+
+		if (count($nameComponents) == 2) {
+			list ($ns, $name) = $nameComponents;
+			if (empty($ns)) {
+				$this->success = false;
+				return;
+			}
+		}
+
+		// Any need to pop at end of calendar-data?
+		// Yes - $this->_comps is re-used for parsing filters
+		if ($name == 'comp' || $name == 'calendar-data' ||
+				$name == 'comp-filter' || $name == 'filter') {
+			array_pop($this->_comps);
+		}
+
+		array_pop($this->_names);
+	}
 }
 
 /*

phpicalendar/lib/HTTP/WebDAV/Server.php

Indentation +2255 added lines, -2255 removed lines

@@ -33,2266 +33,2266 @@ 
  */
 class HTTP_WebDAV_Server
 {
-    // {{{ Member Variables
-
-    /**
-     * URI path for this request
-     *
-     * @var string
-     */
-    var $path;
-
-    /**
-     * base URI for this request
-     *
-     * @var string
-     */
-    var $base_uri;
-
-    /**
-     * Realm string to be used in authentification popups
-     *
-     * @var string
-     */
-    var $http_auth_realm = 'PHP WebDAV';
-
-    /**
-     * String to be used in "X-Dav-Powered-By" header
-     *
-     * @var string
-     */
-    var $dav_powered_by = '';
-
-    /**
-     * Remember parsed If: (RFC2518 9.4) header conditions
-     *
-     * @var array
-     */
-    var $_if_header_uris = array();
-
-    /**
-     * HTTP response status/message
-     *
-     * @var string
-     */
-    var $_http_status = '200 OK';
-
-    /**
-     * encoding of property values passed in
-     *
-     * @var string
-     */
-    var $_prop_encoding = 'utf-8';
-
-    // }}}
-
-    // {{{ ServeRequest
-
-    /**
-     * Serve WebDAV HTTP request
-     *
-     * dispatch WebDAV HTTP request to the apropriate method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function ServeRequest()
-    {
-        // identify ourselves
-        if (empty($this->dav_powered_by)) {
-            $this->dav_powered_by = 'PHP class: ' . get_class($this);
-        }
-        header('X-Dav-Powered-By: ' . $this->dav_powered_by);
-
-        // set path
-        if (empty($this->path)) {
-            $this->path = $this->_urldecode($_SERVER['PATH_INFO']);
-            $this->path = ltrim($this->path, '/');
-            $this->path = rtrim($this->path, '/');
-        }
-
-        if (ini_get('magic_quotes_gpc')) {
-            $this->path = stripslashes($this->path);
-        }
-
-        // set base uri
-        if (empty($this->base_uri)) {
-            $path_info = $this->_urldecode($_SERVER['PATH_INFO']);
-            $request_uri = $this->_urldecode($_SERVER['REQUEST_URI']);
-            $this->base_uri = substr($request_uri, 0, strlen($request_uri) -
-                strlen($path_info));
-            $this->base_uri = rtrim($this->base_uri, '/');
-        }
-
-        // check authentication
-        if (!$this->check_auth_wrapper()) {
-
-            // RFC2518 says we must use Digest instead of Basic
-            // but Microsoft Clients do not support Digest
-            // and we don't support NTLM or Kerberos
-            // so we are stuck with Basic here
-            header('WWW-Authenticate: Basic realm="' . ($this->http_auth_realm) . '"');
-
-            // Windows seems to require this being the last header sent
-            // (changed according to PECL bug #3138)
-            $this->http_status('401 Authentication Required');
-
-            return;
-        }
-
-        // check
-        if (! $this->_check_if_header_conditions()) {
-            $this->http_status('412 Precondition Failed');
-            return;
-        }
-
-        // detect requested method names
-        $method = strtolower($_SERVER['REQUEST_METHOD']);
-        $wrapper = $method . '_wrapper';
-
-        // emulate HEAD using GET if no HEAD method found
-        if ($wrapper == 'head_wrapper' &&
-                !method_exists($this, 'head')) {
-            $method = 'get';
-        }
-
-        if (method_exists($this, $method) &&
-                method_exists($this, $wrapper) ||
-                $method == 'options') {
-            $this->$wrapper();
-            return;
-        }
-
-        // method not found/implemented
-        if ($method == 'lock') {
-            $this->http_status('412 Precondition Failed');
-            return;
-        }
-
-        // tell client what's allowed
-        header('Allow: ' . implode(', ', $this->_allow()));
-        $this->http_status('405 Method Not Allowed');
-    }
-
-    // }}}
-
-    // {{{ abstract WebDAV methods
-
-    // {{{ GET
-
-    /**
-     * GET implementation
-     *
-     * overload this method to retrieve resources from your server
-     * <br>
-     *
-     *
-     * @abstract
-     * @param array &$params array of input and output parameters
-     * <br><b>input</b><ul>
-     * <li> path -
-     * </ul>
-     * <br><b>output</b><ul>
-     * <li> size -
-     * </ul>
-     * @returns int HTTP-Statuscode
-     */
-
-    /* abstract
+	// {{{ Member Variables
+
+	/**
+	 * URI path for this request
+	 *
+	 * @var string
+	 */
+	var $path;
+
+	/**
+	 * base URI for this request
+	 *
+	 * @var string
+	 */
+	var $base_uri;
+
+	/**
+	 * Realm string to be used in authentification popups
+	 *
+	 * @var string
+	 */
+	var $http_auth_realm = 'PHP WebDAV';
+
+	/**
+	 * String to be used in "X-Dav-Powered-By" header
+	 *
+	 * @var string
+	 */
+	var $dav_powered_by = '';
+
+	/**
+	 * Remember parsed If: (RFC2518 9.4) header conditions
+	 *
+	 * @var array
+	 */
+	var $_if_header_uris = array();
+
+	/**
+	 * HTTP response status/message
+	 *
+	 * @var string
+	 */
+	var $_http_status = '200 OK';
+
+	/**
+	 * encoding of property values passed in
+	 *
+	 * @var string
+	 */
+	var $_prop_encoding = 'utf-8';
+
+	// }}}
+
+	// {{{ ServeRequest
+
+	/**
+	 * Serve WebDAV HTTP request
+	 *
+	 * dispatch WebDAV HTTP request to the apropriate method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function ServeRequest()
+	{
+		// identify ourselves
+		if (empty($this->dav_powered_by)) {
+			$this->dav_powered_by = 'PHP class: ' . get_class($this);
+		}
+		header('X-Dav-Powered-By: ' . $this->dav_powered_by);
+
+		// set path
+		if (empty($this->path)) {
+			$this->path = $this->_urldecode($_SERVER['PATH_INFO']);
+			$this->path = ltrim($this->path, '/');
+			$this->path = rtrim($this->path, '/');
+		}
+
+		if (ini_get('magic_quotes_gpc')) {
+			$this->path = stripslashes($this->path);
+		}
+
+		// set base uri
+		if (empty($this->base_uri)) {
+			$path_info = $this->_urldecode($_SERVER['PATH_INFO']);
+			$request_uri = $this->_urldecode($_SERVER['REQUEST_URI']);
+			$this->base_uri = substr($request_uri, 0, strlen($request_uri) -
+				strlen($path_info));
+			$this->base_uri = rtrim($this->base_uri, '/');
+		}
+
+		// check authentication
+		if (!$this->check_auth_wrapper()) {
+
+			// RFC2518 says we must use Digest instead of Basic
+			// but Microsoft Clients do not support Digest
+			// and we don't support NTLM or Kerberos
+			// so we are stuck with Basic here
+			header('WWW-Authenticate: Basic realm="' . ($this->http_auth_realm) . '"');
+
+			// Windows seems to require this being the last header sent
+			// (changed according to PECL bug #3138)
+			$this->http_status('401 Authentication Required');
+
+			return;
+		}
+
+		// check
+		if (! $this->_check_if_header_conditions()) {
+			$this->http_status('412 Precondition Failed');
+			return;
+		}
+
+		// detect requested method names
+		$method = strtolower($_SERVER['REQUEST_METHOD']);
+		$wrapper = $method . '_wrapper';
+
+		// emulate HEAD using GET if no HEAD method found
+		if ($wrapper == 'head_wrapper' &&
+				!method_exists($this, 'head')) {
+			$method = 'get';
+		}
+
+		if (method_exists($this, $method) &&
+				method_exists($this, $wrapper) ||
+				$method == 'options') {
+			$this->$wrapper();
+			return;
+		}
+
+		// method not found/implemented
+		if ($method == 'lock') {
+			$this->http_status('412 Precondition Failed');
+			return;
+		}
+
+		// tell client what's allowed
+		header('Allow: ' . implode(', ', $this->_allow()));
+		$this->http_status('405 Method Not Allowed');
+	}
+
+	// }}}
+
+	// {{{ abstract WebDAV methods
+
+	// {{{ GET
+
+	/**
+	 * GET implementation
+	 *
+	 * overload this method to retrieve resources from your server
+	 * <br>
+	 *
+	 *
+	 * @abstract
+	 * @param array &$params array of input and output parameters
+	 * <br><b>input</b><ul>
+	 * <li> path -
+	 * </ul>
+	 * <br><b>output</b><ul>
+	 * <li> size -
+	 * </ul>
+	 * @returns int HTTP-Statuscode
+	 */
+
+	/* abstract
        function GET()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ PUT
+	// {{{ PUT
 
-    /**
-     * PUT implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * PUT implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function PUT()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ COPY
+	// {{{ COPY
 
-    /**
-     * COPY implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * COPY implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function COPY()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ MOVE
+	// {{{ MOVE
 
-    /**
-     * MOVE implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * MOVE implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function MOVE()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ DELETE
+	// {{{ DELETE
 
-    /**
-     * DELETE implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * DELETE implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function DELETE()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ PROPFIND
+	// {{{ PROPFIND
 
-    /**
-     * PROPFIND implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * PROPFIND implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function PROPFIND()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ PROPPATCH
+	// {{{ PROPPATCH
 
-    /**
-     * PROPPATCH implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * PROPPATCH implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function PROPPATCH()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ LOCK
+	// {{{ LOCK
 
-    /**
-     * LOCK implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * LOCK implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function LOCK()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ UNLOCK
+	// {{{ UNLOCK
 
-    /**
-     * UNLOCK implementation
-     *
-     * @abstract
-     * @param array &$params
-     * @returns int HTTP-Statuscode
-     */
+	/**
+	 * UNLOCK implementation
+	 *
+	 * @abstract
+	 * @param array &$params
+	 * @returns int HTTP-Statuscode
+	 */
 
-    /* abstract
+	/* abstract
        function UNLOCK()
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // }}}
+	// }}}
 
-    // {{{ other abstract methods
+	// {{{ other abstract methods
 
-    // {{{ checkAuth
+	// {{{ checkAuth
 
-    /**
-     * check authentication
-     *
-     * overload this method to retrieve and confirm authentication information
-     *
-     * @abstract
-     * @param string type Authentication type, e.g. "basic" or "digest"
-     * @param string username Transmitted username
-     * @param string passwort Transmitted password
-     * @returns bool Authentication status
-     */
+	/**
+	 * check authentication
+	 *
+	 * overload this method to retrieve and confirm authentication information
+	 *
+	 * @abstract
+	 * @param string type Authentication type, e.g. "basic" or "digest"
+	 * @param string username Transmitted username
+	 * @param string passwort Transmitted password
+	 * @returns bool Authentication status
+	 */
 
-    /* abstract
+	/* abstract
        function checkAuth($type, $username, $password)
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
+	// }}}
 
-    // {{{ getLocks
+	// {{{ getLocks
 
-    /**
-     * get lock entries for a resource
-     *
-     * overload this method to return shared and exclusive locks
-     * active for this resource
-     *
-     * @abstract
-     * @param string resource path to check
-     * @returns array of lock entries each consisting
-     *                of 'type' ('shared'/'exclusive'), 'token' and 'timeout'
-     */
+	/**
+	 * get lock entries for a resource
+	 *
+	 * overload this method to return shared and exclusive locks
+	 * active for this resource
+	 *
+	 * @abstract
+	 * @param string resource path to check
+	 * @returns array of lock entries each consisting
+	 *                of 'type' ('shared'/'exclusive'), 'token' and 'timeout'
+	 */
 
-    /* abstract
+	/* abstract
        function getLocks($path)
        {
            // dummy entry for PHPDoc
        }
     */
 
-    // }}}
-
-    // }}}
-
-    // {{{ WebDAV HTTP method wrappers
-
-    // {{{ options
-
-    /**
-     * OPTIONS method handler
-     *
-     * The OPTIONS method handler creates a valid OPTIONS reply
-     * including Dav: and Allowed: heaers
-     * based on the implemented methods found in the actual instance
-     *
-     * @param void
-     * @return void
-     */
-    function options()
-    {
-        // get allowed methods
-        $allow = $this->_allow();
-
-        // dav header
-        $dav = array(1); // assume we are always dav class 1 compliant
-        if (in_array('LOCK', $allow) && in_array('UNLOCK', $allow)) {
-            $dav[] = 2; // dav class 2 requires that locking is supported
-        }
-
-        // tell clients what we found
-        header('Allow: ' . implode(', ', $allow));
-        header('DAV: ' . implode(',', $dav));
-        header('Content-Length: 0');
-
-        // Microsoft clients default to the Frontpage protocol
-        // unless we tell them to use WebDAV
-        header('MS-Author-Via: DAV');
-
-        $this->http_status('200 OK');
-    }
-
-    // }}}
-
-    // {{{ propfind_request_helper
-
-    /**
-     * PROPFIND request helper - prepares data-structures from PROPFIND requests
-     *
-     * @param options
-     * @return void
-     */
-    function propfind_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        // get depth from header (default is 'infinity')
-        $options['depth'] = 'infinity';
-        if (isset($_SERVER['HTTP_DEPTH'])) {
-            $options['depth'] = $_SERVER['HTTP_DEPTH'];
-        }
-
-        // analyze request payload
-        $parser = new _parse_propfind('php://input');
-        if (!$parser->success) {
-            $this->http_status('400 Bad Request');
-            return;
-        }
-
-        $options['props'] = $parser->props;
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ propfind_response_helper
-
-    /**
-     * PROPFIND response helper - format PROPFIND response
-     *
-     * @param options
-     * @param files
-     * @return void
-     */
-    function propfind_response_helper($options, $files)
-    {
-        $responses = array();
-
-        // now loop over all returned files
-        foreach ($files as $file) {
-
-            // collect namespaces here
-            // Microsoft need this special namespace for date and time values
-            $ns_hash = array(
-                'urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882' => 'ns0');
-
-            $response = array();
-
-            $response['href'] = $this->getHref($file['path']);
-            if (isset($file['href'])) {
-                $response['href'] = $file['href'];
-            }
-
-            $response['propstat'] = array();
-
-            if (is_array($options['props'])) {
-
-                // loop over all requested properties
-                foreach ($options['props'] as $reqprop) {
-                    $status = '200 OK';
-                    $prop = $this->getProp($reqprop, $file, $options);
-
-                    if (isset($prop['status'])) {
-                        $status = $prop['status'];
-                    }
-
-                    if (!isset($response['propstat'][$status])) {
-                        $response['propstat'][$status] = array();
-                    }
-
-                    $response['propstat'][$status][] = $prop;
-
-                    // 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);
-                }
-            } else if (is_array($file['props'])) {
-
-                // loop over all returned properties
-                foreach ($file['props'] as $prop) {
-                    $status = '200 OK';
-
-                    if (isset($prop['status'])) {
-                        $status = $prop['status'];
-                    }
-
-                    if (!isset($response['propstat'][$status])) {
-                        $response['propstat'][$status] = array();
-                    }
-
-                    if ($options['props'] == 'propname') {
-
-                        // only names of all existing properties were requested
-                        // so remove values
-                        unset($prop['value']);
-                    }
-
-                    $response['propstat'][$status][] = $prop;
-                        unset($prop['value']);
-
-                    // 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);
-                }
-            }
-
-            $response['ns_hash'] = $ns_hash;
-            $responses[] = $response;
-        }
-
-        $this->_multistatus($responses);
-    }
-
-    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 (!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";
-    }
-
-    // }}}
-
-    // {{{ propfind_wrapper
-
-    /**
-     * PROPFIND method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function propfind_wrapper()
-    {
-        // prepare data-structure from PROPFIND request
-        if (!$this->propfind_request_helper($options)) {
-            return;
-        }
-
-        // call user handler
-        if (!$this->propfind($options, $files)) {
-            return;
-        }
-
-        // format PROPFIND response
-        $this->propfind_response_helper($options, $files);
-    }
-
-    // }}}
-
-    // {{{ proppatch_request_helper
-
-    /**
-     * PROPPATCH request helper - prepares data-structures from PROPPATCH requests
-     *
-     * @param options
-     * @return void
-     */
-    function proppatch_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        $propinfo = new _parse_proppatch('php://input');
-
-        if (!$propinfo->success) {
-            $this->http_status('400 Bad Request');
-            return;
-        }
-
-        $options['props'] = $propinfo->props;
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ proppatch_response_helper
-
-    /**
-     * PROPPATCH response helper - format PROPPATCH response
-     *
-     * @param options
-     * @param responsedescr
-     * @return void
-     */
-    function proppatch_response_helper($options, $responsedescription=null)
-    {
-        $response = array();
-
-        $response['href'] = $this->getHref($options['path']);
-        if (isset($options['href'])) {
-            $response['href'] = $options['href'];
-        }
-
-        $response['propstat'] = array();
-
-        // collect namespaces here
-        $ns_hash = array();
-
-        if (isset($options['props']) && is_array($options['props'])) {
-            foreach ($options['props'] as $prop) {
-                $status = '200 OK';
-                if (isset($prop['status'])) {
-                    $status = $prop['status'];
-                }
-
-                if (!isset($response['propstat'][$status])) {
-                    $response['propstat'][$status] = array();
-                }
-
-                $response['propstat'][$status][] = $prop;
-
-                // 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);
-            }
-        }
-
-        $response['ns_hash'] = $ns_hash;
-        $response['responsedescription'] = $responsedescription;
-
-        $this->_multistatus(array($response));
-    }
-
-    // }}}
-
-    // {{{ proppatch_wrapper
-
-    /**
-     * PROPPATCH method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function proppatch_wrapper()
-    {
-        // check resource is not locked
-        if (!$this->check_lock_wrapper($this->path)) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        // perpare data-structure from PROPATCH request
-        if (!$this->proppatch_request_helper($options)) {
-            return;
-        }
-
-        // call user handler
-        $responsedescription = $this->proppatch($options);
-
-        // format PROPPATCH response
-        $this->proppatch_response_helper($options, $responsedescription);
-    }
-
-    // }}}
-
-    // {{{ mkcol_wrapper
-
-    /**
-     * MKCOL method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function mkcol_wrapper()
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        $status = $this->mkcol($options);
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    // {{{ get_request_helper
-
-    /**
-     * GET request helper - prepares data-structures from GET requests
-     *
-     * @param options
-     * @return void
-     */
-    function get_request_helper(&$options)
-    {
-        // TODO check for invalid stream
-
-        $options = array();
-        $options['path'] = $this->path;
-
-        $this->_get_ranges($options);
-
-        return true;
-    }
-
-    /**
-     * parse HTTP Range: header
-     *
-     * @param  array options array to store result in
-     * @return void
-     */
-    function _get_ranges(&$options)
-    {
-        // process Range: header if present
-        if (isset($_SERVER['HTTP_RANGE'])) {
-
-            // we only support standard 'bytes' range specifications for now
-            if (ereg('bytes[[:space:]]*=[[:space:]]*(.+)', $_SERVER['HTTP_RANGE'], $matches)) {
-                $options['ranges'] = array();
-
-                // ranges are comma separated
-                foreach (explode(',', $matches[1]) as $range) {
-                    // ranges are either from-to pairs or just end positions
-                    list($start, $end) = explode('-', $range);
-                    $options['ranges'][] = ($start === '')
-                        ? array('last' => $end)
-                        : array('start' => $start, 'end' => $end);
-                }
-            }
-        }
-    }
-
-    // }}}
-
-    // {{{ get_response_helper
-
-    /**
-     * GET response helper - format GET response
-     *
-     * @param options
-     * @param status
-     * @return void
-     */
-    function get_response_helper($options, $status)
-    {
-        if (empty($status)) {
-            $status = '404 Not Found';
-        }
-
-        // set headers before we start printing
-        $this->http_status($status);
-
-        if ($status !== true) {
-            return;
-        }
-
-        if (!isset($options['mimetype'])) {
-            $options['mimetype'] = 'application/octet-stream';
-        }
-        header("Content-Type: $options[mimetype]");
-
-        if (isset($options['mtime'])) {
-            header('Last-Modified:' .
-                gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
-        }
-
-        if ($options['stream']) {
-            // GET handler returned a stream
-
-            if (!empty($options['ranges']) &&
-                    (fseek($options['stream'], 0, SEEK_SET) === 0)) {
-                // partial request and stream is seekable
-
-                if (count($options['ranges']) === 1) {
-                    $range = $options['ranges'][0];
-
-                    if (isset($range['start'])) {
-                        fseek($options['stream'], $range['start'], SEEK_SET);
-                        if (feof($options['stream'])) {
-                            $this->http_status('416 Requested Range Not Satisfiable');
-                            return;
-                        }
-
-                        if (isset($range['end'])) {
-                            $size = $range['end'] - $range['start'] + 1;
-                            $this->http_status('206 Partial');
-                            header("Content-Length: $size");
-                            header("Content-Range: $range[start]-$range[end]/" .
-                                (isset($options['size']) ? $options['size'] : '*'));
-                            while ($size && !feof($options['stream'])) {
-                                $buffer = fread($options['stream'], 4096);
-                                $size -= strlen($buffer);
-                                echo $buffer;
-                            }
-                        } else {
-                            $this->http_status('206 Partial');
-                            if (isset($options['size'])) {
-                                header("Content-Length: " .
-                                    ($options['size'] - $range['start']));
-                                header("Content-Range: $start-$end/" .
-                                    (isset($options['size']) ? $options['size'] : '*'));
-                            }
-                            fpassthru($options['stream']);
-                        }
-                    } else {
-                        header("Content-Length: $range[last]");
-                        fseek($options['stream'], -$range['last'], SEEK_END);
-                        fpassthru($options['stream']);
-                    }
-                } else {
-                    $this->_multipart_byterange_header(); // init multipart
-                    foreach ($options['ranges'] as $range) {
-
-                        // TODO what if size unknown? 500?
-                        if (isset($range['start'])) {
-                            $from = $range['start'];
-                            $to = !empty($range['end']) ? $range['end'] : $options['size'] - 1;
-                        } else {
-                            $from = $options['size'] - $range['last'] - 1;
-                            $to = $options['size'] - 1;
-                        }
-                        $total = isset($options['size']) ? $options['size'] : '*';
-                        $size = $to - $from + 1;
-                        $this->_multipart_byterange_header($options['mimetype'],
-                            $from, $to, $total);
-
-                        fseek($options['stream'], $start, SEEK_SET);
-                        while ($size && !feof($options['stream'])) {
-                            $buffer = fread($options['stream'], 4096);
-                            $size -= strlen($buffer);
-                            echo $buffer;
-                        }
-                    }
-                    $this->_multipart_byterange_header(); // end multipart
-                }
-            } else {
-                // normal request or stream isn't seekable, return full content
-                if (isset($options['size'])) {
-                    header("Content-Length: $options[size]");
-                }
-
-                fpassthru($options['stream']);
-            }
-        } else if (isset($options['data']))  {
-            if (is_array($options['data'])) {
-                // reply to partial request
-            } else {
-                header("Content-Length: " . strlen($options['data']));
-                echo $options['data'];
-            }
-        }
-    }
-
-    /**
-     * generate separator headers for multipart response
-     *
-     * first and last call happen without parameters to generate
-     * the initial header and closing sequence, all calls inbetween
-     * require content mimetype, start and end byte position and
-     * optionaly the total byte length of the requested resource
-     *
-     * @param  string  mimetype
-     * @param  int     start byte position
-     * @param  int     end   byte position
-     * @param  int     total resource byte size
-     */
-    function _multipart_byterange_header($mimetype = false, $from = false,
-        $to = false, $total = false)
-    {
-        if ($mimetype === false) {
-            if (!isset($this->multipart_separator)) {
-                // init
-                // a little naive, this sequence *might* be part of the content
-                // but it's really not likely and rather expensive to check
-                $this->multipart_separator = 'SEPARATOR_' . md5(microtime());
-
-                // generate HTTP header
-                header('Content-Type: multipart/byteranges; boundary=' .
-                    $this->multipart_separator);
-
-                return;
-            }
-
-            // end
-            // generate closing multipart sequence
-            echo "\n--{$this->multipart_separator}--";
-
-            return;
-        }
-
-        // generate separator and header for next part
-        echo "\n--{$this->multipart_separator}\n";
-        echo "Content-Type: $mimetype\n";
-        echo "Content-Range: $from-$to/"
-            . ($total === false ? "*" : $total) . "\n\n";
-    }
-
-    // }}}
-
-    // {{{ get_wrapper
-
-    /**
-     * GET method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function get_wrapper()
-    {
-        // perpare data-structure from GET request
-        if (!$this->get_request_helper($options)) {
-            return;
-        }
-
-        // call user handler
-        $status = $this->get($options);
-
-        // format GET response
-        $this->get_response_helper($options, $status);
-    }
-
-    // }}}
-
-    // {{{ head_response_helper
-
-    /**
-     * HEAD response helper - format HEAD response
-     *
-     * @param options
-     * @param status
-     * @return void
-     */
-    function head_response_helper($options, $status)
-    {
-        if (empty($status)) {
-            $status('404 Not Found');
-        }
-
-        // set headers before we start printing
-        $this->http_status($status);
-
-        if ($status !== true) {
-            return;
-        }
-
-        if (!isset($options['mimetype'])) {
-            $options['mimetype'] = 'application/octet-stream';
-        }
-        header("Content-Type: $options[mimetype]");
-
-        if (isset($options['mtime'])) {
-            header('Last-Modified:' .
-                gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
-        }
-
-        if (isset($options['stream'])) {
-            // GET handler returned a stream
-
-            if (!empty($options['ranges']) &&
-                    (fseek($options['stream'], 0, SEEK_SET) === 0)) {
-                // partial request and stream is seekable
-
-                if (count($options['ranges']) === 1) {
-                    $range = $options['ranges'][0];
-
-                    if (isset($range['start'])) {
-                        fseek($options['stream'], $range['start'], SEEK_SET);
-                        if (feof($options['stream'])) {
-                            $this->http_status('416 Requested Range Not Satisfiable');
-                            return;
-                        }
-
-                        if (isset($range['end'])) {
-                            $size = $range['end'] - $range['start'] + 1;
-                            $this->http_status('206 Partial');
-                            header("Content-Length: $size");
-                            header("Content-Range: $range[start]-$range[end]/" .
-                                (isset($options['size']) ? $options['size'] : '*'));
-                        } else {
-                            $this->http_status('206 Partial');
-                            if (isset($options['size'])) {
-                                header("Content-Length: " .
-                                    ($options['size'] - $range['start']));
-                                header("Content-Range: $start-$end/" .
-                                    (isset($options['size']) ? $options['size'] : '*'));
-                            }
-                        }
-                    } else {
-                        header("Content-Length: $range[last]");
-                        fseek($options['stream'], -$range['last'], SEEK_END);
-                    }
-                } else {
-                    $this->_multipart_byterange_header(); // init multipart
-                    foreach ($options['ranges'] as $range) {
-
-                        // TODO what if size unknown? 500?
-                        if (isset($range['start'])) {
-                            $from = $range['start'];
-                            $to = !empty($range['end']) ? $range['end'] :
-                                $options['size'] - 1;
-                        } else {
-                            $from = $options['size'] - $range['last'] - 1;
-                            $to = $options['size'] - 1;
-                        }
-                        $total = isset($options['size']) ? $options['size'] :
-                            '*';
-                        $size = $to - $from + 1;
-                        $this->_multipart_byterange_header($options['mimetype'],
-                            $from, $to, $total);
-
-                        fseek($options['stream'], $start, SEEK_SET);
-                    }
-                    $this->_multipart_byterange_header(); // end multipart
-                }
-            } else {
-                // normal request or stream isn't seekable, return full content
-                if (isset($options['size'])) {
-                    header("Content-Length: $options[size]");
-                }
-            }
-        } else if (isset($options['data']))  {
-            if (is_array($options['data'])) {
-                // reply to partial request
-            } else {
-                header("Content-Length: " . strlen($options['data']));
-            }
-        }
-    }
-
-    // }}}
-
-    // {{{ head_wrapper
-
-    /**
-     * HEAD method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function head_wrapper()
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        // call user handler
-        if (method_exists($this, 'head')) {
-            $status = $this->head($options);
-        } else {
-
-            // can emulate HEAD using GET
-            ob_start();
-            $status = $this->get($options);
-            ob_end_clean();
-        }
-
-        // format HEAD response
-        $this->head_response_helper($options, $status);
-    }
-
-    // }}}
-
-    // {{{ put_request_helper
-
-    /**
-     * PUT request helper - prepares data-structures from PUT requests
-     *
-     * @param options
-     * @return void
-     */
-    function put_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-        $options['content_length'] = $_SERVER['CONTENT_LENGTH'];
-
-        // get the content-type
-        if (isset($_SERVER['CONTENT_TYPE'])) {
-
-            // for now we do not support any sort of multipart requests
-            if (!strncmp($_SERVER['CONTENT_TYPE'], 'multipart/', 10)) {
-                $this->http_status('501 Not Implemented');
-                echo 'The service does not support mulipart PUT requests';
-                return;
-            }
-
-            $options['content_type'] = $_SERVER['CONTENT_TYPE'];
-        } else {
-
-            // default content type if none given
-            $options['content_type'] = 'application/unknown';
-        }
-
-        // RFC2616 2.6 says: The recipient of the entity MUST NOT
-        // ignore any Content-* (e.g. Content-Range) headers that it
-        // does not understand or implement and MUST return a 501
-        // (Not Implemented) response in such cases.
-        foreach ($_SERVER as $key => $value) {
-            if (strncmp($key, 'HTTP_CONTENT', 11)) continue;
-            switch ($key) {
-            case 'HTTP_CONTENT_ENCODING': // RFC2616 14.11
-
-                // TODO support this if ext/zlib filters are available
-                $this->http_status('501 Not Implemented');
-                echo "The service does not support '$value' content encoding";
-                return;
-
-            case 'HTTP_CONTENT_LANGUAGE': // RFC2616 14.12
-
-                // we assume it is not critical if this one is ignored
-                // in the actual PUT implementation...
-                $options['content_language'] = $value;
-                break;
-
-            case 'HTTP_CONTENT_LOCATION': // RFC2616 14.14
-
-                // The meaning of the Content-Location header in PUT
-                // or POST requests is undefined; servers are free
-                // to ignore it in those cases. */
-                break;
-
-            case 'HTTP_CONTENT_RANGE': // RFC2616 14.16
-
-                // single byte range requests are supported
-                // the header format is also specified in RFC2616 14.16
-                // TODO we have to ensure that implementations support this or send 501 instead
-                if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $value, $matches)) {
-                    $this->http_status('400 Bad Request');
-                    echo 'The service does only support single byte ranges';
-                    return;
-                }
-
-                $range = array('start' => $matches[1], 'end' => $matches[2]);
-                if (is_numeric($matches[3])) {
-                    $range['total_length'] = $matches[3];
-                }
-                $option['ranges'][] = $range;
-
-                // TODO make sure the implementation supports partial PUT
-                // this has to be done in advance to avoid data being overwritten
-                // on implementations that do not support this...
-                break;
-
-            case 'HTTP_CONTENT_MD5': // RFC2616 14.15
-
-                // TODO maybe we can just pretend here?
-                $this->http_status('501 Not Implemented');
-                echo 'The service does not support content MD5 checksum verification';
-                return;
-
-            default:
-
-                // any other unknown Content-* headers
-                $this->http_status('501 Not Implemented');
-                echo "The service does not support '$key'";
-                return;
-            }
-        }
-
-        $options['stream'] = fopen('php://input', 'r');
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ put_response_helper
-
-    /**
-     * PUT response helper - format PUT response
-     *
-     * @param options
-     * @param status
-     * @return void
-     */
-    function put_response_helper($options, $status)
-    {
-        if (empty($status)) {
-            $status = '403 Forbidden';
-        } else if (is_resource($status) &&
-                get_resource_type($status) == 'stream') {
-            $stream = $status;
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
-
-            if (!empty($options['ranges'])) {
-
-                // TODO multipart support is missing (see also above)
-                if (0 == fseek($stream, $range[0]['start'], SEEK_SET)) {
-                    $length = $range[0]['end'] - $range[0]['start'] + 1;
-                    if (!fwrite($stream, fread($options['stream'], $length))) {
-                        $status = '403 Forbidden';
-                    }
-                } else {
-                    $status = '403 Forbidden';
-                }
-            } else {
-                while (!feof($options['stream'])) {
-                    $buf = fread($options['stream'], 4096);
-                    if (fwrite($stream, $buf) != 4096) {
-                        break;
-                    }
-                }
-            }
-
-            fclose($stream);
-        }
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    // {{{ put_wrapper
-
-    /**
-     * PUT method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function put_wrapper()
-    {
-        // check resource is not locked
-        if (!$this->check_lock_wrapper($this->path)) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        // perpare data-structure from PUT request
-        if (!$this->put_request_helper($options)) {
-            return;
-        }
-
-        // call user handler
-        $status = $this->put($options);
-
-        // format PUT response
-        $this->put_response_helper($options, $status);
-    }
-
-    // }}}
-
-    // {{{ delete_wrapper
-
-    /**
-     * DELETE method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function delete_wrapper()
-    {
-        // RFC2518 9.2 last paragraph
-        if (isset($_SERVER['HTTP_DEPTH']) &&
-                $_SERVER['HTTP_DEPTH'] != 'infinity') {
-            $this->http_status('400 Bad Request');
-            return;
-        }
-
-        // check resource is not locked
-        if (!$this->check_lock_wrapper($this->path)) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        $options = array();
-        $options['path'] = $this->path;
-
-        // call user handler
-        $status = $this->delete($options);
-        if ($status === true) {
-            $status = '204 No Content';
-        }
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    // {{{ copymove_request_helper
-
-    /**
-     * COPY/MOVE request helper - prepares data-structures from COPY/MOVE
-     * requests
-     *
-     * @param options
-     * @return void
-     */
-    function copymove_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        $options['depth'] = 'infinity';
-        if (isset($_SERVER['HTTP_DEPTH'])) {
-            $options['depth'] = $_SERVER['HTTP_DEPTH'];
-        }
-
-        // RFC2518 9.6, 8.8.4 and 8.9.3
-        $options['overwrite'] = true;
-        if (isset($_SERVER['HTTP_OVERWRITE'])) {
-            $options['overwrite'] = $_SERVER['HTTP_OVERWRITE'] == 'T';
-        }
-
-        list ($src_host, $src_port) = explode(':', $_SERVER['HTTP_HOST']);
-        if (empty($src_port)) {
-            $src_port = 80;
-        }
-
-        $dst_url = parse_url($_SERVER['HTTP_DESTINATION']);
-        $dst_host = $dst_url['host'];
-
-        $dst_port = $dst_url['port'];
-        if (empty($dst_port)) {
-            $dst_port = 80;
-        }
-
-        $dst_path = $dst_url['path'];
-
-        // base_uri is urldecoded
-        $dst_path = $this->_urldecode($dst_path);
-
-        // does the destination resource belong on this server?
-        if ($dst_host == $src_host && $dst_port == $src_port &&
-                !strncmp($dst_path, $this->base_uri, strlen($this->base_uri))) {
-            $options['dest'] = substr($dst_path, strlen($this->base_uri));
-
-            $options['dest'] = ltrim($options['dest'], '/');
-
-            // check source & destination are not the same - data could be lost
-            // if overwrite is true - RFC2518 8.8.5
-            if ($options['dest'] == $this->path) {
-                $this->http_status('403 Forbidden');
-                return;
-            }
-
-            return true;
-        }
-
-        $options['dest_url'] = $_SERVER['HTTP_DESTINATION'];
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ copy_wrapper
-
-    /**
-     * COPY method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function copy_wrapper()
-    {
-        // no need to check source is not locked
-
-        // perpare data-structure from COPY request
-        if (!$this->copymove_request_helper($options)) {
-            return;
-        }
-
-        // check destination is not locked
-        if (isset($options['dest']) &&
-                !$this->check_lock_wrapper($options['dest'])) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        // call user handler
-        $status = $this->copy($options);
-        if ($status === true) {
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
-        }
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    // {{{ move_wrapper
-
-    /**
-     * MOVE method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function move_wrapper()
-    {
-        // check resource is not locked
-        if (!$this->check_lock_wrapper($this->path)) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        // perpare data-structure from MOVE request
-        if (!$this->copymove_request_helper($options)) {
-            return;
-        }
-
-        // check destination is not locked
-        if (isset($options['dest']) &&
-                !$this->check_lock_wrapper($options['dest'])) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        // call user handler
-        $status = $this->move($options);
-        if ($status === true) {
-            $status = $options['new'] === false ? '204 No Content' :
-                '201 Created';
-        }
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    // {{{ lock_request_helper
-
-    /**
-     * LOCK request helper - prepares data-structures from LOCK requests
-     *
-     * @param options
-     * @return void
-     */
-    function lock_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        $options['depth'] = 'infinity';
-        if (isset($_SERVER['HTTP_DEPTH'])) {
-            $options['depth'] = $_SERVER['HTTP_DEPTH'];
-        }
-
-        if (isset($_SERVER['HTTP_TIMEOUT'])) {
-            $options['timeout'] = explode(',', $_SERVER['HTTP_TIMEOUT']);
-        }
-
-        if (empty($_SERVER['CONTENT_LENGTH']) && !empty($_SERVER['HTTP_IF'])) {
-
-            // refresh lock
-            $options['update'] = substr($_SERVER['HTTP_IF'], 2, -2);
-
-            return true;
-        }
-
-        // extract lock request information from request XML payload
-        $lockinfo = new _parse_lockinfo('php://input');
-        if (!$lockinfo->success) {
-            $this->http_status('400 Bad Request');
-            return;
-        }
-
-        // new lock
-        $options['scope'] = $lockinfo->lockscope;
-        $options['type']  = $lockinfo->locktype;
-        $options['owner'] = $lockinfo->owner;
-
-        $options['token'] = $this->_new_locktoken();
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ lock_response_helper
-
-    /**
-     * LOCK response helper - format LOCK response
-     *
-     * @param options
-     * @param status
-     * @return void
-     */
-    function lock_response_helper($options, $status)
-    {
-        if (isset($options['locks']) && is_array($options['locks'])) {
-            $this->http_status('409 Conflict');
-
-            $responses = array();
-            foreach ($options['locks'] as $lock) {
-                $response = array();
-
-                $response['href'] = $this->getHref($lock['path']);
-                if (isset($lock['href'])) {
-                    $response['href'] = $lock['href'];
-                }
-
-                $response['status'] = '423 Locked';
-
-                $responses[] = $response;
-            }
-
-            $this->_multistatus($responses);
-            return;
-        }
-
-        if (is_bool($status)) {
-            $status = $status ? '200 OK' : '423 Locked';
-        }
-
-        // set headers before we start printing
-        $this->http_status($status);
-
-        if ($status{0} == 2) { // 2xx states are ok
-            header('Content-Type: text/xml; charset="utf-8"');
-            header("Lock-Token: <$options[token]>");
-
-            echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-            echo "<D:prop xmlns:D=\"DAV:\">\n";
-            echo " <D:lockdiscovery>\n";
-            echo '  ' . $this->_activelocks(array($options)) . "\n";
-            echo " </D:lockdiscovery>\n";
-            echo "</D:prop>\n";
-        }
-    }
-
-    // }}}
-
-    // {{{ lock_wrapper
-
-    /**
-     * LOCK method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function lock_wrapper()
-    {
-        // perpare data-structure from LOCK request
-        if (!$this->lock_request_helper($options)) {
-            return;
-        }
-
-        // check resource is not locked
-        if (isset($options['update']) &&
-                !$this->check_lock_wrapper($this->path) ||
-                !$this->check_lock_wrapper($this->path,
-                $options['scope'] == 'shared')) {
-            $this->http_status('423 Locked');
-            return;
-        }
-
-        $options['locks'] = $this->getDescendentsLocks($this->path);
-        if (empty($options['locks'])) {
-
-            // call user handler
-            $status = $this->lock($options);
-        }
-
-        // format LOCK response
-        $this->lock_response_helper($options, $status);
-    }
-
-    // }}}
-
-    // {{{ unlock_request_helper
-
-    /**
-     * UNLOCK request helper - prepares data-structures from UNLOCK requests
-     *
-     * @param options
-     * @return void
-     */
-    function unlock_request_helper(&$options)
-    {
-        $options = array();
-        $options['path'] = $this->path;
-
-        // strip surrounding <>
-        $options['token'] = substr(trim($_SERVER['HTTP_LOCK_TOKEN']), 1, -1);
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ unlock_wrapper
-
-    /**
-     * UNLOCK method wrapper
-     *
-     * @param void
-     * @return void
-     */
-    function unlock_wrapper()
-    {
-        // perpare data-structure from DELETE request
-        if (!$this->unlock_request_helper($options)) {
-            return;
-        }
-
-        // call user handler
-        $status = $this->unlock($options);
-
-        // RFC2518 8.11.1
-        if ($status === true) {
-            $status = '204 No Content';
-        }
-
-        $this->http_status($status);
-    }
-
-    // }}}
-
-    function getHref($path)
-    {
-        return $this->base_uri . '/' . $path;
-    }
-
-    function getProp($reqprop, $file, $options)
-    {
-        // check if property exists in response
-        foreach ($file['props'] as $prop) {
-            if ($reqprop['name'] == $prop['name'] &&
-                    $reqprop['ns'] == $prop['ns']) {
-                return $prop;
-            }
-        }
-
-        if ($reqprop['name'] == 'lockdiscovery' &&
-                $reqprop['ns'] == 'DAV:' &&
-                method_exists($this, 'getLocks')) {
-
-            return $this->mkprop('DAV:', 'lockdiscovery',
-                $this->getLocks($file['path']));
-        }
-
-        // incase the requested property had a value, like calendar-data
-        unset($reqprop['value']);
-        $reqprop['status'] = '404 Not Found';
-        return $reqprop;
-    }
-
-    function getDescendentsLocks($path)
-    {
-        $options = array();
-        $options['path'] = $path;
-        $options['depth'] = 'infinity';
-        $options['props'] = array();
-        $options['props'][] = $this->mkprop('DAV:', 'lockdiscovery', null);
-
-        // call user handler
-        if (!$this->propfind($options, $files)) {
-            return;
-        }
-
-        return $files;
-    }
-
-    // {{{ _allow()
-
-    /**
-     * list implemented methods
-     *
-     * @param void
-     * @return array something
-     */
-    function _allow()
-    {
-        // OPTIONS is always there
-        $allow = array('OPTIONS');
-
-        // all other methods need both a method_wrapper() and a method()
-        // implementation
-        // the base class defines only wrappers
-        foreach(get_class_methods($this) as $method) {
-
-            // strncmp breaks with negative len -
-            // http://bugs.php.net/bug.php?id=36944
-            //if (!strncmp('_wrapper', $method, -8)) {
-            if (!strcmp(substr($method, -8), '_wrapper')) {
-                $method = strtolower(substr($method, 0, -8));
-                if (method_exists($this, $method) &&
-                        ($method != 'lock' && $method != 'unlock' ||
-                        method_exists($this, 'getLocks'))) {
-                    $allow[] = $method;
-                }
-            }
-        }
-
-        // we can emulate a missing HEAD implemetation using GET
-        if (in_array('GET', $allow)) {
-            $allow[] = 'HEAD';
-        }
-
-        return $allow;
-    }
-
-    // }}}
-
-    // {{{ mkprop
-
-    /**
-     * helper for property element creation
-     *
-     * @param  string XML namespace (optional)
-     * @param  string property name
-     * @param  string property value
-     * @return array  property array
-     */
-    function mkprop()
-    {
-        $args = func_get_args();
-
-        $prop = array();
-        $prop['ns'] = 'DAV:';
-        if (count($args) > 2) {
-            $prop['ns'] = array_shift($args);
-        }
-
-        $prop['name'] = array_shift($args);
-        $prop['value'] = array_shift($args);
-        $prop['status'] = array_shift($args);
-
-        return $prop;
-    }
-
-    // }}}
-
-    // {{{ check_auth_wrapper
-
-    /**
-     * check authentication if implemented
-     *
-     * @param  void
-     * @return bool  true if authentication succeded or not necessary
-     */
-    function check_auth_wrapper()
-    {
-        if (method_exists($this, 'checkAuth')) {
-
-            // PEAR style method name
-            return $this->checkAuth(@$_SERVER['AUTH_TYPE'],
-                @$_SERVER['PHP_AUTH_USER'],
-                @$_SERVER['PHP_AUTH_PW']);
-        }
-
-        if (method_exists($this, 'check_auth')) {
-
-            // old (pre 1.0) method name
-            return $this->check_auth(@$_SERVER['AUTH_TYPE'],
-                @$_SERVER['PHP_AUTH_USER'],
-                @$_SERVER['PHP_AUTH_PW']);
-        }
-
-        // no method found -> no authentication required
-        return true;
-    }
-
-    // }}}
-
-    // {{{ UUID stuff
-
-    /**
-     * generate Unique Universal IDentifier for lock token
-     *
-     * @param void
-     * @return string a new UUID
-     */
-    function _new_uuid()
-    {
-        // use uuid extension from PECL if available
-        if (function_exists('uuid_create')) {
-            return uuid_create();
-        }
-
-        // fallback
-        $uuid = md5(microtime() . getmypid()); // this should be random enough for now
-
-        // set variant and version fields for 'true' random uuid
-        $uuid{12} = '4';
-        $n = 8 + (ord($uuid{16}) & 3);
-        $hex = '0123456789abcdef';
-        $uuid{16} = $hex{$n};
-
-        // return formated uuid
-        return substr($uuid,  0, 8) . '-' .
-            substr($uuid,  8, 4) . '-' .
-            substr($uuid, 12, 4) . '-' .
-            substr($uuid, 16, 4) . '-' .
-            substr($uuid, 20);
-    }
-
-    /**
-     * create a new opaque lock token as defined in RFC2518
-     *
-     * @param  void
-     * @return string new RFC2518 opaque lock token
-     */
-    function _new_locktoken()
-    {
-        return 'opaquelocktoken:' . $this->_new_uuid();
-    }
-
-    // }}}
-
-    // {{{ WebDAV If: header parsing
-
-    /**
-     *
-     *
-     * @param string header string to parse
-     * @param int current parsing position
-     * @return array next token (type and value)
-     */
-    function _if_header_lexer($string, &$pos)
-    {
-        // skip whitespace
-        while (ctype_space($string{$pos})) {
-            ++$pos;
-        }
-
-        // already at end of string?
-        if (strlen($string) <= $pos) {
-            return;
-        }
-
-        // get next character
-        $c = $string{$pos++};
-
-        // now it depends on what we found
-        switch ($c) {
-
-            // URIs are enclosed in <...>
-            case '<':
-                $pos2 = strpos($string, '>', $pos);
-                $uri = substr($string, $pos, $pos2 - $pos);
-                $pos = $pos2 + 1;
-                return array('URI', $uri);
-
-            // ETags are enclosed in [...]
-            case '[':
-                $type = 'ETAG_STRONG';
-                if ($string{$pos} == 'W') {
-                    $type = 'ETAG_WEAK';
-                    $pos += 2;
-                }
-
-                $pos2 = strpos($string, ']', $pos);
-                $etag = substr($string, $pos + 1, $pos2 - $pos - 2);
-                $pos = $pos2 + 1;
-                return array($type, $etag);
-
-            // 'N' indicates negation
-            case 'N':
-                $pos += 2;
-                return array('NOT', 'Not');
-
-            // anything else is passed verbatim char by char
-            default:
-                return array('CHAR', $c);
-        }
-    }
-
-    /**
-     * parse If: header
-     *
-     * @param  string  header string
-     * @return array   URIs and their conditions
-     */
-    function _if_header_parser($str)
-    {
-        $pos = 0;
-        $len = strlen($str);
-
-        $uris = array();
-
-        // parser loop
-        while ($pos < $len) {
-
-            // get next token
-            $token = $this->_if_header_lexer($str, $pos);
-
-            // check for URI
-            $uri = '';
-            if ($token[0] == 'URI') {
-                $uri = $token[1]; // remember URI
-                $token = $this->_if_header_lexer($str, $pos); // get next token
-            }
-
-            // sanity check
-            if ($token[0] != 'CHAR' || $token[1] != '(') {
-                return;
-            }
-
-            $list = array();
-            $level = 1;
-            while ($level) {
-                $token = $this->_if_header_lexer($str, $pos);
-
-                $not = '';
-                if ($token[0] == 'NOT') {
-                    $not = '!';
-                    $token = $this->_if_header_lexer($str, $pos);
-                }
-
-                switch ($token[0]) {
-                    case 'CHAR':
-                        switch ($token[1]) {
-                            case '(':
-                                $level++;
-                                break;
-
-                            case ')':
-                                $level--;
-                                break;
-
-                            default:
-                                return;
-                        }
-                        break;
-
-                    case 'URI':
-                        $list[] = $not . "<$token[1]>";
-                        break;
-
-                    case 'ETAG_WEAK':
-                        $list[] = $not . "[W/'$token[1]']>";
-                        break;
-
-                    case 'ETAG_STRONG':
-                        $list[] = $not . "['$token[1]']>";
-                        break;
-
-                    default:
-                        return;
-                }
-            }
-
-            if (is_array($uris[$uri])) {
-                $uris[$uri] = array_merge($uris[$uri], $list);
-                continue;
-            }
-            $uris[$uri] = $list;
-        }
-
-        return $uris;
-    }
-
-    /**
-     * check if conditions from If: headers are met
-     *
-     * the If: header is an extension to HTTP/1.1
-     * defined in RFC2518 9.4
-     *
-     * @param  void
-     * @return void
-     */
-    function _check_if_header_conditions()
-    {
-        if (!isset($_SERVER['HTTP_IF'])) {
-            return true;
-        }
-
-        $this->_if_header_uris =
-            $this->_if_header_parser($_SERVER['HTTP_IF']);
-
-        // any match is ok
-        foreach($this->_if_header_uris as $uri => $conditions) {
-            if (empty($uri)) {
-                $uri = $this->base_uri . '/' . $this->path;
-            }
-
-            // all must match
-            foreach ($conditions as $condition) {
-
-                // lock tokens may be free form (RFC2518 6.3)
-                // but if opaquelocktokens are used (RFC2518 6.4)
-                // we have to check the format (litmus tests this)
-                if (!strncmp($condition, '<opaquelocktoken:', strlen('<opaquelocktoken'))) {
-                    if (!ereg('^<opaquelocktoken:[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}>$', $condition)) {
-                        return;
-                    }
-                }
-
-                if (!$this->_check_uri_condition($uri, $condition)) {
-                    continue (2);
-                }
-            }
-
-            return true;
-        }
-    }
-
-    /**
-     * Check a single URI condition parsed from an if-header
-     *
-     * @abstract
-     * @param string $uri URI to check
-     * @param string $condition Condition to check for this URI
-     * @returns bool Condition check result
-     */
-    function _check_uri_condition($uri, $condition)
-    {
-        // not really implemented here,
-        // implementations must override
-        return true;
-    }
-
-    /**
-     * @param array of locks
-     * @param bool exclusive lock?
-     */
-    function check_lock_helper($lock, $exclusive_only = false)
-    {
-        if (!is_array($lock) || empty($lock)) {
-            return true;
-        }
-
-        // FIXME doesn't check uri restrictions yet
-        if (strstr($_SERVER['HTTP_IF'], $lock['token'])) {
-            return true;
-        }
-
-        if ($exclusive_only && ($lock['scope'] == 'shared')) {
-            return true;
-        }
-    }
-
-    /**
-     * @param string path of resource to check
-     * @param bool exclusive lock?
-     */
-    function check_lock_wrapper($path, $exclusive_only = false)
-    {
-        if (!method_exists($this, 'getLocks')) {
-            return true;
-        }
-
-        $lock = $this->getLocks($path);
-
-        return $this->check_lock_helper($lock, $exclusive_only);
-    }
-
-    // }}}
-
-    function _lockentries($locks)
-    {
-        if (!is_array($locks) || empty($locks)) {
-            return '';
-        }
-
-        foreach ($locks as $key => $lock) {
-            if (!is_array($lock) || empty($lock)) {
-                continue;
-            }
-
-            $locks[$key] = "<D:lockentry>
+	// }}}
+
+	// }}}
+
+	// {{{ WebDAV HTTP method wrappers
+
+	// {{{ options
+
+	/**
+	 * OPTIONS method handler
+	 *
+	 * The OPTIONS method handler creates a valid OPTIONS reply
+	 * including Dav: and Allowed: heaers
+	 * based on the implemented methods found in the actual instance
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function options()
+	{
+		// get allowed methods
+		$allow = $this->_allow();
+
+		// dav header
+		$dav = array(1); // assume we are always dav class 1 compliant
+		if (in_array('LOCK', $allow) && in_array('UNLOCK', $allow)) {
+			$dav[] = 2; // dav class 2 requires that locking is supported
+		}
+
+		// tell clients what we found
+		header('Allow: ' . implode(', ', $allow));
+		header('DAV: ' . implode(',', $dav));
+		header('Content-Length: 0');
+
+		// Microsoft clients default to the Frontpage protocol
+		// unless we tell them to use WebDAV
+		header('MS-Author-Via: DAV');
+
+		$this->http_status('200 OK');
+	}
+
+	// }}}
+
+	// {{{ propfind_request_helper
+
+	/**
+	 * PROPFIND request helper - prepares data-structures from PROPFIND requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function propfind_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		// get depth from header (default is 'infinity')
+		$options['depth'] = 'infinity';
+		if (isset($_SERVER['HTTP_DEPTH'])) {
+			$options['depth'] = $_SERVER['HTTP_DEPTH'];
+		}
+
+		// analyze request payload
+		$parser = new _parse_propfind('php://input');
+		if (!$parser->success) {
+			$this->http_status('400 Bad Request');
+			return;
+		}
+
+		$options['props'] = $parser->props;
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ propfind_response_helper
+
+	/**
+	 * PROPFIND response helper - format PROPFIND response
+	 *
+	 * @param options
+	 * @param files
+	 * @return void
+	 */
+	function propfind_response_helper($options, $files)
+	{
+		$responses = array();
+
+		// now loop over all returned files
+		foreach ($files as $file) {
+
+			// collect namespaces here
+			// Microsoft need this special namespace for date and time values
+			$ns_hash = array(
+				'urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882' => 'ns0');
+
+			$response = array();
+
+			$response['href'] = $this->getHref($file['path']);
+			if (isset($file['href'])) {
+				$response['href'] = $file['href'];
+			}
+
+			$response['propstat'] = array();
+
+			if (is_array($options['props'])) {
+
+				// loop over all requested properties
+				foreach ($options['props'] as $reqprop) {
+					$status = '200 OK';
+					$prop = $this->getProp($reqprop, $file, $options);
+
+					if (isset($prop['status'])) {
+						$status = $prop['status'];
+					}
+
+					if (!isset($response['propstat'][$status])) {
+						$response['propstat'][$status] = array();
+					}
+
+					$response['propstat'][$status][] = $prop;
+
+					// 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);
+				}
+			} else if (is_array($file['props'])) {
+
+				// loop over all returned properties
+				foreach ($file['props'] as $prop) {
+					$status = '200 OK';
+
+					if (isset($prop['status'])) {
+						$status = $prop['status'];
+					}
+
+					if (!isset($response['propstat'][$status])) {
+						$response['propstat'][$status] = array();
+					}
+
+					if ($options['props'] == 'propname') {
+
+						// only names of all existing properties were requested
+						// so remove values
+						unset($prop['value']);
+					}
+
+					$response['propstat'][$status][] = $prop;
+						unset($prop['value']);
+
+					// 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);
+				}
+			}
+
+			$response['ns_hash'] = $ns_hash;
+			$responses[] = $response;
+		}
+
+		$this->_multistatus($responses);
+	}
+
+	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 (!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";
+	}
+
+	// }}}
+
+	// {{{ propfind_wrapper
+
+	/**
+	 * PROPFIND method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function propfind_wrapper()
+	{
+		// prepare data-structure from PROPFIND request
+		if (!$this->propfind_request_helper($options)) {
+			return;
+		}
+
+		// call user handler
+		if (!$this->propfind($options, $files)) {
+			return;
+		}
+
+		// format PROPFIND response
+		$this->propfind_response_helper($options, $files);
+	}
+
+	// }}}
+
+	// {{{ proppatch_request_helper
+
+	/**
+	 * PROPPATCH request helper - prepares data-structures from PROPPATCH requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function proppatch_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		$propinfo = new _parse_proppatch('php://input');
+
+		if (!$propinfo->success) {
+			$this->http_status('400 Bad Request');
+			return;
+		}
+
+		$options['props'] = $propinfo->props;
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ proppatch_response_helper
+
+	/**
+	 * PROPPATCH response helper - format PROPPATCH response
+	 *
+	 * @param options
+	 * @param responsedescr
+	 * @return void
+	 */
+	function proppatch_response_helper($options, $responsedescription=null)
+	{
+		$response = array();
+
+		$response['href'] = $this->getHref($options['path']);
+		if (isset($options['href'])) {
+			$response['href'] = $options['href'];
+		}
+
+		$response['propstat'] = array();
+
+		// collect namespaces here
+		$ns_hash = array();
+
+		if (isset($options['props']) && is_array($options['props'])) {
+			foreach ($options['props'] as $prop) {
+				$status = '200 OK';
+				if (isset($prop['status'])) {
+					$status = $prop['status'];
+				}
+
+				if (!isset($response['propstat'][$status])) {
+					$response['propstat'][$status] = array();
+				}
+
+				$response['propstat'][$status][] = $prop;
+
+				// 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);
+			}
+		}
+
+		$response['ns_hash'] = $ns_hash;
+		$response['responsedescription'] = $responsedescription;
+
+		$this->_multistatus(array($response));
+	}
+
+	// }}}
+
+	// {{{ proppatch_wrapper
+
+	/**
+	 * PROPPATCH method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function proppatch_wrapper()
+	{
+		// check resource is not locked
+		if (!$this->check_lock_wrapper($this->path)) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		// perpare data-structure from PROPATCH request
+		if (!$this->proppatch_request_helper($options)) {
+			return;
+		}
+
+		// call user handler
+		$responsedescription = $this->proppatch($options);
+
+		// format PROPPATCH response
+		$this->proppatch_response_helper($options, $responsedescription);
+	}
+
+	// }}}
+
+	// {{{ mkcol_wrapper
+
+	/**
+	 * MKCOL method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function mkcol_wrapper()
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		$status = $this->mkcol($options);
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	// {{{ get_request_helper
+
+	/**
+	 * GET request helper - prepares data-structures from GET requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function get_request_helper(&$options)
+	{
+		// TODO check for invalid stream
+
+		$options = array();
+		$options['path'] = $this->path;
+
+		$this->_get_ranges($options);
+
+		return true;
+	}
+
+	/**
+	 * parse HTTP Range: header
+	 *
+	 * @param  array options array to store result in
+	 * @return void
+	 */
+	function _get_ranges(&$options)
+	{
+		// process Range: header if present
+		if (isset($_SERVER['HTTP_RANGE'])) {
+
+			// we only support standard 'bytes' range specifications for now
+			if (ereg('bytes[[:space:]]*=[[:space:]]*(.+)', $_SERVER['HTTP_RANGE'], $matches)) {
+				$options['ranges'] = array();
+
+				// ranges are comma separated
+				foreach (explode(',', $matches[1]) as $range) {
+					// ranges are either from-to pairs or just end positions
+					list($start, $end) = explode('-', $range);
+					$options['ranges'][] = ($start === '')
+						? array('last' => $end)
+						: array('start' => $start, 'end' => $end);
+				}
+			}
+		}
+	}
+
+	// }}}
+
+	// {{{ get_response_helper
+
+	/**
+	 * GET response helper - format GET response
+	 *
+	 * @param options
+	 * @param status
+	 * @return void
+	 */
+	function get_response_helper($options, $status)
+	{
+		if (empty($status)) {
+			$status = '404 Not Found';
+		}
+
+		// set headers before we start printing
+		$this->http_status($status);
+
+		if ($status !== true) {
+			return;
+		}
+
+		if (!isset($options['mimetype'])) {
+			$options['mimetype'] = 'application/octet-stream';
+		}
+		header("Content-Type: $options[mimetype]");
+
+		if (isset($options['mtime'])) {
+			header('Last-Modified:' .
+				gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
+		}
+
+		if ($options['stream']) {
+			// GET handler returned a stream
+
+			if (!empty($options['ranges']) &&
+					(fseek($options['stream'], 0, SEEK_SET) === 0)) {
+				// partial request and stream is seekable
+
+				if (count($options['ranges']) === 1) {
+					$range = $options['ranges'][0];
+
+					if (isset($range['start'])) {
+						fseek($options['stream'], $range['start'], SEEK_SET);
+						if (feof($options['stream'])) {
+							$this->http_status('416 Requested Range Not Satisfiable');
+							return;
+						}
+
+						if (isset($range['end'])) {
+							$size = $range['end'] - $range['start'] + 1;
+							$this->http_status('206 Partial');
+							header("Content-Length: $size");
+							header("Content-Range: $range[start]-$range[end]/" .
+								(isset($options['size']) ? $options['size'] : '*'));
+							while ($size && !feof($options['stream'])) {
+								$buffer = fread($options['stream'], 4096);
+								$size -= strlen($buffer);
+								echo $buffer;
+							}
+						} else {
+							$this->http_status('206 Partial');
+							if (isset($options['size'])) {
+								header("Content-Length: " .
+									($options['size'] - $range['start']));
+								header("Content-Range: $start-$end/" .
+									(isset($options['size']) ? $options['size'] : '*'));
+							}
+							fpassthru($options['stream']);
+						}
+					} else {
+						header("Content-Length: $range[last]");
+						fseek($options['stream'], -$range['last'], SEEK_END);
+						fpassthru($options['stream']);
+					}
+				} else {
+					$this->_multipart_byterange_header(); // init multipart
+					foreach ($options['ranges'] as $range) {
+
+						// TODO what if size unknown? 500?
+						if (isset($range['start'])) {
+							$from = $range['start'];
+							$to = !empty($range['end']) ? $range['end'] : $options['size'] - 1;
+						} else {
+							$from = $options['size'] - $range['last'] - 1;
+							$to = $options['size'] - 1;
+						}
+						$total = isset($options['size']) ? $options['size'] : '*';
+						$size = $to - $from + 1;
+						$this->_multipart_byterange_header($options['mimetype'],
+							$from, $to, $total);
+
+						fseek($options['stream'], $start, SEEK_SET);
+						while ($size && !feof($options['stream'])) {
+							$buffer = fread($options['stream'], 4096);
+							$size -= strlen($buffer);
+							echo $buffer;
+						}
+					}
+					$this->_multipart_byterange_header(); // end multipart
+				}
+			} else {
+				// normal request or stream isn't seekable, return full content
+				if (isset($options['size'])) {
+					header("Content-Length: $options[size]");
+				}
+
+				fpassthru($options['stream']);
+			}
+		} else if (isset($options['data']))  {
+			if (is_array($options['data'])) {
+				// reply to partial request
+			} else {
+				header("Content-Length: " . strlen($options['data']));
+				echo $options['data'];
+			}
+		}
+	}
+
+	/**
+	 * generate separator headers for multipart response
+	 *
+	 * first and last call happen without parameters to generate
+	 * the initial header and closing sequence, all calls inbetween
+	 * require content mimetype, start and end byte position and
+	 * optionaly the total byte length of the requested resource
+	 *
+	 * @param  string  mimetype
+	 * @param  int     start byte position
+	 * @param  int     end   byte position
+	 * @param  int     total resource byte size
+	 */
+	function _multipart_byterange_header($mimetype = false, $from = false,
+		$to = false, $total = false)
+	{
+		if ($mimetype === false) {
+			if (!isset($this->multipart_separator)) {
+				// init
+				// a little naive, this sequence *might* be part of the content
+				// but it's really not likely and rather expensive to check
+				$this->multipart_separator = 'SEPARATOR_' . md5(microtime());
+
+				// generate HTTP header
+				header('Content-Type: multipart/byteranges; boundary=' .
+					$this->multipart_separator);
+
+				return;
+			}
+
+			// end
+			// generate closing multipart sequence
+			echo "\n--{$this->multipart_separator}--";
+
+			return;
+		}
+
+		// generate separator and header for next part
+		echo "\n--{$this->multipart_separator}\n";
+		echo "Content-Type: $mimetype\n";
+		echo "Content-Range: $from-$to/"
+			. ($total === false ? "*" : $total) . "\n\n";
+	}
+
+	// }}}
+
+	// {{{ get_wrapper
+
+	/**
+	 * GET method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function get_wrapper()
+	{
+		// perpare data-structure from GET request
+		if (!$this->get_request_helper($options)) {
+			return;
+		}
+
+		// call user handler
+		$status = $this->get($options);
+
+		// format GET response
+		$this->get_response_helper($options, $status);
+	}
+
+	// }}}
+
+	// {{{ head_response_helper
+
+	/**
+	 * HEAD response helper - format HEAD response
+	 *
+	 * @param options
+	 * @param status
+	 * @return void
+	 */
+	function head_response_helper($options, $status)
+	{
+		if (empty($status)) {
+			$status('404 Not Found');
+		}
+
+		// set headers before we start printing
+		$this->http_status($status);
+
+		if ($status !== true) {
+			return;
+		}
+
+		if (!isset($options['mimetype'])) {
+			$options['mimetype'] = 'application/octet-stream';
+		}
+		header("Content-Type: $options[mimetype]");
+
+		if (isset($options['mtime'])) {
+			header('Last-Modified:' .
+				gmdate('D, d M Y H:i:s', $options['mtime']) . 'GMT');
+		}
+
+		if (isset($options['stream'])) {
+			// GET handler returned a stream
+
+			if (!empty($options['ranges']) &&
+					(fseek($options['stream'], 0, SEEK_SET) === 0)) {
+				// partial request and stream is seekable
+
+				if (count($options['ranges']) === 1) {
+					$range = $options['ranges'][0];
+
+					if (isset($range['start'])) {
+						fseek($options['stream'], $range['start'], SEEK_SET);
+						if (feof($options['stream'])) {
+							$this->http_status('416 Requested Range Not Satisfiable');
+							return;
+						}
+
+						if (isset($range['end'])) {
+							$size = $range['end'] - $range['start'] + 1;
+							$this->http_status('206 Partial');
+							header("Content-Length: $size");
+							header("Content-Range: $range[start]-$range[end]/" .
+								(isset($options['size']) ? $options['size'] : '*'));
+						} else {
+							$this->http_status('206 Partial');
+							if (isset($options['size'])) {
+								header("Content-Length: " .
+									($options['size'] - $range['start']));
+								header("Content-Range: $start-$end/" .
+									(isset($options['size']) ? $options['size'] : '*'));
+							}
+						}
+					} else {
+						header("Content-Length: $range[last]");
+						fseek($options['stream'], -$range['last'], SEEK_END);
+					}
+				} else {
+					$this->_multipart_byterange_header(); // init multipart
+					foreach ($options['ranges'] as $range) {
+
+						// TODO what if size unknown? 500?
+						if (isset($range['start'])) {
+							$from = $range['start'];
+							$to = !empty($range['end']) ? $range['end'] :
+								$options['size'] - 1;
+						} else {
+							$from = $options['size'] - $range['last'] - 1;
+							$to = $options['size'] - 1;
+						}
+						$total = isset($options['size']) ? $options['size'] :
+							'*';
+						$size = $to - $from + 1;
+						$this->_multipart_byterange_header($options['mimetype'],
+							$from, $to, $total);
+
+						fseek($options['stream'], $start, SEEK_SET);
+					}
+					$this->_multipart_byterange_header(); // end multipart
+				}
+			} else {
+				// normal request or stream isn't seekable, return full content
+				if (isset($options['size'])) {
+					header("Content-Length: $options[size]");
+				}
+			}
+		} else if (isset($options['data']))  {
+			if (is_array($options['data'])) {
+				// reply to partial request
+			} else {
+				header("Content-Length: " . strlen($options['data']));
+			}
+		}
+	}
+
+	// }}}
+
+	// {{{ head_wrapper
+
+	/**
+	 * HEAD method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function head_wrapper()
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		// call user handler
+		if (method_exists($this, 'head')) {
+			$status = $this->head($options);
+		} else {
+
+			// can emulate HEAD using GET
+			ob_start();
+			$status = $this->get($options);
+			ob_end_clean();
+		}
+
+		// format HEAD response
+		$this->head_response_helper($options, $status);
+	}
+
+	// }}}
+
+	// {{{ put_request_helper
+
+	/**
+	 * PUT request helper - prepares data-structures from PUT requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function put_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+		$options['content_length'] = $_SERVER['CONTENT_LENGTH'];
+
+		// get the content-type
+		if (isset($_SERVER['CONTENT_TYPE'])) {
+
+			// for now we do not support any sort of multipart requests
+			if (!strncmp($_SERVER['CONTENT_TYPE'], 'multipart/', 10)) {
+				$this->http_status('501 Not Implemented');
+				echo 'The service does not support mulipart PUT requests';
+				return;
+			}
+
+			$options['content_type'] = $_SERVER['CONTENT_TYPE'];
+		} else {
+
+			// default content type if none given
+			$options['content_type'] = 'application/unknown';
+		}
+
+		// RFC2616 2.6 says: The recipient of the entity MUST NOT
+		// ignore any Content-* (e.g. Content-Range) headers that it
+		// does not understand or implement and MUST return a 501
+		// (Not Implemented) response in such cases.
+		foreach ($_SERVER as $key => $value) {
+			if (strncmp($key, 'HTTP_CONTENT', 11)) continue;
+			switch ($key) {
+			case 'HTTP_CONTENT_ENCODING': // RFC2616 14.11
+
+				// TODO support this if ext/zlib filters are available
+				$this->http_status('501 Not Implemented');
+				echo "The service does not support '$value' content encoding";
+				return;
+
+			case 'HTTP_CONTENT_LANGUAGE': // RFC2616 14.12
+
+				// we assume it is not critical if this one is ignored
+				// in the actual PUT implementation...
+				$options['content_language'] = $value;
+				break;
+
+			case 'HTTP_CONTENT_LOCATION': // RFC2616 14.14
+
+				// The meaning of the Content-Location header in PUT
+				// or POST requests is undefined; servers are free
+				// to ignore it in those cases. */
+				break;
+
+			case 'HTTP_CONTENT_RANGE': // RFC2616 14.16
+
+				// single byte range requests are supported
+				// the header format is also specified in RFC2616 14.16
+				// TODO we have to ensure that implementations support this or send 501 instead
+				if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $value, $matches)) {
+					$this->http_status('400 Bad Request');
+					echo 'The service does only support single byte ranges';
+					return;
+				}
+
+				$range = array('start' => $matches[1], 'end' => $matches[2]);
+				if (is_numeric($matches[3])) {
+					$range['total_length'] = $matches[3];
+				}
+				$option['ranges'][] = $range;
+
+				// TODO make sure the implementation supports partial PUT
+				// this has to be done in advance to avoid data being overwritten
+				// on implementations that do not support this...
+				break;
+
+			case 'HTTP_CONTENT_MD5': // RFC2616 14.15
+
+				// TODO maybe we can just pretend here?
+				$this->http_status('501 Not Implemented');
+				echo 'The service does not support content MD5 checksum verification';
+				return;
+
+			default:
+
+				// any other unknown Content-* headers
+				$this->http_status('501 Not Implemented');
+				echo "The service does not support '$key'";
+				return;
+			}
+		}
+
+		$options['stream'] = fopen('php://input', 'r');
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ put_response_helper
+
+	/**
+	 * PUT response helper - format PUT response
+	 *
+	 * @param options
+	 * @param status
+	 * @return void
+	 */
+	function put_response_helper($options, $status)
+	{
+		if (empty($status)) {
+			$status = '403 Forbidden';
+		} else if (is_resource($status) &&
+				get_resource_type($status) == 'stream') {
+			$stream = $status;
+			$status = $options['new'] === false ? '204 No Content' :
+				'201 Created';
+
+			if (!empty($options['ranges'])) {
+
+				// TODO multipart support is missing (see also above)
+				if (0 == fseek($stream, $range[0]['start'], SEEK_SET)) {
+					$length = $range[0]['end'] - $range[0]['start'] + 1;
+					if (!fwrite($stream, fread($options['stream'], $length))) {
+						$status = '403 Forbidden';
+					}
+				} else {
+					$status = '403 Forbidden';
+				}
+			} else {
+				while (!feof($options['stream'])) {
+					$buf = fread($options['stream'], 4096);
+					if (fwrite($stream, $buf) != 4096) {
+						break;
+					}
+				}
+			}
+
+			fclose($stream);
+		}
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	// {{{ put_wrapper
+
+	/**
+	 * PUT method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function put_wrapper()
+	{
+		// check resource is not locked
+		if (!$this->check_lock_wrapper($this->path)) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		// perpare data-structure from PUT request
+		if (!$this->put_request_helper($options)) {
+			return;
+		}
+
+		// call user handler
+		$status = $this->put($options);
+
+		// format PUT response
+		$this->put_response_helper($options, $status);
+	}
+
+	// }}}
+
+	// {{{ delete_wrapper
+
+	/**
+	 * DELETE method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function delete_wrapper()
+	{
+		// RFC2518 9.2 last paragraph
+		if (isset($_SERVER['HTTP_DEPTH']) &&
+				$_SERVER['HTTP_DEPTH'] != 'infinity') {
+			$this->http_status('400 Bad Request');
+			return;
+		}
+
+		// check resource is not locked
+		if (!$this->check_lock_wrapper($this->path)) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		$options = array();
+		$options['path'] = $this->path;
+
+		// call user handler
+		$status = $this->delete($options);
+		if ($status === true) {
+			$status = '204 No Content';
+		}
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	// {{{ copymove_request_helper
+
+	/**
+	 * COPY/MOVE request helper - prepares data-structures from COPY/MOVE
+	 * requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function copymove_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		$options['depth'] = 'infinity';
+		if (isset($_SERVER['HTTP_DEPTH'])) {
+			$options['depth'] = $_SERVER['HTTP_DEPTH'];
+		}
+
+		// RFC2518 9.6, 8.8.4 and 8.9.3
+		$options['overwrite'] = true;
+		if (isset($_SERVER['HTTP_OVERWRITE'])) {
+			$options['overwrite'] = $_SERVER['HTTP_OVERWRITE'] == 'T';
+		}
+
+		list ($src_host, $src_port) = explode(':', $_SERVER['HTTP_HOST']);
+		if (empty($src_port)) {
+			$src_port = 80;
+		}
+
+		$dst_url = parse_url($_SERVER['HTTP_DESTINATION']);
+		$dst_host = $dst_url['host'];
+
+		$dst_port = $dst_url['port'];
+		if (empty($dst_port)) {
+			$dst_port = 80;
+		}
+
+		$dst_path = $dst_url['path'];
+
+		// base_uri is urldecoded
+		$dst_path = $this->_urldecode($dst_path);
+
+		// does the destination resource belong on this server?
+		if ($dst_host == $src_host && $dst_port == $src_port &&
+				!strncmp($dst_path, $this->base_uri, strlen($this->base_uri))) {
+			$options['dest'] = substr($dst_path, strlen($this->base_uri));
+
+			$options['dest'] = ltrim($options['dest'], '/');
+
+			// check source & destination are not the same - data could be lost
+			// if overwrite is true - RFC2518 8.8.5
+			if ($options['dest'] == $this->path) {
+				$this->http_status('403 Forbidden');
+				return;
+			}
+
+			return true;
+		}
+
+		$options['dest_url'] = $_SERVER['HTTP_DESTINATION'];
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ copy_wrapper
+
+	/**
+	 * COPY method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function copy_wrapper()
+	{
+		// no need to check source is not locked
+
+		// perpare data-structure from COPY request
+		if (!$this->copymove_request_helper($options)) {
+			return;
+		}
+
+		// check destination is not locked
+		if (isset($options['dest']) &&
+				!$this->check_lock_wrapper($options['dest'])) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		// call user handler
+		$status = $this->copy($options);
+		if ($status === true) {
+			$status = $options['new'] === false ? '204 No Content' :
+				'201 Created';
+		}
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	// {{{ move_wrapper
+
+	/**
+	 * MOVE method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function move_wrapper()
+	{
+		// check resource is not locked
+		if (!$this->check_lock_wrapper($this->path)) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		// perpare data-structure from MOVE request
+		if (!$this->copymove_request_helper($options)) {
+			return;
+		}
+
+		// check destination is not locked
+		if (isset($options['dest']) &&
+				!$this->check_lock_wrapper($options['dest'])) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		// call user handler
+		$status = $this->move($options);
+		if ($status === true) {
+			$status = $options['new'] === false ? '204 No Content' :
+				'201 Created';
+		}
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	// {{{ lock_request_helper
+
+	/**
+	 * LOCK request helper - prepares data-structures from LOCK requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function lock_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		$options['depth'] = 'infinity';
+		if (isset($_SERVER['HTTP_DEPTH'])) {
+			$options['depth'] = $_SERVER['HTTP_DEPTH'];
+		}
+
+		if (isset($_SERVER['HTTP_TIMEOUT'])) {
+			$options['timeout'] = explode(',', $_SERVER['HTTP_TIMEOUT']);
+		}
+
+		if (empty($_SERVER['CONTENT_LENGTH']) && !empty($_SERVER['HTTP_IF'])) {
+
+			// refresh lock
+			$options['update'] = substr($_SERVER['HTTP_IF'], 2, -2);
+
+			return true;
+		}
+
+		// extract lock request information from request XML payload
+		$lockinfo = new _parse_lockinfo('php://input');
+		if (!$lockinfo->success) {
+			$this->http_status('400 Bad Request');
+			return;
+		}
+
+		// new lock
+		$options['scope'] = $lockinfo->lockscope;
+		$options['type']  = $lockinfo->locktype;
+		$options['owner'] = $lockinfo->owner;
+
+		$options['token'] = $this->_new_locktoken();
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ lock_response_helper
+
+	/**
+	 * LOCK response helper - format LOCK response
+	 *
+	 * @param options
+	 * @param status
+	 * @return void
+	 */
+	function lock_response_helper($options, $status)
+	{
+		if (isset($options['locks']) && is_array($options['locks'])) {
+			$this->http_status('409 Conflict');
+
+			$responses = array();
+			foreach ($options['locks'] as $lock) {
+				$response = array();
+
+				$response['href'] = $this->getHref($lock['path']);
+				if (isset($lock['href'])) {
+					$response['href'] = $lock['href'];
+				}
+
+				$response['status'] = '423 Locked';
+
+				$responses[] = $response;
+			}
+
+			$this->_multistatus($responses);
+			return;
+		}
+
+		if (is_bool($status)) {
+			$status = $status ? '200 OK' : '423 Locked';
+		}
+
+		// set headers before we start printing
+		$this->http_status($status);
+
+		if ($status{0} == 2) { // 2xx states are ok
+			header('Content-Type: text/xml; charset="utf-8"');
+			header("Lock-Token: <$options[token]>");
+
+			echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+			echo "<D:prop xmlns:D=\"DAV:\">\n";
+			echo " <D:lockdiscovery>\n";
+			echo '  ' . $this->_activelocks(array($options)) . "\n";
+			echo " </D:lockdiscovery>\n";
+			echo "</D:prop>\n";
+		}
+	}
+
+	// }}}
+
+	// {{{ lock_wrapper
+
+	/**
+	 * LOCK method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function lock_wrapper()
+	{
+		// perpare data-structure from LOCK request
+		if (!$this->lock_request_helper($options)) {
+			return;
+		}
+
+		// check resource is not locked
+		if (isset($options['update']) &&
+				!$this->check_lock_wrapper($this->path) ||
+				!$this->check_lock_wrapper($this->path,
+				$options['scope'] == 'shared')) {
+			$this->http_status('423 Locked');
+			return;
+		}
+
+		$options['locks'] = $this->getDescendentsLocks($this->path);
+		if (empty($options['locks'])) {
+
+			// call user handler
+			$status = $this->lock($options);
+		}
+
+		// format LOCK response
+		$this->lock_response_helper($options, $status);
+	}
+
+	// }}}
+
+	// {{{ unlock_request_helper
+
+	/**
+	 * UNLOCK request helper - prepares data-structures from UNLOCK requests
+	 *
+	 * @param options
+	 * @return void
+	 */
+	function unlock_request_helper(&$options)
+	{
+		$options = array();
+		$options['path'] = $this->path;
+
+		// strip surrounding <>
+		$options['token'] = substr(trim($_SERVER['HTTP_LOCK_TOKEN']), 1, -1);
+
+		return true;
+	}
+
+	// }}}
+
+	// {{{ unlock_wrapper
+
+	/**
+	 * UNLOCK method wrapper
+	 *
+	 * @param void
+	 * @return void
+	 */
+	function unlock_wrapper()
+	{
+		// perpare data-structure from DELETE request
+		if (!$this->unlock_request_helper($options)) {
+			return;
+		}
+
+		// call user handler
+		$status = $this->unlock($options);
+
+		// RFC2518 8.11.1
+		if ($status === true) {
+			$status = '204 No Content';
+		}
+
+		$this->http_status($status);
+	}
+
+	// }}}
+
+	function getHref($path)
+	{
+		return $this->base_uri . '/' . $path;
+	}
+
+	function getProp($reqprop, $file, $options)
+	{
+		// check if property exists in response
+		foreach ($file['props'] as $prop) {
+			if ($reqprop['name'] == $prop['name'] &&
+					$reqprop['ns'] == $prop['ns']) {
+				return $prop;
+			}
+		}
+
+		if ($reqprop['name'] == 'lockdiscovery' &&
+				$reqprop['ns'] == 'DAV:' &&
+				method_exists($this, 'getLocks')) {
+
+			return $this->mkprop('DAV:', 'lockdiscovery',
+				$this->getLocks($file['path']));
+		}
+
+		// incase the requested property had a value, like calendar-data
+		unset($reqprop['value']);
+		$reqprop['status'] = '404 Not Found';
+		return $reqprop;
+	}
+
+	function getDescendentsLocks($path)
+	{
+		$options = array();
+		$options['path'] = $path;
+		$options['depth'] = 'infinity';
+		$options['props'] = array();
+		$options['props'][] = $this->mkprop('DAV:', 'lockdiscovery', null);
+
+		// call user handler
+		if (!$this->propfind($options, $files)) {
+			return;
+		}
+
+		return $files;
+	}
+
+	// {{{ _allow()
+
+	/**
+	 * list implemented methods
+	 *
+	 * @param void
+	 * @return array something
+	 */
+	function _allow()
+	{
+		// OPTIONS is always there
+		$allow = array('OPTIONS');
+
+		// all other methods need both a method_wrapper() and a method()
+		// implementation
+		// the base class defines only wrappers
+		foreach(get_class_methods($this) as $method) {
+
+			// strncmp breaks with negative len -
+			// http://bugs.php.net/bug.php?id=36944
+			//if (!strncmp('_wrapper', $method, -8)) {
+			if (!strcmp(substr($method, -8), '_wrapper')) {
+				$method = strtolower(substr($method, 0, -8));
+				if (method_exists($this, $method) &&
+						($method != 'lock' && $method != 'unlock' ||
+						method_exists($this, 'getLocks'))) {
+					$allow[] = $method;
+				}
+			}
+		}
+
+		// we can emulate a missing HEAD implemetation using GET
+		if (in_array('GET', $allow)) {
+			$allow[] = 'HEAD';
+		}
+
+		return $allow;
+	}
+
+	// }}}
+
+	// {{{ mkprop
+
+	/**
+	 * helper for property element creation
+	 *
+	 * @param  string XML namespace (optional)
+	 * @param  string property name
+	 * @param  string property value
+	 * @return array  property array
+	 */
+	function mkprop()
+	{
+		$args = func_get_args();
+
+		$prop = array();
+		$prop['ns'] = 'DAV:';
+		if (count($args) > 2) {
+			$prop['ns'] = array_shift($args);
+		}
+
+		$prop['name'] = array_shift($args);
+		$prop['value'] = array_shift($args);
+		$prop['status'] = array_shift($args);
+
+		return $prop;
+	}
+
+	// }}}
+
+	// {{{ check_auth_wrapper
+
+	/**
+	 * check authentication if implemented
+	 *
+	 * @param  void
+	 * @return bool  true if authentication succeded or not necessary
+	 */
+	function check_auth_wrapper()
+	{
+		if (method_exists($this, 'checkAuth')) {
+
+			// PEAR style method name
+			return $this->checkAuth(@$_SERVER['AUTH_TYPE'],
+				@$_SERVER['PHP_AUTH_USER'],
+				@$_SERVER['PHP_AUTH_PW']);
+		}
+
+		if (method_exists($this, 'check_auth')) {
+
+			// old (pre 1.0) method name
+			return $this->check_auth(@$_SERVER['AUTH_TYPE'],
+				@$_SERVER['PHP_AUTH_USER'],
+				@$_SERVER['PHP_AUTH_PW']);
+		}
+
+		// no method found -> no authentication required
+		return true;
+	}
+
+	// }}}
+
+	// {{{ UUID stuff
+
+	/**
+	 * generate Unique Universal IDentifier for lock token
+	 *
+	 * @param void
+	 * @return string a new UUID
+	 */
+	function _new_uuid()
+	{
+		// use uuid extension from PECL if available
+		if (function_exists('uuid_create')) {
+			return uuid_create();
+		}
+
+		// fallback
+		$uuid = md5(microtime() . getmypid()); // this should be random enough for now
+
+		// set variant and version fields for 'true' random uuid
+		$uuid{12} = '4';
+		$n = 8 + (ord($uuid{16}) & 3);
+		$hex = '0123456789abcdef';
+		$uuid{16} = $hex{$n};
+
+		// return formated uuid
+		return substr($uuid,  0, 8) . '-' .
+			substr($uuid,  8, 4) . '-' .
+			substr($uuid, 12, 4) . '-' .
+			substr($uuid, 16, 4) . '-' .
+			substr($uuid, 20);
+	}
+
+	/**
+	 * create a new opaque lock token as defined in RFC2518
+	 *
+	 * @param  void
+	 * @return string new RFC2518 opaque lock token
+	 */
+	function _new_locktoken()
+	{
+		return 'opaquelocktoken:' . $this->_new_uuid();
+	}
+
+	// }}}
+
+	// {{{ WebDAV If: header parsing
+
+	/**
+	 *
+	 *
+	 * @param string header string to parse
+	 * @param int current parsing position
+	 * @return array next token (type and value)
+	 */
+	function _if_header_lexer($string, &$pos)
+	{
+		// skip whitespace
+		while (ctype_space($string{$pos})) {
+			++$pos;
+		}
+
+		// already at end of string?
+		if (strlen($string) <= $pos) {
+			return;
+		}
+
+		// get next character
+		$c = $string{$pos++};
+
+		// now it depends on what we found
+		switch ($c) {
+
+			// URIs are enclosed in <...>
+			case '<':
+				$pos2 = strpos($string, '>', $pos);
+				$uri = substr($string, $pos, $pos2 - $pos);
+				$pos = $pos2 + 1;
+				return array('URI', $uri);
+
+			// ETags are enclosed in [...]
+			case '[':
+				$type = 'ETAG_STRONG';
+				if ($string{$pos} == 'W') {
+					$type = 'ETAG_WEAK';
+					$pos += 2;
+				}
+
+				$pos2 = strpos($string, ']', $pos);
+				$etag = substr($string, $pos + 1, $pos2 - $pos - 2);
+				$pos = $pos2 + 1;
+				return array($type, $etag);
+
+			// 'N' indicates negation
+			case 'N':
+				$pos += 2;
+				return array('NOT', 'Not');
+
+			// anything else is passed verbatim char by char
+			default:
+				return array('CHAR', $c);
+		}
+	}
+
+	/**
+	 * parse If: header
+	 *
+	 * @param  string  header string
+	 * @return array   URIs and their conditions
+	 */
+	function _if_header_parser($str)
+	{
+		$pos = 0;
+		$len = strlen($str);
+
+		$uris = array();
+
+		// parser loop
+		while ($pos < $len) {
+
+			// get next token
+			$token = $this->_if_header_lexer($str, $pos);
+
+			// check for URI
+			$uri = '';
+			if ($token[0] == 'URI') {
+				$uri = $token[1]; // remember URI
+				$token = $this->_if_header_lexer($str, $pos); // get next token
+			}
+
+			// sanity check
+			if ($token[0] != 'CHAR' || $token[1] != '(') {
+				return;
+			}
+
+			$list = array();
+			$level = 1;
+			while ($level) {
+				$token = $this->_if_header_lexer($str, $pos);
+
+				$not = '';
+				if ($token[0] == 'NOT') {
+					$not = '!';
+					$token = $this->_if_header_lexer($str, $pos);
+				}
+
+				switch ($token[0]) {
+					case 'CHAR':
+						switch ($token[1]) {
+							case '(':
+								$level++;
+								break;
+
+							case ')':
+								$level--;
+								break;
+
+							default:
+								return;
+						}
+						break;
+
+					case 'URI':
+						$list[] = $not . "<$token[1]>";
+						break;
+
+					case 'ETAG_WEAK':
+						$list[] = $not . "[W/'$token[1]']>";
+						break;
+
+					case 'ETAG_STRONG':
+						$list[] = $not . "['$token[1]']>";
+						break;
+
+					default:
+						return;
+				}
+			}
+
+			if (is_array($uris[$uri])) {
+				$uris[$uri] = array_merge($uris[$uri], $list);
+				continue;
+			}
+			$uris[$uri] = $list;
+		}
+
+		return $uris;
+	}
+
+	/**
+	 * check if conditions from If: headers are met
+	 *
+	 * the If: header is an extension to HTTP/1.1
+	 * defined in RFC2518 9.4
+	 *
+	 * @param  void
+	 * @return void
+	 */
+	function _check_if_header_conditions()
+	{
+		if (!isset($_SERVER['HTTP_IF'])) {
+			return true;
+		}
+
+		$this->_if_header_uris =
+			$this->_if_header_parser($_SERVER['HTTP_IF']);
+
+		// any match is ok
+		foreach($this->_if_header_uris as $uri => $conditions) {
+			if (empty($uri)) {
+				$uri = $this->base_uri . '/' . $this->path;
+			}
+
+			// all must match
+			foreach ($conditions as $condition) {
+
+				// lock tokens may be free form (RFC2518 6.3)
+				// but if opaquelocktokens are used (RFC2518 6.4)
+				// we have to check the format (litmus tests this)
+				if (!strncmp($condition, '<opaquelocktoken:', strlen('<opaquelocktoken'))) {
+					if (!ereg('^<opaquelocktoken:[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}>$', $condition)) {
+						return;
+					}
+				}
+
+				if (!$this->_check_uri_condition($uri, $condition)) {
+					continue (2);
+				}
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Check a single URI condition parsed from an if-header
+	 *
+	 * @abstract
+	 * @param string $uri URI to check
+	 * @param string $condition Condition to check for this URI
+	 * @returns bool Condition check result
+	 */
+	function _check_uri_condition($uri, $condition)
+	{
+		// not really implemented here,
+		// implementations must override
+		return true;
+	}
+
+	/**
+	 * @param array of locks
+	 * @param bool exclusive lock?
+	 */
+	function check_lock_helper($lock, $exclusive_only = false)
+	{
+		if (!is_array($lock) || empty($lock)) {
+			return true;
+		}
+
+		// FIXME doesn't check uri restrictions yet
+		if (strstr($_SERVER['HTTP_IF'], $lock['token'])) {
+			return true;
+		}
+
+		if ($exclusive_only && ($lock['scope'] == 'shared')) {
+			return true;
+		}
+	}
+
+	/**
+	 * @param string path of resource to check
+	 * @param bool exclusive lock?
+	 */
+	function check_lock_wrapper($path, $exclusive_only = false)
+	{
+		if (!method_exists($this, 'getLocks')) {
+			return true;
+		}
+
+		$lock = $this->getLocks($path);
+
+		return $this->check_lock_helper($lock, $exclusive_only);
+	}
+
+	// }}}
+
+	function _lockentries($locks)
+	{
+		if (!is_array($locks) || empty($locks)) {
+			return '';
+		}
+
+		foreach ($locks as $key => $lock) {
+			if (!is_array($lock) || empty($lock)) {
+				continue;
+			}
+
+			$locks[$key] = "<D:lockentry>
        <D:lockscope><D:$lock[scope]/></D:lockscope>
        <D:locktype><D:$lock[type]/></D:locktype>
       </D:lockentry>";
-        }
-
-        return implode('', $locks);
-    }
-
-    function _activelocks($locks)
-    {
-        if (!is_array($locks) || empty($locks)) {
-            return '';
-        }
-
-        foreach ($locks as $key => $lock) {
-            if (!is_array($lock) || empty($lock)) {
-                continue;
-            }
-
-            // check for 'timeout' or 'expires'
-            $timeout = 'Infinite';
-            if (!empty($lock['expires'])) {
-                $timeout = 'Second-' . ($lock['expires'] - time());
-            } else if (!empty($lock['timeout'])) {
-
-                // more than a million is considered an absolute timestamp
-                // less is more likely a relative value
-                $timeout = "Second-$lock[timeout]";
-                if ($lock['timeout'] > 1000000) {
-                    $timeout = 'Second-' . ($lock['timeout'] - time());
-                }
-            }
-
-            // genreate response block
-                $locks[$key] = "<D:activelock>
+		}
+
+		return implode('', $locks);
+	}
+
+	function _activelocks($locks)
+	{
+		if (!is_array($locks) || empty($locks)) {
+			return '';
+		}
+
+		foreach ($locks as $key => $lock) {
+			if (!is_array($lock) || empty($lock)) {
+				continue;
+			}
+
+			// check for 'timeout' or 'expires'
+			$timeout = 'Infinite';
+			if (!empty($lock['expires'])) {
+				$timeout = 'Second-' . ($lock['expires'] - time());
+			} else if (!empty($lock['timeout'])) {
+
+				// more than a million is considered an absolute timestamp
+				// less is more likely a relative value
+				$timeout = "Second-$lock[timeout]";
+				if ($lock['timeout'] > 1000000) {
+					$timeout = 'Second-' . ($lock['timeout'] - time());
+				}
+			}
+
+			// genreate response block
+				$locks[$key] = "<D:activelock>
        <D:lockscope><D:$lock[scope]/></D:lockscope>
        <D:locktype><D:$lock[type]/></D:locktype>
        <D:depth>$lock[depth]</D:depth>
@@ -2300,102 +2300,102 @@ 
        <D:timeout>$timeout</D:timeout>
        <D:locktoken><D:href>$lock[token]</D:href></D:locktoken>
       </D:activelock>";
-        }
-
-        return implode('', $locks);
-    }
-
-    /**
-     * set HTTP return status and mirror it in a private header
-     *
-     * @param string status code and message
-     * @return void
-     */
-    function http_status($status)
-    {
-        // simplified success case
-        if ($status === true) {
-            $status = '200 OK';
-        }
-
-        // didn't set a more specific status code
-        if (empty($status)) {
-            $status = '500 Internal Server Error';
-        }
-
-        // remember status
-        $this->_http_status = $status;
-
-        // generate HTTP status response
-        header("HTTP/1.1 $status");
-        header("X-WebDAV-Status: $status", true);
-    }
-
-    /**
-     * private minimalistic version of PHP urlencode
-     *
-     * only blanks and XML special chars must be encoded here
-     * full urlencode encoding confuses some clients...
-     *
-     * @param  string  URL to encode
-     * @return string  encoded URL
-     */
-    function _urlencode($url)
-    {
-        return strtr($url, array(
-                ' ' => '%20',
-                '&' => '%26',
-                '<' => '%3C',
-                '>' => '%3E',
-            ));
-    }
-
-    /**
-     * private version of PHP urldecode
-     *
-     * not really needed but added for completenes
-     *
-     * @param  string  URL to decode
-     * @return string  decoded URL
-     */
-    function _urldecode($path)
-    {
-        return urldecode($path);
-    }
-
-    /**
-     * UTF-8 encode property values if not already done so
-     *
-     * @param  string  text to encode
-     * @return string  utf-8 encoded text
-     */
-    function _prop_encode($text)
-    {
-        switch (strtolower($this->_prop_encoding)) {
-        case 'utf-8':
-            return $text;
-        case 'iso-8859-1':
-        case 'iso-8859-15':
-        case 'latin-1':
-        default:
-            return utf8_encode($text);
-        }
-    }
-
-    /**
-     * slashify - make sure path ends in a slash
-     *
-     * @param  string directory path
-     * @return string directory path with trailing slash
-     */
-    function _slashify($path)
-    {
-        if (substr($path, -1) != '/') {
-            $path .= '/';
-        }
-
-        return $path;
-    }
+		}
+
+		return implode('', $locks);
+	}
+
+	/**
+	 * set HTTP return status and mirror it in a private header
+	 *
+	 * @param string status code and message
+	 * @return void
+	 */
+	function http_status($status)
+	{
+		// simplified success case
+		if ($status === true) {
+			$status = '200 OK';
+		}
+
+		// didn't set a more specific status code
+		if (empty($status)) {
+			$status = '500 Internal Server Error';
+		}
+
+		// remember status
+		$this->_http_status = $status;
+
+		// generate HTTP status response
+		header("HTTP/1.1 $status");
+		header("X-WebDAV-Status: $status", true);
+	}
+
+	/**
+	 * private minimalistic version of PHP urlencode
+	 *
+	 * only blanks and XML special chars must be encoded here
+	 * full urlencode encoding confuses some clients...
+	 *
+	 * @param  string  URL to encode
+	 * @return string  encoded URL
+	 */
+	function _urlencode($url)
+	{
+		return strtr($url, array(
+				' ' => '%20',
+				'&' => '%26',
+				'<' => '%3C',
+				'>' => '%3E',
+			));
+	}
+
+	/**
+	 * private version of PHP urldecode
+	 *
+	 * not really needed but added for completenes
+	 *
+	 * @param  string  URL to decode
+	 * @return string  decoded URL
+	 */
+	function _urldecode($path)
+	{
+		return urldecode($path);
+	}
+
+	/**
+	 * UTF-8 encode property values if not already done so
+	 *
+	 * @param  string  text to encode
+	 * @return string  utf-8 encoded text
+	 */
+	function _prop_encode($text)
+	{
+		switch (strtolower($this->_prop_encoding)) {
+		case 'utf-8':
+			return $text;
+		case 'iso-8859-1':
+		case 'iso-8859-15':
+		case 'latin-1':
+		default:
+			return utf8_encode($text);
+		}
+	}
+
+	/**
+	 * slashify - make sure path ends in a slash
+	 *
+	 * @param  string directory path
+	 * @return string directory path with trailing slash
+	 */
+	function _slashify($path)
+	{
+		if (substr($path, -1) != '/') {
+			$path .= '/';
+		}
+
+		return $path;
+	}
 }
 
 // Local variables:

phpicalendar/lib/HTTP/WebDAV/Tools/_parse_propfind.php

Indentation +136 added lines, -136 removed lines

@@ -27,141 +27,141 @@
  */
 class _parse_propfind
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * found properties are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $props = false;
-
-    /**
-     * internal tag nesting depth counter
-     *
-     * @var int
-     * @access private
-     */
-    var $depth = 0;
-
-    /**
-     * constructor
-     *
-     * @access public
-     */
-    function _parse_propfind($input)
-    {
-        // success state flag
-        $this->success = true;
-
-        // property storage array
-        $this->props = array();
-
-        // internal tag depth counter
-        $this->depth = 0;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open input stream
-        $handle = fopen($input, 'r');
-        if (!$handle) {
-            $this->success = false;
-            return;
-        }
-
-        // create XML parser
-        $parser = xml_parser_create_ns('UTF-8', ' ');
-
-        // set tag and data handlers
-        xml_set_element_handler($parser, array(&$this, '_startElement'),
-            array(&$this, '_endElement'));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        while ($this->success && !feof($handle)) {
-            $line = fgets($handle);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($parser, $line, false);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($parser, '', true);
-        }
-
-        // free parser
-        xml_parser_free($parser);
-
-        // close input stream
-        fclose($handle);
-
-        // if no input was parsed it was a request
-        if (empty($this->props)) {
-            $this->props = 'allprop';
-        }
-    }
-
-    /**
-     * start tag handler
-     *
-     * @access private
-     * @param resource parser
-     * @param string tag name
-     * @param array tag attributes
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        // name space handling
-        if (strstr($name, ' ')) {
-            list ($ns, $name) = explode(' ', $name);
-            if (!$ns) {
-                $this->success = false;
-            }
-        }
-
-        // special tags at level 1: <allprop> and <propname>
-        if ($this->depth == 1) {
-            if ($name == 'allprop' || $name == 'propname') {
-                $this->props = $name;
-            }
-        }
-
-        // requested properties are found at level 2
-        if ($this->depth == 2) {
-            $prop = array('name' => $name);
-            if ($ns) {
-                $prop['ns'] = $ns;
-            }
-            $this->props[] = $prop;
-        }
-
-        // increment depth count
-        $this->depth++;
-    }
-
-    /**
-     * end tag handler
-     *
-     * @access private
-     * @param resource parser
-     * @param string tag name
-     */
-    function _endElement($parser, $name)
-    {
-        // here we only need to decrement the depth count
-        $this->depth--;
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * found properties are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $props = false;
+
+	/**
+	 * internal tag nesting depth counter
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $depth = 0;
+
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 */
+	function _parse_propfind($input)
+	{
+		// success state flag
+		$this->success = true;
+
+		// property storage array
+		$this->props = array();
+
+		// internal tag depth counter
+		$this->depth = 0;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open input stream
+		$handle = fopen($input, 'r');
+		if (!$handle) {
+			$this->success = false;
+			return;
+		}
+
+		// create XML parser
+		$parser = xml_parser_create_ns('UTF-8', ' ');
+
+		// set tag and data handlers
+		xml_set_element_handler($parser, array(&$this, '_startElement'),
+			array(&$this, '_endElement'));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		while ($this->success && !feof($handle)) {
+			$line = fgets($handle);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($parser, $line, false);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($parser, '', true);
+		}
+
+		// free parser
+		xml_parser_free($parser);
+
+		// close input stream
+		fclose($handle);
+
+		// if no input was parsed it was a request
+		if (empty($this->props)) {
+			$this->props = 'allprop';
+		}
+	}
+
+	/**
+	 * start tag handler
+	 *
+	 * @access private
+	 * @param resource parser
+	 * @param string tag name
+	 * @param array tag attributes
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		// name space handling
+		if (strstr($name, ' ')) {
+			list ($ns, $name) = explode(' ', $name);
+			if (!$ns) {
+				$this->success = false;
+			}
+		}
+
+		// special tags at level 1: <allprop> and <propname>
+		if ($this->depth == 1) {
+			if ($name == 'allprop' || $name == 'propname') {
+				$this->props = $name;
+			}
+		}
+
+		// requested properties are found at level 2
+		if ($this->depth == 2) {
+			$prop = array('name' => $name);
+			if ($ns) {
+				$prop['ns'] = $ns;
+			}
+			$this->props[] = $prop;
+		}
+
+		// increment depth count
+		$this->depth++;
+	}
+
+	/**
+	 * end tag handler
+	 *
+	 * @access private
+	 * @param resource parser
+	 * @param string tag name
+	 */
+	function _endElement($parser, $name)
+	{
+		// here we only need to decrement the depth count
+		$this->depth--;
+	}
 }
 ?>

phpicalendar/lib/HTTP/WebDAV/Tools/_parse_proppatch.php

Indentation +176 added lines, -176 removed lines

@@ -29,186 +29,186 @@
  */
 class _parse_proppatch 
 {
-    /**
-     *
-     * 
-     * @var
-     * @access
-     */
-    var $success;
-
-    /**
-     *
-     * 
-     * @var
-     * @access
-     */
-    var $props;
-
-    /**
-     *
-     * 
-     * @var
-     * @access
-     */
-    var $depth;
-
-    /**
-     *
-     * 
-     * @var
-     * @access
-     */
-    var $mode;
-
-    /**
-     *
-     * 
-     * @var
-     * @access
-     */
-    var $current;
-
-    /**
-     * constructor
-     * 
-     * @param  string  path of input stream 
-     * @access public
-     */
-    function _parse_proppatch($path) 
-    {
-        $this->success = true;
-
-        $this->depth = 0;
-        $this->props = array();
-        $had_input = false;
-
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        while($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        } 
+	/**
+	 *
+	 * 
+	 * @var
+	 * @access
+	 */
+	var $success;
+
+	/**
+	 *
+	 * 
+	 * @var
+	 * @access
+	 */
+	var $props;
+
+	/**
+	 *
+	 * 
+	 * @var
+	 * @access
+	 */
+	var $depth;
+
+	/**
+	 *
+	 * 
+	 * @var
+	 * @access
+	 */
+	var $mode;
+
+	/**
+	 *
+	 * 
+	 * @var
+	 * @access
+	 */
+	var $current;
+
+	/**
+	 * constructor
+	 * 
+	 * @param  string  path of input stream 
+	 * @access public
+	 */
+	function _parse_proppatch($path) 
+	{
+		$this->success = true;
+
+		$this->depth = 0;
+		$this->props = array();
+		$had_input = false;
+
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		while($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		} 
         
-        if($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        xml_parser_free($xml_parser);
-
-        fclose($f_in);
-    }
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs) 
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        if ($this->depth == 1) {
-            $this->mode = $tag;
-        } 
-
-        if ($this->depth == 3) {
-            $prop = array("name" => $tag);
-            $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
-            if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
-            }
-        }
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "<$tag";
-            foreach ($attr as $key => $val) {
-                $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
-            }
-            $this->current["val"] .= ">";
-        }
+		if($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		xml_parser_free($xml_parser);
+
+		fclose($f_in);
+	}
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs) 
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		if ($this->depth == 1) {
+			$this->mode = $tag;
+		} 
+
+		if ($this->depth == 3) {
+			$prop = array("name" => $tag);
+			$this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
+			if ($this->mode == "set") {
+				$this->current["val"] = "";     // default set val
+			}
+		}
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "<$tag";
+			foreach ($attr as $key => $val) {
+				$this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+			}
+			$this->current["val"] .= ">";
+		}
 
         
 
-        $this->depth++;
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name) 
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        $this->depth--;
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "</$tag>";
-        }
-
-        if ($this->depth == 3) {
-            if (isset($this->current)) {
-                $this->props[] = $this->current;
-                unset($this->current);
-            }
-        }
-    }
-
-    /**
-     * input data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data) {
-        if (isset($this->current)) {
-            $this->current["val"] .= $data;
-        }
-    }
+		$this->depth++;
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name) 
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		$this->depth--;
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "</$tag>";
+		}
+
+		if ($this->depth == 3) {
+			if (isset($this->current)) {
+				$this->props[] = $this->current;
+				unset($this->current);
+			}
+		}
+	}
+
+	/**
+	 * input data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data) {
+		if (isset($this->current)) {
+			$this->current["val"] .= $data;
+		}
+	}
 }
 
 ?>
\ No newline at end of file

phpicalendar/lib/HTTP/WebDAV/Tools/_parse_lockinfo.php

Indentation +35 added lines, -35 removed lines

@@ -75,7 +75,7 @@ 
 	 * @param  string  path of stream to read
 	 * @access public
 	 */
-    function _parse_lockinfo($path) 
+	function _parse_lockinfo($path) 
 	{
 		// we assume success unless problems occur
 		$this->success = true;
@@ -139,32 +139,32 @@ 
 	 * @return void
 	 * @access private
 	 */
-    function _startElement($parser, $name, $attrs) 
-    {
+	function _startElement($parser, $name, $attrs) 
+	{
 		// namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
 		
   
-        if ($this->collect_owner) {
+		if ($this->collect_owner) {
 			// everything within the <owner> tag needs to be collected
-            $ns_short = "";
-            $ns_attr = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
+			$ns_short = "";
+			$ns_attr = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "<$ns_short$tag$ns_attr>";
+		} else if ($ns == "DAV:") {
 			// parse only the essential tags
-            switch ($tag) {
+			switch ($tag) {
 			case "write":
 				$this->locktype = $tag;
 				break;
@@ -175,9 +175,9 @@ 
 			case "owner":
 				$this->collect_owner = true;
 				break;
-            }
-        }
-    }
+			}
+		}
+	}
 	
 	/**
 	 * data handler
@@ -187,13 +187,13 @@ 
 	 * @return void
 	 * @access private
 	 */
-    function _data($parser, $data) 
-    {
+	function _data($parser, $data) 
+	{
 		// only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
 
 	/**
 	 * tag end handler
@@ -203,8 +203,8 @@ 
 	 * @return void
 	 * @access private
 	 */
-    function _endElement($parser, $name) 
-    {
+	function _endElement($parser, $name) 
+	{
 		// namespace handling
 		if (strstr($name, " ")) {
 			list($ns, $tag) = explode(" ", $name);
@@ -224,14 +224,14 @@ 
 			$ns_attr = "";
 			if ($ns) {
 				if ($ns == "DAV:") {
-                    $ns_short = "D:";
+					$ns_short = "D:";
 				} else {
 					$ns_attr = " xmlns='$ns'";
 				}
 			}
 			$this->owner .= "</$ns_short$tag$ns_attr>";
 		}
-    }
+	}
 }
 
 ?>
\ No newline at end of file

phpicalendar/lib/bennu/bennu.class.php

Indentation +30 added lines, -30 removed lines

@@ -14,46 +14,46 @@
  */
 
 class Bennu {
-    function timestamp_to_datetime($t = NULL) {
-        if($t === NULL) {
-            $t = time();
-        }
-        return gmstrftime('%Y%m%dT%H%M%SZ', $t);
-    }
+	function timestamp_to_datetime($t = NULL) {
+		if($t === NULL) {
+			$t = time();
+		}
+		return gmstrftime('%Y%m%dT%H%M%SZ', $t);
+	}
 
-    function generate_guid() {
-        // Implemented as per the Network Working Group draft on UUIDs and GUIDs
+	function generate_guid() {
+		// Implemented as per the Network Working Group draft on UUIDs and GUIDs
     
-        // These two octets get special treatment
-        $time_hi_and_version       = sprintf('%02x', (1 << 6) + mt_rand(0, 15)); // 0100 plus 4 random bits
-        $clock_seq_hi_and_reserved = sprintf('%02x', (1 << 7) + mt_rand(0, 63)); // 10 plus 6 random bits
+		// These two octets get special treatment
+		$time_hi_and_version       = sprintf('%02x', (1 << 6) + mt_rand(0, 15)); // 0100 plus 4 random bits
+		$clock_seq_hi_and_reserved = sprintf('%02x', (1 << 7) + mt_rand(0, 63)); // 10 plus 6 random bits
     
-        // Need another 14 random octects
-        $pool = '';
-        for($i = 0; $i < 7; ++$i) {
-            $pool .= sprintf('%04x', mt_rand(0, 65535));
-        }
+		// Need another 14 random octects
+		$pool = '';
+		for($i = 0; $i < 7; ++$i) {
+			$pool .= sprintf('%04x', mt_rand(0, 65535));
+		}
     
-        // time_low = 4 octets
-        $random  = substr($pool, 0, 8).'-';
+		// time_low = 4 octets
+		$random  = substr($pool, 0, 8).'-';
     
-        // time_mid = 2 octets
-        $random .= substr($pool, 8, 4).'-';
+		// time_mid = 2 octets
+		$random .= substr($pool, 8, 4).'-';
     
-        // time_high_and_version = 2 octets
-        $random .= $time_hi_and_version.substr($pool, 12, 2).'-';
+		// time_high_and_version = 2 octets
+		$random .= $time_hi_and_version.substr($pool, 12, 2).'-';
     
-        // clock_seq_high_and_reserved = 1 octet
-        $random .= $clock_seq_hi_and_reserved;
+		// clock_seq_high_and_reserved = 1 octet
+		$random .= $clock_seq_hi_and_reserved;
     
-        // clock_seq_low = 1 octet
-        $random .= substr($pool, 13, 2).'-';
+		// clock_seq_low = 1 octet
+		$random .= substr($pool, 13, 2).'-';
     
-        // node = 6 octets
-        $random .= substr($pool, 14, 12);
+		// node = 6 octets
+		$random .= substr($pool, 14, 12);
     
-        return $random;
-    }
+		return $random;
+	}
 }
 
 ?>

phpicalendar/lib/bennu/iCalendar_components.php

Indentation +342 added lines, -342 removed lines

@@ -14,377 +14,377 @@
  */
 
 class iCalendar_component {
-    var $name             = NULL;
-    var $properties       = NULL;
-    var $components       = NULL;
-    var $valid_properties = NULL;
-    var $valid_components = NULL;
-
-    function iCalendar_component() {
-        $this->construct();
-    }
-
-    function construct() {
-        // Initialize the components array
-        if(empty($this->components)) {
-            $this->components = array();
-            foreach($this->valid_components as $name) {
-                $this->components[$name] = array();
-            }
-        }
-    }
-
-    function get_name() {
-        return $this->name;
-    }
-
-    function add_property($name, $value = NULL, $parameters = NULL) {
-
-        // Uppercase first of all
-        $name = strtoupper($name);
-
-        // Are we trying to add a valid property?
-        $xname = false;
-        if(!isset($this->valid_properties[$name])) {
-            // If not, is it an x-name as per RFC 2445?
-            if(!rfc2445_is_xname($name)) {
-                return false;
-            }
-            // Since this is an xname, all components are supposed to allow this property
-            $xname = true;
-        }
-
-        // Create a property object of the correct class
-        if($xname) {
-            $property = new iCalendar_property_x;
-            $property->set_name($name);
-        }
-        else {
-            $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $name));
-            $property = new $classname;
-        }
-
-        // If $value is NULL, then this property must define a default value.
-        if($value === NULL) {
-            $value = $property->default_value();
-            if($value === NULL) {
-                return false;
-            }
-        }
-
-        // Set this property's parent component to ourselves, because some
-        // properties behave differently according to what component they apply to.
-        $property->set_parent_component($this->name);
-
-        // Set parameters before value; this helps with some properties which
-        // accept a VALUE parameter, and thus change their default value type.
-
-        // The parameters must be valid according to property specifications
-        if(!empty($parameters)) {
-            foreach($parameters as $paramname => $paramvalue) {
-                if(!$property->set_parameter($paramname, $paramvalue)) {
-                    return false;
-                }
-            }
-
-            // Some parameters interact among themselves (e.g. ENCODING and VALUE)
-            // so make sure that after the dust settles, these invariants hold true
-            if(!$property->invariant_holds()) {
-                return false;
-            }
-        }
-
-        // $value MUST be valid according to the property data type
-        if(!$property->set_value($value)) {
-            return false;
-        }
-
-        // If this property is restricted to only once, blindly overwrite value
-        if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
-            $this->properties[$name] = array($property);
-        }
-
-        // Otherwise add it to the instance array for this property
-        else {
-            $this->properties[$name][] = $property;
-        }
-
-        // Finally: after all these, does the component invariant hold?
-        if(!$this->invariant_holds()) {
-            // If not, completely undo the property addition
-            array_pop($this->properties[$name]);
-            if(empty($this->properties[$name])) {
-                unset($this->properties[$name]);
-            }
-            return false;
-        }
-
-        return true;        
+	var $name             = NULL;
+	var $properties       = NULL;
+	var $components       = NULL;
+	var $valid_properties = NULL;
+	var $valid_components = NULL;
+
+	function iCalendar_component() {
+		$this->construct();
+	}
+
+	function construct() {
+		// Initialize the components array
+		if(empty($this->components)) {
+			$this->components = array();
+			foreach($this->valid_components as $name) {
+				$this->components[$name] = array();
+			}
+		}
+	}
+
+	function get_name() {
+		return $this->name;
+	}
+
+	function add_property($name, $value = NULL, $parameters = NULL) {
+
+		// Uppercase first of all
+		$name = strtoupper($name);
+
+		// Are we trying to add a valid property?
+		$xname = false;
+		if(!isset($this->valid_properties[$name])) {
+			// If not, is it an x-name as per RFC 2445?
+			if(!rfc2445_is_xname($name)) {
+				return false;
+			}
+			// Since this is an xname, all components are supposed to allow this property
+			$xname = true;
+		}
+
+		// Create a property object of the correct class
+		if($xname) {
+			$property = new iCalendar_property_x;
+			$property->set_name($name);
+		}
+		else {
+			$classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $name));
+			$property = new $classname;
+		}
+
+		// If $value is NULL, then this property must define a default value.
+		if($value === NULL) {
+			$value = $property->default_value();
+			if($value === NULL) {
+				return false;
+			}
+		}
+
+		// Set this property's parent component to ourselves, because some
+		// properties behave differently according to what component they apply to.
+		$property->set_parent_component($this->name);
+
+		// Set parameters before value; this helps with some properties which
+		// accept a VALUE parameter, and thus change their default value type.
+
+		// The parameters must be valid according to property specifications
+		if(!empty($parameters)) {
+			foreach($parameters as $paramname => $paramvalue) {
+				if(!$property->set_parameter($paramname, $paramvalue)) {
+					return false;
+				}
+			}
+
+			// Some parameters interact among themselves (e.g. ENCODING and VALUE)
+			// so make sure that after the dust settles, these invariants hold true
+			if(!$property->invariant_holds()) {
+				return false;
+			}
+		}
+
+		// $value MUST be valid according to the property data type
+		if(!$property->set_value($value)) {
+			return false;
+		}
+
+		// If this property is restricted to only once, blindly overwrite value
+		if(!$xname && $this->valid_properties[$name] & RFC2445_ONCE) {
+			$this->properties[$name] = array($property);
+		}
+
+		// Otherwise add it to the instance array for this property
+		else {
+			$this->properties[$name][] = $property;
+		}
+
+		// Finally: after all these, does the component invariant hold?
+		if(!$this->invariant_holds()) {
+			// If not, completely undo the property addition
+			array_pop($this->properties[$name]);
+			if(empty($this->properties[$name])) {
+				unset($this->properties[$name]);
+			}
+			return false;
+		}
+
+		return true;        
         
-    }
-
-    function add_component($component) {
-
-        // With the detailed interface, you can add only components with this function
-        if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
-            return false;
-        }
-
-        $name = $component->get_name();
-
-        // Only valid components as specified by this component are allowed
-        if(!in_array($name, $this->valid_components)) {
-            return false;
-        }
-
-        // Add it
-        $this->components[$name][] = $component;
-
-        return true;
-    }
-
-    function get_property_list($name) {
-    }
-
-    function invariant_holds() {
-        return true;
-    }
-
-    function is_valid() {
-        // If we have any child components, check that they are all valid
-        if(!empty($this->components)) {
-            foreach($this->components as $component => $instances) {
-                foreach($instances as $number => $instance) {
-                    if(!$instance->is_valid()) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        // Finally, check the valid property list for any mandatory properties
-        // that have not been set and do not have a default value
-        foreach($this->valid_properties as $property => $propdata) {
-            if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
-                $classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
-                $object    = new $classname;
-                if($object->default_value() === NULL) {
-                    return false;
-                }
-                unset($object);
-            }
-        }
-
-        return true;
-    }
+	}
+
+	function add_component($component) {
+
+		// With the detailed interface, you can add only components with this function
+		if(!is_object($component) || !is_subclass_of($component, 'iCalendar_component')) {
+			return false;
+		}
+
+		$name = $component->get_name();
+
+		// Only valid components as specified by this component are allowed
+		if(!in_array($name, $this->valid_components)) {
+			return false;
+		}
+
+		// Add it
+		$this->components[$name][] = $component;
+
+		return true;
+	}
+
+	function get_property_list($name) {
+	}
+
+	function invariant_holds() {
+		return true;
+	}
+
+	function is_valid() {
+		// If we have any child components, check that they are all valid
+		if(!empty($this->components)) {
+			foreach($this->components as $component => $instances) {
+				foreach($instances as $number => $instance) {
+					if(!$instance->is_valid()) {
+						return false;
+					}
+				}
+			}
+		}
+
+		// Finally, check the valid property list for any mandatory properties
+		// that have not been set and do not have a default value
+		foreach($this->valid_properties as $property => $propdata) {
+			if(($propdata & RFC2445_REQUIRED) && empty($this->properties[$property])) {
+				$classname = 'iCalendar_property_'.strtolower(str_replace('-', '_', $property));
+				$object    = new $classname;
+				if($object->default_value() === NULL) {
+					return false;
+				}
+				unset($object);
+			}
+		}
+
+		return true;
+	}
     
-    function serialize() {
-        // Start tag
-        $string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
-
-        // List of properties
-        if(!empty($this->properties)) {
-            foreach($this->properties as $name => $properties) {
-                foreach($properties as $property) {
-                    $string .= $property->serialize();
-                }
-            }
-        }
-
-        // List of components
-        if(!empty($this->components)) {
-            foreach($this->components as $name => $components) {
-                foreach($components as $component) {
-                    $string .= $component->serialize();
-                }
-            }
-        }
-
-        // End tag
-        $string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
-
-        return $string;
-    }
+	function serialize() {
+		// Start tag
+		$string = rfc2445_fold('BEGIN:'.$this->name) . RFC2445_CRLF;
+
+		// List of properties
+		if(!empty($this->properties)) {
+			foreach($this->properties as $name => $properties) {
+				foreach($properties as $property) {
+					$string .= $property->serialize();
+				}
+			}
+		}
+
+		// List of components
+		if(!empty($this->components)) {
+			foreach($this->components as $name => $components) {
+				foreach($components as $component) {
+					$string .= $component->serialize();
+				}
+			}
+		}
+
+		// End tag
+		$string .= rfc2445_fold('END:'.$this->name) . RFC2445_CRLF;
+
+		return $string;
+	}
 }
 
 class iCalendar extends iCalendar_component {
-    var $name = 'VCALENDAR';
-
-    function construct() {
-        $this->valid_properties = array(
-            'CALSCALE'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'METHOD'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'PRODID'      => RFC2445_REQUIRED | RFC2445_ONCE,
-            'VERSION'     => RFC2445_REQUIRED | RFC2445_ONCE,
-            RFC2445_XNAME => RFC2445_OPTIONAL 
-        );
-
-        $this->valid_components = array(
-            'VEVENT'
-            // TODO: add support for the other component types
-            //, 'VTODO', 'VJOURNAL', 'VFREEBUSY', 'VTIMEZONE', 'VALARM'
-        );
-        parent::construct();
-    }
+	var $name = 'VCALENDAR';
+
+	function construct() {
+		$this->valid_properties = array(
+			'CALSCALE'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'METHOD'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'PRODID'      => RFC2445_REQUIRED | RFC2445_ONCE,
+			'VERSION'     => RFC2445_REQUIRED | RFC2445_ONCE,
+			RFC2445_XNAME => RFC2445_OPTIONAL 
+		);
+
+		$this->valid_components = array(
+			'VEVENT'
+			// TODO: add support for the other component types
+			//, 'VTODO', 'VJOURNAL', 'VFREEBUSY', 'VTIMEZONE', 'VALARM'
+		);
+		parent::construct();
+	}
 }
 
 class iCalendar_event extends iCalendar_component {
 
-    var $name       = 'VEVENT';
-    var $properties;
+	var $name       = 'VEVENT';
+	var $properties;
     
-    function construct() {
+	function construct() {
         
-        $this->valid_components = array('VALARM');
-
-        $this->valid_properties = array(
-            'CLASS'          => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'CREATED'        => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DESCRIPTION'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that DTSTAMP in optional,
-            // while in 4.8.7.2 it says it's REQUIRED. Go with REQUIRED.
-            'DTSTAMP'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that DTSTART in optional,
-            // while in 4.8.2.4 it says it's REQUIRED. Go with REQUIRED.
-            'DTSTART'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            'GEO'            => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'LAST-MODIFIED'  => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'LOCATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'ORGANIZER'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'PRIORITY'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'SEQUENCE'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'STATUS'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'SUMMARY'        => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'TRANSP'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // Standard ambiguous here: in 4.6.1 it says that UID in optional,
-            // while in 4.8.4.7 it says it's REQUIRED. Go with REQUIRED.
-            'UID'            => RFC2445_REQUIRED | RFC2445_ONCE,
-            'URL'            => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'RECURRENCE-ID'  => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DTEND'          => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'DURATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'ATTACH'         => RFC2445_OPTIONAL,
-            'ATTENDEE'       => RFC2445_OPTIONAL,
-            'CATEGORIES'     => RFC2445_OPTIONAL,
-            'COMMENT'        => RFC2445_OPTIONAL,
-            'CONTACT'        => RFC2445_OPTIONAL,
-            'EXDATE'         => RFC2445_OPTIONAL,
-            'EXRULE'         => RFC2445_OPTIONAL,
-            'REQUEST-STATUS' => RFC2445_OPTIONAL,
-            'RELATED-TO'     => RFC2445_OPTIONAL,
-            'RESOURCES'      => RFC2445_OPTIONAL,
-            'RDATE'          => RFC2445_OPTIONAL,
-            'RRULE'          => RFC2445_OPTIONAL,
-            RFC2445_XNAME    => RFC2445_OPTIONAL
-        );
-
-        parent::construct();
-    }
-
-    function invariant_holds() {
-        // DTEND and DURATION must not appear together
-        if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
-            return false;
-        }
+		$this->valid_components = array('VALARM');
+
+		$this->valid_properties = array(
+			'CLASS'          => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'CREATED'        => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DESCRIPTION'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that DTSTAMP in optional,
+			// while in 4.8.7.2 it says it's REQUIRED. Go with REQUIRED.
+			'DTSTAMP'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that DTSTART in optional,
+			// while in 4.8.2.4 it says it's REQUIRED. Go with REQUIRED.
+			'DTSTART'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			'GEO'            => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'LAST-MODIFIED'  => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'LOCATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'ORGANIZER'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'PRIORITY'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'SEQUENCE'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'STATUS'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'SUMMARY'        => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'TRANSP'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// Standard ambiguous here: in 4.6.1 it says that UID in optional,
+			// while in 4.8.4.7 it says it's REQUIRED. Go with REQUIRED.
+			'UID'            => RFC2445_REQUIRED | RFC2445_ONCE,
+			'URL'            => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'RECURRENCE-ID'  => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DTEND'          => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'DURATION'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'ATTACH'         => RFC2445_OPTIONAL,
+			'ATTENDEE'       => RFC2445_OPTIONAL,
+			'CATEGORIES'     => RFC2445_OPTIONAL,
+			'COMMENT'        => RFC2445_OPTIONAL,
+			'CONTACT'        => RFC2445_OPTIONAL,
+			'EXDATE'         => RFC2445_OPTIONAL,
+			'EXRULE'         => RFC2445_OPTIONAL,
+			'REQUEST-STATUS' => RFC2445_OPTIONAL,
+			'RELATED-TO'     => RFC2445_OPTIONAL,
+			'RESOURCES'      => RFC2445_OPTIONAL,
+			'RDATE'          => RFC2445_OPTIONAL,
+			'RRULE'          => RFC2445_OPTIONAL,
+			RFC2445_XNAME    => RFC2445_OPTIONAL
+		);
+
+		parent::construct();
+	}
+
+	function invariant_holds() {
+		// DTEND and DURATION must not appear together
+		if(isset($this->properties['DTEND']) && isset($this->properties['DURATION'])) {
+			return false;
+		}
 
         
-        if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
-            // DTEND must be later than DTSTART
-            // The standard is not clear on how to hande different value types though
-            // TODO: handle this correctly even if the value types are different
-            if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
-                return false;
-            }
-
-            // DTEND and DTSTART must have the same value type
-            if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
-                return false;
-            }
-
-        }
-        return true;
-    }
+		if(isset($this->properties['DTEND']) && isset($this->properties['DTSTART'])) {
+			// DTEND must be later than DTSTART
+			// The standard is not clear on how to hande different value types though
+			// TODO: handle this correctly even if the value types are different
+			if($this->properties['DTEND'][0]->value <= $this->properties['DTSTART'][0]->value) {
+				return false;
+			}
+
+			// DTEND and DTSTART must have the same value type
+			if($this->properties['DTEND'][0]->val_type != $this->properties['DTSTART'][0]->val_type) {
+				return false;
+			}
+
+		}
+		return true;
+	}
 }
 
 class iCalendar_todo extends iCalendar_component {
-    var $name       = 'VTODO';
-    var $properties;
-
-    function construct() {
-
-        $this->properties = array(
-            'class'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'completed'   => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'created'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'description' => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'dtstamp'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'dtstart'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'geo'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'location'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'organizer'   => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'percent'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'priority'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'recurid'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'sequence'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'status'      => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'summary'     => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'uid'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'url'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'due'         => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'duration'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'attach'      => RFC2445_OPTIONAL,
-            'attendee'    => RFC2445_OPTIONAL,
-            'categories'  => RFC2445_OPTIONAL,
-            'comment'     => RFC2445_OPTIONAL,
-            'contact'     => RFC2445_OPTIONAL,
-            'exdate'      => RFC2445_OPTIONAL,
-            'exrule'      => RFC2445_OPTIONAL,
-            'rstatus'     => RFC2445_OPTIONAL,
-            'related'     => RFC2445_OPTIONAL,
-            'resources'   => RFC2445_OPTIONAL,
-            'rdate'       => RFC2445_OPTIONAL,
-            'rrule'       => RFC2445_OPTIONAL,
-            'xprop'       => RFC2445_OPTIONAL
-        );
-
-        parent::construct();
-        // TODO:
-        // either 'due' or 'duration' may appear in  a 'eventprop', but 'due'
-        // and 'duration' MUST NOT occur in the same 'eventprop'
-    }
+	var $name       = 'VTODO';
+	var $properties;
+
+	function construct() {
+
+		$this->properties = array(
+			'class'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'completed'   => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'created'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'description' => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'dtstamp'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'dtstart'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'geo'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'location'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'organizer'   => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'percent'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'priority'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'recurid'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'sequence'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'status'      => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'summary'     => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'uid'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'url'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'due'         => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'duration'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'attach'      => RFC2445_OPTIONAL,
+			'attendee'    => RFC2445_OPTIONAL,
+			'categories'  => RFC2445_OPTIONAL,
+			'comment'     => RFC2445_OPTIONAL,
+			'contact'     => RFC2445_OPTIONAL,
+			'exdate'      => RFC2445_OPTIONAL,
+			'exrule'      => RFC2445_OPTIONAL,
+			'rstatus'     => RFC2445_OPTIONAL,
+			'related'     => RFC2445_OPTIONAL,
+			'resources'   => RFC2445_OPTIONAL,
+			'rdate'       => RFC2445_OPTIONAL,
+			'rrule'       => RFC2445_OPTIONAL,
+			'xprop'       => RFC2445_OPTIONAL
+		);
+
+		parent::construct();
+		// TODO:
+		// either 'due' or 'duration' may appear in  a 'eventprop', but 'due'
+		// and 'duration' MUST NOT occur in the same 'eventprop'
+	}
 }
 
 class iCalendar_journal extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_freebusy extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_alarm extends iCalendar_component {
-    // TODO: implement
+	// TODO: implement
 }
 
 class iCalendar_timezone extends iCalendar_component {
-    var $name       = 'VTIMEZONE';
-    var $properties;
-
-    function construct() {
-
-        $this->properties = array(
-            'tzid'        => RFC2445_REQUIRED | RFC2445_ONCE,
-            'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
-            'tzurl'       => RFC2445_OPTIONAL | RFC2445_ONCE,
-            // TODO: the next two are components of their own!
-            'standardc'   => RFC2445_REQUIRED,
-            'daylightc'   => RFC2445_REQUIRED,
-            'x-prop'      => RFC2445_OPTIONAL
-        );
+	var $name       = 'VTIMEZONE';
+	var $properties;
+
+	function construct() {
+
+		$this->properties = array(
+			'tzid'        => RFC2445_REQUIRED | RFC2445_ONCE,
+			'last-modified'    => RFC2445_OPTIONAL | RFC2445_ONCE,
+			'tzurl'       => RFC2445_OPTIONAL | RFC2445_ONCE,
+			// TODO: the next two are components of their own!
+			'standardc'   => RFC2445_REQUIRED,
+			'daylightc'   => RFC2445_REQUIRED,
+			'x-prop'      => RFC2445_OPTIONAL
+		);
         
-        parent::construct();
-    }
+		parent::construct();
+	}
 }
 
 // REMINDER: DTEND must be later than DTSTART for all components which support both

phpicalendar/lib/bennu/iCalendar_parameters.php

Indentation +220 added lines, -220 removed lines

@@ -14,226 +14,226 @@
  */
 
 class iCalendar_parameter {
-    function multiple_values_allowed($parameter) {
-        switch($parameter) {
-            case 'DELEGATED-FROM':
-            case 'DELEGATED-TO':
-            case 'MEMBER':
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    function default_value($parameter) {
-        switch($parameter) {
-            case 'CUTYPE':   return 'INDIVIDUAL';
-            case 'FBTYPE':   return 'BUSY';
-            case 'PARTSTAT': return 'NEEDS-ACTION';
-            case 'RELATED':  return 'START';
-            case 'RELTYPE':  return 'PARENT';
-            case 'ROLE':     return 'REQ-PARTICIPANT';
-            case 'RSVP':     return 'FALSE';
-            default:         return NULL;
-        }
-    }
-
-    function is_valid_value(&$parent_property, $parameter, $value) {
-        switch($parameter) {
-            // These must all be a URI
-            case 'ALTREP':
-            case 'DIR':
-                return rfc2445_is_valid_value($value, RFC2445_TYPE_URI);
-            break;
-
-            // These must be CAL-ADDRESS, which is equivalent to URI
-            case 'DELEGATED-FROM':
-            case 'DELEGATED-TO':
-            case 'MEMBER':
-            case 'SENT-BY':
-                return rfc2445_is_valid_value($value, RFC2445_TYPE_CAL_ADDRESS);
-            break;
-
-            // These are textual parameters, so the MUST NOT contain double quotes
-            case 'CN':
-                return (strpos($value, '"') === false);
-            break;
-
-            // These have enumerated legal values
-            case 'CUTYPE':
-                $value = strtoupper($value);
-                return ($value == 'INDIVIDUAL' || $value == 'GROUP' || $value == 'RESOURCE' || $value == 'ROOM' || $value == 'UNKNOWN' || rfc2445_is_xname($value));
-            break;
-
-            case 'ENCODING':
-                $value = strtoupper($value);
-                return ($value == '8BIT' || $value == 'BASE64' || rfc2445_is_xname($value));
-            break;
-
-            case 'FBTYPE':
-                $value = strtoupper($value);
-                return ($value == 'FREE' || $value == 'BUSY' || $value == 'BUSY-UNAVAILABLE' || $value == 'BUSY-TENTATIVE' || rfc2445_is_xname($value));
-            break;
-
-            case 'FMTTYPE':
-                $fmttypes = array(
-                        'TEXT'        => array('PLAIN', 'RICHTEXT', 'ENRICHED', 'TAB-SEPARATED-VALUES', 'HTML', 'SGML',
-                                               'VND.LATEX-Z', 'VND.FMI.FLEXSTOR'),
-                        'MULTIPART'   => array('MIXED', 'ALTERNATIVE', 'DIGEST', 'PARALLEL', 'APPLEDOUBLE', 'HEADER-SET',
-                                               'FORM-DATA', 'RELATED', 'REPORT', 'VOICE-MESSAGE', 'SIGNED', 'ENCRYPTED',
-                                               'BYTERANGES'),
-                        'MESSAGE'     => array('RFC822', 'PARTIAL', 'EXTERNAL-BODY', 'NEWS', 'HTTP'),
-                        'APPLICATION' => array('OCTET-STREAM', 'POSTSCRIPT', 'ODA', 'ATOMICMAIL', 'ANDREW-INSET', 'SLATE',
-                                               'WITA', 'DEC-DX', 'DCA-RFT', 'ACTIVEMESSAGE', 'RTF', 'APPLEFILE',
-                                               'MAC-BINHEX40', 'NEWS-MESSAGE-ID', 'NEWS-TRANSMISSION', 'WORDPERFECT5.1',
-                                               'PDF', 'ZIP', 'MACWRITEII', 'MSWORD', 'REMOTE-PRINTING', 'MATHEMATICA',
-                                               'CYBERCASH', 'COMMONGROUND', 'IGES', 'RISCOS', 'ESHOP', 'X400-BP', 'SGML',
-                                               'CALS-1840', 'PGP-ENCRYPTED', 'PGP-SIGNATURE', 'PGP-KEYS', 'VND.FRAMEMAKER',
-                                               'VND.MIF', 'VND.MS-EXCEL', 'VND.MS-POWERPOINT', 'VND.MS-PROJECT',
-                                               'VND.MS-WORKS', 'VND.MS-TNEF', 'VND.SVD', 'VND.MUSIC-NIFF', 'VND.MS-ARTGALRY',
-                                               'VND.TRUEDOC', 'VND.KOAN', 'VND.STREET-STREAM', 'VND.FDF',
-                                               'SET-PAYMENT-INITIATION', 'SET-PAYMENT', 'SET-REGISTRATION-INITIATION',
-                                               'SET-REGISTRATION', 'VND.SEEMAIL', 'VND.BUSINESSOBJECTS',
-                                               'VND.MERIDIAN-SLINGSHOT', 'VND.XARA', 'SGML-OPEN-CATALOG', 'VND.RAPID',
-                                               'VND.ENLIVEN', 'VND.JAPANNET-REGISTRATION-WAKEUP', 
-                                               'VND.JAPANNET-VERIFICATION-WAKEUP', 'VND.JAPANNET-PAYMENT-WAKEUP',
-                                               'VND.JAPANNET-DIRECTORY-SERVICE', 'VND.INTERTRUST.DIGIBOX', 'VND.INTERTRUST.NNCP'),
-                        'IMAGE'       => array('JPEG', 'GIF', 'IEF', 'G3FAX', 'TIFF', 'CGM', 'NAPLPS', 'VND.DWG', 'VND.SVF',
-                                               'VND.DXF', 'PNG', 'VND.FPX', 'VND.NET-FPX'),
-                        'AUDIO'       => array('BASIC', '32KADPCM', 'VND.QCELP'),
-                        'VIDEO'       => array('MPEG', 'QUICKTIME', 'VND.VIVO', 'VND.MOTOROLA.VIDEO', 'VND.MOTOROLA.VIDEOP')
-                );
-                $value = strtoupper($value);
-                if(rfc2445_is_xname($value)) {
-                    return true;
-                }
-                @list($type, $subtype) = explode('/', $value);
-                if(empty($type) || empty($subtype)) {
-                    return false;
-                }
-                if(!isset($fmttypes[$type]) || !in_array($subtype, $fmttypes[$type])) {
-                    return false;
-                }
-                return true;
-            break;
-
-            case 'LANGUAGE':
-                $value = strtoupper($value);
-                $parts = explode('-', $value);
-                foreach($parts as $part) {
-                    if(empty($part)) {
-                        return false;
-                    }
-                    if(strspn($part, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') != strlen($part)) {
-                        return false;
-                    }
-                }
-                return true;
-            break;
-
-            case 'PARTSTAT':
-                $value = strtoupper($value);
-                switch($parent_property->parent_component) {
-                    case 'VEVENT':
-                        return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || $value == 'TENTATIVE'
-                                || $value == 'DELEGATED' || rfc2445_is_xname($value));
-                    break;
-                    case 'VTODO':
-                        return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || $value == 'TENTATIVE'
-                                || $value == 'DELEGATED' || $value == 'COMPLETED' || $value == 'IN-PROCESS' || rfc2445_is_xname($value));
-                    break;
-                    case 'VJOURNAL':
-                        return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || rfc2445_is_xname($value));
-                    break;
-                }
-                return false;
-            break;
-
-            case 'RANGE':
-                $value = strtoupper($value);
-                return ($value == 'THISANDPRIOR' || $value == 'THISANDFUTURE');
-            break;
-
-            case 'RELATED':
-                $value = strtoupper($value);
-                return ($value == 'START' || $value == 'END');
-            break;
-
-            case 'RELTYPE':
-                $value = strtoupper($value);
-                return ($value == 'PARENT' || $value == 'CHILD' || $value == 'SIBLING' || rfc2445_is_xname($value));
-            break;
-
-            case 'ROLE':
-                $value = strtoupper($value);
-                return ($value == 'CHAIR' || $value == 'REQ-PARTICIPANT' || $value == 'OPT-PARTICIPANT' || $value == 'NON-PARTICIPANT' || rfc2445_is_xname($value));
-            break;
-
-            case 'RSVP':
-                $value = strtoupper($value);
-                return ($value == 'TRUE' || $value == 'FALSE');
-            break;
-
-            case 'TZID':
-                if(empty($value)) {
-                    return false;
-                }
-                return (strcspn($value, '";:,') == strlen($value));
-            break;
-
-            case 'VALUE':
-                $value = strtoupper($value);
-                return ($value == 'BINARY'    || $value == 'BOOLEAN'    || $value == 'CAL-ADDRESS' || $value == 'DATE'    ||
-                        $value == 'DATE-TIME' || $value == 'DURATION'   || $value == 'FLOAT'       || $value == 'INTEGER' ||
-                        $value == 'PERIOD'    || $value == 'RECUR'      || $value == 'TEXT'        || $value == 'TIME'    ||
-                        $value == 'URI'       || $value == 'UTC-OFFSET' || rfc2445_is_xname($value));
-            break;
-        }
-    }
-
-    function do_value_formatting($parameter, $value) {
-        switch($parameter) {
-            // Parameters of type CAL-ADDRESS or URI MUST be double-quoted
-            case 'ALTREP':
-            case 'DIR':
-            case 'DELEGATED-FROM':
-            case 'DELEGATED-TO':
-            case 'MEMBER':
-            case 'SENT-BY':
-                return '"'.$value.'"';
-            break;
-
-            // Textual parameter types must be double quoted if they contain COLON, SEMICOLON
-            // or COMMA. Quoting always sounds easier and standards-conformant though.
-            case 'CN':
-                return '"'.$value.'"';
-            break;
-
-            // Parameters with enumerated legal values, just make them all caps
-            case 'CUTYPE':
-            case 'ENCODING':
-            case 'FBTYPE':
-            case 'FMTTYPE':
-            case 'LANGUAGE':
-            case 'PARTSTAT':
-            case 'RANGE':
-            case 'RELATED':
-            case 'RELTYPE':
-            case 'ROLE':
-            case 'RSVP':
-            case 'VALUE':
-                return strtoupper($value);
-            break;
-
-            // Parameters we shouldn't be messing with
-            case 'TZID':
-                return $value;
-            break;
-        }
-    }
-
-    function undo_value_formatting($parameter, $value) {
-    }
+	function multiple_values_allowed($parameter) {
+		switch($parameter) {
+			case 'DELEGATED-FROM':
+			case 'DELEGATED-TO':
+			case 'MEMBER':
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	function default_value($parameter) {
+		switch($parameter) {
+			case 'CUTYPE':   return 'INDIVIDUAL';
+			case 'FBTYPE':   return 'BUSY';
+			case 'PARTSTAT': return 'NEEDS-ACTION';
+			case 'RELATED':  return 'START';
+			case 'RELTYPE':  return 'PARENT';
+			case 'ROLE':     return 'REQ-PARTICIPANT';
+			case 'RSVP':     return 'FALSE';
+			default:         return NULL;
+		}
+	}
+
+	function is_valid_value(&$parent_property, $parameter, $value) {
+		switch($parameter) {
+			// These must all be a URI
+			case 'ALTREP':
+			case 'DIR':
+				return rfc2445_is_valid_value($value, RFC2445_TYPE_URI);
+			break;
+
+			// These must be CAL-ADDRESS, which is equivalent to URI
+			case 'DELEGATED-FROM':
+			case 'DELEGATED-TO':
+			case 'MEMBER':
+			case 'SENT-BY':
+				return rfc2445_is_valid_value($value, RFC2445_TYPE_CAL_ADDRESS);
+			break;
+
+			// These are textual parameters, so the MUST NOT contain double quotes
+			case 'CN':
+				return (strpos($value, '"') === false);
+			break;
+
+			// These have enumerated legal values
+			case 'CUTYPE':
+				$value = strtoupper($value);
+				return ($value == 'INDIVIDUAL' || $value == 'GROUP' || $value == 'RESOURCE' || $value == 'ROOM' || $value == 'UNKNOWN' || rfc2445_is_xname($value));
+			break;
+
+			case 'ENCODING':
+				$value = strtoupper($value);
+				return ($value == '8BIT' || $value == 'BASE64' || rfc2445_is_xname($value));
+			break;
+
+			case 'FBTYPE':
+				$value = strtoupper($value);
+				return ($value == 'FREE' || $value == 'BUSY' || $value == 'BUSY-UNAVAILABLE' || $value == 'BUSY-TENTATIVE' || rfc2445_is_xname($value));
+			break;
+
+			case 'FMTTYPE':
+				$fmttypes = array(
+						'TEXT'        => array('PLAIN', 'RICHTEXT', 'ENRICHED', 'TAB-SEPARATED-VALUES', 'HTML', 'SGML',
+											   'VND.LATEX-Z', 'VND.FMI.FLEXSTOR'),
+						'MULTIPART'   => array('MIXED', 'ALTERNATIVE', 'DIGEST', 'PARALLEL', 'APPLEDOUBLE', 'HEADER-SET',
+											   'FORM-DATA', 'RELATED', 'REPORT', 'VOICE-MESSAGE', 'SIGNED', 'ENCRYPTED',
+											   'BYTERANGES'),
+						'MESSAGE'     => array('RFC822', 'PARTIAL', 'EXTERNAL-BODY', 'NEWS', 'HTTP'),
+						'APPLICATION' => array('OCTET-STREAM', 'POSTSCRIPT', 'ODA', 'ATOMICMAIL', 'ANDREW-INSET', 'SLATE',
+											   'WITA', 'DEC-DX', 'DCA-RFT', 'ACTIVEMESSAGE', 'RTF', 'APPLEFILE',
+											   'MAC-BINHEX40', 'NEWS-MESSAGE-ID', 'NEWS-TRANSMISSION', 'WORDPERFECT5.1',
+											   'PDF', 'ZIP', 'MACWRITEII', 'MSWORD', 'REMOTE-PRINTING', 'MATHEMATICA',
+											   'CYBERCASH', 'COMMONGROUND', 'IGES', 'RISCOS', 'ESHOP', 'X400-BP', 'SGML',
+											   'CALS-1840', 'PGP-ENCRYPTED', 'PGP-SIGNATURE', 'PGP-KEYS', 'VND.FRAMEMAKER',
+											   'VND.MIF', 'VND.MS-EXCEL', 'VND.MS-POWERPOINT', 'VND.MS-PROJECT',
+											   'VND.MS-WORKS', 'VND.MS-TNEF', 'VND.SVD', 'VND.MUSIC-NIFF', 'VND.MS-ARTGALRY',
+											   'VND.TRUEDOC', 'VND.KOAN', 'VND.STREET-STREAM', 'VND.FDF',
+											   'SET-PAYMENT-INITIATION', 'SET-PAYMENT', 'SET-REGISTRATION-INITIATION',
+											   'SET-REGISTRATION', 'VND.SEEMAIL', 'VND.BUSINESSOBJECTS',
+											   'VND.MERIDIAN-SLINGSHOT', 'VND.XARA', 'SGML-OPEN-CATALOG', 'VND.RAPID',
+											   'VND.ENLIVEN', 'VND.JAPANNET-REGISTRATION-WAKEUP', 
+											   'VND.JAPANNET-VERIFICATION-WAKEUP', 'VND.JAPANNET-PAYMENT-WAKEUP',
+											   'VND.JAPANNET-DIRECTORY-SERVICE', 'VND.INTERTRUST.DIGIBOX', 'VND.INTERTRUST.NNCP'),
+						'IMAGE'       => array('JPEG', 'GIF', 'IEF', 'G3FAX', 'TIFF', 'CGM', 'NAPLPS', 'VND.DWG', 'VND.SVF',
+											   'VND.DXF', 'PNG', 'VND.FPX', 'VND.NET-FPX'),
+						'AUDIO'       => array('BASIC', '32KADPCM', 'VND.QCELP'),
+						'VIDEO'       => array('MPEG', 'QUICKTIME', 'VND.VIVO', 'VND.MOTOROLA.VIDEO', 'VND.MOTOROLA.VIDEOP')
+				);
+				$value = strtoupper($value);
+				if(rfc2445_is_xname($value)) {
+					return true;
+				}
+				@list($type, $subtype) = explode('/', $value);
+				if(empty($type) || empty($subtype)) {
+					return false;
+				}
+				if(!isset($fmttypes[$type]) || !in_array($subtype, $fmttypes[$type])) {
+					return false;
+				}
+				return true;
+			break;
+
+			case 'LANGUAGE':
+				$value = strtoupper($value);
+				$parts = explode('-', $value);
+				foreach($parts as $part) {
+					if(empty($part)) {
+						return false;
+					}
+					if(strspn($part, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') != strlen($part)) {
+						return false;
+					}
+				}
+				return true;
+			break;
+
+			case 'PARTSTAT':
+				$value = strtoupper($value);
+				switch($parent_property->parent_component) {
+					case 'VEVENT':
+						return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || $value == 'TENTATIVE'
+								|| $value == 'DELEGATED' || rfc2445_is_xname($value));
+					break;
+					case 'VTODO':
+						return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || $value == 'TENTATIVE'
+								|| $value == 'DELEGATED' || $value == 'COMPLETED' || $value == 'IN-PROCESS' || rfc2445_is_xname($value));
+					break;
+					case 'VJOURNAL':
+						return ($value == 'NEEDS-ACTION' || $value == 'ACCEPTED' || $value == 'DECLINED' || rfc2445_is_xname($value));
+					break;
+				}
+				return false;
+			break;
+
+			case 'RANGE':
+				$value = strtoupper($value);
+				return ($value == 'THISANDPRIOR' || $value == 'THISANDFUTURE');
+			break;
+
+			case 'RELATED':
+				$value = strtoupper($value);
+				return ($value == 'START' || $value == 'END');
+			break;
+
+			case 'RELTYPE':
+				$value = strtoupper($value);
+				return ($value == 'PARENT' || $value == 'CHILD' || $value == 'SIBLING' || rfc2445_is_xname($value));
+			break;
+
+			case 'ROLE':
+				$value = strtoupper($value);
+				return ($value == 'CHAIR' || $value == 'REQ-PARTICIPANT' || $value == 'OPT-PARTICIPANT' || $value == 'NON-PARTICIPANT' || rfc2445_is_xname($value));
+			break;
+
+			case 'RSVP':
+				$value = strtoupper($value);
+				return ($value == 'TRUE' || $value == 'FALSE');
+			break;
+
+			case 'TZID':
+				if(empty($value)) {
+					return false;
+				}
+				return (strcspn($value, '";:,') == strlen($value));
+			break;
+
+			case 'VALUE':
+				$value = strtoupper($value);
+				return ($value == 'BINARY'    || $value == 'BOOLEAN'    || $value == 'CAL-ADDRESS' || $value == 'DATE'    ||
+						$value == 'DATE-TIME' || $value == 'DURATION'   || $value == 'FLOAT'       || $value == 'INTEGER' ||
+						$value == 'PERIOD'    || $value == 'RECUR'      || $value == 'TEXT'        || $value == 'TIME'    ||
+						$value == 'URI'       || $value == 'UTC-OFFSET' || rfc2445_is_xname($value));
+			break;
+		}
+	}
+
+	function do_value_formatting($parameter, $value) {
+		switch($parameter) {
+			// Parameters of type CAL-ADDRESS or URI MUST be double-quoted
+			case 'ALTREP':
+			case 'DIR':
+			case 'DELEGATED-FROM':
+			case 'DELEGATED-TO':
+			case 'MEMBER':
+			case 'SENT-BY':
+				return '"'.$value.'"';
+			break;
+
+			// Textual parameter types must be double quoted if they contain COLON, SEMICOLON
+			// or COMMA. Quoting always sounds easier and standards-conformant though.
+			case 'CN':
+				return '"'.$value.'"';
+			break;
+
+			// Parameters with enumerated legal values, just make them all caps
+			case 'CUTYPE':
+			case 'ENCODING':
+			case 'FBTYPE':
+			case 'FMTTYPE':
+			case 'LANGUAGE':
+			case 'PARTSTAT':
+			case 'RANGE':
+			case 'RELATED':
+			case 'RELTYPE':
+			case 'ROLE':
+			case 'RSVP':
+			case 'VALUE':
+				return strtoupper($value);
+			break;
+
+			// Parameters we shouldn't be messing with
+			case 'TZID':
+				return $value;
+			break;
+		}
+	}
+
+	function undo_value_formatting($parameter, $value) {
+	}
 }
 
 ?>

phpicalendar/lib/bennu/iCalendar_rfc2445.php

Indentation +678 added lines, -678 removed lines

@@ -54,732 +54,732 @@
 
 
 function rfc2445_fold($string) {
-    if(strlen($string) <= RFC2445_FOLDED_LINE_LENGTH) {
-        return $string;
-    }
+	if(strlen($string) <= RFC2445_FOLDED_LINE_LENGTH) {
+		return $string;
+	}
 
-    $retval = '';
+	$retval = '';
 
-    while(strlen($string) > RFC2445_FOLDED_LINE_LENGTH) {
-        $retval .= substr($string, 0, RFC2445_FOLDED_LINE_LENGTH - 1) . RFC2445_CRLF . ' ';
-        $string  = substr($string, RFC2445_FOLDED_LINE_LENGTH - 1);
-    }
+	while(strlen($string) > RFC2445_FOLDED_LINE_LENGTH) {
+		$retval .= substr($string, 0, RFC2445_FOLDED_LINE_LENGTH - 1) . RFC2445_CRLF . ' ';
+		$string  = substr($string, RFC2445_FOLDED_LINE_LENGTH - 1);
+	}
 
-    $retval .= $string;
+	$retval .= $string;
     
-    return $retval;
+	return $retval;
 
 }
 
 function rfc2445_unfold($string) {
-    for($i = 0; $i < strlen(RFC2445_WSP); ++$i) {
-        $string = str_replace(RFC2445_CRLF.substr(RFC2445_WSP, $i, 1), '', $string);
-    }
+	for($i = 0; $i < strlen(RFC2445_WSP); ++$i) {
+		$string = str_replace(RFC2445_CRLF.substr(RFC2445_WSP, $i, 1), '', $string);
+	}
 
-    return $string;
+	return $string;
 }
 
 function rfc2445_is_xname($name) {
 
-    // If it's less than 3 chars, it cannot be legal
-    if(strlen($name) < 3) {
-        return false;
-    }
+	// If it's less than 3 chars, it cannot be legal
+	if(strlen($name) < 3) {
+		return false;
+	}
 
-    // If it contains an illegal char anywhere, reject it
-    if(strspn($name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-') != strlen($name)) {
-        return false;
-    }
+	// If it contains an illegal char anywhere, reject it
+	if(strspn($name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-') != strlen($name)) {
+		return false;
+	}
 
-    // To be legal, it must still start with "X-"
-    return substr($name, 0, 2) === 'X-';
+	// To be legal, it must still start with "X-"
+	return substr($name, 0, 2) === 'X-';
 }
 
 function rfc2445_is_valid_value($value, $type) {
 
-    // This branch should only be taken with xname values
-    if($type === NULL) {
-        return true;
-    }
+	// This branch should only be taken with xname values
+	if($type === NULL) {
+		return true;
+	}
 
-    switch($type) {
-        case RFC2445_TYPE_CAL_ADDRESS:
-        case RFC2445_TYPE_URI:
-            if(!is_string($value)) {
-                return false;
-            }
+	switch($type) {
+		case RFC2445_TYPE_CAL_ADDRESS:
+		case RFC2445_TYPE_URI:
+			if(!is_string($value)) {
+				return false;
+			}
 
-            $valid_schemes = array('ftp', 'http', 'ldap', 'gopher', 'mailto', 'news', 'nntp', 'telnet', 'wais', 'file', 'prospero');
+			$valid_schemes = array('ftp', 'http', 'ldap', 'gopher', 'mailto', 'news', 'nntp', 'telnet', 'wais', 'file', 'prospero');
 
-            $pos = strpos($value, ':');
-            if(!$pos) {
-                return false;
-            }
+			$pos = strpos($value, ':');
+			if(!$pos) {
+				return false;
+			}
         
-            $scheme = strtolower(substr($value, 0, $pos));
-            $remain = substr($value, $pos + 1);
+			$scheme = strtolower(substr($value, 0, $pos));
+			$remain = substr($value, $pos + 1);
             
-            if(!in_array($scheme, $valid_schemes)) {
-                return false;
-            }
+			if(!in_array($scheme, $valid_schemes)) {
+				return false;
+			}
         
-            if($scheme === 'mailto') {
-                $regexp = '^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$';
-            }
-            else {
-                $regexp = '^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$';
-            }
+			if($scheme === 'mailto') {
+				$regexp = '^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$';
+			}
+			else {
+				$regexp = '^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$';
+			}
         
-            return ereg($regexp, $remain);
-        break;
+			return ereg($regexp, $remain);
+		break;
 
-        case RFC2445_TYPE_BINARY:
-            if(!is_string($value)) {
-                return false;
-            }
+		case RFC2445_TYPE_BINARY:
+			if(!is_string($value)) {
+				return false;
+			}
 
-            $len = strlen($value);
+			$len = strlen($value);
             
-            if($len % 4 != 0) {
-                return false;
-            }
-
-            for($i = 0; $i < $len; ++$i) {
-                $ch = $value{$i};
-                if(!($ch >= 'a' && $ch <= 'z' || $ch >= 'A' && $ch <= 'Z' || $ch >= '0' && $ch <= '9' || $ch == '-' || $ch == '+')) {
-                    if($ch == '=' && $len - $i <= 2) {
-                        continue;
-                    }
-                    return false;
-                }
-            }
-            return true;
-        break;
-
-        case RFC2445_TYPE_BOOLEAN:
-            if(is_bool($value)) {
-                return true;
-            }
-            if(is_string($value)) {
-                $value = strtoupper($value);
-                return ($value == 'TRUE' || $value == 'FALSE');
-            }
-            return false;
-        break;
-
-        case RFC2445_TYPE_DATE:
-            if(is_int($value)) {
-                if($value < 0) {
-                    return false;
-                }
-                $value = "$value";
-            }
-            else if(!is_string($value)) {
-                return false;
-            }
-
-            if(strlen($value) != 8) {
-                return false;
-            }
-
-            $y = intval(substr($value, 0, 4));
-            $m = intval(substr($value, 4, 2));
-            $d = intval(substr($value, 6, 2));
-
-            return checkdate($m, $d, $y);
-        break;
-
-        case RFC2445_TYPE_DATE_TIME:
-            if(!is_string($value) || strlen($value) < 15) {
-                return false;
-            }
-
-            return($value{8} == 'T' && 
-                   rfc2445_is_valid_value(substr($value, 0, 8), RFC2445_TYPE_DATE) &&
-                   rfc2445_is_valid_value(substr($value, 9), RFC2445_TYPE_TIME));
-        break;
-
-        case RFC2445_TYPE_DURATION:
-            if(!is_string($value)) {
-                return false;
-            }
-
-            $len = strlen($value);
-
-            if($len < 3) {
-                // Minimum conformant length: "P1W"
-                return false;
-            }
-
-            if($value{0} == '+' || $value{0} == '-') {
-                $value = substr($value, 1);
-                --$len; // Don't forget to update this!
-            }
-
-            if($value{0} != 'P') {
-                return false;
-            }
-
-            // OK, now break it up
-            $num = '';
-            $allowed = 'WDT';
-
-            for($i = 1; $i < $len; ++$i) {
-                $ch = $value{$i};
-                if($ch >= '0' && $ch <= '9') {
-                    $num .= $ch;
-                    continue;
-                }
-                if(strpos($allowed, $ch) === false) {
-                    // Non-numeric character which shouldn't be here
-                    return false;
-                }
-                if($num === '' && $ch != 'T') {
-                    // Allowed non-numeric character, but no digits came before it
-                    return false;
-                }
-
-                // OK, $ch now holds a character which tells us what $num is
-                switch($ch) {
-                    case 'W':
-                        // If duration in weeks is specified, this must end the string
-                        return ($i == $len - 1);
-                    break;
-
-                    case 'D':
-                        // Days specified, now if anything comes after it must be a 'T'
-                        $allowed = 'T';
-                    break;
-
-                    case 'T':
-                        // Starting to specify time, H M S are now valid delimiters
-                        $allowed = 'HMS';
-                    break;
-
-                    case 'H':
-                        $allowed = 'M';
-                    break;
-
-                    case 'M':
-                        $allowed = 'S';
-                    break;
-
-                    case 'S':
-                        return ($i == $len - 1);
-                    break;
-                }
-
-                // If we 're going to continue, reset $num
-                $num = '';
-
-            }
-
-            // $num is kept for this reason: if we 're here, we ran out of chars
-            // therefore $num must be empty for the period to be legal
-            return ($num === '' && $ch != 'T');
-
-        break;
+			if($len % 4 != 0) {
+				return false;
+			}
+
+			for($i = 0; $i < $len; ++$i) {
+				$ch = $value{$i};
+				if(!($ch >= 'a' && $ch <= 'z' || $ch >= 'A' && $ch <= 'Z' || $ch >= '0' && $ch <= '9' || $ch == '-' || $ch == '+')) {
+					if($ch == '=' && $len - $i <= 2) {
+						continue;
+					}
+					return false;
+				}
+			}
+			return true;
+		break;
+
+		case RFC2445_TYPE_BOOLEAN:
+			if(is_bool($value)) {
+				return true;
+			}
+			if(is_string($value)) {
+				$value = strtoupper($value);
+				return ($value == 'TRUE' || $value == 'FALSE');
+			}
+			return false;
+		break;
+
+		case RFC2445_TYPE_DATE:
+			if(is_int($value)) {
+				if($value < 0) {
+					return false;
+				}
+				$value = "$value";
+			}
+			else if(!is_string($value)) {
+				return false;
+			}
+
+			if(strlen($value) != 8) {
+				return false;
+			}
+
+			$y = intval(substr($value, 0, 4));
+			$m = intval(substr($value, 4, 2));
+			$d = intval(substr($value, 6, 2));
+
+			return checkdate($m, $d, $y);
+		break;
+
+		case RFC2445_TYPE_DATE_TIME:
+			if(!is_string($value) || strlen($value) < 15) {
+				return false;
+			}
+
+			return($value{8} == 'T' && 
+				   rfc2445_is_valid_value(substr($value, 0, 8), RFC2445_TYPE_DATE) &&
+				   rfc2445_is_valid_value(substr($value, 9), RFC2445_TYPE_TIME));
+		break;
+
+		case RFC2445_TYPE_DURATION:
+			if(!is_string($value)) {
+				return false;
+			}
+
+			$len = strlen($value);
+
+			if($len < 3) {
+				// Minimum conformant length: "P1W"
+				return false;
+			}
+
+			if($value{0} == '+' || $value{0} == '-') {
+				$value = substr($value, 1);
+				--$len; // Don't forget to update this!
+			}
+
+			if($value{0} != 'P') {
+				return false;
+			}
+
+			// OK, now break it up
+			$num = '';
+			$allowed = 'WDT';
+
+			for($i = 1; $i < $len; ++$i) {
+				$ch = $value{$i};
+				if($ch >= '0' && $ch <= '9') {
+					$num .= $ch;
+					continue;
+				}
+				if(strpos($allowed, $ch) === false) {
+					// Non-numeric character which shouldn't be here
+					return false;
+				}
+				if($num === '' && $ch != 'T') {
+					// Allowed non-numeric character, but no digits came before it
+					return false;
+				}
+
+				// OK, $ch now holds a character which tells us what $num is
+				switch($ch) {
+					case 'W':
+						// If duration in weeks is specified, this must end the string
+						return ($i == $len - 1);
+					break;
+
+					case 'D':
+						// Days specified, now if anything comes after it must be a 'T'
+						$allowed = 'T';
+					break;
+
+					case 'T':
+						// Starting to specify time, H M S are now valid delimiters
+						$allowed = 'HMS';
+					break;
+
+					case 'H':
+						$allowed = 'M';
+					break;
+
+					case 'M':
+						$allowed = 'S';
+					break;
+
+					case 'S':
+						return ($i == $len - 1);
+					break;
+				}
+
+				// If we 're going to continue, reset $num
+				$num = '';
+
+			}
+
+			// $num is kept for this reason: if we 're here, we ran out of chars
+			// therefore $num must be empty for the period to be legal
+			return ($num === '' && $ch != 'T');
+
+		break;
         
-        case RFC2445_TYPE_FLOAT:
-            if(is_float($value)) {
-                return true;
-            }
-            if(!is_string($value) || $value === '') {
-                return false;
-            }
-
-            $dot = false;
-            $int = false;
-            $len = strlen($value);
-            for($i = 0; $i < $len; ++$i) {
-                switch($value{$i}) {
-                    case '-': case '+':
-                        // A sign can only be seen at position 0 and cannot be the only char
-                        if($i != 0 || $len == 1) {
-                            return false;
-                        }
-                    break;
-                    case '.':
-                        // A second dot is an error
-                        // Make sure we had at least one int before the dot
-                        if($dot || !$int) {
-                            return false;
-                        }
-                        $dot = true;
-                        // Make also sure that the float doesn't end with a dot
-                        if($i == $len - 1) {
-                            return false;
-                        }
-                    break;
-                    case '0': case '1': case '2': case '3': case '4':
-                    case '5': case '6': case '7': case '8': case '9':
-                        $int = true;
-                    break;
-                    default:
-                        // Any other char is a no-no
-                        return false;
-                    break;
-                }
-            }
-            return true;
-        break;
-
-        case RFC2445_TYPE_INTEGER:
-            if(is_int($value)) {
-                return true;
-            }
-            if(!is_string($value) || $value === '') {
-                return false;
-            }
-
-            if($value{0} == '+' || $value{0} == '-') {
-                if(strlen($value) == 1) {
-                    return false;
-                }
-                $value = substr($value, 1);
-            }
-
-            if(strspn($value, '0123456789') != strlen($value)) {
-                return false;
-            }
-
-            return ($value >= -2147483648 && $value <= 2147483647);
-        break;
-
-        case RFC2445_TYPE_PERIOD:
-            if(!is_string($value) || empty($value)) {
-                return false;
-            }
-
-            $parts = explode('/', $value);
-            if(count($parts) != 2) {
-                return false;
-            }
-
-            if(!rfc2445_is_valid_value($parts[0], RFC2445_TYPE_DATE_TIME)) {
-                return false;
-            }
-
-            // Two legal cases for the second part:
-            if(rfc2445_is_valid_value($parts[1], RFC2445_TYPE_DATE_TIME)) {
-                // It has to be after the start time, so
-                return ($parts[1] > $parts[0]);
-            }
-            else if(rfc2445_is_valid_value($parts[1], RFC2445_TYPE_DURATION)) {
-                // The period MUST NOT be negative
-                return ($parts[1]{0} != '-');
-            }
-
-            // It seems to be illegal
-            return false;
-        break;
-
-        case RFC2445_TYPE_RECUR:
-            if(!is_string($value)) {
-                return false;
-            }
-
-            $parts = explode(';', strtoupper($value));
-
-            // First of all, we need at least a FREQ and a UNTIL or COUNT part, so...
-            if(count($parts) < 2) {
-                return false;
-            }
-
-            // Let's get that into a more easily comprehensible format
-            $vars = array();
-            foreach($parts as $part) {
-
-                $pieces = explode('=', $part);
-                // There must be exactly 2 pieces, e.g. FREQ=WEEKLY
-                if(count($pieces) != 2) {
-                    return false;
-                }
-
-                // It's illegal for a variable to appear twice
-                if(isset($vars[$pieces[0]])) {
-                    return false;
-                }
-
-                // Sounds good
-                $vars[$pieces[0]] = $pieces[1];
-            }
-
-            // OK... now to test everything else
-
-            // FREQ must be the first thing appearing
-            reset($vars);
-            if(key($vars) != 'FREQ') {
-                return false;
-            }
-
-            // It's illegal to have both UNTIL and COUNT appear
-            if(isset($vars['UNTIL']) && isset($vars['COUNT'])) {
-                return false;
-            }
-
-            // Special case: BYWEEKNO is only valid for FREQ=YEARLY
-            if(isset($vars['BYWEEKNO']) && $vars['FREQ'] != 'YEARLY') {
-                return false;
-            }
-
-            // Special case: BYSETPOS is only valid if another BY option is specified
-            if(isset($vars['BYSETPOS'])) {
-                $options = array('BYSECOND', 'BYMINUTE', 'BYHOUR', 'BYDAY', 'BYMONTHDAY', 'BYYEARDAY', 'BYWEEKNO', 'BYMONTH');
-                $defined = array_keys($vars);
-                $common  = array_intersect($options, $defined);
-                if(empty($common)) {
-                    return false;
-                }
-            }
-
-            // OK, now simply check if each element has a valid value,
-            // unsetting them on the way. If at the end the array still
-            // has some elements, they are illegal.
-
-            if($vars['FREQ'] != 'SECONDLY' && $vars['FREQ'] != 'MINUTELY' && $vars['FREQ'] != 'HOURLY' && 
-               $vars['FREQ'] != 'DAILY'    && $vars['FREQ'] != 'WEEKLY' &&
-               $vars['FREQ'] != 'MONTHLY'  && $vars['FREQ'] != 'YEARLY') {
-                return false;
-            }
-            unset($vars['FREQ']);
-
-            // Set this, we may need it later
-            $weekdays = explode(',', RFC2445_WEEKDAYS);
-
-            if(isset($vars['UNTIL'])) {
-                if(rfc2445_is_valid_value($vars['UNTIL'], RFC2445_TYPE_DATE_TIME)) {
-                    // The time MUST be in UTC format
-                    if(!(substr($vars['UNTIL'], -1) == 'Z')) {
-                        return false;
-                    }
-                }
-                else if(!rfc2445_is_valid_value($vars['UNTIL'], RFC2445_TYPE_DATE_TIME)) {
-                    return false;
-                }
-            }
-            unset($vars['UNTIL']);
-
-
-            if(isset($vars['COUNT'])) {
-                if(empty($vars['COUNT'])) {
-                    // This also catches the string '0', which makes no sense
-                    return false;
-                }
-                if(strspn($vars['COUNT'], '0123456789') != strlen($vars['COUNT'])) {
-                    return false;
-                }
-            }
-            unset($vars['COUNT']);
+		case RFC2445_TYPE_FLOAT:
+			if(is_float($value)) {
+				return true;
+			}
+			if(!is_string($value) || $value === '') {
+				return false;
+			}
+
+			$dot = false;
+			$int = false;
+			$len = strlen($value);
+			for($i = 0; $i < $len; ++$i) {
+				switch($value{$i}) {
+					case '-': case '+':
+						// A sign can only be seen at position 0 and cannot be the only char
+						if($i != 0 || $len == 1) {
+							return false;
+						}
+					break;
+					case '.':
+						// A second dot is an error
+						// Make sure we had at least one int before the dot
+						if($dot || !$int) {
+							return false;
+						}
+						$dot = true;
+						// Make also sure that the float doesn't end with a dot
+						if($i == $len - 1) {
+							return false;
+						}
+					break;
+					case '0': case '1': case '2': case '3': case '4':
+					case '5': case '6': case '7': case '8': case '9':
+						$int = true;
+					break;
+					default:
+						// Any other char is a no-no
+						return false;
+					break;
+				}
+			}
+			return true;
+		break;
+
+		case RFC2445_TYPE_INTEGER:
+			if(is_int($value)) {
+				return true;
+			}
+			if(!is_string($value) || $value === '') {
+				return false;
+			}
+
+			if($value{0} == '+' || $value{0} == '-') {
+				if(strlen($value) == 1) {
+					return false;
+				}
+				$value = substr($value, 1);
+			}
+
+			if(strspn($value, '0123456789') != strlen($value)) {
+				return false;
+			}
+
+			return ($value >= -2147483648 && $value <= 2147483647);
+		break;
+
+		case RFC2445_TYPE_PERIOD:
+			if(!is_string($value) || empty($value)) {
+				return false;
+			}
+
+			$parts = explode('/', $value);
+			if(count($parts) != 2) {
+				return false;
+			}
+
+			if(!rfc2445_is_valid_value($parts[0], RFC2445_TYPE_DATE_TIME)) {
+				return false;
+			}
+
+			// Two legal cases for the second part:
+			if(rfc2445_is_valid_value($parts[1], RFC2445_TYPE_DATE_TIME)) {
+				// It has to be after the start time, so
+				return ($parts[1] > $parts[0]);
+			}
+			else if(rfc2445_is_valid_value($parts[1], RFC2445_TYPE_DURATION)) {
+				// The period MUST NOT be negative
+				return ($parts[1]{0} != '-');
+			}
+
+			// It seems to be illegal
+			return false;
+		break;
+
+		case RFC2445_TYPE_RECUR:
+			if(!is_string($value)) {
+				return false;
+			}
+
+			$parts = explode(';', strtoupper($value));
+
+			// First of all, we need at least a FREQ and a UNTIL or COUNT part, so...
+			if(count($parts) < 2) {
+				return false;
+			}
+
+			// Let's get that into a more easily comprehensible format
+			$vars = array();
+			foreach($parts as $part) {
+
+				$pieces = explode('=', $part);
+				// There must be exactly 2 pieces, e.g. FREQ=WEEKLY
+				if(count($pieces) != 2) {
+					return false;
+				}
+
+				// It's illegal for a variable to appear twice
+				if(isset($vars[$pieces[0]])) {
+					return false;
+				}
+
+				// Sounds good
+				$vars[$pieces[0]] = $pieces[1];
+			}
+
+			// OK... now to test everything else
+
+			// FREQ must be the first thing appearing
+			reset($vars);
+			if(key($vars) != 'FREQ') {
+				return false;
+			}
+
+			// It's illegal to have both UNTIL and COUNT appear
+			if(isset($vars['UNTIL']) && isset($vars['COUNT'])) {
+				return false;
+			}
+
+			// Special case: BYWEEKNO is only valid for FREQ=YEARLY
+			if(isset($vars['BYWEEKNO']) && $vars['FREQ'] != 'YEARLY') {
+				return false;
+			}
+
+			// Special case: BYSETPOS is only valid if another BY option is specified
+			if(isset($vars['BYSETPOS'])) {
+				$options = array('BYSECOND', 'BYMINUTE', 'BYHOUR', 'BYDAY', 'BYMONTHDAY', 'BYYEARDAY', 'BYWEEKNO', 'BYMONTH');
+				$defined = array_keys($vars);
+				$common  = array_intersect($options, $defined);
+				if(empty($common)) {
+					return false;
+				}
+			}
+
+			// OK, now simply check if each element has a valid value,
+			// unsetting them on the way. If at the end the array still
+			// has some elements, they are illegal.
+
+			if($vars['FREQ'] != 'SECONDLY' && $vars['FREQ'] != 'MINUTELY' && $vars['FREQ'] != 'HOURLY' && 
+			   $vars['FREQ'] != 'DAILY'    && $vars['FREQ'] != 'WEEKLY' &&
+			   $vars['FREQ'] != 'MONTHLY'  && $vars['FREQ'] != 'YEARLY') {
+				return false;
+			}
+			unset($vars['FREQ']);
+
+			// Set this, we may need it later
+			$weekdays = explode(',', RFC2445_WEEKDAYS);
+
+			if(isset($vars['UNTIL'])) {
+				if(rfc2445_is_valid_value($vars['UNTIL'], RFC2445_TYPE_DATE_TIME)) {
+					// The time MUST be in UTC format
+					if(!(substr($vars['UNTIL'], -1) == 'Z')) {
+						return false;
+					}
+				}
+				else if(!rfc2445_is_valid_value($vars['UNTIL'], RFC2445_TYPE_DATE_TIME)) {
+					return false;
+				}
+			}
+			unset($vars['UNTIL']);
+
+
+			if(isset($vars['COUNT'])) {
+				if(empty($vars['COUNT'])) {
+					// This also catches the string '0', which makes no sense
+					return false;
+				}
+				if(strspn($vars['COUNT'], '0123456789') != strlen($vars['COUNT'])) {
+					return false;
+				}
+			}
+			unset($vars['COUNT']);
 
             
-            if(isset($vars['INTERVAL'])) {
-                if(empty($vars['INTERVAL'])) {
-                    // This also catches the string '0', which makes no sense
-                    return false;
-                }
-                if(strspn($vars['INTERVAL'], '0123456789') != strlen($vars['INTERVAL'])) {
-                    return false;
-                }
-            }
-            unset($vars['INTERVAL']);
+			if(isset($vars['INTERVAL'])) {
+				if(empty($vars['INTERVAL'])) {
+					// This also catches the string '0', which makes no sense
+					return false;
+				}
+				if(strspn($vars['INTERVAL'], '0123456789') != strlen($vars['INTERVAL'])) {
+					return false;
+				}
+			}
+			unset($vars['INTERVAL']);
 
             
-            if(isset($vars['BYSECOND'])) {
-                if($vars['BYSECOND'] == '') {
-                    return false;
-                }
-                // Comma also allowed
-                if(strspn($vars['BYSECOND'], '0123456789,') != strlen($vars['BYSECOND'])) {
-                    return false;
-                }
-                $secs = explode(',', $vars['BYSECOND']);
-                foreach($secs as $sec) {
-                    if($sec == '' || $sec < 0 || $sec > 59) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYSECOND']);
+			if(isset($vars['BYSECOND'])) {
+				if($vars['BYSECOND'] == '') {
+					return false;
+				}
+				// Comma also allowed
+				if(strspn($vars['BYSECOND'], '0123456789,') != strlen($vars['BYSECOND'])) {
+					return false;
+				}
+				$secs = explode(',', $vars['BYSECOND']);
+				foreach($secs as $sec) {
+					if($sec == '' || $sec < 0 || $sec > 59) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYSECOND']);
 
             
-            if(isset($vars['BYMINUTE'])) {
-                if($vars['BYMINUTE'] == '') {
-                    return false;
-                }
-                // Comma also allowed
-                if(strspn($vars['BYMINUTE'], '0123456789,') != strlen($vars['BYMINUTE'])) {
-                    return false;
-                }
-                $mins = explode(',', $vars['BYMINUTE']);
-                foreach($mins as $min) {
-                    if($min == '' || $min < 0 || $min > 59) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYMINUTE']);
+			if(isset($vars['BYMINUTE'])) {
+				if($vars['BYMINUTE'] == '') {
+					return false;
+				}
+				// Comma also allowed
+				if(strspn($vars['BYMINUTE'], '0123456789,') != strlen($vars['BYMINUTE'])) {
+					return false;
+				}
+				$mins = explode(',', $vars['BYMINUTE']);
+				foreach($mins as $min) {
+					if($min == '' || $min < 0 || $min > 59) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYMINUTE']);
 
             
-            if(isset($vars['BYHOUR'])) {
-                if($vars['BYHOUR'] == '') {
-                    return false;
-                }
-                // Comma also allowed
-                if(strspn($vars['BYHOUR'], '0123456789,') != strlen($vars['BYHOUR'])) {
-                    return false;
-                }
-                $hours = explode(',', $vars['BYHOUR']);
-                foreach($hours as $hour) {
-                    if($hour == '' || $hour < 0 || $hour > 23) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYHOUR']);
+			if(isset($vars['BYHOUR'])) {
+				if($vars['BYHOUR'] == '') {
+					return false;
+				}
+				// Comma also allowed
+				if(strspn($vars['BYHOUR'], '0123456789,') != strlen($vars['BYHOUR'])) {
+					return false;
+				}
+				$hours = explode(',', $vars['BYHOUR']);
+				foreach($hours as $hour) {
+					if($hour == '' || $hour < 0 || $hour > 23) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYHOUR']);
             
 
-            if(isset($vars['BYDAY'])) {
-                if(empty($vars['BYDAY'])) {
-                    return false;
-                }
+			if(isset($vars['BYDAY'])) {
+				if(empty($vars['BYDAY'])) {
+					return false;
+				}
 
-                // First off, split up all values we may have
-                $days = explode(',', $vars['BYDAY']);
+				// First off, split up all values we may have
+				$days = explode(',', $vars['BYDAY']);
                 
-                foreach($days as $day) {
-                    $daypart = substr($day, -2);
-                    if(!in_array($daypart, $weekdays)) {
-                        return false;
-                    }
-
-                    if(strlen($day) > 2) {
-                        $intpart = substr($day, 0, strlen($day) - 2);
-                        if(!rfc2445_is_valid_value($intpart, RFC2445_TYPE_INTEGER)) {
-                            return false;
-                        }
-                        if(intval($intpart) == 0) {
-                            return false;
-                        }
-                    }
-                }
-            }
-            unset($vars['BYDAY']);
-
-
-            if(isset($vars['BYMONTHDAY'])) {
-                if(empty($vars['BYMONTHDAY'])) {
-                    return false;
-                }
-                $mdays = explode(',', $vars['BYMONTHDAY']);
-                foreach($mdays as $mday) {
-                    if(!rfc2445_is_valid_value($mday, RFC2445_TYPE_INTEGER)) {
-                        return false;
-                    }
-                    $mday = abs(intval($mday));
-                    if($mday == 0 || $mday > 31) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYMONTHDAY']);
-
-
-            if(isset($vars['BYYEARDAY'])) {
-                if(empty($vars['BYYEARDAY'])) {
-                    return false;
-                }
-                $ydays = explode(',', $vars['BYYEARDAY']);
-                foreach($ydays as $yday) {
-                    if(!rfc2445_is_valid_value($yday, RFC2445_TYPE_INTEGER)) {
-                        return false;
-                    }
-                    $yday = abs(intval($yday));
-                    if($yday == 0 || $yday > 366) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYYEARDAY']);
-
-
-            if(isset($vars['BYWEEKNO'])) {
-                if(empty($vars['BYWEEKNO'])) {
-                    return false;
-                }
-                $weeknos = explode(',', $vars['BYWEEKNO']);
-                foreach($weeknos as $weekno) {
-                    if(!rfc2445_is_valid_value($weekno, RFC2445_TYPE_INTEGER)) {
-                        return false;
-                    }
-                    $weekno = abs(intval($weekno));
-                    if($weekno == 0 || $weekno > 53) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYWEEKNO']);
-
-
-            if(isset($vars['BYMONTH'])) {
-                if(empty($vars['BYMONTH'])) {
-                    return false;
-                }
-                // Comma also allowed
-                if(strspn($vars['BYMONTH'], '0123456789,') != strlen($vars['BYMONTH'])) {
-                    return false;
-                }
-                $months = explode(',', $vars['BYMONTH']);
-                foreach($months as $month) {
-                    if($month == '' || $month < 1 || $month > 12) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYMONTH']);
-
-
-            if(isset($vars['BYSETPOS'])) {
-                if(empty($vars['BYSETPOS'])) {
-                    return false;
-                }
-                $sets = explode(',', $vars['BYSETPOS']);
-                foreach($sets as $set) {
-                    if(!rfc2445_is_valid_value($set, RFC2445_TYPE_INTEGER)) {
-                        return false;
-                    }
-                    $set = abs(intval($set));
-                    if($set == 0 || $set > 366) {
-                        return false;
-                    }
-                }
-            }
-            unset($vars['BYSETPOS']);
-
-
-            if(isset($vars['WKST'])) {
-                if(!in_array($vars['WKST'], $weekdays)) {
-                    return false;
-                }
-            }
-            unset($vars['WKST']);
-
-
-            // Any remaining vars must be x-names
-            if(empty($vars)) {
-                return true;
-            }
-
-            foreach($vars as $name => $var) {
-                if(!rfc2445_is_xname($name)) {
-                    return false;
-                }
-            }
-
-            // At last, all is OK!
-            return true;
-
-        break;
-
-        case RFC2445_TYPE_TEXT:
-            return true;
-        break;
-
-        case RFC2445_TYPE_TIME:
-            if(is_int($value)) {
-                if($value < 0) {
-                    return false;
-                }
-                $value = "$value";
-            }
-            else if(!is_string($value)) {
-                return false;
-            }
-
-            if(strlen($value) == 7) {
-                if(strtoupper(substr($value, -1)) != 'Z') {
-                    return false;
-                }
-                $value = substr($value, 0, 6);
-            }
-            if(strlen($value) != 6) {
-                return false;
-            }
-
-            $h = intval(substr($value, 0, 2));
-            $m = intval(substr($value, 2, 2));
-            $s = intval(substr($value, 4, 2));
-
-            return ($h <= 23 && $m <= 59 && $s <= 60);
-        break;
-
-        case RFC2445_TYPE_UTC_OFFSET:
-            if(is_int($value)) {
-                if($value >= 0) {
-                    $value = "+$value";
-                }
-                else {
-                    $value = "$value";
-                }
-            }
-            else if(!is_string($value)) {
-                return false;
-            }
-
-            if(strlen($value) == 7) {
-                $s = intval(substr($value, 5, 2));
-                $value = substr($value, 0, 5);
-            }
-            if(strlen($value) != 5 || $value == "-0000") {
-                return false;
-            }
-
-            if($value{0} != '+' && $value{0} != '-') {
-                return false;
-            }
-
-            $h = intval(substr($value, 1, 2));
-            $m = intval(substr($value, 3, 2));
-
-            return ($h <= 23 && $m <= 59 && $s <= 59);
-        break;
-    }
-
-    // TODO: remove this assertion
-    trigger_error('bad code path', E_USER_WARNING);
-    var_dump($type);
-    return false;
+				foreach($days as $day) {
+					$daypart = substr($day, -2);
+					if(!in_array($daypart, $weekdays)) {
+						return false;
+					}
+
+					if(strlen($day) > 2) {
+						$intpart = substr($day, 0, strlen($day) - 2);
+						if(!rfc2445_is_valid_value($intpart, RFC2445_TYPE_INTEGER)) {
+							return false;
+						}
+						if(intval($intpart) == 0) {
+							return false;
+						}
+					}
+				}
+			}
+			unset($vars['BYDAY']);
+
+
+			if(isset($vars['BYMONTHDAY'])) {
+				if(empty($vars['BYMONTHDAY'])) {
+					return false;
+				}
+				$mdays = explode(',', $vars['BYMONTHDAY']);
+				foreach($mdays as $mday) {
+					if(!rfc2445_is_valid_value($mday, RFC2445_TYPE_INTEGER)) {
+						return false;
+					}
+					$mday = abs(intval($mday));
+					if($mday == 0 || $mday > 31) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYMONTHDAY']);
+
+
+			if(isset($vars['BYYEARDAY'])) {
+				if(empty($vars['BYYEARDAY'])) {
+					return false;
+				}
+				$ydays = explode(',', $vars['BYYEARDAY']);
+				foreach($ydays as $yday) {
+					if(!rfc2445_is_valid_value($yday, RFC2445_TYPE_INTEGER)) {
+						return false;
+					}
+					$yday = abs(intval($yday));
+					if($yday == 0 || $yday > 366) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYYEARDAY']);
+
+
+			if(isset($vars['BYWEEKNO'])) {
+				if(empty($vars['BYWEEKNO'])) {
+					return false;
+				}
+				$weeknos = explode(',', $vars['BYWEEKNO']);
+				foreach($weeknos as $weekno) {
+					if(!rfc2445_is_valid_value($weekno, RFC2445_TYPE_INTEGER)) {
+						return false;
+					}
+					$weekno = abs(intval($weekno));
+					if($weekno == 0 || $weekno > 53) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYWEEKNO']);
+
+
+			if(isset($vars['BYMONTH'])) {
+				if(empty($vars['BYMONTH'])) {
+					return false;
+				}
+				// Comma also allowed
+				if(strspn($vars['BYMONTH'], '0123456789,') != strlen($vars['BYMONTH'])) {
+					return false;
+				}
+				$months = explode(',', $vars['BYMONTH']);
+				foreach($months as $month) {
+					if($month == '' || $month < 1 || $month > 12) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYMONTH']);
+
+
+			if(isset($vars['BYSETPOS'])) {
+				if(empty($vars['BYSETPOS'])) {
+					return false;
+				}
+				$sets = explode(',', $vars['BYSETPOS']);
+				foreach($sets as $set) {
+					if(!rfc2445_is_valid_value($set, RFC2445_TYPE_INTEGER)) {
+						return false;
+					}
+					$set = abs(intval($set));
+					if($set == 0 || $set > 366) {
+						return false;
+					}
+				}
+			}
+			unset($vars['BYSETPOS']);
+
+
+			if(isset($vars['WKST'])) {
+				if(!in_array($vars['WKST'], $weekdays)) {
+					return false;
+				}
+			}
+			unset($vars['WKST']);
+
+
+			// Any remaining vars must be x-names
+			if(empty($vars)) {
+				return true;
+			}
+
+			foreach($vars as $name => $var) {
+				if(!rfc2445_is_xname($name)) {
+					return false;
+				}
+			}
+
+			// At last, all is OK!
+			return true;
+
+		break;
+
+		case RFC2445_TYPE_TEXT:
+			return true;
+		break;
+
+		case RFC2445_TYPE_TIME:
+			if(is_int($value)) {
+				if($value < 0) {
+					return false;
+				}
+				$value = "$value";
+			}
+			else if(!is_string($value)) {
+				return false;
+			}
+
+			if(strlen($value) == 7) {
+				if(strtoupper(substr($value, -1)) != 'Z') {
+					return false;
+				}
+				$value = substr($value, 0, 6);
+			}
+			if(strlen($value) != 6) {
+				return false;
+			}
+
+			$h = intval(substr($value, 0, 2));
+			$m = intval(substr($value, 2, 2));
+			$s = intval(substr($value, 4, 2));
+
+			return ($h <= 23 && $m <= 59 && $s <= 60);
+		break;
+
+		case RFC2445_TYPE_UTC_OFFSET:
+			if(is_int($value)) {
+				if($value >= 0) {
+					$value = "+$value";
+				}
+				else {
+					$value = "$value";
+				}
+			}
+			else if(!is_string($value)) {
+				return false;
+			}
+
+			if(strlen($value) == 7) {
+				$s = intval(substr($value, 5, 2));
+				$value = substr($value, 0, 5);
+			}
+			if(strlen($value) != 5 || $value == "-0000") {
+				return false;
+			}
+
+			if($value{0} != '+' && $value{0} != '-') {
+				return false;
+			}
+
+			$h = intval(substr($value, 1, 2));
+			$m = intval(substr($value, 3, 2));
+
+			return ($h <= 23 && $m <= 59 && $s <= 59);
+		break;
+	}
+
+	// TODO: remove this assertion
+	trigger_error('bad code path', E_USER_WARNING);
+	var_dump($type);
+	return false;
 }
 
 function rfc2445_do_value_formatting($value, $type) {
-    // Note: this does not only do formatting; it also does conversion to string!
-    switch($type) {
-        case RFC2445_TYPE_CAL_ADDRESS:
-        case RFC2445_TYPE_URI:
-            // Enclose in double quotes
-            $value = '"'.$value.'"';
-        break;
-        case RFC2445_TYPE_TEXT:
-            // Escape entities
-            $value = strtr($value, array("\n" => '\\n', '\\' => '\\\\', ',' => '\\,', ';' => '\\;'));
-        break;
-    }
-    return $value;
+	// Note: this does not only do formatting; it also does conversion to string!
+	switch($type) {
+		case RFC2445_TYPE_CAL_ADDRESS:
+		case RFC2445_TYPE_URI:
+			// Enclose in double quotes
+			$value = '"'.$value.'"';
+		break;
+		case RFC2445_TYPE_TEXT:
+			// Escape entities
+			$value = strtr($value, array("\n" => '\\n', '\\' => '\\\\', ',' => '\\,', ';' => '\\;'));
+		break;
+	}
+	return $value;
 }
 
 function rfc2445_undo_value_formatting($value, $type) {
-    switch($type) {
-        case RFC2445_TYPE_CAL_ADDRESS:
-        case RFC2445_TYPE_URI:
-            // Trim beginning and end double quote
-            $value = substr($value, 1, strlen($value) - 2);
-        break;
-        case RFC2445_TYPE_TEXT:
-            // Unescape entities
-            $value = strtr($value, array('\\n' => "\n", '\\N' => "\n", '\\\\' => '\\', '\\,' => ',', '\\;' => ';'));
-        break;
-    }
-    return $value;
+	switch($type) {
+		case RFC2445_TYPE_CAL_ADDRESS:
+		case RFC2445_TYPE_URI:
+			// Trim beginning and end double quote
+			$value = substr($value, 1, strlen($value) - 2);
+		break;
+		case RFC2445_TYPE_TEXT:
+			// Unescape entities
+			$value = strtr($value, array('\\n' => "\n", '\\N' => "\n", '\\\\' => '\\', '\\,' => ',', '\\;' => ';'));
+		break;
+	}
+	return $value;
 }
 
 ?>