EGroupware / egroupware

api/src/Mail.php

Indentation +7 added lines, -7 removed lines

@@ -6730,14 +6730,14 @@
 					{
 						if ($this->folderExists($_folder,true))
 						{
-						    if($this->isSentFolder($_folder))
+							if($this->isSentFolder($_folder))
 							{
-						        $flags = '\\Seen';
-						    } elseif($this->isDraftFolder($_folder)) {
-						        $flags = '\\Draft';
-						    } else {
-						        $flags = '';
-						    }
+								$flags = '\\Seen';
+							} elseif($this->isDraftFolder($_folder)) {
+								$flags = '\\Draft';
+							} else {
+								$flags = '';
+							}
 							$savefailed = false;
 							try
 							{

api/src/WebDAV/Tools/_parse_lockinfo.php

Indentation +203 added lines, -203 removed lines

@@ -43,209 +43,209 @@
  */
 class _parse_lockinfo
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * lock type, currently only "write"
-     *
-     * @var string
-     * @access public
-     */
-    var $locktype = "";
-
-    /**
-     * lock scope, "shared" or "exclusive"
-     *
-     * @var string
-     * @access public
-     */
-    var $lockscope = "";
-
-    /**
-     * lock owner information
-     *
-     * @var string
-     * @access public
-     */
-    var $owner = "";
-
-    /**
-     * flag that is set during lock owner read
-     *
-     * @var bool
-     * @access private
-     */
-    var $collect_owner = false;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of stream to read
-     * @access public
-     */
-    function __construct($path)
-    {
-        // we assume success unless problems occur
-        $this->success = true;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        // create namespace aware parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        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);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        // check if required tags where found
-        $this->success &= !empty($this->locktype);
-        $this->success &= !empty($this->lockscope);
-
-        // free parser resource
-        xml_parser_free($xml_parser);
-
-        // close input stream
-        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)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-
-        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:") {
-            // parse only the essential tags
-            switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        // only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-        // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
-            $this->collect_owner = false;
-        }
-
-        // within <owner> we have to collect everything
-        if ($this->collect_owner) {
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "</$ns_short$tag$ns_attr>";
-        }
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * lock type, currently only "write"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $locktype = "";
+
+	/**
+	 * lock scope, "shared" or "exclusive"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $lockscope = "";
+
+	/**
+	 * lock owner information
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $owner = "";
+
+	/**
+	 * flag that is set during lock owner read
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $collect_owner = false;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of stream to read
+	 * @access public
+	 */
+	function __construct($path)
+	{
+		// we assume success unless problems occur
+		$this->success = true;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		// create namespace aware parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		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);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		// check if required tags where found
+		$this->success &= !empty($this->locktype);
+		$this->success &= !empty($this->lockscope);
+
+		// free parser resource
+		xml_parser_free($xml_parser);
+
+		// close input stream
+		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)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+
+		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:") {
+			// parse only the essential tags
+			switch ($tag) {
+			case "write":
+				$this->locktype = $tag;
+				break;
+			case "exclusive":
+			case "shared":
+				$this->lockscope = $tag;
+				break;
+			case "owner":
+				$this->collect_owner = true;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		// only the <owner> tag has data content
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+		// <owner> finished?
+		if (($ns == "DAV:") && ($tag == "owner")) {
+			$this->collect_owner = false;
+		}
+
+		// within <owner> we have to collect everything
+		if ($this->collect_owner) {
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "</$ns_short$tag$ns_attr>";
+		}
+	}
 }
 
 ?>

api/src/WebDAV/Tools/_parse_proppatch.php

Indentation +192 added lines, -192 removed lines

@@ -43,198 +43,198 @@
  */
 class _parse_proppatch
 {
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $success;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $props;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $depth;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $mode;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $current;
-
-    /**
-     * On return whole request, if $store_request == true was specified in constructor
-     *
-     * @var string
-     */
-    var $request;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of input stream
-     * @param boolean $store_request =false if true whole request data will be made available in $this->request
-     * @access public
-     */
-    function __construct($path, $store_request=false)
-    {
-        $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 ($store_request) $this->request .= $line;
-            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";
-            if (isset($attr)) {
-                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;
-        }
-    }
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $success;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $props;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $depth;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $mode;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $current;
+
+	/**
+	 * On return whole request, if $store_request == true was specified in constructor
+	 *
+	 * @var string
+	 */
+	var $request;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of input stream
+	 * @param boolean $store_request =false if true whole request data will be made available in $this->request
+	 * @access public
+	 */
+	function __construct($path, $store_request=false)
+	{
+		$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 ($store_request) $this->request .= $line;
+			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";
+			if (isset($attr)) {
+				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;
+		}
+	}
 }
 
 /*

api/src/WebDAV/Tools/_parse_propfind.php

Indentation +207 added lines, -207 removed lines

@@ -42,244 +42,244 @@
  */
 class _parse_propfind
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
 
-    /**
-     * found properties are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $props = false;
+	/**
+	 * found properties are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $props = false;
 
-    /**
-     * found (CalDAV) filters are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $filters = false;
+	/**
+	 * found (CalDAV) filters are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $filters = false;
 
-    /**
-     * found other tags, eg. CalDAV calendar-multiget href's
-     *
-     * @var array
-     * @access public
-     */
-    var $other = false;
+	/**
+	 * found other tags, eg. CalDAV calendar-multiget href's
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $other = false;
 
-    /**
-     * what we are currently parsing: props or filters
-     *
-     * @var array
-     * @access private
-     */
-    var $use = 'props';
+	/**
+	 * what we are currently parsing: props or filters
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $use = 'props';
 
-    /**
-     * Root tag, usually 'propfind' for PROPFIND, but can be eg. 'calendar-query' or 'calendar-multiget' for CalDAV REPORT
-     *
-     * @var array with keys 'name' and 'ns'
-     */
-    var $root;
+	/**
+	 * Root tag, usually 'propfind' for PROPFIND, but can be eg. 'calendar-query' or 'calendar-multiget' for CalDAV REPORT
+	 *
+	 * @var array with keys 'name' and 'ns'
+	 */
+	var $root;
 
-    /**
-     * internal tag nesting depth counter
-     *
-     * @var int
-     * @access private
-     */
-    var $depth = 0;
+	/**
+	 * internal tag nesting depth counter
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $depth = 0;
 
-    /**
-     * On return whole request, if $store_request == true was specified in constructor
-     *
-     * @var string
-     */
-    var $request;
+	/**
+	 * On return whole request, if $store_request == true was specified in constructor
+	 *
+	 * @var string
+	 */
+	var $request;
 
-    /**
-     * constructor
-     *
-     * @access public
-     * @param string $path
-     * @param boolean $store_request =false if true whole request data will be made available in $this->request
-     */
-    function __construct($path, $store_request=false)
-    {
-        // success state flag
-        $this->success = true;
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @param string $path
+	 * @param boolean $store_request =false if true whole request data will be made available in $this->request
+	 */
+	function __construct($path, $store_request=false)
+	{
+		// success state flag
+		$this->success = true;
 
-        // property storage array
-        $this->props = array();
+		// property storage array
+		$this->props = array();
 
-        // internal tag depth counter
-        $this->depth = 0;
+		// internal tag depth counter
+		$this->depth = 0;
 
-        // remember if any input was parsed
-        $had_input = false;
+		// remember if any input was parsed
+		$had_input = false;
 
-        // open input stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
+		// open input stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
 
-        // create XML parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
+		// create XML parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
 
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
 
 		xml_set_character_data_handler($xml_parser,
-            array(&$this,'_charData')
-        );
+			array(&$this,'_charData')
+		);
 
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
 
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if ($store_request) $this->request .= $line;
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
 
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
 
-        // free parser
-        xml_parser_free($xml_parser);
+		// free parser
+		xml_parser_free($xml_parser);
 
-        // close input stream
-        fclose($f_in);
+		// close input stream
+		fclose($f_in);
 
-        // if no input was parsed it was a request
-        if(!count($this->props)) $this->props = "all"; // default
-    }
+		// if no input was parsed it was a request
+		if(!count($this->props)) $this->props = "all"; // default
+	}
 
 
-    /**
-     * 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, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
+	/**
+	 * 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, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
 
-        // record root tag
-        if ($this->depth == 0) {
-        	$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
-        }
-        // special tags at level 1: <allprop> and <propname>
-        if ($this->depth == 1) {
-         	$this->use = 'props';
-            switch ($tag)
-            {
-            	case "allprop":
-                	$this->props = "all";
+		// record root tag
+		if ($this->depth == 0) {
+			$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
+		}
+		// special tags at level 1: <allprop> and <propname>
+		if ($this->depth == 1) {
+		 	$this->use = 'props';
+			switch ($tag)
+			{
+				case "allprop":
+					$this->props = "all";
 					break;
-            	case "propname":
-               		$this->props = "names";
-               		break;
-            	case 'prop':
-           			break;
-            	case 'filter':
-            		$this->use = 'filters';
-            		$this->filters['attrs'] = $attrs;	// need attrs eg. <filters test="(anyof|alloff)">
-            		break;
-            	default:
-            		$this->use = 'other';
-            		break;
-            }
-        }
+				case "propname":
+			   		$this->props = "names";
+			   		break;
+				case 'prop':
+		   			break;
+				case 'filter':
+					$this->use = 'filters';
+					$this->filters['attrs'] = $attrs;	// need attrs eg. <filters test="(anyof|alloff)">
+					break;
+				default:
+					$this->use = 'other';
+					break;
+			}
+		}
 		//echo "$this->depth: use=$this->use $ns:$tag attrs=".array2string($attrs)."\n";
 
-        // requested properties are found at level 2
-        // CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
-        if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
-        	$this->use == 'props' && $this->depth >= 2) {
-            $prop = array("name" => $tag);
-            if ($ns)
-                $prop["xmlns"] = $ns;
-            if ($this->use != 'props' || $this->depth > 2) {
-            	$prop['attrs'] = $attrs;
-            	$prop['depth'] = $this->depth;
-            }
-            // collect sub-elements of props in the original props children attribute
-            // eg. required for CalDAV <calendar-data><expand start="..." end="..."/></calendar-data>
-            if ($this->use == 'props' && $this->depth > 2)
-            {
-            	$this->last_prop['children'][$tag] = $prop;
-            }
-            else
-            {
-	         	// this can happen if we have allprop and prop in one propfind:
-	        	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
-	            if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
-	            $this->{$this->use}[] =& $prop;
-	            $this->last_prop =& $prop;
-	            unset($prop);
-            }
-        }
+		// requested properties are found at level 2
+		// CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
+		if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
+			$this->use == 'props' && $this->depth >= 2) {
+			$prop = array("name" => $tag);
+			if ($ns)
+				$prop["xmlns"] = $ns;
+			if ($this->use != 'props' || $this->depth > 2) {
+				$prop['attrs'] = $attrs;
+				$prop['depth'] = $this->depth;
+			}
+			// collect sub-elements of props in the original props children attribute
+			// eg. required for CalDAV <calendar-data><expand start="..." end="..."/></calendar-data>
+			if ($this->use == 'props' && $this->depth > 2)
+			{
+				$this->last_prop['children'][$tag] = $prop;
+			}
+			else
+			{
+			 	// this can happen if we have allprop and prop in one propfind:
+				// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
+				if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
+				$this->{$this->use}[] =& $prop;
+				$this->last_prop =& $prop;
+				unset($prop);
+			}
+		}
 
-        // increment depth count
-        $this->depth++;
-    }
+		// 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--;
-    }
+	/**
+	 * 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--;
+	}
 
 
-    /**
-     * char data handler for non prop tags, eg. href's in CalDAV multiget, or filter contents
-     *
-     * @access private
-     * @param  resource  parser
-     * @param  string    character data
-     */
-    function _charData($parser, $data)
-    {
-        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
-        	$this->{$this->use}[$n-1]['data'] = $data;
-        }
-    }
+	/**
+	 * char data handler for non prop tags, eg. href's in CalDAV multiget, or filter contents
+	 *
+	 * @access private
+	 * @param  resource  parser
+	 * @param  string    character data
+	 */
+	function _charData($parser, $data)
+	{
+		if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
+			$this->{$this->use}[$n-1]['data'] = $data;
+		}
+	}
 }

api/src/WebDAV/Server/Filesystem.php

Indentation +827 added lines, -827 removed lines

@@ -44,793 +44,793 @@ 
  */
 class HTTP_WebDAV_Server_Filesystem extends HTTP_WebDAV_Server
 {
-    /**
-     * Root directory for WebDAV access
-     *
-     * Defaults to webserver document root (set by ServeRequest)
-     *
-     * @access private
-     * @var    string
-     */
-    var $base = "";
-
-    /**
-     * MySQL Host where property and locking information is stored
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_host = "localhost";
-
-    /**
-     * MySQL database for property/locking information storage
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_name = "webdav";
-
-    /**
-     * MySQL table name prefix
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_prefix = "";
-
-    /**
-     * MySQL user for property/locking db access
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_user = "root";
-
-    /**
-     * MySQL password for property/locking db access
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_passwd = "";
-
-    /**
-     * Serve a webdav request
-     *
-     * @access public
-     * @param  string
-     */
-    function ServeRequest($base = false)
-    {
-        // special treatment for litmus compliance test
-        // reply on its identifier header
-        // not needed for the test itself but eases debugging
-        if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
-            error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
-            header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
-        }
-
-        // set root directory, defaults to webserver document root if not set
-        if ($base) {
-            $this->base = realpath($base); // TODO throw if not a directory
-        } else if (!$this->base) {
-            $this->base = $this->_SERVER['DOCUMENT_ROOT'];
-        }
-
-        // establish connection to property/locking db
-        mysql_connect($this->db_host, $this->db_user, $this->db_passwd) or die(mysql_error());
-        mysql_select_db($this->db_name) or die(mysql_error());
-        // TODO throw on connection problems
-
-        // let the base class do all the work
-        parent::ServeRequest();
-    }
-
-    /**
-     * No authentication is needed here
-     *
-     * @access private
-     * @param  string  HTTP Authentication type (Basic, Digest, ...)
-     * @param  string  Username
-     * @param  string  Password
-     * @return bool    true on successful authentication
-     */
-    function check_auth($type, $user, $pass)
-    {
-        return true;
-    }
-
-
-    /**
-     * PROPFIND method handler
-     *
-     * @param  array  general parameter passing array
-     * @param  array  return array for file properties
-     * @return bool   true on success
-     */
-    function PROPFIND(&$options, &$files)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // sanity check
-        if (!file_exists($fspath)) {
-            return false;
-        }
-
-        // prepare property array
-        $files["files"] = array();
-
-        // store information for the requested path itself
-        $files["files"][] = $this->fileinfo($options["path"]);
-
-        // information for contained resources requested?
-        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
-
-            // make sure path ends with '/'
-            $options["path"] = $this->_slashify($options["path"]);
-
-            // try to open directory
-            $handle = opendir($fspath);
-
-            if ($handle) {
-                // ok, now get all its contents
-                while ($filename = readdir($handle)) {
-                    if ($filename != "." && $filename != "..") {
-                        $files["files"][] = $this->fileinfo($options["path"].$filename);
-                    }
-                }
-                // TODO recursion needed if "Depth: infinite"
-            	closedir($handle);
-            }
-        }
-
-        // ok, all done
-        return true;
-    }
-
-    /**
-     * Get properties for a single file/resource
-     *
-     * @param  string  resource path
-     * @return array   resource properties
-     */
-    function fileinfo($path)
-    {
-        // map URI path to filesystem path
-        $fspath = $this->base . $path;
-
-        // create result array
-        $info = array();
-        // TODO remove slash append code when base clase is able to do it itself
-        $info["path"]  = is_dir($fspath) ? $this->_slashify($path) : $path;
-        $info["props"] = array();
-
-        // no special beautified displayname here ...
-        $info["props"][] = $this->mkprop("displayname", strtoupper($path));
-
-        // creation and modification time
-        $info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
-        $info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
-
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
-
-        // type and size (caller already made sure that path exists)
-        if (is_dir($fspath)) {
-            // directory (WebDAV collection)
-            $info["props"][] = $this->mkprop("resourcetype", "collection");
-            $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
-        } else {
-            // plain file (WebDAV resource)
-            $info["props"][] = $this->mkprop("resourcetype", "");
-            if ($this->_is_readable($fspath)) {
-                $info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
-            } else {
-                $info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
-            }
-            $info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
-        }
-
-        // get additional properties from database
-        $query = "SELECT ns, name, value
+	/**
+	 * Root directory for WebDAV access
+	 *
+	 * Defaults to webserver document root (set by ServeRequest)
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $base = "";
+
+	/**
+	 * MySQL Host where property and locking information is stored
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_host = "localhost";
+
+	/**
+	 * MySQL database for property/locking information storage
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_name = "webdav";
+
+	/**
+	 * MySQL table name prefix
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_prefix = "";
+
+	/**
+	 * MySQL user for property/locking db access
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_user = "root";
+
+	/**
+	 * MySQL password for property/locking db access
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_passwd = "";
+
+	/**
+	 * Serve a webdav request
+	 *
+	 * @access public
+	 * @param  string
+	 */
+	function ServeRequest($base = false)
+	{
+		// special treatment for litmus compliance test
+		// reply on its identifier header
+		// not needed for the test itself but eases debugging
+		if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
+			error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
+			header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
+		}
+
+		// set root directory, defaults to webserver document root if not set
+		if ($base) {
+			$this->base = realpath($base); // TODO throw if not a directory
+		} else if (!$this->base) {
+			$this->base = $this->_SERVER['DOCUMENT_ROOT'];
+		}
+
+		// establish connection to property/locking db
+		mysql_connect($this->db_host, $this->db_user, $this->db_passwd) or die(mysql_error());
+		mysql_select_db($this->db_name) or die(mysql_error());
+		// TODO throw on connection problems
+
+		// let the base class do all the work
+		parent::ServeRequest();
+	}
+
+	/**
+	 * No authentication is needed here
+	 *
+	 * @access private
+	 * @param  string  HTTP Authentication type (Basic, Digest, ...)
+	 * @param  string  Username
+	 * @param  string  Password
+	 * @return bool    true on successful authentication
+	 */
+	function check_auth($type, $user, $pass)
+	{
+		return true;
+	}
+
+
+	/**
+	 * PROPFIND method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @param  array  return array for file properties
+	 * @return bool   true on success
+	 */
+	function PROPFIND(&$options, &$files)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// sanity check
+		if (!file_exists($fspath)) {
+			return false;
+		}
+
+		// prepare property array
+		$files["files"] = array();
+
+		// store information for the requested path itself
+		$files["files"][] = $this->fileinfo($options["path"]);
+
+		// information for contained resources requested?
+		if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
+
+			// make sure path ends with '/'
+			$options["path"] = $this->_slashify($options["path"]);
+
+			// try to open directory
+			$handle = opendir($fspath);
+
+			if ($handle) {
+				// ok, now get all its contents
+				while ($filename = readdir($handle)) {
+					if ($filename != "." && $filename != "..") {
+						$files["files"][] = $this->fileinfo($options["path"].$filename);
+					}
+				}
+				// TODO recursion needed if "Depth: infinite"
+				closedir($handle);
+			}
+		}
+
+		// ok, all done
+		return true;
+	}
+
+	/**
+	 * Get properties for a single file/resource
+	 *
+	 * @param  string  resource path
+	 * @return array   resource properties
+	 */
+	function fileinfo($path)
+	{
+		// map URI path to filesystem path
+		$fspath = $this->base . $path;
+
+		// create result array
+		$info = array();
+		// TODO remove slash append code when base clase is able to do it itself
+		$info["path"]  = is_dir($fspath) ? $this->_slashify($path) : $path;
+		$info["props"] = array();
+
+		// no special beautified displayname here ...
+		$info["props"][] = $this->mkprop("displayname", strtoupper($path));
+
+		// creation and modification time
+		$info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
+		$info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
+
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
+
+		// type and size (caller already made sure that path exists)
+		if (is_dir($fspath)) {
+			// directory (WebDAV collection)
+			$info["props"][] = $this->mkprop("resourcetype", "collection");
+			$info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
+		} else {
+			// plain file (WebDAV resource)
+			$info["props"][] = $this->mkprop("resourcetype", "");
+			if ($this->_is_readable($fspath)) {
+				$info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
+			} else {
+				$info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
+			}
+			$info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
+		}
+
+		// get additional properties from database
+		$query = "SELECT ns, name, value
                         FROM {$this->db_prefix}properties
                        WHERE path = '$path'";
-        $res = mysql_query($query);
-        while ($row = mysql_fetch_assoc($res)) {
-            $info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
-        }
-        mysql_free_result($res);
-
-        return $info;
-    }
-
-    /**
-     * detect if a given program is found in the search PATH
-     *
-     * helper function used by _mimetype() to detect if the
-     * external 'file' utility is available
-     *
-     * @param  string  program name
-     * @param  string  optional search path, defaults to $PATH
-     * @return bool    true if executable program found in path
-     */
-    function _can_execute($name, $path = false)
-    {
-        // path defaults to PATH from environment if not set
-        if ($path === false) {
-            $path = getenv("PATH");
-        }
-
-        // check method depends on operating system
-        if (!strncmp(PHP_OS, "WIN", 3)) {
-            // on Windows an appropriate COM or EXE file needs to exist
-            $exts     = array(".exe", ".com");
-            $check_fn = "file_exists";
-        } else {
-            // anywhere else we look for an executable file of that name
-            $exts     = array("");
-            $check_fn = "is_executable";
-        }
-
-        // now check the directories in the path for the program
-        foreach (explode(PATH_SEPARATOR, $path) as $dir) {
-            // skip invalid path entries
-            if (!file_exists($dir)) continue;
-            if (!is_dir($dir)) continue;
-
-            // and now look for the file
-            foreach ($exts as $ext) {
-                if ($check_fn("$dir/$name".$ext)) return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if path is readable by current user
-     *
-     * Allow extending classes to overwrite it
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * Allow extending classes to overwrite it
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return is_writable($fspath);
-    }
-
-    /**
-     * try to detect the mime type of a file
-     *
-     * @param  string  file path
-     * @return string  guessed mime type
-     */
-    function _mimetype($fspath)
-    {
-        if (is_dir($fspath)) {
-            // directories are easy
-            return "httpd/unix-directory";
-        } else if (function_exists("mime_content_type")) {
-            // use mime magic extension if available
-            $mime_type = mime_content_type($fspath);
-        } else if ($this->_can_execute("file")) {
-            // it looks like we have a 'file' command,
-            // lets see it it does have mime support
-            $fp    = popen("file -i '$fspath' 2>/dev/null", "r");
-            $reply = fgets($fp);
-            pclose($fp);
-
-            // popen will not return an error if the binary was not found
-            // and find may not have mime support using "-i"
-            // so we test the format of the returned string
-
-            // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
-                $reply = substr($reply, strlen($fspath)+2);
-                // followed by the mime type (maybe including options)
-                if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
-                    $mime_type = $matches[0];
-                }
-            }
-        }
-
-        if (empty($mime_type)) {
-            // Fallback solution: try to guess the type by the file extension
-            // TODO: add more ...
-            // TODO: it has been suggested to delegate mimetype detection
-            //       to apache but this has at least three issues:
-            //       - works only with apache
-            //       - needs file to be within the document tree
-            //       - requires apache mod_magic
-            // TODO: can we use the registry for this on Windows?
-            //       OTOH if the server is Windos the clients are likely to
-            //       be Windows, too, and tend do ignore the Content-Type
-            //       anyway (overriding it with information taken from
-            //       the registry)
-            // TODO: have a seperate PEAR class for mimetype detection?
-            switch (strtolower(strrchr(basename($fspath), "."))) {
-            case ".html":
-                $mime_type = "text/html";
-                break;
-            case ".gif":
-                $mime_type = "image/gif";
-                break;
-            case ".jpg":
-                $mime_type = "image/jpeg";
-                break;
-            default:
-                $mime_type = "application/octet-stream";
-                break;
-            }
-        }
-
-        return $mime_type;
-    }
-
-    /**
-     * HEAD method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function HEAD(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // sanity check
-        if (!file_exists($fspath)) return false;
-
-        // detect resource type
-        $options['mimetype'] = $this->_mimetype($fspath);
-
-        // detect modification time
-        // see rfc2518, section 13.7
-        // some clients seem to treat this as a reverse rule
-        // requiering a Last-Modified header if the getlastmodified header was set
-        $options['mtime'] = filemtime($fspath);
-
-        // detect resource size
-        $options['size'] = filesize($fspath);
-
-        return true;
-    }
-
-    /**
-     * GET method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function GET(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // is this a collection?
-        if (is_dir($fspath)) {
-            return $this->GetDir($fspath, $options);
-        }
-
-        // the header output is the same as for HEAD
-        if (!$this->HEAD($options)) {
-            return false;
-        }
-
-        // no need to check result here, it is handled by the base class
-        $options['stream'] = fopen($fspath, "r");
-
-        return true;
-    }
-
-    /**
-     * GET method handler for directories
-     *
-     * This is a very simple mod_index lookalike.
-     * See RFC 2518, Section 8.4 on GET/HEAD for collections
-     *
-     * @param  string  directory path
-     * @return void    function has to handle HTTP response itself
-     */
-    function GetDir($fspath, &$options)
-    {
-        $path = $this->_slashify($options["path"]);
-        if ($path != $options["path"]) {
-            header("Location: ".$this->base_uri.$path);
-            exit;
-        }
-
-        // fixed width directory column format
-        $format = "%15s  %-19s  %-s\n";
-
-        if (!$this->_is_readable($fspath)) {
-            return false;
-        }
-
-        $handle = opendir($fspath);
-        if (!$handle) {
-            return false;
-        }
-
-        echo "<html><head><title>Index of ".htmlspecialchars(urldecode($options['path']))."</title></head>\n";
-
-        echo "<h1>Index of ".htmlspecialchars($options['path'])."</h1>\n";
-
-        echo "<pre>";
-        printf($format, "Size", "Last modified", "Filename");
-        echo "<hr>";
-
-        while ($filename = readdir($handle)) {
-            if ($filename != "." && $filename != "..") {
-                $fullpath = $fspath.$filename;
-                $name     = htmlspecialchars($filename);
-                printf($format,
-                       number_format(filesize($fullpath)),
-                       strftime("%Y-%m-%d %H:%M:%S", filemtime($fullpath)),
-                       '<a href="'.$name.'">'.urldecode($name).'</a>');
-            }
-        }
-
-        echo "</pre>";
-
-        closedir($handle);
-
-        echo "</html>\n";
-
-        exit;
-    }
-
-    /**
-     * PUT method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function PUT(&$options)
-    {
-        $fspath = $this->base . $options["path"];
-
-        $dir = dirname($fspath);
-        if (!file_exists($dir) || !is_dir($dir)) {
-            return "409 Conflict"; // TODO right status code for both?
-        }
-
-        $options["new"] = ! file_exists($fspath);
-
-        if ($options["new"] && !$this->_is_writable($dir)) {
-            return "403 Forbidden";
-        }
-        if (!$options["new"] && !$this->_is_writable($fspath)) {
-            return "403 Forbidden";
-        }
-        if (!$options["new"] && is_dir($fspath)) {
-            return "403 Forbidden";
-        }
-
-        $fp = fopen($fspath, "w");
-
-        return $fp;
-    }
-
-
-    /**
-     * MKCOL method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MKCOL($options)
-    {
-        $path   = $this->base .$options["path"];
-        $parent = dirname($path);
-        $name   = basename($path);
-
-        if (!file_exists($parent)) {
-            return "409 Conflict";
-        }
-
-        if (!is_dir($parent)) {
-            return "403 Forbidden";
-        }
-
-        if ( file_exists($parent."/".$name) ) {
-            return "405 Method not allowed";
-        }
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        $stat = mkdir($parent."/".$name, 0777);
-        if (!$stat) {
-            return "403 Forbidden";
-        }
-
-        return ("201 Created");
-    }
-
-
-    /**
-     * DELETE method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function DELETE($options)
-    {
-        $path = $this->base . "/" .$options["path"];
-
-        if (!file_exists($path)) {
-            return "404 Not found";
-        }
-
-        if (is_dir($path)) {
-            $query = "DELETE FROM {$this->db_prefix}properties
+		$res = mysql_query($query);
+		while ($row = mysql_fetch_assoc($res)) {
+			$info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
+		}
+		mysql_free_result($res);
+
+		return $info;
+	}
+
+	/**
+	 * detect if a given program is found in the search PATH
+	 *
+	 * helper function used by _mimetype() to detect if the
+	 * external 'file' utility is available
+	 *
+	 * @param  string  program name
+	 * @param  string  optional search path, defaults to $PATH
+	 * @return bool    true if executable program found in path
+	 */
+	function _can_execute($name, $path = false)
+	{
+		// path defaults to PATH from environment if not set
+		if ($path === false) {
+			$path = getenv("PATH");
+		}
+
+		// check method depends on operating system
+		if (!strncmp(PHP_OS, "WIN", 3)) {
+			// on Windows an appropriate COM or EXE file needs to exist
+			$exts     = array(".exe", ".com");
+			$check_fn = "file_exists";
+		} else {
+			// anywhere else we look for an executable file of that name
+			$exts     = array("");
+			$check_fn = "is_executable";
+		}
+
+		// now check the directories in the path for the program
+		foreach (explode(PATH_SEPARATOR, $path) as $dir) {
+			// skip invalid path entries
+			if (!file_exists($dir)) continue;
+			if (!is_dir($dir)) continue;
+
+			// and now look for the file
+			foreach ($exts as $ext) {
+				if ($check_fn("$dir/$name".$ext)) return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * Allow extending classes to overwrite it
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * Allow extending classes to overwrite it
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return is_writable($fspath);
+	}
+
+	/**
+	 * try to detect the mime type of a file
+	 *
+	 * @param  string  file path
+	 * @return string  guessed mime type
+	 */
+	function _mimetype($fspath)
+	{
+		if (is_dir($fspath)) {
+			// directories are easy
+			return "httpd/unix-directory";
+		} else if (function_exists("mime_content_type")) {
+			// use mime magic extension if available
+			$mime_type = mime_content_type($fspath);
+		} else if ($this->_can_execute("file")) {
+			// it looks like we have a 'file' command,
+			// lets see it it does have mime support
+			$fp    = popen("file -i '$fspath' 2>/dev/null", "r");
+			$reply = fgets($fp);
+			pclose($fp);
+
+			// popen will not return an error if the binary was not found
+			// and find may not have mime support using "-i"
+			// so we test the format of the returned string
+
+			// the reply begins with the requested filename
+			if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
+				$reply = substr($reply, strlen($fspath)+2);
+				// followed by the mime type (maybe including options)
+				if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
+					$mime_type = $matches[0];
+				}
+			}
+		}
+
+		if (empty($mime_type)) {
+			// Fallback solution: try to guess the type by the file extension
+			// TODO: add more ...
+			// TODO: it has been suggested to delegate mimetype detection
+			//       to apache but this has at least three issues:
+			//       - works only with apache
+			//       - needs file to be within the document tree
+			//       - requires apache mod_magic
+			// TODO: can we use the registry for this on Windows?
+			//       OTOH if the server is Windos the clients are likely to
+			//       be Windows, too, and tend do ignore the Content-Type
+			//       anyway (overriding it with information taken from
+			//       the registry)
+			// TODO: have a seperate PEAR class for mimetype detection?
+			switch (strtolower(strrchr(basename($fspath), "."))) {
+			case ".html":
+				$mime_type = "text/html";
+				break;
+			case ".gif":
+				$mime_type = "image/gif";
+				break;
+			case ".jpg":
+				$mime_type = "image/jpeg";
+				break;
+			default:
+				$mime_type = "application/octet-stream";
+				break;
+			}
+		}
+
+		return $mime_type;
+	}
+
+	/**
+	 * HEAD method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function HEAD(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// sanity check
+		if (!file_exists($fspath)) return false;
+
+		// detect resource type
+		$options['mimetype'] = $this->_mimetype($fspath);
+
+		// detect modification time
+		// see rfc2518, section 13.7
+		// some clients seem to treat this as a reverse rule
+		// requiering a Last-Modified header if the getlastmodified header was set
+		$options['mtime'] = filemtime($fspath);
+
+		// detect resource size
+		$options['size'] = filesize($fspath);
+
+		return true;
+	}
+
+	/**
+	 * GET method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function GET(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// is this a collection?
+		if (is_dir($fspath)) {
+			return $this->GetDir($fspath, $options);
+		}
+
+		// the header output is the same as for HEAD
+		if (!$this->HEAD($options)) {
+			return false;
+		}
+
+		// no need to check result here, it is handled by the base class
+		$options['stream'] = fopen($fspath, "r");
+
+		return true;
+	}
+
+	/**
+	 * GET method handler for directories
+	 *
+	 * This is a very simple mod_index lookalike.
+	 * See RFC 2518, Section 8.4 on GET/HEAD for collections
+	 *
+	 * @param  string  directory path
+	 * @return void    function has to handle HTTP response itself
+	 */
+	function GetDir($fspath, &$options)
+	{
+		$path = $this->_slashify($options["path"]);
+		if ($path != $options["path"]) {
+			header("Location: ".$this->base_uri.$path);
+			exit;
+		}
+
+		// fixed width directory column format
+		$format = "%15s  %-19s  %-s\n";
+
+		if (!$this->_is_readable($fspath)) {
+			return false;
+		}
+
+		$handle = opendir($fspath);
+		if (!$handle) {
+			return false;
+		}
+
+		echo "<html><head><title>Index of ".htmlspecialchars(urldecode($options['path']))."</title></head>\n";
+
+		echo "<h1>Index of ".htmlspecialchars($options['path'])."</h1>\n";
+
+		echo "<pre>";
+		printf($format, "Size", "Last modified", "Filename");
+		echo "<hr>";
+
+		while ($filename = readdir($handle)) {
+			if ($filename != "." && $filename != "..") {
+				$fullpath = $fspath.$filename;
+				$name     = htmlspecialchars($filename);
+				printf($format,
+					   number_format(filesize($fullpath)),
+					   strftime("%Y-%m-%d %H:%M:%S", filemtime($fullpath)),
+					   '<a href="'.$name.'">'.urldecode($name).'</a>');
+			}
+		}
+
+		echo "</pre>";
+
+		closedir($handle);
+
+		echo "</html>\n";
+
+		exit;
+	}
+
+	/**
+	 * PUT method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function PUT(&$options)
+	{
+		$fspath = $this->base . $options["path"];
+
+		$dir = dirname($fspath);
+		if (!file_exists($dir) || !is_dir($dir)) {
+			return "409 Conflict"; // TODO right status code for both?
+		}
+
+		$options["new"] = ! file_exists($fspath);
+
+		if ($options["new"] && !$this->_is_writable($dir)) {
+			return "403 Forbidden";
+		}
+		if (!$options["new"] && !$this->_is_writable($fspath)) {
+			return "403 Forbidden";
+		}
+		if (!$options["new"] && is_dir($fspath)) {
+			return "403 Forbidden";
+		}
+
+		$fp = fopen($fspath, "w");
+
+		return $fp;
+	}
+
+
+	/**
+	 * MKCOL method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MKCOL($options)
+	{
+		$path   = $this->base .$options["path"];
+		$parent = dirname($path);
+		$name   = basename($path);
+
+		if (!file_exists($parent)) {
+			return "409 Conflict";
+		}
+
+		if (!is_dir($parent)) {
+			return "403 Forbidden";
+		}
+
+		if ( file_exists($parent."/".$name) ) {
+			return "405 Method not allowed";
+		}
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		$stat = mkdir($parent."/".$name, 0777);
+		if (!$stat) {
+			return "403 Forbidden";
+		}
+
+		return ("201 Created");
+	}
+
+
+	/**
+	 * DELETE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function DELETE($options)
+	{
+		$path = $this->base . "/" .$options["path"];
+
+		if (!file_exists($path)) {
+			return "404 Not found";
+		}
+
+		if (is_dir($path)) {
+			$query = "DELETE FROM {$this->db_prefix}properties
                            WHERE path LIKE '".$this->_slashify($options["path"])."%'";
-            mysql_query($query);
-            System::rm(array("-rf", $path));
-        } else {
-            unlink($path);
-        }
-        $query = "DELETE FROM {$this->db_prefix}properties
+			mysql_query($query);
+			System::rm(array("-rf", $path));
+		} else {
+			unlink($path);
+		}
+		$query = "DELETE FROM {$this->db_prefix}properties
                        WHERE path = '$options[path]'";
-        mysql_query($query);
-
-        return "204 No Content";
-    }
-
-
-    /**
-     * MOVE method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MOVE($options)
-    {
-        return $this->COPY($options, true);
-    }
-
-    /**
-     * COPY method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function COPY($options, $del=false)
-    {
-        // TODO Property updates still broken (Litmus should detect this?)
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
-            return "502 bad gateway";
-        }
-
-        $source = $this->base . $options["path"];
-        if (!file_exists($source)) {
-            return "404 Not found";
-        }
-
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
-            }
-        }
-
-        $dest         = $this->base . $options["dest"];
-        $destdir      = dirname($dest);
-
-        if (!file_exists($destdir) || !is_dir($destdir)) {
-            return "409 Conflict";
-        }
-
-
-        $new          = !file_exists($dest);
-        $existing_col = false;
-
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
-                    return "412 precondition failed";
-                }
-                $dest .= basename($source);
-                if (file_exists($dest)) {
-                    $options["dest"] .= basename($source);
-                } else {
-                    $new          = true;
-                    $existing_col = true;
-                }
-            }
-        }
-
-        if (!$new) {
-            if ($options["overwrite"]) {
-                $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
-                    return $stat;
-                }
-            } else {
-                return "412 precondition failed";
-            }
-        }
-
-        if ($del) {
-            if (!rename($source, $dest)) {
-                return "500 Internal server error";
-            }
-            $destpath = $this->_unslashify($options["dest"]);
-            if (is_dir($source)) {
-                $query = "UPDATE {$this->db_prefix}properties
+		mysql_query($query);
+
+		return "204 No Content";
+	}
+
+
+	/**
+	 * MOVE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MOVE($options)
+	{
+		return $this->COPY($options, true);
+	}
+
+	/**
+	 * COPY method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function COPY($options, $del=false)
+	{
+		// TODO Property updates still broken (Litmus should detect this?)
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		// no copying to different WebDAV Servers yet
+		if (isset($options["dest_url"])) {
+			return "502 bad gateway";
+		}
+
+		$source = $this->base . $options["path"];
+		if (!file_exists($source)) {
+			return "404 Not found";
+		}
+
+		if (is_dir($source)) { // resource is a collection
+			switch ($options["depth"]) {
+			case "infinity": // valid
+				break;
+			case "0": // valid for COPY only
+				if ($del) { // MOVE?
+					return "400 Bad request";
+				}
+				break;
+			case "1": // invalid for both COPY and MOVE
+			default:
+				return "400 Bad request";
+			}
+		}
+
+		$dest         = $this->base . $options["dest"];
+		$destdir      = dirname($dest);
+
+		if (!file_exists($destdir) || !is_dir($destdir)) {
+			return "409 Conflict";
+		}
+
+
+		$new          = !file_exists($dest);
+		$existing_col = false;
+
+		if (!$new) {
+			if ($del && is_dir($dest)) {
+				if (!$options["overwrite"]) {
+					return "412 precondition failed";
+				}
+				$dest .= basename($source);
+				if (file_exists($dest)) {
+					$options["dest"] .= basename($source);
+				} else {
+					$new          = true;
+					$existing_col = true;
+				}
+			}
+		}
+
+		if (!$new) {
+			if ($options["overwrite"]) {
+				$stat = $this->DELETE(array("path" => $options["dest"]));
+				if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+					return $stat;
+				}
+			} else {
+				return "412 precondition failed";
+			}
+		}
+
+		if ($del) {
+			if (!rename($source, $dest)) {
+				return "500 Internal server error";
+			}
+			$destpath = $this->_unslashify($options["dest"]);
+			if (is_dir($source)) {
+				$query = "UPDATE {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
-                mysql_query($query);
-            }
+				mysql_query($query);
+			}
 
-            $query = "UPDATE {$this->db_prefix}properties
+			$query = "UPDATE {$this->db_prefix}properties
                              SET path = '".$destpath."'
                            WHERE path = '".$options["path"]."'";
-            mysql_query($query);
-        } else {
-            if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
-                $files = System::find($source);
-                $files = array_reverse($files);
-            } else {
-                $files = array($source);
-            }
-
-            if (!is_array($files) || empty($files)) {
-                return "500 Internal server error";
-            }
-
-
-            foreach ($files as $file) {
-                if (is_dir($file)) {
-                    $file = $this->_slashify($file);
-                }
-
-                $destfile = str_replace($source, $dest, $file);
-
-                if (is_dir($file)) {
-                    if (!file_exists($destfile)) {
-                        if (!$this->_is_writable(dirname($destfile))) {
-                            return "403 Forbidden";
-                        }
-                        if (!mkdir($destfile)) {
-                            return "409 Conflict";
-                        }
-                    } else if (!is_dir($destfile)) {
-                        return "409 Conflict";
-                    }
-                } else {
-
-                    if (!copy($file, $destfile)) {
-                        return "409 Conflict";
-                    }
-                }
-            }
-
-            $query = "INSERT INTO {$this->db_prefix}properties
+			mysql_query($query);
+		} else {
+			if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
+				$files = System::find($source);
+				$files = array_reverse($files);
+			} else {
+				$files = array($source);
+			}
+
+			if (!is_array($files) || empty($files)) {
+				return "500 Internal server error";
+			}
+
+
+			foreach ($files as $file) {
+				if (is_dir($file)) {
+					$file = $this->_slashify($file);
+				}
+
+				$destfile = str_replace($source, $dest, $file);
+
+				if (is_dir($file)) {
+					if (!file_exists($destfile)) {
+						if (!$this->_is_writable(dirname($destfile))) {
+							return "403 Forbidden";
+						}
+						if (!mkdir($destfile)) {
+							return "409 Conflict";
+						}
+					} else if (!is_dir($destfile)) {
+						return "409 Conflict";
+					}
+				} else {
+
+					if (!copy($file, $destfile)) {
+						return "409 Conflict";
+					}
+				}
+			}
+
+			$query = "INSERT INTO {$this->db_prefix}properties
                                SELECT *
                                  FROM {$this->db_prefix}properties
                                 WHERE path = '".$options['path']."'";
-        }
-
-        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
-    }
-
-    /**
-     * PROPPATCH method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function PROPPATCH(&$options)
-    {
-        global $prefs, $tab;
-
-        $msg  = "";
-        $path = $options["path"];
-        $dir  = dirname($path)."/";
-        $base = basename($path);
-
-        foreach ($options["props"] as $key => $prop) {
-            if ($prop["ns"] == "DAV:") {
-                $options["props"][$key]['status'] = "403 Forbidden";
-            } else {
-                if (isset($prop["val"])) {
-                    $query = "REPLACE INTO {$this->db_prefix}properties
+		}
+
+		return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+	}
+
+	/**
+	 * PROPPATCH method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function PROPPATCH(&$options)
+	{
+		global $prefs, $tab;
+
+		$msg  = "";
+		$path = $options["path"];
+		$dir  = dirname($path)."/";
+		$base = basename($path);
+
+		foreach ($options["props"] as $key => $prop) {
+			if ($prop["ns"] == "DAV:") {
+				$options["props"][$key]['status'] = "403 Forbidden";
+			} else {
+				if (isset($prop["val"])) {
+					$query = "REPLACE INTO {$this->db_prefix}properties
                                            SET path = '$options[path]'
                                              , name = '$prop[name]'
                                              , ns= '$prop[ns]'
                                              , value = '$prop[val]'";
-                } else {
-                    $query = "DELETE FROM {$this->db_prefix}properties
+				} else {
+					$query = "DELETE FROM {$this->db_prefix}properties
                                         WHERE path = '$options[path]'
                                           AND name = '$prop[name]'
                                           AND ns = '$prop[ns]'";
-                }
-                mysql_query($query);
-            }
-        }
-
-        return "";
-    }
-
-
-    /**
-     * LOCK method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function LOCK(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // TODO recursive locks on directories not supported yet
-        // makes litmus test "32. lock_collection" fail
-        if (is_dir($fspath) && !empty($options["depth"])) {
-            return "409 Conflict";
-        }
-
-        $options["timeout"] = time()+300; // 5min. hardcoded
-
-        if (isset($options["update"])) { // Lock Update
-            $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
-
-            $query = "SELECT owner, exclusivelock FROM {$this->db_prefix}locks $where";
-            $res   = mysql_query($query);
-            $row   = mysql_fetch_assoc($res);
-            mysql_free_result($res);
-
-            if (is_array($row)) {
-                $query = "UPDATE {$this->db_prefix}locks
+				}
+				mysql_query($query);
+			}
+		}
+
+		return "";
+	}
+
+
+	/**
+	 * LOCK method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function LOCK(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// TODO recursive locks on directories not supported yet
+		// makes litmus test "32. lock_collection" fail
+		if (is_dir($fspath) && !empty($options["depth"])) {
+			return "409 Conflict";
+		}
+
+		$options["timeout"] = time()+300; // 5min. hardcoded
+
+		if (isset($options["update"])) { // Lock Update
+			$where = "WHERE path = '$options[path]' AND token = '$options[update]'";
+
+			$query = "SELECT owner, exclusivelock FROM {$this->db_prefix}locks $where";
+			$res   = mysql_query($query);
+			$row   = mysql_fetch_assoc($res);
+			mysql_free_result($res);
+
+			if (is_array($row)) {
+				$query = "UPDATE {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
                               $where";
-                mysql_query($query);
+				mysql_query($query);
 
-                $options['owner'] = $row['owner'];
-                $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
-                $options['type']  = $row["exclusivelock"] ? "write"     : "read";
+				$options['owner'] = $row['owner'];
+				$options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
+				$options['type']  = $row["exclusivelock"] ? "write"     : "read";
 
-                return true;
-            } else {
-                return false;
-            }
-        }
+				return true;
+			} else {
+				return false;
+			}
+		}
 
-        $query = "INSERT INTO {$this->db_prefix}locks
+		$query = "INSERT INTO {$this->db_prefix}locks
                         SET token   = '$options[locktoken]'
                           , path    = '$options[path]'
                           , created = ".time()."
@@ -838,76 +838,76 @@ 
                           , owner   = '$options[owner]'
                           , expires = '$options[timeout]'
                           , exclusivelock  = " .($options['scope'] === "exclusive" ? "1" : "0")
-            ;
-        mysql_query($query);
-
-        return mysql_affected_rows() ? "200 OK" : "409 Conflict";
-    }
-
-    /**
-     * UNLOCK method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function UNLOCK(&$options)
-    {
-        $query = "DELETE FROM {$this->db_prefix}locks
+			;
+		mysql_query($query);
+
+		return mysql_affected_rows() ? "200 OK" : "409 Conflict";
+	}
+
+	/**
+	 * UNLOCK method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function UNLOCK(&$options)
+	{
+		$query = "DELETE FROM {$this->db_prefix}locks
                       WHERE path = '$options[path]'
                         AND token = '$options[token]'";
-        mysql_query($query);
-
-        return mysql_affected_rows() ? "204 No Content" : "409 Conflict";
-    }
-
-    /**
-     * checkLock() helper
-     *
-     * @param  string resource path to check for locks
-     * @return bool   true on success
-     */
-    function checkLock($path)
-    {
-        $result = false;
-
-        $query = "SELECT owner, token, created, modified, expires, exclusivelock
+		mysql_query($query);
+
+		return mysql_affected_rows() ? "204 No Content" : "409 Conflict";
+	}
+
+	/**
+	 * checkLock() helper
+	 *
+	 * @param  string resource path to check for locks
+	 * @return bool   true on success
+	 */
+	function checkLock($path)
+	{
+		$result = false;
+
+		$query = "SELECT owner, token, created, modified, expires, exclusivelock
                   FROM {$this->db_prefix}locks
                  WHERE path = '$path'
                ";
-        $res = mysql_query($query);
-
-        if ($res) {
-            $row = mysql_fetch_array($res);
-            mysql_free_result($res);
-
-            if ($row) {
-                $result = array( "type"    => "write",
-                                 "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
-                                 "depth"   => 0,
-                                 "owner"   => $row['owner'],
-                                 "token"   => $row['token'],
-                                 "created" => $row['created'],
-                                 "modified" => $row['modified'],
-                                 "expires" => $row['expires']
-                                 );
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * create database tables for property and lock storage
-     *
-     * @param  void
-     * @return bool   true on success
-     */
-    function create_database()
-    {
-        // TODO
-        return false;
-    }
+		$res = mysql_query($query);
+
+		if ($res) {
+			$row = mysql_fetch_array($res);
+			mysql_free_result($res);
+
+			if ($row) {
+				$result = array( "type"    => "write",
+								 "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
+								 "depth"   => 0,
+								 "owner"   => $row['owner'],
+								 "token"   => $row['token'],
+								 "created" => $row['created'],
+								 "modified" => $row['modified'],
+								 "expires" => $row['expires']
+								 );
+			}
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 * create database tables for property and lock storage
+	 *
+	 * @param  void
+	 * @return bool   true on success
+	 */
+	function create_database()
+	{
+		// TODO
+		return false;
+	}
 }
 
 

api/src/Header/Authenticate.php

Indentation +12 added lines, -12 removed lines

@@ -255,20 +255,20 @@
 	 */
 	static public function parse_digest($txt)
 	{
-	    // protect against missing data
-	    $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-	    $data = array();
-	    $keys = implode('|', array_keys($needed_parts));
+		// protect against missing data
+		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+		$data = array();
+		$keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
-	    foreach ($matches as $m)
-	    {
-	        $data[$m[1]] = $m[3] ? $m[3] : $m[4];
-	        unset($needed_parts[$m[1]]);
-	    }
-	    //error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
-	    return $needed_parts ? false : $data;
+		foreach ($matches as $m)
+		{
+			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
+			unset($needed_parts[$m[1]]);
+		}
+		//error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
+		return $needed_parts ? false : $data;
 	}
 }

api/src/Etemplate/Widget/Vfs.php

Indentation +7 added lines, -7 removed lines

@@ -224,13 +224,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, $file)
 	{
 		$name = $_REQUEST['widget_id'];

api/src/Etemplate/Widget/File.php

Indentation +4 added lines, -4 removed lines

@@ -238,10 +238,10 @@
 	}
 
 	/**
-	* Delete a directory RECURSIVELY
-	* @param string $dir - directory path
-	* @link http://php.net/manual/en/function.rmdir.php
-	*/
+	 * Delete a directory RECURSIVELY
+	 * @param string $dir - directory path
+	 * @link http://php.net/manual/en/function.rmdir.php
+	 */
 	private static function rrmdir($dir)
 	{
 		if (is_dir($dir))

api/src/Etemplate/Widget/HistoryLog.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->id);