EGroupware / egroupware

api/src/Vfs/Dav/Directory.php

Spacing +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@ 
 	function getChild($name)
 	{
 		//error_log(__METHOD__."('$name') this->path=$this->path, this->vfs_path=$this->vfs_path");
-		$path = $this->vfs_path . '/' . $name;
-		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
+		$path = $this->vfs_path.'/'.$name;
+		$vfs_path = $this->vfs_path.'/'.Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name '.$path.' could not be located');
 
 		if (Vfs::is_dir($vfs_path))
 		{
@@ -88,6 +88,6 @@ 
 	 */
 	function getQuotaInfo()
 	{
-		return [ false, false ];
+		return [false, false];
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -69,7 +69,10 @@
 		$path = $this->vfs_path . '/' . $name;
 		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path))
+		{
+			throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		}
 
 		if (Vfs::is_dir($vfs_path))
 		{

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>";
+		}
+	}
 }
 
 ?>

Switch Indentation +10 added lines, -10 removed lines

@@ -179,16 +179,16 @@
         } 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;
+            	case "write":
+                	$this->locktype = $tag;
+                	break;
+            	case "exclusive":
+            	case "shared":
+                	$this->lockscope = $tag;
+                	break;
+            	case "owner":
+                	$this->collect_owner = true;
+                	break;
             }
         }
     }

Braces +45 added lines, -20 removed lines

@@ -99,7 +99,8 @@ 
 
         // open stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -119,16 +120,19 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if (is_string($line)) {
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
         // finish parsing
-        if ($had_input) {
+        if ($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -156,29 +160,40 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        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:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }
             $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
+        }
+        else if ($ns == "DAV:")
+        {
             // parse only the essential tags
-            switch ($tag) {
+            switch ($tag)
+            {
             case "write":
                 $this->locktype = $tag;
                 break;
@@ -204,7 +219,8 @@ 
     function _data($parser, $data)
     {
         // only the <owner> tag has data content
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $this->owner .= $data;
         }
     }
@@ -220,26 +236,35 @@ 
     function _endElement($parser, $name)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
+        if (($ns == "DAV:") && ($tag == "owner"))
+        {
             $this->collect_owner = false;
         }
 
         // within <owner> we have to collect everything
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }

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;
+		}
+	}
 }
 
 /*

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
      * @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)
+    function __construct($path, $store_request = false)
     {
         $this->success = true;
 
@@ -123,7 +123,7 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        while($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in)) {
             $line = fgets($f_in);
             if ($store_request) $this->request .= $line;
             if (is_string($line)) {
@@ -132,7 +132,7 @@ 
             }
         }
 
-        if($had_input) {
+        if ($had_input) {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -169,7 +169,7 @@ 
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
             if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
+                $this->current["val"] = ""; // default set val
             }
         }
 
@@ -177,7 +177,7 @@ 
             $this->current["val"] .= "<$tag";
             if (isset($attr)) {
                 foreach ($attr as $key => $val) {
-                    $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+                    $this->current["val"] .= ' '.$key.'="'.str_replace('"', '&quot;', $val).'"';
                 }
             }
             $this->current["val"] .= ">";

Braces +48 added lines, -21 removed lines

@@ -106,7 +106,8 @@ 
         $had_input = false;
 
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -123,16 +124,22 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        while($this->success && !feof($f_in)) {
+        while($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
+            if ($store_request)
+            {
+            	$this->request .= $line;
+            }
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
-        if($had_input) {
+        if($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -152,31 +159,42 @@ 
      */
     function _startElement($parser, $name, $attrs)
     {
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns = "";
             $tag = $name;
         }
 
-        if ($this->depth == 1) {
+        if ($this->depth == 1)
+        {
             $this->mode = $tag;
         }
 
-        if ($this->depth == 3) {
+        if ($this->depth == 3)
+        {
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
-            if ($this->mode == "set") {
+            if ($this->mode == "set")
+            {
                 $this->current["val"] = "";     // default set val
             }
         }
 
-        if ($this->depth >= 4) {
+        if ($this->depth >= 4)
+        {
             $this->current["val"] .= "<$tag";
-            if (isset($attr)) {
-                foreach ($attr as $key => $val) {
+            if (isset($attr))
+            {
+                foreach ($attr as $key => $val)
+                {
                     $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
                 }
             }
@@ -198,23 +216,31 @@ 
      */
     function _endElement($parser, $name)
     {
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns = "";
             $tag = $name;
         }
 
         $this->depth--;
 
-        if ($this->depth >= 4) {
+        if ($this->depth >= 4)
+        {
             $this->current["val"] .= "</$tag>";
         }
 
-        if ($this->depth == 3) {
-            if (isset($this->current)) {
+        if ($this->depth == 3)
+        {
+            if (isset($this->current))
+            {
                 $this->props[] = $this->current;
                 unset($this->current);
             }
@@ -231,7 +257,8 @@ 
      */
     function _data($parser, $data)
     {
-        if (isset($this->current)) {
+        if (isset($this->current))
+        {
             $this->current["val"] .= $data;
         }
     }

api/src/WebDAV/Server/Filesystem.php

Switch Indentation +22 added lines, -22 removed lines

@@ -365,18 +365,18 @@ 
             //       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;
+            	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;
             }
         }
 
@@ -633,16 +633,16 @@ 
 
         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";
+            	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";
             }
         }
 

Spacing +21 added lines, -21 removed lines

@@ -151,7 +151,7 @@ 
     function PROPFIND(&$options, &$files)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) {
@@ -198,7 +198,7 @@ 
     function fileinfo($path)
     {
         // map URI path to filesystem path
-        $fspath = $this->base . $path;
+        $fspath = $this->base.$path;
 
         // create result array
         $info = array();
@@ -210,11 +210,11 @@ 
         $info["props"][] = $this->mkprop("displayname", strtoupper($path));
 
         // creation and modification time
-        $info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
+        $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("lastaccessed", fileatime($fspath));
         $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
 
         // type and size (caller already made sure that path exists)
@@ -341,8 +341,8 @@ 
             // 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);
+            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];
@@ -392,7 +392,7 @@ 
     function HEAD(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) return false;
@@ -421,7 +421,7 @@ 
     function GET(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // is this a collection?
         if (is_dir($fspath)) {
@@ -504,14 +504,14 @@ 
      */
     function PUT(&$options)
     {
-        $fspath = $this->base . $options["path"];
+        $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);
+        $options["new"] = !file_exists($fspath);
 
         if ($options["new"] && !$this->_is_writable($dir)) {
             return "403 Forbidden";
@@ -537,7 +537,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->base .$options["path"];
+        $path   = $this->base.$options["path"];
         $parent = dirname($path);
         $name   = basename($path);
 
@@ -549,7 +549,7 @@ 
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if (file_exists($parent."/".$name)) {
             return "405 Method not allowed";
         }
 
@@ -574,7 +574,7 @@ 
      */
     function DELETE($options)
     {
-        $path = $this->base . "/" .$options["path"];
+        $path = $this->base."/".$options["path"];
 
         if (!file_exists($path)) {
             return "404 Not found";
@@ -613,7 +613,7 @@ 
      * @param  array  general parameter passing array
      * @return bool   true on success
      */
-    function COPY($options, $del=false)
+    function COPY($options, $del = false)
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
@@ -626,7 +626,7 @@ 
             return "502 bad gateway";
         }
 
-        $source = $this->base . $options["path"];
+        $source = $this->base.$options["path"];
         if (!file_exists($source)) {
             return "404 Not found";
         }
@@ -646,7 +646,7 @@ 
             }
         }
 
-        $dest         = $this->base . $options["dest"];
+        $dest         = $this->base.$options["dest"];
         $destdir      = dirname($dest);
 
         if (!file_exists($destdir) || !is_dir($destdir)) {
@@ -795,7 +795,7 @@ 
     function LOCK(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // TODO recursive locks on directories not supported yet
         // makes litmus test "32. lock_collection" fail
@@ -803,7 +803,7 @@ 
             return "409 Conflict";
         }
 
-        $options["timeout"] = time()+300; // 5min. hardcoded
+        $options["timeout"] = time() + 300; // 5min. hardcoded
 
         if (isset($options["update"])) { // Lock Update
             $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
@@ -822,7 +822,7 @@ 
 
                 $options['owner'] = $row['owner'];
                 $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
-                $options['type']  = $row["exclusivelock"] ? "write"     : "read";
+                $options['type']  = $row["exclusivelock"] ? "write" : "read";
 
                 return true;
             } else {
@@ -837,7 +837,7 @@ 
                           , modified = ".time()."
                           , owner   = '$options[owner]'
                           , expires = '$options[timeout]'
-                          , exclusivelock  = " .($options['scope'] === "exclusive" ? "1" : "0")
+                          , exclusivelock  = ".($options['scope'] === "exclusive" ? "1" : "0")
             ;
         mysql_query($query);
 
@@ -881,7 +881,7 @@ 
             mysql_free_result($res);
 
             if ($row) {
-                $result = array( "type"    => "write",
+                $result = array("type"    => "write",
                                  "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
                                  "depth"   => 0,
                                  "owner"   => $row['owner'],

Braces +212 added lines, -91 removed lines

@@ -105,15 +105,19 @@ 
         // 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'])) {
+        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) {
+        if ($base)
+        {
             $this->base = realpath($base); // TODO throw if not a directory
-        } else if (!$this->base) {
+        }
+        else if (!$this->base)
+        {
             $this->base = $this->_SERVER['DOCUMENT_ROOT'];
         }
 
@@ -154,7 +158,8 @@ 
         $fspath = $this->base . $options["path"];
 
         // sanity check
-        if (!file_exists($fspath)) {
+        if (!file_exists($fspath))
+        {
             return false;
         }
 
@@ -165,7 +170,8 @@ 
         $files["files"][] = $this->fileinfo($options["path"]);
 
         // information for contained resources requested?
-        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
+        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath))
+        {
 
             // make sure path ends with '/'
             $options["path"] = $this->_slashify($options["path"]);
@@ -173,10 +179,13 @@ 
             // try to open directory
             $handle = opendir($fspath);
 
-            if ($handle) {
+            if ($handle)
+            {
                 // ok, now get all its contents
-                while ($filename = readdir($handle)) {
-                    if ($filename != "." && $filename != "..") {
+                while ($filename = readdir($handle))
+                {
+                    if ($filename != "." && $filename != "..")
+                    {
                         $files["files"][] = $this->fileinfo($options["path"].$filename);
                     }
                 }
@@ -218,16 +227,22 @@ 
         $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
 
         // type and size (caller already made sure that path exists)
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             // directory (WebDAV collection)
             $info["props"][] = $this->mkprop("resourcetype", "collection");
             $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
-        } else {
+        }
+        else
+        {
             // plain file (WebDAV resource)
             $info["props"][] = $this->mkprop("resourcetype", "");
-            if ($this->_is_readable($fspath)) {
+            if ($this->_is_readable($fspath))
+            {
                 $info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
-            } else {
+            }
+            else
+            {
                 $info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
             }
             $info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
@@ -238,7 +253,8 @@ 
                         FROM {$this->db_prefix}properties
                        WHERE path = '$path'";
         $res = mysql_query($query);
-        while ($row = mysql_fetch_assoc($res)) {
+        while ($row = mysql_fetch_assoc($res))
+        {
             $info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
         }
         mysql_free_result($res);
@@ -259,30 +275,45 @@ 
     function _can_execute($name, $path = false)
     {
         // path defaults to PATH from environment if not set
-        if ($path === false) {
+        if ($path === false)
+        {
             $path = getenv("PATH");
         }
 
         // check method depends on operating system
-        if (!strncmp(PHP_OS, "WIN", 3)) {
+        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 {
+        }
+        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) {
+        foreach (explode(PATH_SEPARATOR, $path) as $dir)
+        {
             // skip invalid path entries
-            if (!file_exists($dir)) continue;
-            if (!is_dir($dir)) continue;
+            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;
+            foreach ($exts as $ext)
+            {
+                if ($check_fn("$dir/$name".$ext))
+                {
+                	return true;
+                }
             }
         }
 
@@ -323,13 +354,18 @@ 
      */
     function _mimetype($fspath)
     {
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             // directories are easy
             return "httpd/unix-directory";
-        } else if (function_exists("mime_content_type")) {
+        }
+        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")) {
+        }
+        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");
@@ -341,16 +377,19 @@ 
             // so we test the format of the returned string
 
             // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
+            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)) {
+                if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches))
+                {
                     $mime_type = $matches[0];
                 }
             }
         }
 
-        if (empty($mime_type)) {
+        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
@@ -364,7 +403,8 @@ 
             //       anyway (overriding it with information taken from
             //       the registry)
             // TODO: have a seperate PEAR class for mimetype detection?
-            switch (strtolower(strrchr(basename($fspath), "."))) {
+            switch (strtolower(strrchr(basename($fspath), ".")))
+            {
             case ".html":
                 $mime_type = "text/html";
                 break;
@@ -395,7 +435,10 @@ 
         $fspath = $this->base . $options["path"];
 
         // sanity check
-        if (!file_exists($fspath)) return false;
+        if (!file_exists($fspath))
+        {
+        	return false;
+        }
 
         // detect resource type
         $options['mimetype'] = $this->_mimetype($fspath);
@@ -424,12 +467,14 @@ 
         $fspath = $this->base . $options["path"];
 
         // is this a collection?
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             return $this->GetDir($fspath, $options);
         }
 
         // the header output is the same as for HEAD
-        if (!$this->HEAD($options)) {
+        if (!$this->HEAD($options))
+        {
             return false;
         }
 
@@ -451,7 +496,8 @@ 
     function GetDir($fspath, &$options)
     {
         $path = $this->_slashify($options["path"]);
-        if ($path != $options["path"]) {
+        if ($path != $options["path"])
+        {
             header("Location: ".$this->base_uri.$path);
             exit;
         }
@@ -459,12 +505,14 @@ 
         // fixed width directory column format
         $format = "%15s  %-19s  %-s\n";
 
-        if (!$this->_is_readable($fspath)) {
+        if (!$this->_is_readable($fspath))
+        {
             return false;
         }
 
         $handle = opendir($fspath);
-        if (!$handle) {
+        if (!$handle)
+        {
             return false;
         }
 
@@ -476,8 +524,10 @@ 
         printf($format, "Size", "Last modified", "Filename");
         echo "<hr>";
 
-        while ($filename = readdir($handle)) {
-            if ($filename != "." && $filename != "..") {
+        while ($filename = readdir($handle))
+        {
+            if ($filename != "." && $filename != "..")
+            {
                 $fullpath = $fspath.$filename;
                 $name     = htmlspecialchars($filename);
                 printf($format,
@@ -507,19 +557,23 @@ 
         $fspath = $this->base . $options["path"];
 
         $dir = dirname($fspath);
-        if (!file_exists($dir) || !is_dir($dir)) {
+        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)) {
+        if ($options["new"] && !$this->_is_writable($dir))
+        {
             return "403 Forbidden";
         }
-        if (!$options["new"] && !$this->_is_writable($fspath)) {
+        if (!$options["new"] && !$this->_is_writable($fspath))
+        {
             return "403 Forbidden";
         }
-        if (!$options["new"] && is_dir($fspath)) {
+        if (!$options["new"] && is_dir($fspath))
+        {
             return "403 Forbidden";
         }
 
@@ -541,24 +595,30 @@ 
         $parent = dirname($path);
         $name   = basename($path);
 
-        if (!file_exists($parent)) {
+        if (!file_exists($parent))
+        {
             return "409 Conflict";
         }
 
-        if (!is_dir($parent)) {
+        if (!is_dir($parent))
+        {
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if ( file_exists($parent."/".$name) )
+        {
             return "405 Method not allowed";
         }
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         $stat = mkdir($parent."/".$name, 0777);
-        if (!$stat) {
+        if (!$stat)
+        {
             return "403 Forbidden";
         }
 
@@ -576,16 +636,20 @@ 
     {
         $path = $this->base . "/" .$options["path"];
 
-        if (!file_exists($path)) {
+        if (!file_exists($path))
+        {
             return "404 Not found";
         }
 
-        if (is_dir($path)) {
+        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 {
+        }
+        else
+        {
             unlink($path);
         }
         $query = "DELETE FROM {$this->db_prefix}properties
@@ -617,26 +681,35 @@ 
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        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"])) {
+        if (isset($options["dest_url"]))
+        {
             return "502 bad gateway";
         }
 
         $source = $this->base . $options["path"];
-        if (!file_exists($source)) {
+        if (!file_exists($source))
+        {
             return "404 Not found";
         }
 
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
+        if (is_dir($source))
+        {
+// resource is a collection
+            switch ($options["depth"])
+            {
             case "infinity": // valid
                 break;
             case "0": // valid for COPY only
-                if ($del) { // MOVE?
+                if ($del)
+                {
+// MOVE?
                     return "400 Bad request";
                 }
                 break;
@@ -649,7 +722,8 @@ 
         $dest         = $this->base . $options["dest"];
         $destdir      = dirname($dest);
 
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+        if (!file_exists($destdir) || !is_dir($destdir))
+        {
             return "409 Conflict";
         }
 
@@ -657,38 +731,52 @@ 
         $new          = !file_exists($dest);
         $existing_col = false;
 
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
+        if (!$new)
+        {
+            if ($del && is_dir($dest))
+            {
+                if (!$options["overwrite"])
+                {
                     return "412 precondition failed";
                 }
                 $dest .= basename($source);
-                if (file_exists($dest)) {
+                if (file_exists($dest))
+                {
                     $options["dest"] .= basename($source);
-                } else {
+                }
+                else
+                {
                     $new          = true;
                     $existing_col = true;
                 }
             }
         }
 
-        if (!$new) {
-            if ($options["overwrite"]) {
+        if (!$new)
+        {
+            if ($options["overwrite"])
+            {
                 $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404"))
+                {
                     return $stat;
                 }
-            } else {
+            }
+            else
+            {
                 return "412 precondition failed";
             }
         }
 
-        if ($del) {
-            if (!rename($source, $dest)) {
+        if ($del)
+        {
+            if (!rename($source, $dest))
+            {
                 return "500 Internal server error";
             }
             $destpath = $this->_unslashify($options["dest"]);
-            if (is_dir($source)) {
+            if (is_dir($source))
+            {
                 $query = "UPDATE {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
@@ -699,40 +787,58 @@ 
                              SET path = '".$destpath."'
                            WHERE path = '".$options["path"]."'";
             mysql_query($query);
-        } else {
-            if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
+        }
+        else
+        {
+            if (is_dir($source) && $options["depth"] == "infinity")
+            {
+// no find for depth="0"
                 $files = System::find($source);
                 $files = array_reverse($files);
-            } else {
+            }
+            else
+            {
                 $files = array($source);
             }
 
-            if (!is_array($files) || empty($files)) {
+            if (!is_array($files) || empty($files))
+            {
                 return "500 Internal server error";
             }
 
 
-            foreach ($files as $file) {
-                if (is_dir($file)) {
+            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))) {
+                if (is_dir($file))
+                {
+                    if (!file_exists($destfile))
+                    {
+                        if (!$this->_is_writable(dirname($destfile)))
+                        {
                             return "403 Forbidden";
                         }
-                        if (!mkdir($destfile)) {
+                        if (!mkdir($destfile))
+                        {
                             return "409 Conflict";
                         }
-                    } else if (!is_dir($destfile)) {
+                    }
+                    else if (!is_dir($destfile))
+                    {
                         return "409 Conflict";
                     }
-                } else {
+                }
+                else
+                {
 
-                    if (!copy($file, $destfile)) {
+                    if (!copy($file, $destfile))
+                    {
                         return "409 Conflict";
                     }
                 }
@@ -762,17 +868,24 @@ 
         $dir  = dirname($path)."/";
         $base = basename($path);
 
-        foreach ($options["props"] as $key => $prop) {
-            if ($prop["ns"] == "DAV:") {
+        foreach ($options["props"] as $key => $prop)
+        {
+            if ($prop["ns"] == "DAV:")
+            {
                 $options["props"][$key]['status'] = "403 Forbidden";
-            } else {
-                if (isset($prop["val"])) {
+            }
+            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 {
+                }
+                else
+                {
                     $query = "DELETE FROM {$this->db_prefix}properties
                                         WHERE path = '$options[path]'
                                           AND name = '$prop[name]'
@@ -799,13 +912,16 @@ 
 
         // TODO recursive locks on directories not supported yet
         // makes litmus test "32. lock_collection" fail
-        if (is_dir($fspath) && !empty($options["depth"])) {
+        if (is_dir($fspath) && !empty($options["depth"]))
+        {
             return "409 Conflict";
         }
 
         $options["timeout"] = time()+300; // 5min. hardcoded
 
-        if (isset($options["update"])) { // Lock Update
+        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";
@@ -813,7 +929,8 @@ 
             $row   = mysql_fetch_assoc($res);
             mysql_free_result($res);
 
-            if (is_array($row)) {
+            if (is_array($row))
+            {
                 $query = "UPDATE {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
@@ -825,7 +942,9 @@ 
                 $options['type']  = $row["exclusivelock"] ? "write"     : "read";
 
                 return true;
-            } else {
+            }
+            else
+            {
                 return false;
             }
         }
@@ -876,11 +995,13 @@ 
                ";
         $res = mysql_query($query);
 
-        if ($res) {
+        if ($res)
+        {
             $row = mysql_fetch_array($res);
             mysql_free_result($res);
 
-            if ($row) {
+            if ($row)
+            {
                 $result = array( "type"    => "write",
                                  "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
                                  "depth"   => 0,

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -689,13 +689,13 @@ 
             }
             $destpath = $this->_unslashify($options["dest"]);
             if (is_dir($source)) {
-                $query = "UPDATE {$this->db_prefix}properties
+                $query = "update {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
                 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);
@@ -814,7 +814,7 @@ 
             mysql_free_result($res);
 
             if (is_array($row)) {
-                $query = "UPDATE {$this->db_prefix}locks
+                $query = "update {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
                               $where";

Indentation +824 added lines, -824 removed lines

@@ -44,794 +44,794 @@ 
  */
 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";
-        }
+		$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";
+		}
 
 		// for range requests we need to open with "c" as "w" truncates the file!
 		$fp = fopen($fspath, empty($options['ranges']) ? "w" : "c");
 
-        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
+		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()."
@@ -839,76 +839,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;
 	}
 }

Braces +38 added lines, -10 removed lines

@@ -82,7 +82,10 @@ 
 			error_log(__METHOD__.'() PHP_AUTH_USER='.array2string($_SERVER['PHP_AUTH_USER']).', PHP_AUTH_PW='.array2string($pw).', PHP_AUTH_DIGEST='.array2string($_SERVER['PHP_AUTH_DIGEST']));
 		}
 		$realm = $GLOBALS['egw_info']['flags']['auth_realm'];
-		if (empty($realm)) $realm = 'EGroupware';
+		if (empty($realm))
+		{
+			$realm = 'EGroupware';
+		}
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
@@ -139,7 +142,8 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches)
+				{
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -167,7 +171,10 @@ 
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
-			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			}
 			return false;	// no plain-text passwords used
 		}
 		// check for specific user, if given
@@ -175,10 +182,16 @@ 
 			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
 		{
 			unset($user_pw);
-			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			}
 			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw,0,7) == '{PLAIN}')
+		{
+			$user_pw = substr($user_pw,7);
+		}
 
 		if (self::ERROR_LOG)
 		{
@@ -200,7 +213,10 @@ 
 		{
 			$nonce = uniqid();
    			header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
-			if (self::ERROR_LOG) error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			}
 		}
 	}
 
@@ -215,7 +231,10 @@ 
 	 */
 	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
 	{
-		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		if (is_null($auth_digest))
+		{
+			$auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		}
 
 		$data = self::parse_digest($auth_digest);
 
@@ -228,7 +247,10 @@ 
 
 		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
 
-		if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		if (self::ERROR_LOG)
+		{
+			error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		}
 		return $data['response'] === $valid_response;
 	}
 
@@ -247,10 +269,16 @@ 
 		{
 			return false;
 		}
-		if (is_null($password)) $password = $user_pw;
+		if (is_null($password))
+		{
+			$password = $user_pw;
+		}
 
 		$A1 = md5($username . ':' . $realm . ':' . $password);
-		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		if (self::ERROR_LOG > 1)
+		{
+			error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		}
 		return $A1;
 	}
 

Spacing +19 added lines, -19 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	static public function autocreate_session_callback(&$account)
 	{
-		unset($account);	// not used, but required by function signature
+		unset($account); // not used, but required by function signature
 		if (self::ERROR_LOG)
 		{
 			$pw = self::ERROR_LOG > 1 ? $_SERVER['PHP_AUTH_PW'] : '**********';
@@ -86,15 +86,15 @@ 
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
-		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],'Basic ') === 0)
+		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 'Basic ') === 0)
 		{
-			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],6));
+			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6));
 			if (strpos($hash, ':') !== false)
 			{
 				list($username, $password) = explode(':', $hash, 2);
 			}
 		}
-		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm,$_SERVER['PHP_AUTH_DIGEST'],$username,$password))
+		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm, $_SERVER['PHP_AUTH_DIGEST'], $username, $password))
 		{
 			unset($password);
 		}
@@ -115,7 +115,7 @@ 
 			{
 				$realm .= ': '.$GLOBALS['egw']->session->reason;
 			}
-			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.Api\Translation::charset().'"');
+			header('WWW-Authenticate: Basic realm="'.$realm.'"'); // draft-reschke-basicauth-enc-06 adds, accept-charset="'.Api\Translation::charset().'"');
 			self::digest_header($realm);
 			header('HTTP/1.1 401 Unauthorized');
 			header('X-WebDAV-Status: 401 Unauthorized', true);
@@ -139,7 +139,7 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches) {
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -161,24 +161,24 @@ 
 	 * @param string &$user_pw =null stored cleartext password, if $username given AND function returns true
 	 * @return boolean true if digest auth is available, false otherwise
 	 */
-	static public function digest_auth_available($realm,$username=null,&$user_pw=null)
+	static public function digest_auth_available($realm, $username = null, &$user_pw = null)
 	{
 		// we currently require plaintext passwords!
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
 			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
-			return false;	// no plain-text passwords used
+			return false; // no plain-text passwords used
 		}
 		// check for specific user, if given
-		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username,'account_pwd','u')) ||
-			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
+		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username, 'account_pwd', 'u')) ||
+			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw, 0, 7) != '{PLAIN}'))
 		{
 			unset($user_pw);
 			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
-			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
+			return false; // user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw, 0, 7) == '{PLAIN}') $user_pw = substr($user_pw, 7);
 
 		if (self::ERROR_LOG)
 		{
@@ -194,7 +194,7 @@ 
 	 * @param string $realm
 	 * @param string &$nonce=null on return
 	 */
-	static public function digest_header($realm,&$nonce=null)
+	static public function digest_header($realm, &$nonce = null)
 	{
 		if (self::digest_auth_available($realm))
 		{
@@ -213,13 +213,13 @@ 
 	 * @param string &$password on return cleartext password
 	 * @return boolean true if digest is correct, false otherwise
 	 */
-	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
+	static public function is_valid($realm, $auth_digest = null, &$username = null, &$password = null)
 	{
 		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
 
 		$data = self::parse_digest($auth_digest);
 
-		if (!$data || !($A1 = self::get_digest_A1($realm,$username=$data['username'],$password=null)))
+		if (!$data || !($A1 = self::get_digest_A1($realm, $username = $data['username'], $password = null)))
 		{
 			error_log(__METHOD__."('$realm','$auth_digest','$username') returning FALSE");
 			return false;
@@ -240,16 +240,16 @@ 
 	 * @param string &$password=null password to use or if null, on return stored password
 	 * @return string|boolean false if $password not given and can NOT be read
 	 */
-	static private function get_digest_A1($realm,$username,&$password=null)
+	static private function get_digest_A1($realm, $username, &$password = null)
 	{
 		$user_pw = null;
-		if (empty($username) || empty($realm) || !self::digest_auth_available($realm,$username,$user_pw))
+		if (empty($username) || empty($realm) || !self::digest_auth_available($realm, $username, $user_pw))
 		{
 			return false;
 		}
 		if (is_null($password)) $password = $user_pw;
 
-		$A1 = md5($username . ':' . $realm . ':' . $password);
+		$A1 = md5($username.':'.$realm.':'.$password);
 		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
 		return $A1;
 	}
@@ -265,7 +265,7 @@ 
 	    $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)
 	    {

api/src/Header/Referer.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return string
 	 * @todo get "real" referer for jDots template
 	 */
-	static function get($default='',$referer='')
+	static function get($default = '', $referer = '')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
 		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
@@ -34,11 +34,11 @@ 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/', '', $referer); // removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
-			list(,$referer) = explode($webserver_url,$referer,2);
+			list(,$referer) = explode($webserver_url, $referer, 2);
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 

Braces +14 added lines, -4 removed lines

@@ -29,12 +29,19 @@ 
 	static function get($default='',$referer='')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
-		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
+		if (!$referer)
+		{
+			$referer = urldecode($_SERVER['HTTP_REFERER']);
+		}
 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
-		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
+		if (empty($webserver_url) || $webserver_url{0} == '/')
+		{
+			// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);
+		}
+		// removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
@@ -42,7 +49,10 @@ 
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 
-		if (empty($ret) || strpos($ret, 'cd=yes') !== false) $ret = $default;
+		if (empty($ret) || strpos($ret, 'cd=yes') !== false)
+		{
+			$ret = $default;
+		}
 
 		return $ret;
 	}

api/src/Etemplate/Widget/Transformer.php

Spacing +21 added lines, -21 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, array $expand=array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$attrs = $this->attrs;
 		$form_name = self::form_name($cname, $this->id);
@@ -82,14 +82,14 @@ 
 			error_log(__METHOD__."() $this has no id!");
 			return;
 		}
-		$attrs['value'] = $value =& self::get_array(self::$request->content, $form_name, false, true);
+		$attrs['value'] = $value = & self::get_array(self::$request->content, $form_name, false, true);
 		$attrs['type'] = $this->type;
 		$attrs['id'] = $this->id;
 
 		$unmodified = $attrs;
 
 		// run the transformation
-		foreach(static::$transformation as $filter => $data)
+		foreach (static::$transformation as $filter => $data)
 		{
 			$this->action($filter, $data, $attrs);
 		}
@@ -97,14 +97,14 @@ 
 		//echo $this; _debug_array($unmodified); _debug_array($attrs); _debug_array(array_diff_assoc($attrs, $unmodified));
 		// compute the difference and send it to the client as modifications
 		$type_changed = false;
-		foreach(array_diff_assoc($attrs, $unmodified) as $attr => $val)
+		foreach (array_diff_assoc($attrs, $unmodified) as $attr => $val)
 		{
-			switch($attr)
+			switch ($attr)
 			{
 				case 'value':
 					if ($val != $value)
 					{
-						$value = $val;	// $value is reference to self::$request->content
+						$value = $val; // $value is reference to self::$request->content
 					}
 					break;
 				case 'sel_options':
@@ -112,15 +112,15 @@ 
 					break;
 				case 'type':	// not an attribute in etemplate2
 					$type_changed = true;
-					if($val == 'template')
+					if ($val == 'template')
 					{
 						// If the widget has been transformed into a template, we
 						// also need to try and instanciate & parse the template too
 						$transformed_template = Template::instance($attrs['template']);
-						if($transformed_template)
+						if ($transformed_template)
 						{
 							$this->expand_widget($transformed_template, $expand);
-							$transformed_template->run('beforeSendToClient',array($cname,$expand));
+							$transformed_template->run('beforeSendToClient', array($cname, $expand));
 						}
 						$type_changed = false;
 					}
@@ -129,14 +129,14 @@ 
 					break;
 			}
 		}
-		if($type_changed)
+		if ($type_changed)
 		{
 			// Run the new widget type's beforeSendToClient
-			$expanded_child = self::factory($attrs['type'], false,$this->id);
+			$expanded_child = self::factory($attrs['type'], false, $this->id);
 			$expanded_child->id = $this->id;
 			$expanded_child->type = $attrs['type'];
 			$expanded_child->attrs = $attrs;
-			$expanded_child->run('beforeSendToClient',array($cname,$expand));
+			$expanded_child->run('beforeSendToClient', array($cname, $expand));
 		}
 	}
 
@@ -158,7 +158,7 @@ 
 			if (strpos($action, '@') !== false)
 			{
 				$replace = array();
-				foreach($attrs as $a => $v)
+				foreach ($attrs as $a => $v)
 				{
 					if (is_scalar($v) || is_null($v)) $replace['@'.$a] = $v;
 				}
@@ -166,14 +166,14 @@ 
 				// now replace with non-scalar value, eg. if values is an array: "@value", "@value[key] or "@value[@key]"
 				if (($a = strstr($action, '@')))
 				{
-					$action = self::get_array($attrs, substr($a,1));
+					$action = self::get_array($attrs, substr($a, 1));
 				}
 			}
 			$attrs[$attr] = $action;
 			if (self::DEBUG) error_log(__METHOD__."('$attr', ".array2string($action).") attrs['$attr'] = ".array2string($action).', attrs='.array2string($attrs));
 		}
 		// action is a serverside callback
-		elseif(is_array($action) && isset($action['__callback__']))
+		elseif (is_array($action) && isset($action['__callback__']))
 		{
 			if (!is_string(($callback = $action['__callback__'])))
 			{
@@ -183,7 +183,7 @@ 
 			{
 				$attrs[$attr] = $this->$callback($attrs[$attr], $attrs);
 			}
-			elseif(count(explode('.', $callback)) == 3)
+			elseif (count(explode('.', $callback)) == 3)
 			{
 				$attrs[$attr] = ExecMethod($callback, $attrs[$attr], $attrs);
 			}
@@ -197,29 +197,29 @@ 
 			}
 		}
 		// action is a clientside callback
-		elseif(is_array($action) && isset($action['__js__']))
+		elseif (is_array($action) && isset($action['__js__']))
 		{
 			// nothing to do here
 		}
 		// TODO: Might be a better way to handle when value to be set is an array
-		elseif(is_array($action) && $attr == 'sel_options')
+		elseif (is_array($action) && $attr == 'sel_options')
 		{
 			$attrs[$attr] = $action;
 		}
 		// action is a switch --> check cases
-		elseif(is_array($action))
+		elseif (is_array($action))
 		{
 			// case matches --> run all actions
 			if (isset($action[$attrs[$attr]]) || !isset($action[$attrs[$attr]]) && isset($action['__default__']))
 			{
 				$actions = isset($action[$attrs[$attr]]) ? $action[$attrs[$attr]] : $action['__default__'];
-				if(!is_array($actions))
+				if (!is_array($actions))
 				{
 					$attrs[$attr] = $actions;
 					$actions = array($attr => $actions);
 				}
 				if (self::DEBUG) error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
-				foreach($actions as $attr => $action)
+				foreach ($actions as $attr => $action)
 				{
 					$this->action($attr, $action, $attrs);
 				}

Braces +16 added lines, -4 removed lines

@@ -150,7 +150,10 @@ 
 	 */
 	protected function action($attr, $action, array &$attrs)
 	{
-		if (self::DEBUG) error_log(__METHOD__."('$attr', ".array2string($action).')');
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."('$attr', ".array2string($action).')');
+		}
 		// action is an assignment
 		if (is_scalar($action) || is_null($action))
 		{
@@ -160,7 +163,10 @@ 
 				$replace = array();
 				foreach($attrs as $a => $v)
 				{
-					if (is_scalar($v) || is_null($v)) $replace['@'.$a] = $v;
+					if (is_scalar($v) || is_null($v))
+					{
+						$replace['@'.$a] = $v;
+					}
 				}
 				$action = strtr($action, $replace);
 				// now replace with non-scalar value, eg. if values is an array: "@value", "@value[key] or "@value[@key]"
@@ -170,7 +176,10 @@ 
 				}
 			}
 			$attrs[$attr] = $action;
-			if (self::DEBUG) error_log(__METHOD__."('$attr', ".array2string($action).") attrs['$attr'] = ".array2string($action).', attrs='.array2string($attrs));
+			if (self::DEBUG)
+			{
+				error_log(__METHOD__."('$attr', ".array2string($action).") attrs['$attr'] = ".array2string($action).', attrs='.array2string($attrs));
+			}
 		}
 		// action is a serverside callback
 		elseif(is_array($action) && isset($action['__callback__']))
@@ -218,7 +227,10 @@ 
 					$attrs[$attr] = $actions;
 					$actions = array($attr => $actions);
 				}
-				if (self::DEBUG) error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
+				if (self::DEBUG)
+				{
+					error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
+				}
 				foreach($actions as $attr => $action)
 				{
 					$this->action($attr, $action, $attrs);

api/src/Etemplate/Widget/Box.php

Spacing +12 added lines, -12 removed lines

@@ -42,17 +42,17 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be cname!
 	 * @param boolean $respect_disabled =false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false)
+	public function run($method_name, $params = array(''), $respect_disabled = false)
 	{
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
 		if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
 		if ($expand['cname'] !== $cname && $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 		if ($respect_disabled && ($disabled = $this->attrs['disabled'] && self::check_disabled($this->attrs['disabled'], $expand)))
@@ -67,11 +67,11 @@ 
 
 		// Expand children
 		$columns_disabled = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			if (isset($this->children[$n]))
 			{
-				$child =& $this->children[$n];
+				$child = & $this->children[$n];
 				// If type has something that can be expanded, we need to expand it so the correct method is run
 				$this->expand_widget($child, $expand);
 			}
@@ -107,17 +107,17 @@ 
 	 */
 	private function need_autorepeat(Etemplate\Widget $widget, $cname, array $expand)
 	{
-		foreach(array($widget) + $widget->children as $check_widget)
+		foreach (array($widget) + $widget->children as $check_widget)
 		{
 			$pat = $check_widget->id;
-			while(($pattern = strstr($pat, '$')))
+			while (($pattern = strstr($pat, '$')))
 			{
-				$pat = substr($pattern,$pattern[1] == '{' ? 2 : 1);
+				$pat = substr($pattern, $pattern[1] == '{' ? 2 : 1);
 
-				$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-					substr($pat,0,4) == 'row_' && substr($pat,0,8) != 'row_cont');
+				$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+					substr($pat, 0, 4) == 'row_' && substr($pat, 0, 8) != 'row_cont');
 
-				if ($Ok && ($fname=self::form_name($cname, $check_widget->id, $expand)) &&
+				if ($Ok && ($fname = self::form_name($cname, $check_widget->id, $expand)) &&
 					// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 					// for an id like "run[$row_cont[appname]]"
 					substr($fname, -2) != '[]' &&

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
-		if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
+		if ($this->id && $this->type != 'groupbox')
+		{
+			$cname = self::form_name($cname, $this->id, $params[1]);
+		}
 		if ($expand['cname'] !== $cname && $cname)
 		{
 			$expand['cont'] =& self::get_array(self::$request->content, $cname);
@@ -121,10 +124,13 @@ 
 					// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 					// for an id like "run[$row_cont[appname]]"
 					substr($fname, -2) != '[]' &&
-					($value = self::get_array(self::$request->content, $fname)) !== null)	// null = not found (can be false!)
+					($value = self::get_array(self::$request->content, $fname)) !== null)
+				{
+					// null = not found (can be false!)
 				{
 					//error_log(__METHOD__."($widget,$cname) $this autorepeating row $expand[row] because of $check_widget->id = '$fname' is ".array2string($value));
 					unset($value);
+				}
 					return true;
 				}
 			}

api/src/Etemplate/Widget/AjaxSelect.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		$matches = null;
 		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
@@ -55,13 +55,13 @@ 
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
 		$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
-		if(is_array(self::$request->sel_options[$options]))
+		if (is_array(self::$request->sel_options[$options]))
 		{
 
 			// Fix any custom options from application
-			self::fix_encoded_options(self::$request->sel_options[$options],true);
+			self::fix_encoded_options(self::$request->sel_options[$options], true);
 
-			if(!self::$request->sel_options[$options])
+			if (!self::$request->sel_options[$options])
 			{
 				unset(self::$request->sel_options[$options]);
 			}

Braces +4 added lines, -1 removed lines

@@ -29,10 +29,13 @@
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		$matches = null;
-		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
+		if ($cname == '$row')
+		{
+			// happens eg. with custom-fields: $cname='$row', this->id='#something'
 		{
 			$form_name = $this->id;
 		}
+		}
 		// happens with fields in nm-header: $cname='nm', this->id='${row}[something]' or '{$row}[something]'
 		elseif (preg_match('/(\${row}|{\$row})\[([^]]+)\]$/', $this->id, $matches))
 		{