EGroupware / egroupware

api/src/Vfs/WebDAV.php

Switch Indentation +10 added lines, -10 removed lines

@@ -171,16 +171,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";
             }
         }
 

Braces +133 added lines, -50 removed lines

@@ -64,7 +64,8 @@ 
 		// 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']);
 		}
@@ -123,24 +124,30 @@ 
         $path   = $this->_unslashify($this->base .$options["path"]);
         $parent = Vfs::dirname($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($path) ) {
+        if ( file_exists($path) )
+        {
             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($path, 0777);
-        if (!$stat) {
+        if (!$stat)
+        {
             return "403 Forbidden";
         }
 
@@ -157,24 +164,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)) return "404 Not found";
+        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;
@@ -187,76 +205,104 @@ 
         $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";
         }
 
         $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 ($del)
+        {
 			try {
-				if (!rename($source, $dest)) {
+				if (!rename($source, $dest))
+				{
 					return "500 Internal server error";
 				}
 			}
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
+        }
+        else
+        {
+            if (is_dir($source) && $options['depth'] == 'infinity')
+            {
             	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } 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 (!is_dir($destfile)) {
+                if (is_dir($file))
+                {
+                    if (!is_dir($destfile))
+                    {
                         // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
+                        if (!@mkdir($destfile))
+                        {
                             return "409 Conflict";
                         }
                     }
-                } else {
-                    if (!@copy($file, $destfile)) {
+                }
+                else
+                {
+                    if (!@copy($file, $destfile))
+                    {
                         return "409 Conflict";
                     }
                 }
@@ -306,17 +352,23 @@ 
         $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
-		if (is_dir($fspath)) {
+		if (is_dir($fspath))
+		{
 			// directory (WebDAV collection)
 			$info['props'][] = self::mkprop	('resourcetype', array(
 			 	self::mkprop('collection', '')));
 			$info['props'][] = self::mkprop	('getcontenttype', 'httpd/unix-directory');
-		} else {
+		}
+		else
+		{
 			// plain file (WebDAV resource)
 			$info['props'][] = self::mkprop	('resourcetype', '');
-			if (Vfs::is_readable($path)) {
+			if (Vfs::is_readable($path))
+			{
 				$info['props'][] = self::mkprop	('getcontenttype', Vfs::mime_content_type($path));
-			} else {
+			}
+			else
+			{
 				error_log(__METHOD__."($path) $fspath is not readable!");
 				$info['props'][] = self::mkprop	('getcontenttype', 'application/x-non-readable');
 			}
@@ -388,7 +440,10 @@ 
 				continue;
 			}
 			$_path = $info['path'];
-			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/') $_path = substr($info['path'],0,-1);
+			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/')
+			{
+				$_path = substr($info['path'],0,-1);
+			}
 
 			// need to encode path again, as $info['path'] is NOT encoded, but Vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -427,16 +482,22 @@ 
 				$fileprops =& $files['files'][$path2n[$path]]['props'];
 				foreach($props as $prop)
 				{
-					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
+					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')
+					{
+						// eGW's customfields
 					{
 						$prop['ns'] .= 'customfields/';
+					}
 						$prop['name'] = substr($prop['name'],1);
 					}
 					$fileprops[] = $prop;
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."() props=".array2string($files['files']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() props=".array2string($files['files']));
+		}
 		return true;
 	}
 
@@ -488,7 +549,8 @@ 
 	{
 		$path = Api\Translation::convert($options['path'],'utf-8');
 
-		foreach ($options['props'] as $key => $prop) {
+		foreach ($options['props'] as $key => $prop)
+		{
 			$attributes = array();
 			switch($prop['ns'])
 			{
@@ -505,7 +567,10 @@ 
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -534,7 +599,10 @@ 
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -544,15 +612,24 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!Vfs::proppatch($path,array($prop)))
+					{
+						$options['props'][$key]['status'] = '403 Forbidden';
+					}
 					break;
 			}
-			if ($this->debug) $props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			if ($this->debug)
+			{
+				$props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			}
 		}
 		if ($this->debug)
 		{
 			error_log(__METHOD__.": path=$options[path], props=".implode(', ',$props));
-			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			if ($attributes)
+			{
+				error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			}
 		}
 
 		return '';	// this is as the filesystem example handler does it, no true or false ...
@@ -566,7 +643,10 @@ 
 	 */
 	function LOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		// TODO recursive locks on directories not supported yet
 		if (is_dir($this->base . $options['path']) && !empty($options['depth']))
 		{
@@ -592,7 +672,10 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		return Vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 

api/src/WebDAV/Tools/_parse_lockinfo.php

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/Server.php

Switch Indentation +179 added lines, -179 removed lines

@@ -816,34 +816,34 @@ 
 	            	// this can happen if we have allprop and prop in one propfind:
 	            	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
 	                switch(is_array($props) ? $props[0] : $props) {
-	                case "all":
-	                    // nothing to remove
-	                    break;
-
-	                case "names":
-	                    // only the names of all existing properties were requested
-	                    // so we remove all values
-	                    unset($prop["val"]);
-	                    break;
-
-	                default:
-	                    $found = false;
-
-	                    // search property name in requested properties
-	                    foreach ((array)$props as $reqprop) {
-	                        if (   $reqprop["name"]  == $prop["name"]
-	                               && @$reqprop["xmlns"] == $prop["ns"]) {
-	                            $found = true;
-	                            break;
-	                        }
-	                    }
-
-	                    // unset property and continue with next one if not found/requested
-	                    if (!$found) {
-	                        $prop="";
-	                        continue(2);
-	                    }
-	                    break;
+	                	case "all":
+	                    	// nothing to remove
+	                    	break;
+
+	                	case "names":
+	                    	// only the names of all existing properties were requested
+	                    	// so we remove all values
+	                    	unset($prop["val"]);
+	                    	break;
+
+	                	default:
+	                    	$found = false;
+
+	                    	// search property name in requested properties
+	                    	foreach ((array)$props as $reqprop) {
+	                        	if (   $reqprop["name"]  == $prop["name"]
+	                               	&& @$reqprop["xmlns"] == $prop["ns"]) {
+	                            	$found = true;
+	                            	break;
+	                        	}
+	                    	}
+
+	                    	// unset property and continue with next one if not found/requested
+	                    	if (!$found) {
+	                        	$prop="";
+	                        	continue(2);
+	                    	}
+	                    	break;
 	                }
 
 	                // namespace handling
@@ -964,49 +964,49 @@ 
                     } else if ($prop["ns"] == "DAV:") {
                         // some WebDAV properties need special treatment
                         switch ($prop["name"]) {
-                        case "creationdate":
-                            echo '     <'.($this->crrnd?'':'D:')."creationdate ns0:dt=\"dateTime.tz\">"
-                                . gmdate("Y-m-d\\TH:i:s\\Z", $prop['val'])
-                                . '</'.($this->crrnd?'':'D:')."creationdate>\n";
-                            break;
-                        case "getlastmodified":
-                            echo '     <'.($this->crrnd?'':'D:')."getlastmodified ns0:dt=\"dateTime.rfc1123\">"
-                                . gmdate("D, d M Y H:i:s ", $prop['val'])
-                                . "GMT</".($this->crrnd?'':'D:')."getlastmodified>\n";
-                            break;
-                        case "supportedlock":
-                            echo '     <'.($this->crrnd?'':'D:')."supportedlock>$prop[val]</".($this->crrnd?'':'D:')."supportedlock>\n";
-                            break;
-                        case "lockdiscovery":
-                            echo '     <'.($this->crrnd?'':'D:')."lockdiscovery>\n";
-                            echo $prop["val"];
-                            echo '     </'.($this->crrnd?'':'D:')."lockdiscovery>\n";
-                            break;
-                        // the following are non-standard Microsoft extensions to the DAV namespace
-                        case "lastaccessed":
-                            echo '     <'.($this->crrnd?'':'D:')."lastaccessed ns0:dt=\"dateTime.rfc1123\">"
-                                . gmdate("D, d M Y H:i:s ", $prop['val'])
-                                . 'GMT</'.($this->crrnd?'':'D:')."lastaccessed>\n";
-                            break;
-                        case "ishidden":
-                            echo '     <'.($this->crrnd?'':'D:')."ishidden>"
-                                . is_string($prop['val']) ? $prop['val'] : ($prop['val'] ? 'true' : 'false')
-                                . '</'.($this->crrnd?'':'D:')."</D:ishidden>\n";
-                            break;
-                        default:
-                        	$ns_defs = '';
-                            if (is_array($prop['val']))
-                            {
-                            	$hns_hash = $ns_hash;
-                            	$val = $this->_hierarchical_prop_encode($prop['val'], 'DAV:', $ns_defs, $hns_hash);
-                            } elseif (isset($prop['raw'])) {
-                            	$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
-                            } else {
-	                    		$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
-                            }
-	                        echo '     <'.($this->crrnd?'':'D:')."$prop[name]$ns_defs>$val".
-	                        	'</'.($this->crrnd?'':'D:')."$prop[name]>\n";
-                            break;
+                        	case "creationdate":
+                            	echo '     <'.($this->crrnd?'':'D:')."creationdate ns0:dt=\"dateTime.tz\">"
+                                	. gmdate("Y-m-d\\TH:i:s\\Z", $prop['val'])
+                                	. '</'.($this->crrnd?'':'D:')."creationdate>\n";
+                            	break;
+                        	case "getlastmodified":
+                            	echo '     <'.($this->crrnd?'':'D:')."getlastmodified ns0:dt=\"dateTime.rfc1123\">"
+                                	. gmdate("D, d M Y H:i:s ", $prop['val'])
+                                	. "GMT</".($this->crrnd?'':'D:')."getlastmodified>\n";
+                            	break;
+                        	case "supportedlock":
+                            	echo '     <'.($this->crrnd?'':'D:')."supportedlock>$prop[val]</".($this->crrnd?'':'D:')."supportedlock>\n";
+                            	break;
+                        	case "lockdiscovery":
+                            	echo '     <'.($this->crrnd?'':'D:')."lockdiscovery>\n";
+                            	echo $prop["val"];
+                            	echo '     </'.($this->crrnd?'':'D:')."lockdiscovery>\n";
+                            	break;
+                        	// the following are non-standard Microsoft extensions to the DAV namespace
+                        	case "lastaccessed":
+                            	echo '     <'.($this->crrnd?'':'D:')."lastaccessed ns0:dt=\"dateTime.rfc1123\">"
+                                	. gmdate("D, d M Y H:i:s ", $prop['val'])
+                                	. 'GMT</'.($this->crrnd?'':'D:')."lastaccessed>\n";
+                            	break;
+                        	case "ishidden":
+                            	echo '     <'.($this->crrnd?'':'D:')."ishidden>"
+                                	. is_string($prop['val']) ? $prop['val'] : ($prop['val'] ? 'true' : 'false')
+                                	. '</'.($this->crrnd?'':'D:')."</D:ishidden>\n";
+                            	break;
+                        	default:
+                        		$ns_defs = '';
+                            	if (is_array($prop['val']))
+                            	{
+                            		$hns_hash = $ns_hash;
+                            		$val = $this->_hierarchical_prop_encode($prop['val'], 'DAV:', $ns_defs, $hns_hash);
+                            	} elseif (isset($prop['raw'])) {
+                            		$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
+                            	} else {
+	                    			$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
+                            	}
+	                        	echo '     <'.($this->crrnd?'':'D:')."$prop[name]$ns_defs>$val".
+	                        		'</'.($this->crrnd?'':'D:')."$prop[name]>\n";
+                            	break;
                         }
                     } else {
                         // allow multiple values and attributes, required eg. for caldav:supported-calendar-component-set
@@ -1761,9 +1761,9 @@ 
             foreach ($this->_SERVER as $key => $val) {
                 if (strncmp($key, "HTTP_CONTENT", 11)) continue;
                 switch ($key) {
-                case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
-		        	switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
-		        	{
+                	case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
+		        		switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
+		        		{
 		        		case 'gzip':
 		        		case 'deflate':	//zlib
 		        			if (extension_loaded('zlib')) break;
@@ -1772,67 +1772,67 @@ 
 					        $this->http_status('415 Unsupported Media Type');
 					        echo "The service does not support '$val' content encoding";
 					        return;
-		        	}
+		        		}
 		        	break;
 
-                case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
-                    // we assume it is not critical if this one is ignored
-                    // in the actual PUT implementation ...
-                    $options["content_language"] = $val;
-                    break;
+                	case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
+                    	// we assume it is not critical if this one is ignored
+                    	// in the actual PUT implementation ...
+                    	$options["content_language"] = $val;
+                    	break;
 
-                case 'HTTP_CONTENT_LENGTH':
-                    // defined on IIS and has the same value as CONTENT_LENGTH
-                    break;
+                	case 'HTTP_CONTENT_LENGTH':
+                    	// defined on IIS and has the same value as CONTENT_LENGTH
+                    	break;
 
-                case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
-                    /* The meaning of the Content-Location header in PUT
+                	case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
+                    	/* The meaning of the Content-Location header in PUT
                      or POST requests is undefined; servers are free
                      to ignore it in those cases. */
-                    break;
-
-                case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
-                    // single byte range requests are supported
-                    // the header format is also specified in RFC 2616 14.16
-                    // TODO we have to ensure that implementations support this or send 501 instead
-					$matches = null;
-                    if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
-                        $this->http_status("400 bad request");
-                        echo "The service does only support single byte ranges";
-                        return;
-                    }
-
-                    $range = array("start" => $matches[1], "end" => $matches[2]);
-                    if (is_numeric($matches[3])) {
-                        $range["total_length"] = $matches[3];
-                    }
-
-                    if (!isset($options['ranges'])) {
-                        $options['ranges'] = array();
-                    }
-
-                    $options["ranges"][] = $range;
-
-                    // TODO make sure the implementation supports partial PUT
-                    // this has to be done in advance to avoid data being overwritten
-                    // on implementations that do not support this ...
-                    break;
-
-                case 'HTTP_CONTENT_TYPE':
-                    // defined on IIS and has the same value as CONTENT_TYPE
-                    break;
-
-                case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
-                    // TODO: maybe we can just pretend here?
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support content MD5 checksum verification";
-                    return;
-
-                default:
-                    // any other unknown Content-* headers
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$key'";
-                    return;
+                    	break;
+
+                	case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
+                    	// single byte range requests are supported
+                    	// the header format is also specified in RFC 2616 14.16
+                    	// TODO we have to ensure that implementations support this or send 501 instead
+						$matches = null;
+                    	if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
+                        	$this->http_status("400 bad request");
+                        	echo "The service does only support single byte ranges";
+                        	return;
+                    	}
+
+                    	$range = array("start" => $matches[1], "end" => $matches[2]);
+                    	if (is_numeric($matches[3])) {
+                        	$range["total_length"] = $matches[3];
+                    	}
+
+                    	if (!isset($options['ranges'])) {
+                        	$options['ranges'] = array();
+                    	}
+
+                    	$options["ranges"][] = $range;
+
+                    	// TODO make sure the implementation supports partial PUT
+                    	// this has to be done in advance to avoid data being overwritten
+                    	// on implementations that do not support this ...
+                    	break;
+
+                	case 'HTTP_CONTENT_TYPE':
+                    	// defined on IIS and has the same value as CONTENT_TYPE
+                    	break;
+
+                	case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
+                    	// TODO: maybe we can just pretend here?
+                    	$this->http_status("501 not implemented");
+                    	echo "The service does not support content MD5 checksum verification";
+                    	return;
+
+                	default:
+                    	// any other unknown Content-* headers
+                    	$this->http_status("501 not implemented");
+                    	echo "The service does not support '$key'";
+                    	return;
                 }
             }
 
@@ -2390,34 +2390,34 @@ 
 
         // now it depends on what we found
         switch ($c) {
-        case "<":
-            // URIs are enclosed in <...>
-            $pos2 = strpos($string, ">", $pos);
-            $uri  = substr($string, $pos, $pos2 - $pos);
-            $pos  = $pos2 + 1;
-            return array("URI", $uri);
-
-        case "[":
-            //Etags are enclosed in [...]
-            if ($string{$pos} == "W") {
-                $type = "ETAG_WEAK";
-                $pos += 2;
-            } else {
-                $type = "ETAG_STRONG";
-            }
-            $pos2 = strpos($string, "]", $pos);
-            $etag = substr($string, $pos + 1, $pos2 - $pos - 2);
-            $pos  = $pos2 + 1;
-            return array($type, $etag);
-
-        case "N":
-            // "N" indicates negation
-            $pos += 2;
-            return array("NOT", "Not");
-
-        default:
-            // anything else is passed verbatim char by char
-            return array("CHAR", $c);
+        	case "<":
+            	// URIs are enclosed in <...>
+            	$pos2 = strpos($string, ">", $pos);
+            	$uri  = substr($string, $pos, $pos2 - $pos);
+            	$pos  = $pos2 + 1;
+            	return array("URI", $uri);
+
+        	case "[":
+            	//Etags are enclosed in [...]
+            	if ($string{$pos} == "W") {
+                	$type = "ETAG_WEAK";
+                	$pos += 2;
+            	} else {
+                	$type = "ETAG_STRONG";
+            	}
+            	$pos2 = strpos($string, "]", $pos);
+            	$etag = substr($string, $pos + 1, $pos2 - $pos - 2);
+            	$pos  = $pos2 + 1;
+            	return array($type, $etag);
+
+        	case "N":
+            	// "N" indicates negation
+            	$pos += 2;
+            	return array("NOT", "Not");
+
+        	default:
+            	// anything else is passed verbatim char by char
+            	return array("CHAR", $c);
         }
     }
 
@@ -2461,33 +2461,33 @@ 
                     continue;
                 }
                 switch ($token[0]) {
-                case "CHAR":
-                    switch ($token[1]) {
-                    case "(":
-                        $level++;
-                        break;
-                    case ")":
-                        $level--;
-                        break;
-                    default:
-                        return false;
-                    }
+                	case "CHAR":
+                    	switch ($token[1]) {
+                    		case "(":
+                        		$level++;
+                        		break;
+                    		case ")":
+                        		$level--;
+                        		break;
+                    		default:
+                        		return false;
+                    	}
                     break;
 
-                case "URI":
-                    $list[] = $not."<$token[1]>";
-                    break;
+                	case "URI":
+                    	$list[] = $not."<$token[1]>";
+                    	break;
 
-                case "ETAG_WEAK":
-                    $list[] = $not."[W/'$token[1]']>";
-                    break;
+                	case "ETAG_WEAK":
+                    	$list[] = $not."[W/'$token[1]']>";
+                    	break;
 
-                case "ETAG_STRONG":
-                    $list[] = $not."['$token[1]']>";
-                    break;
+                	case "ETAG_STRONG":
+                    	$list[] = $not."['$token[1]']>";
+                    	break;
 
-                default:
-                    return false;
+                	default:
+                    	return false;
                 }
                 $not = "";
             }

Braces +700 added lines, -289 removed lines

@@ -196,7 +196,8 @@ 
     function ServeRequest($prefix=null)
     {
         // prevent warning in litmus check 'delete_fragment'
-        if (strstr($this->_SERVER["REQUEST_URI"], '#')) {
+        if (strstr($this->_SERVER["REQUEST_URI"], '#'))
+        {
             $this->http_status("400 Bad Request");
             return;
         }
@@ -221,7 +222,8 @@ 
         $path_info_raw = substr($path_info, strlen($this->_SERVER["SCRIPT_NAME"]));
 
         // just in case the path came in empty ...
-        if (empty($path_info_raw)) {
+        if (empty($path_info_raw))
+        {
             $path_info_raw = "/";
         }
 
@@ -245,28 +247,36 @@ 
         	'#' => '%23',
         	'?' => '%3F',
         ));
-        if (!strlen($this->path)) {
-            if ($this->_SERVER["REQUEST_METHOD"] == "GET") {
+        if (!strlen($this->path))
+        {
+            if ($this->_SERVER["REQUEST_METHOD"] == "GET")
+            {
                 // redirect clients that try to GET a collection
                 // WebDAV clients should never try this while
                 // regular HTTP clients might ...
                 header("Location: ".$this->base_uri."/");
                 return;
-            } else {
+            }
+            else
+            {
                 // if a WebDAV client didn't give a path we just assume '/'
                 $this->path = "/";
             }
         }
 
-        if (ini_get("magic_quotes_gpc")) {
+        if (ini_get("magic_quotes_gpc"))
+        {
             $this->path = stripslashes($this->path);
         }
 
 
         // identify ourselves
-        if (empty($this->dav_powered_by)) {
+        if (empty($this->dav_powered_by))
+        {
             header("X-Dav-Powered-By: PHP class: ".get_class($this));
-        } else {
+        }
+        else
+        {
             header("X-Dav-Powered-By: ".$this->dav_powered_by);
         }
 
@@ -274,7 +284,8 @@ 
         // for the motivation for not checking OPTIONS requests on / see
         // http://pear.php.net/bugs/bug.php?id=5363
         if ( (   !(($this->_SERVER['REQUEST_METHOD'] == 'OPTIONS') && ($this->path == "/")))
-             && (!$this->_check_auth())) {
+             && (!$this->_check_auth()))
+        {
             // RFC2518 says we must use Digest instead of Basic
             // but Microsoft Clients do not support Digest
             // and we don't support NTLM and Kerberos
@@ -289,7 +300,8 @@ 
         }
 
         // check
-        if (! $this->_check_if_header_conditions()) {
+        if (! $this->_check_if_header_conditions())
+        {
             return;
         }
 
@@ -298,16 +310,24 @@ 
         $wrapper = "http_".$method;
 
         // activate HEAD emulation by GET if no HEAD method found
-        if ($method == "head" && !method_exists($this, "head")) {
+        if ($method == "head" && !method_exists($this, "head"))
+        {
             $method = "get";
         }
 
-        if (method_exists($this, $wrapper) && ($method == "options" || method_exists($this, $method))) {
+        if (method_exists($this, $wrapper) && ($method == "options" || method_exists($this, $method)))
+        {
             $this->$wrapper();  // call method by name
-        } else { // method not found/implemented
-            if ($this->_SERVER["REQUEST_METHOD"] == "LOCK") {
+        }
+        else
+        {
+// method not found/implemented
+            if ($this->_SERVER["REQUEST_METHOD"] == "LOCK")
+            {
             	$error = '412 Precondition failed';
-            } else {
+            }
+            else
+            {
                 $error = '405 Method not allowed';
                 header("Allow: ".join(", ", $this->_allow()));  // tell client what's allowed
             }
@@ -612,12 +632,14 @@ 
 
         // dav header
         $dav = array(1);        // assume we are always dav class 1 compliant
-        if (isset($allow['LOCK'])) {
+        if (isset($allow['LOCK']))
+        {
             $dav[] = 2;         // dav class 2 requires that locking is supported
         }
 
         // allow extending class to modify DAV and Allow headers
-		if (method_exists($this,'OPTIONS')) {
+		if (method_exists($this,'OPTIONS'))
+		{
 			$this->OPTIONS($this->path,$dav,$allow);
 		}
 
@@ -661,34 +683,48 @@ 
         $options["path"] = $this->path;
 
         // search depth from header (default is "infinity)
-        if (isset($this->_SERVER['HTTP_DEPTH'])) {
+        if (isset($this->_SERVER['HTTP_DEPTH']))
+        {
             $options["depth"] = $this->_SERVER["HTTP_DEPTH"];
-        } else {
+        }
+        else
+        {
             $options["depth"] = "infinity";
         }
 
         // analyze request payload
         $propinfo = new _parse_propfind("php://input", $this->store_request);
-        if ($this->store_request) $this->request = $propinfo->request;
-        if (!$propinfo->success) {
+        if ($this->store_request)
+        {
+        	$this->request = $propinfo->request;
+        }
+        if (!$propinfo->success)
+        {
             $this->http_status("400 Error");
             return;
         }
 		$options['root'] = $propinfo->root;
 		$options['props'] = $propinfo->props;
 		if ($propinfo->filters)
-			$options['filters'] = $propinfo->filters;
+		{
+					$options['filters'] = $propinfo->filters;
+		}
 		if ($propinfo->other)
-			$options['other'] = $propinfo->other;
+		{
+					$options['other'] = $propinfo->other;
+		}
 
         // call user handler
-        if (!($retval =$this->$handler($options, $files))) {
+        if (!($retval =$this->$handler($options, $files)))
+        {
             $files = array("files" => array());
-            if (method_exists($this, "checkLock")) {
+            if (method_exists($this, "checkLock"))
+            {
                 // is locked?
                 $lock = $this->checkLock($this->path);
 
-                if (is_array($lock) && count($lock)) {
+                if (is_array($lock) && count($lock))
+                {
                     $created          = isset($lock['created'])  ? $lock['created']  : time();
                     $modified         = isset($lock['modified']) ? $lock['modified'] : time();
                     $files['files'][] = array("path"  => self::_slashify($this->path),
@@ -702,7 +738,8 @@ 
                 }
             }
 
-            if (empty($files['files'])) {
+            if (empty($files['files']))
+            {
                 $this->http_status("404 Not Found");
                 return;
             }
@@ -736,7 +773,8 @@ 
         $allow = false;
 
         // allow extending class to modify DAV
-		if (method_exists($this,'OPTIONS')) {
+		if (method_exists($this,'OPTIONS'))
+		{
 			$this->OPTIONS($this->path,$dav,$allow);
 		}
         header("DAV: "  .join(", ", $dav));
@@ -775,8 +813,14 @@ 
      */
     function multistatus_responses(&$files, $props, $initial_ns_hash=null, $initial_ns_defs=null)
     {
-    	if (!isset($initial_ns_hash)) $initial_ns_hash = array('DAV:' => 'D');
-    	if (!isset($initial_ns_defs)) $initial_ns_defs = 'xmlns:ns0="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/"';
+    	if (!isset($initial_ns_hash))
+    	{
+    		$initial_ns_hash = array('DAV:' => 'D');
+    	}
+    	if (!isset($initial_ns_defs))
+    	{
+    		$initial_ns_defs = 'xmlns:ns0="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/"';
+    	}
 
     	// using an ArrayIterator to prevent foreach from copying the array,
         // as we cant loop by reference, when an iterator is given in $files
@@ -790,10 +834,12 @@ 
         	isset($this->_SERVER['HTTP_PREFER']) && in_array('depth-noroot', preg_split('/, ?/', $this->_SERVER['HTTP_PREFER']));
 
         // now we loop over all returned file entries
-        foreach ($files as $file) {
+        foreach ($files as $file)
+        {
 
         	// skip first element (root), if requested by Prefer: depth-noroot
-        	if ($skip_root) {
+        	if ($skip_root)
+        	{
         		$skip_root = false;
         		continue;
         	}
@@ -805,17 +851,20 @@ 
 	        $ns_defs = $initial_ns_defs;
 
             // nothing to do if no properties were returend for a file
-			if (isset($file["props"]) && is_array($file["props"])) {
+			if (isset($file["props"]) && is_array($file["props"]))
+			{
 
 	            // now loop over all returned properties
-	            foreach ($file["props"] as &$prop) {
+	            foreach ($file["props"] as &$prop)
+	            {
 	                // as a convenience feature we do not require that user handlers
 	                // restrict returned properties to the requested ones
 	                // here we strip all unrequested entries out of the response
 
 	            	// this can happen if we have allprop and prop in one propfind:
 	            	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
-	                switch(is_array($props) ? $props[0] : $props) {
+	                switch(is_array($props) ? $props[0] : $props)
+	                {
 	                case "all":
 	                    // nothing to remove
 	                    break;
@@ -830,16 +879,19 @@ 
 	                    $found = false;
 
 	                    // search property name in requested properties
-	                    foreach ((array)$props as $reqprop) {
+	                    foreach ((array)$props as $reqprop)
+	                    {
 	                        if (   $reqprop["name"]  == $prop["name"]
-	                               && @$reqprop["xmlns"] == $prop["ns"]) {
+	                               && @$reqprop["xmlns"] == $prop["ns"])
+	                        {
 	                            $found = true;
 	                            break;
 	                        }
 	                    }
 
 	                    // unset property and continue with next one if not found/requested
-	                    if (!$found) {
+	                    if (!$found)
+	                    {
 	                        $prop="";
 	                        continue(2);
 	                    }
@@ -847,10 +899,18 @@ 
 	                }
 
 	                // namespace handling
-	                if (empty($prop["ns"])) continue; // no namespace
+	                if (empty($prop["ns"]))
+	                {
+	                	continue;
+	                }
+	                // no namespace
 	                $ns = $prop["ns"];
 	                //if ($ns == "DAV:") continue; // default namespace
-	                if (isset($ns_hash[$ns])) continue; // already known
+	                if (isset($ns_hash[$ns]))
+	                {
+	                	continue;
+	                }
+	                // already known
 
 	                // register namespace
 	                $ns_name = "ns".(count($ns_hash) + 1);
@@ -860,37 +920,50 @@ 
 
 	            // we also need to add empty entries for properties that were requested
 	            // but for which no values where returned by the user handler
-	            if (is_array($props)) {
-	                foreach ($props as $reqprop) {
-	                    if (!is_array($reqprop) || $reqprop['name']=="") continue; // skip empty entries, or 'all' if <allprop /> used together with <prop>
+	            if (is_array($props))
+	            {
+	                foreach ($props as $reqprop)
+	                {
+	                    if (!is_array($reqprop) || $reqprop['name']=="")
+	                    {
+	                    	continue;
+	                    }
+	                    // skip empty entries, or 'all' if <allprop /> used together with <prop>
 
 	                    $found = false;
 
 	                    // check if property exists in result
-	                    foreach ($file["props"] as &$prop) {
+	                    foreach ($file["props"] as &$prop)
+	                    {
 	                        if (is_array($prop) && $reqprop["name"] == $prop["name"]
-	                               && @$reqprop["xmlns"] == $prop["ns"]) {
+	                               && @$reqprop["xmlns"] == $prop["ns"])
+	                        {
 	                            $found = true;
 	                            break;
 	                        }
 	                    }
 
-	                    if (!$found) {
-	                        if ($reqprop["xmlns"]==="DAV:" && $reqprop["name"]==="lockdiscovery") {
+	                    if (!$found)
+	                    {
+	                        if ($reqprop["xmlns"]==="DAV:" && $reqprop["name"]==="lockdiscovery")
+	                        {
 	                            // lockdiscovery is handled by the base class
 	                            $file["props"][]
 	                                = $this->mkprop("DAV:",
 	                                                "lockdiscovery",
 	                                                $this->lockdiscovery($file['path']));
 	                        // only collect $file['noprops'] if we have NO Brief: t and NO Prefer: return=minimal HTTP Header
-	                        } elseif ((!isset($this->_SERVER['HTTP_BRIEF']) || $this->_SERVER['HTTP_BRIEF'] != 't') &&
-	                        	(!isset($this->_SERVER['HTTP_PREFER']) || !in_array('return=minimal', preg_split('/, ?/', $this->_SERVER['HTTP_PREFER'])))) {
+	                        }
+	                        elseif ((!isset($this->_SERVER['HTTP_BRIEF']) || $this->_SERVER['HTTP_BRIEF'] != 't') &&
+	                        	(!isset($this->_SERVER['HTTP_PREFER']) || !in_array('return=minimal', preg_split('/, ?/', $this->_SERVER['HTTP_PREFER']))))
+	                        {
 	                            // add empty value for this property
 	                            $file["noprops"][] =
 	                                $this->mkprop($reqprop["xmlns"], $reqprop["name"], "");
 
 	                            // register property namespace if not known yet
-	                            if ($reqprop["xmlns"] != "DAV:" && !isset($ns_hash[$reqprop["xmlns"]])) {
+	                            if ($reqprop["xmlns"] != "DAV:" && !isset($ns_hash[$reqprop["xmlns"]]))
+	                            {
 	                                $ns_name = "ns".(count($ns_hash) + 1);
 	                                $ns_hash[$reqprop["xmlns"]] = $ns_name;
 	                                $ns_defs .= " xmlns:$ns_name=\"$reqprop[xmlns]\"";
@@ -901,9 +974,15 @@ 
 	            }
 	        }
             // ignore empty or incomplete entries
-            if (!is_array($file) || empty($file) || !isset($file["path"])) continue;
+            if (!is_array($file) || empty($file) || !isset($file["path"]))
+            {
+            	continue;
+            }
             $path = $file['path'];
-            if (!is_string($path) || $path==="") continue;
+            if (!is_string($path) || $path==="")
+            {
+            	continue;
+            }
 
             if ($this->crrnd)
             {
@@ -932,38 +1011,56 @@ 
             }
 
             // report all found properties and their values (if any)
-            if (isset($file["props"]) && is_array($file["props"])) {
+            if (isset($file["props"]) && is_array($file["props"]))
+            {
                 echo '   <'.($this->crrnd?'':'D:')."propstat>\n";
                 echo '    <'.($this->crrnd?'':'D:')."prop>\n";
 
-                foreach ($file["props"] as &$prop) {
+                foreach ($file["props"] as &$prop)
+                {
 
-                    if (!is_array($prop)) continue;
-                    if (!isset($prop["name"])) continue;
+                    if (!is_array($prop))
+                    {
+                    	continue;
+                    }
+                    if (!isset($prop["name"]))
+                    {
+                    	continue;
+                    }
 
-                    if (!isset($prop["val"]) || $prop["val"] === "" || $prop["val"] === false) {
+                    if (!isset($prop["val"]) || $prop["val"] === "" || $prop["val"] === false)
+                    {
                         // empty properties (cannot use empty() for check as "0" is a legal value here)
-                        if ($prop["ns"]=="DAV:") {
+                        if ($prop["ns"]=="DAV:")
+                        {
                             echo '     <'.($this->crrnd?'':'D:')."$prop[name]/>\n";
-                        } else if (!empty($prop["ns"])) {
+                        }
+                        else if (!empty($prop["ns"]))
+                        {
                             echo "     <".$ns_hash[$prop["ns"]].":$prop[name]/>\n";
-                        } else {
+                        }
+                        else
+                        {
                             echo "     <$prop[name] xmlns=\"\"/>";
                         }
                     }
                     // multiple level of responses required for expand-property reports
                     elseif(isset($prop['props']) && is_array($prop['val']))
                     {
-                        if ($prop['ns'] && !isset($ns_hash[$prop['ns']])) {
+                        if ($prop['ns'] && !isset($ns_hash[$prop['ns']]))
+                        {
                             $ns_name = "ns".(count($ns_hash) + 1);
                             $ns_hash[$prop['ns']] = $ns_name;
                         }
                     	echo '     <'.$ns_hash[$prop['ns']].":$prop[name]>\n";
                         $this->multistatus_responses($prop['val'], $prop['props'], $ns_hash, '');
                     	echo '     </'.$ns_hash[$prop['ns']].":$prop[name]>\n";
-                    } else if ($prop["ns"] == "DAV:") {
+                    }
+                    else if ($prop["ns"] == "DAV:")
+                    {
                         // some WebDAV properties need special treatment
-                        switch ($prop["name"]) {
+                        switch ($prop["name"])
+                        {
                         case "creationdate":
                             echo '     <'.($this->crrnd?'':'D:')."creationdate ns0:dt=\"dateTime.tz\">"
                                 . gmdate("Y-m-d\\TH:i:s\\Z", $prop['val'])
@@ -999,40 +1096,57 @@ 
                             {
                             	$hns_hash = $ns_hash;
                             	$val = $this->_hierarchical_prop_encode($prop['val'], 'DAV:', $ns_defs, $hns_hash);
-                            } elseif (isset($prop['raw'])) {
+                            }
+                            elseif (isset($prop['raw']))
+                            {
                             	$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
-                            } else {
+                            }
+                            else
+                            {
 	                    		$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
                             }
 	                        echo '     <'.($this->crrnd?'':'D:')."$prop[name]$ns_defs>$val".
 	                        	'</'.($this->crrnd?'':'D:')."$prop[name]>\n";
                             break;
                         }
-                    } else {
+                    }
+                    else
+                    {
                         // allow multiple values and attributes, required eg. for caldav:supported-calendar-component-set
-                        if ($prop['ns'] && is_array($prop['val'])) {
-                    		if (!isset($ns_hash[$prop['ns']])) {
+                        if ($prop['ns'] && is_array($prop['val']))
+                        {
+                    		if (!isset($ns_hash[$prop['ns']]))
+                    		{
                                 $ns_name = "ns".(count($ns_hash) + 1);
                                 $ns_hash[$prop['ns']] = $ns_name;
                     		}
                   			$vals = $extra_ns = '';
                     		foreach($prop['val'] as $subprop)
                     		{
-                    			if ($subprop['ns'] && $subprop['ns'] != 'DAV:') {
+                    			if ($subprop['ns'] && $subprop['ns'] != 'DAV:')
+                    			{
 		                    		// register property namespace if not known yet
-		                    		if (!isset($ns_hash[$subprop['ns']])) {
+		                    		if (!isset($ns_hash[$subprop['ns']]))
+		                    		{
 			                    		$ns_name = "ns".(count($ns_hash) + 1);
 			                    		$ns_hash[$subprop['ns']] = $ns_name;
-		                    		} else {
+		                    		}
+		                    		else
+		                    		{
 			                    		$ns_name = $ns_hash[$subprop['ns']];
 		                    		}
-		                    		if (strchr($extra_ns,$extra=' xmlns:'.$ns_name.'="'.$subprop['ns'].'"') === false) {
+		                    		if (strchr($extra_ns,$extra=' xmlns:'.$ns_name.'="'.$subprop['ns'].'"') === false)
+		                    		{
 			                    		$extra_ns .= $extra;
 		                    		}
 		                    		$ns_name .= ':';
-	                    		} elseif ($subprop['ns'] == 'DAV:') {
+	                    		}
+	                    		elseif ($subprop['ns'] == 'DAV:')
+	                    		{
 		                    		$ns_name = 'D:';
-	                    		} else {
+	                    		}
+	                    		else
+	                    		{
 		                    		$ns_name = '';
 	                    		}
 	                    		$vals .= "<$ns_name$subprop[name]";
@@ -1047,7 +1161,7 @@ 
 	                    			else	// val contains only attributes, no value
 	                    			{
 			                    		foreach($subprop['val'] as $attr => $val)
-										{
+			                    		{
 				                    		$vals .= ' '.$attr.'="'.htmlspecialchars($val, ENT_NOQUOTES, 'utf-8').'"';
 										}
 			                    		$vals .= '/>';
@@ -1056,34 +1170,50 @@ 
 	                    		else
 	                    		{
 	                    			$vals .= '>';
-	                    			if (isset($subprop['raw'])) {
+	                    			if (isset($subprop['raw']))
+	                    			{
 	                    				$vals .= '<![CDATA['.$subprop['val'].']]>';
-	                    			} else {
-	                    				if($subprop['name'] == 'href') $subprop['val'] = $this->_urlencode($subprop['val']);
+	                    			}
+	                    			else
+	                    			{
+	                    				if($subprop['name'] == 'href')
+	                    				{
+	                    					$subprop['val'] = $this->_urlencode($subprop['val']);
+	                    				}
 		                    			$vals .= htmlspecialchars($subprop['val'], ENT_NOQUOTES, 'utf-8');
 	                    			}
 	                    			$vals .= "</$ns_name$subprop[name]>";
 	                    		}
                     		}
                     		echo '     <'.$ns_hash[$prop['ns']].":$prop[name]$extra_ns>$vals</".$ns_hash[$prop['ns']].":$prop[name]>\n";
-                        } else {
+                        }
+                        else
+                        {
                         	if ($prop['raw'])
                         	{
                         		$val = '<![CDATA['.$prop['val'].']]>';
-                        	} else {
+                        	}
+                        	else
+                        	{
                         		$val = htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8');
                         	}
                         	$val = $this->_prop_encode($val);
 	                        // properties from namespaces != "DAV:" or without any namespace
-	                        if ($prop['ns']) {
-		                        if ($this->crrnd) {
+	                        if ($prop['ns'])
+	                        {
+		                        if ($this->crrnd)
+		                        {
 			                        echo "     <$prop[name] xmlns=".'"'.$prop["ns"].'">'
 									. $val . "</$prop[name]>\n";
-		                        } else {
+		                        }
+		                        else
+		                        {
 			                        echo "     <" . $ns_hash[$prop["ns"]] . ":$prop[name]>"
 									. $val . '</'.$ns_hash[$prop['ns']].":$prop[name]>\n";
 		                        }
-	                        } else {
+	                        }
+	                        else
+	                        {
 		                        echo "     <$prop[name] xmlns=\"\">$val</$prop[name]>\n";
 	                        }
                         }
@@ -1105,16 +1235,23 @@ 
             }
 
             // now report all properties requested but not found
-            if (isset($file["noprops"])) {
+            if (isset($file["noprops"]))
+            {
                 echo '   <'.($this->crrnd?'':'D:')."propstat>\n";
                 echo '    <'.($this->crrnd?'':'D:')."prop>\n";
 
-                foreach ($file["noprops"] as &$prop) {
-                    if ($prop["ns"] == "DAV:") {
+                foreach ($file["noprops"] as &$prop)
+                {
+                    if ($prop["ns"] == "DAV:")
+                    {
                         echo '     <'.($this->crrnd?'':'D:')."$prop[name]/>\n";
-                    } else if ($prop["ns"] == "") {
+                    }
+                    else if ($prop["ns"] == "")
+                    {
                         echo "     <$prop[name] xmlns=\"\"/>\n";
-                    } else {
+                    }
+                    else
+                    {
                         echo "     <" . $ns_hash[$prop["ns"]] . ":$prop[name]/>\n";
                     }
                 }
@@ -1163,15 +1300,20 @@ 
      */
     function http_PROPPATCH()
     {
-        if ($this->_check_lock_status($this->path)) {
+        if ($this->_check_lock_status($this->path))
+        {
             $options = Array();
 
             $options["path"] = $this->path;
 
             $propinfo = new _parse_proppatch("php://input", $this->store_request);
-            if ($this->store_request) $this->request = $propinfo->request;
+            if ($this->store_request)
+            {
+            	$this->request = $propinfo->request;
+            }
 
-            if (!$propinfo->success) {
+            if (!$propinfo->success)
+            {
                 $this->http_status("400 Error");
                 return;
             }
@@ -1189,14 +1331,16 @@ 
             echo ' <'.($this->crrnd?'':'D:')."response>\n";
             echo '  <'.($this->crrnd?'':'D:')."href>".$this->_urlencode($this->_mergePaths($this->_SERVER["SCRIPT_NAME"], $this->path)).'</'.($this->crrnd?'':'D:')."href>\n";
 
-            foreach ($options["props"] as $prop) {
+            foreach ($options["props"] as $prop)
+            {
                 echo '   <'.($this->crrnd?'':'D:')."propstat>\n";
                 echo '    <'.($this->crrnd?'':'D:')."prop><$prop[name] xmlns=\"$prop[ns]\"/></".($this->crrnd?'':'D:')."prop>\n";
                 echo '    <'.($this->crrnd?'':'D:')."status>HTTP/1.1 $prop[status]</".($this->crrnd?'':'D:')."status>\n";
                 echo '   </'.($this->crrnd?'':'D:')."propstat>\n";
             }
 
-            if ($responsedescr) {
+            if ($responsedescr)
+            {
                 echo '  <'.($this->crrnd?'':'D:')."responsedescription>".
                     $this->_prop_encode(htmlspecialchars($responsedescr, ENT_NOQUOTES, 'utf-8')).
                     '</'.($this->crrnd?'':'D:')."responsedescription>\n";
@@ -1204,7 +1348,9 @@ 
 
             echo ' </'.($this->crrnd?'':'D:')."response>\n";
             echo '</'.($this->crrnd?'':'D:')."multistatus>\n";
-        } else {
+        }
+        else
+        {
             $this->http_status("423 Locked");
         }
     }
@@ -1274,11 +1420,14 @@ 
 
         $this->_get_ranges($options);
 
-        if (true === ($status = $this->GET($options))) {
-            if (!headers_sent()) {
+        if (true === ($status = $this->GET($options)))
+        {
+            if (!headers_sent())
+            {
                 $status = "200 OK";
 
-                if (!isset($options['mimetype'])) {
+                if (!isset($options['mimetype']))
+                {
                     $options['mimetype'] = "application/octet-stream";
                 }
                 // switching off zlib.output_compression for everything but text files,
@@ -1290,7 +1439,8 @@ 
                 }
                 header("Content-type: $options[mimetype]");
 
-                if (isset($options['mtime'])) {
+                if (isset($options['mtime']))
+                {
                     header("Last-modified:".gmdate("D, d M Y H:i:s ", $options['mtime'])."GMT");
                 }
                 // fix for IE and https, thanks to rob_burcham@yahoo.com
@@ -1299,55 +1449,82 @@ 
 				header("Cache-Control: maxage=1"); //In seconds
 				header("Pragma: public");
 
-                if (isset($options['stream'])) {
+                if (isset($options['stream']))
+                {
                     // GET handler returned a stream
-                    if (!empty($options['ranges']) && (0===fseek($options['stream'], 0, SEEK_SET))) {
+                    if (!empty($options['ranges']) && (0===fseek($options['stream'], 0, SEEK_SET)))
+                    {
                         // partial request and stream is seekable
 
-                        if (count($options['ranges']) === 1) {
+                        if (count($options['ranges']) === 1)
+                        {
                             $range = $options['ranges'][0];
 
-                            if (isset($range['start'])) {
+                            if (isset($range['start']))
+                            {
                                 fseek($options['stream'], $range['start'], SEEK_SET);
-                                if (feof($options['stream'])) {
+                                if (feof($options['stream']))
+                                {
                                     $this->http_status($status = "416 Requested range not satisfiable");
                                     return;
                                 }
 
-                                if (!empty($range['end'])) {
+                                if (!empty($range['end']))
+                                {
                                     $size = $range['end']-$range['start']+1;
                                     $this->http_status($status = "206 Partial content");
-                                    if (!self::use_compression()) header("Content-Length: $size");
+                                    if (!self::use_compression())
+                                    {
+                                    	header("Content-Length: $size");
+                                    }
                                     header("Content-Range: bytes $range[start]-$range[end]/"
                                            . (isset($options['size']) ? $options['size'] : "*"));
-                                    while ($size > 0 && !feof($options['stream'])) {
+                                    while ($size > 0 && !feof($options['stream']))
+                                    {
                                         $buffer = fread($options['stream'], $size < 8192 ? $size : 8192);
                                         $size  -= self::bytes($buffer);
                                         echo $buffer;
                                     }
-                                } else {
+                                }
+                                else
+                                {
                                     $this->http_status($status = "206 Partial content");
-                                    if (isset($options['size'])) {
-                                        if (!self::use_compression()) header("Content-Length: ".($options['size'] - $range['start']));
+                                    if (isset($options['size']))
+                                    {
+                                        if (!self::use_compression())
+                                        {
+                                        	header("Content-Length: ".($options['size'] - $range['start']));
+                                        }
                                         header("Content-Range: bytes ".$range['start']."-".
 											(isset($options['size']) ? $options['size']-1 : "")."/"
 										   . (isset($options['size']) ? $options['size'] : "*"));
                                     }
                                     fpassthru($options['stream']);
                                 }
-                            } else {
-                                if (!self::use_compression()) header("Content-length: ".$range['last']);
+                            }
+                            else
+                            {
+                                if (!self::use_compression())
+                                {
+                                	header("Content-length: ".$range['last']);
+                                }
                                 fseek($options['stream'], -$range['last'], SEEK_END);
                                 fpassthru($options['stream']);
                             }
-                        } else {
+                        }
+                        else
+                        {
                             $this->_multipart_byterange_header(); // init multipart
-                            foreach ($options['ranges'] as $range) {
+                            foreach ($options['ranges'] as $range)
+                            {
                                 // TODO what if size unknown? 500?
-                                if (isset($range['start'])) {
+                                if (isset($range['start']))
+                                {
                                     $from = $range['start'];
                                     $to   = !empty($range['end']) ? $range['end'] : $options['size']-1;
-                                } else {
+                                }
+                                else
+                                {
                                     $from = $options['size'] - $range['last']-1;
                                     $to   = $options['size'] -1;
                                 }
@@ -1357,7 +1534,8 @@ 
 
 
                                 fseek($options['stream'], $from, SEEK_SET);
-                                while ($size && !feof($options['stream'])) {
+                                while ($size && !feof($options['stream']))
+                                {
                                     $buffer = fread($options['stream'], 4096);
                                     $size  -= self::bytes($buffer);
                                     echo $buffer;
@@ -1365,29 +1543,44 @@ 
                             }
                             $this->_multipart_byterange_header(); // end multipart
                         }
-                    } else {
+                    }
+                    else
+                    {
                         // normal request or stream isn't seekable, return full content
-                        if (isset($options['size']) && !self::use_compression()) {
+                        if (isset($options['size']) && !self::use_compression())
+                        {
                             header("Content-Length: ".$options['size']);
                         }
                         fpassthru($options['stream']);
                         return; // no more headers
                     }
-                } elseif (isset($options['data'])) {
-                    if (is_array($options['data'])) {
+                }
+                elseif (isset($options['data']))
+                {
+                    if (is_array($options['data']))
+                    {
                         // reply to partial request
-                    } else {
-                        if (!self::use_compression()) header("Content-Length: ".self::bytes($options['data']));
+                    }
+                    else
+                    {
+                        if (!self::use_compression())
+                        {
+                        	header("Content-Length: ".self::bytes($options['data']));
+                        }
                         echo $options['data'];
                     }
                 }
             }
         }
 
-        if (!headers_sent()) {
-            if (false === $status) {
+        if (!headers_sent())
+        {
+            if (false === $status)
+            {
                 $this->http_status("404 not found");
-            } else {
+            }
+            else
+            {
                 // TODO: check setting of headers in various code paths above
                 $this->http_status("$status");
             }
@@ -1404,15 +1597,18 @@ 
     function _get_ranges(&$options)
     {
         // process Range: header if present
-        if (isset($this->_SERVER['HTTP_RANGE'])) {
+        if (isset($this->_SERVER['HTTP_RANGE']))
+        {
 
             // we only support standard "bytes" range specifications for now
 			$matches = null;
-            if (preg_match('/bytes\s*=\s*(.+)/', $this->_SERVER['HTTP_RANGE'], $matches)) {
+            if (preg_match('/bytes\s*=\s*(.+)/', $this->_SERVER['HTTP_RANGE'], $matches))
+            {
                 $options["ranges"] = array();
 
                 // ranges are comma separated
-                foreach (explode(",", $matches[1]) as $range) {
+                foreach (explode(",", $matches[1]) as $range)
+                {
                     // ranges are either from-to pairs or just end positions
                     list($start, $end) = explode("-", $range);
                     $options["ranges"][] = ($start==="")
@@ -1438,8 +1634,10 @@ 
      */
     function _multipart_byterange_header($mimetype = false, $from = false, $to=false, $total=false)
     {
-        if ($mimetype === false) {
-            if (!isset($this->multipart_separator)) {
+        if ($mimetype === false)
+        {
+            if (!isset($this->multipart_separator))
+            {
                 // initial
 
                 // a little naive, this sequence *might* be part of the content
@@ -1448,13 +1646,17 @@ 
 
                 // generate HTTP header
                 header("Content-type: multipart/byteranges; boundary=".$this->multipart_separator);
-            } else {
+            }
+            else
+            {
                 // final
 
                 // generate closing multipart sequence
                 echo "\n--{$this->multipart_separator}--";
             }
-        } else {
+        }
+        else
+        {
             // generate separator and header for next part
             echo "\n--{$this->multipart_separator}\n";
             echo "Content-type: $mimetype\n";
@@ -1481,32 +1683,45 @@ 
         $options         = Array();
         $options["path"] = $this->path;
 
-        if (method_exists($this, "HEAD")) {
+        if (method_exists($this, "HEAD"))
+        {
             $status = $this->head($options);
-        } else if (method_exists($this, "GET")) {
+        }
+        else if (method_exists($this, "GET"))
+        {
             ob_start();
             $status = $this->GET($options);
-            if (!isset($options['size'])) {
+            if (!isset($options['size']))
+            {
                 $options['size'] = ob_get_length();
             }
             ob_end_clean();
         }
 
-        if (!isset($options['mimetype'])) {
+        if (!isset($options['mimetype']))
+        {
             $options['mimetype'] = "application/octet-stream";
         }
         header("Content-type: $options[mimetype]");
 
-        if (isset($options['mtime'])) {
+        if (isset($options['mtime']))
+        {
             header("Last-modified:".gmdate("D, d M Y H:i:s ", $options['mtime'])."GMT");
         }
 
-        if (isset($options['size'])) {
+        if (isset($options['size']))
+        {
             header("Content-Length: ".$options['size']);
         }
 
-        if ($status === true)  $status = "200 OK";
-        if ($status === false) $status = "404 Not found";
+        if ($status === true)
+        {
+        	$status = "200 OK";
+        }
+        if ($status === false)
+        {
+        	$status = "404 Not found";
+        }
 
         $this->http_status($status);
     }
@@ -1532,21 +1747,25 @@ 
 	        $options['content_length'] = $this->_SERVER['CONTENT_LENGTH'];
         }
         elseif (isset($this->_SERVER['X-Expected-Entity-Length']))
-		{
+        {
 	        // MacOS gives us that hint
 	        $options['content_length'] = $this->_SERVER['X-Expected-Entity-Length'];
 		}
 
         // get the Content-type
-        if (isset($this->_SERVER["CONTENT_TYPE"])) {
+        if (isset($this->_SERVER["CONTENT_TYPE"]))
+        {
 	        // for now we do not support any sort of multipart requests
-	        if (!strncmp($this->_SERVER["CONTENT_TYPE"], 'multipart/', 10)) {
+	        if (!strncmp($this->_SERVER["CONTENT_TYPE"], 'multipart/', 10))
+	        {
 		        $this->http_status('501 not implemented');
 		        echo 'The service does not support mulipart POST requests';
 		        return;
 	        }
 	        $options['content_type'] = $this->_SERVER['CONTENT_TYPE'];
-        } else {
+        }
+        else
+        {
 	        // default content type if none given
 	        $options['content_type'] = 'application/octet-stream';
         }
@@ -1557,7 +1776,7 @@ 
     		case 'gzip':
     		case 'deflate':	//zlib
     			if (extension_loaded('zlib'))
-     			{
+    			{
       				stream_filter_append($options['stream'], 'zlib.inflate', STREAM_FILTER_READ);
        			}
     	}
@@ -1578,15 +1797,23 @@ 
          does not understand or implement and MUST return a 501
          (Not Implemented) response in such cases."
          */
-        foreach ($this->_SERVER as $key => $val) {
-	        if (strncmp($key, 'HTTP_CONTENT', 11)) continue;
-	        switch ($key) {
+        foreach ($this->_SERVER as $key => $val)
+        {
+	        if (strncmp($key, 'HTTP_CONTENT', 11))
+	        {
+	        	continue;
+	        }
+	        switch ($key)
+	        {
 		        case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
 		        	switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
 		        	{
 		        		case 'gzip':
 		        		case 'deflate':	//zlib
-		        			if (extension_loaded('zlib')) break;
+		        			if (extension_loaded('zlib'))
+		        			{
+		        				break;
+		        			}
 		        			// fall through for no zlib support
 		        		default:
 					        $this->http_status('415 Unsupported Media Type');
@@ -1616,14 +1843,16 @@ 
 			        // the header format is also specified in RFC 2616 14.16
 			        // TODO we have to ensure that implementations support this or send 501 instead
 					$matches = null;
-			        if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
+			        if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches))
+			        {
 				        $this->http_status('400 bad request');
 				        echo 'The service does only support single byte ranges';
 				        return;
 			        }
 
 			        $range = array('start'=>$matches[1], 'end'=>$matches[2]);
-			        if (is_numeric($matches[3])) {
+			        if (is_numeric($matches[3]))
+			        {
 				        $range['total_length'] = $matches[3];
 			        }
 			        $options['ranges'][] = $range;
@@ -1655,31 +1884,46 @@ 
 	        }
         }
 
-        if (method_exists($this, 'POST')) {
+        if (method_exists($this, 'POST'))
+        {
 	        $status = $this->POST($options);
 
-	        if ($status === false) {
+	        if ($status === false)
+	        {
 		        $status = '400 Something went wrong';
-	        } else if ($status === true) {
+	        }
+	        else if ($status === true)
+	        {
 	        	$status = '200 OK';
-	        } else if (is_resource($status) && get_resource_type($status) == 'stream') {
+	        }
+	        else if (is_resource($status) && get_resource_type($status) == 'stream')
+	        {
 		        $stream = $status;
 
 		        $status = empty($options['new']) ? '200 OK' : '201 Created';
 
-		        if (!empty($options['ranges'])) {
+		        if (!empty($options['ranges']))
+		        {
 			        // TODO multipart support is missing (see also above)
-			        if (0 == fseek($stream, $range[0]['start'], SEEK_SET)) {
+			        if (0 == fseek($stream, $range[0]['start'], SEEK_SET))
+			        {
 				        $length = $range[0]['end']-$range[0]['start']+1;
-				        if (!fwrite($stream, fread($options['stream'], $length))) {
+				        if (!fwrite($stream, fread($options['stream'], $length)))
+				        {
 					        $status = '403 Forbidden';
 				        }
-			        } else {
+			        }
+			        else
+			        {
 				        $status = '403 Forbidden';
 			        }
-		        } else {
-			        while (!feof($options['stream'])) {
-				        if (false === fwrite($stream, fread($options['stream'], 4096))) {
+		        }
+		        else
+		        {
+			        while (!feof($options['stream']))
+			        {
+				        if (false === fwrite($stream, fread($options['stream'], 4096)))
+				        {
 					        $status = '403 Forbidden';
 					        break;
 				        }
@@ -1703,7 +1947,8 @@ 
      */
     function http_PUT()
     {
-        if ($this->_check_lock_status($this->path)) {
+        if ($this->_check_lock_status($this->path))
+        {
             $options                   = Array();
             $options["path"]           = $this->path;
 
@@ -1718,15 +1963,19 @@ 
             }
 
             // get the Content-type
-            if (isset($this->_SERVER["CONTENT_TYPE"])) {
+            if (isset($this->_SERVER["CONTENT_TYPE"]))
+            {
                 // for now we do not support any sort of multipart requests
-                if (!strncmp($this->_SERVER["CONTENT_TYPE"], "multipart/", 10)) {
+                if (!strncmp($this->_SERVER["CONTENT_TYPE"], "multipart/", 10))
+                {
                     $this->http_status("501 not implemented");
                     echo "The service does not support multipart PUT requests";
                     return;
                 }
                 $options["content_type"] = $this->_SERVER["CONTENT_TYPE"];
-            } else {
+            }
+            else
+            {
                 // default content type if none given
                 $options["content_type"] = "application/octet-stream";
             }
@@ -1737,7 +1986,7 @@ 
 	    		case 'gzip':
 	    		case 'deflate':	//zlib
 	    			if (extension_loaded('zlib'))
-	     			{
+	    			{
 	      				stream_filter_append($options['stream'], 'zlib.inflate', STREAM_FILTER_READ);
 	       			}
 	    	}
@@ -1758,15 +2007,23 @@ 
              does not understand or implement and MUST return a 501
              (Not Implemented) response in such cases."
             */
-            foreach ($this->_SERVER as $key => $val) {
-                if (strncmp($key, "HTTP_CONTENT", 11)) continue;
-                switch ($key) {
+            foreach ($this->_SERVER as $key => $val)
+            {
+                if (strncmp($key, "HTTP_CONTENT", 11))
+                {
+                	continue;
+                }
+                switch ($key)
+                {
                 case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
 		        	switch($this->_SERVER['HTTP_CONTENT_ENCODING'])
 		        	{
 		        		case 'gzip':
 		        		case 'deflate':	//zlib
-		        			if (extension_loaded('zlib')) break;
+		        			if (extension_loaded('zlib'))
+		        			{
+		        				break;
+		        			}
 		        			// fall through for no zlib support
 		        		default:
 					        $this->http_status('415 Unsupported Media Type');
@@ -1796,18 +2053,21 @@ 
                     // the header format is also specified in RFC 2616 14.16
                     // TODO we have to ensure that implementations support this or send 501 instead
 					$matches = null;
-                    if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches)) {
+                    if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $val, $matches))
+                    {
                         $this->http_status("400 bad request");
                         echo "The service does only support single byte ranges";
                         return;
                     }
 
                     $range = array("start" => $matches[1], "end" => $matches[2]);
-                    if (is_numeric($matches[3])) {
+                    if (is_numeric($matches[3]))
+                    {
                         $range["total_length"] = $matches[3];
                     }
 
-                    if (!isset($options['ranges'])) {
+                    if (!isset($options['ranges']))
+                    {
                         $options['ranges'] = array();
                     }
 
@@ -1838,45 +2098,65 @@ 
 
             $stat = $this->PUT($options);
 
-            if ($stat === false) {
+            if ($stat === false)
+            {
                 $stat = "403 Forbidden";
-            } else if (is_resource($stat) && get_resource_type($stat) == "stream") {
+            }
+            else if (is_resource($stat) && get_resource_type($stat) == "stream")
+            {
                 $stream = $stat;
 
                 $stat = $options["new"] ? "201 Created" : "204 No Content";
 
-                if (!empty($options["ranges"])) {
+                if (!empty($options["ranges"]))
+                {
                     // TODO multipart support is missing (see also above)
-                    if (0 == fseek($stream, $options['ranges'][0]["start"], SEEK_SET)) {
+                    if (0 == fseek($stream, $options['ranges'][0]["start"], SEEK_SET))
+                    {
                         $length = $options['ranges'][0]["end"] - $options['ranges'][0]["start"]+1;
 
-                        while (!feof($options['stream'])) {
-                            if ($length <= 0) {
+                        while (!feof($options['stream']))
+                        {
+                            if ($length <= 0)
+                            {
                                break;
                             }
 
-                            if ($length <= 8192) {
+                            if ($length <= 8192)
+                            {
                                 $data = fread($options['stream'], $length);
-                            } else {
+                            }
+                            else
+                            {
                                 $data = fread($options['stream'], 8192);
                             }
 
-                            if ($data === false) {
+                            if ($data === false)
+                            {
                                 $stat = "400 Bad request";
-                            } elseif (strlen($data)) {
-                                if (false === fwrite($stream, $data)) {
+                            }
+                            elseif (strlen($data))
+                            {
+                                if (false === fwrite($stream, $data))
+                                {
                                     $stat = "403 Forbidden";
                                     break;
                                 }
                                 $length -= strlen($data);
                             }
                         }
-                    } else {
+                    }
+                    else
+                    {
                         $stat = "403 Forbidden";
                     }
-                } else {
-                    while (!feof($options["stream"])) {
-                        if (false === fwrite($stream, fread($options["stream"], 8192))) {
+                }
+                else
+                {
+                    while (!feof($options["stream"]))
+                    {
+                        if (false === fwrite($stream, fread($options["stream"], 8192)))
+                        {
                             $stat = "403 Forbidden";
                             break;
                         }
@@ -1887,7 +2167,9 @@ 
             }
 
             $this->http_status($stat);
-        } else {
+        }
+        else
+        {
             $this->http_status("423 Locked");
         }
     }
@@ -1906,8 +2188,10 @@ 
     function http_DELETE()
     {
         // check RFC 2518 Section 9.2, last paragraph
-        if (isset($this->_SERVER["HTTP_DEPTH"])) {
-            if ($this->_SERVER["HTTP_DEPTH"] != "infinity") {
+        if (isset($this->_SERVER["HTTP_DEPTH"]))
+        {
+            if ($this->_SERVER["HTTP_DEPTH"] != "infinity")
+            {
 				if (stripos($_SERVER['HTTP_USER_AGENT'],'webdrive') !== false)
 				{
 					// pretend we didnt see it, as webdrive does not handle the depth parameter correctly while deleting collections
@@ -1921,7 +2205,8 @@ 
         }
 
         // check lock status
-        if ($this->_check_lock_status($this->path)) {
+        if ($this->_check_lock_status($this->path))
+        {
             // ok, proceed
             $options         = Array();
             $options["path"] = $this->path;
@@ -1929,7 +2214,9 @@ 
             $stat = $this->DELETE($options);
 
             $this->http_status($stat);
-        } else {
+        }
+        else
+        {
             // sorry, its locked
             $this->http_status("423 Locked");
         }
@@ -1964,10 +2251,13 @@ 
      */
     function http_MOVE()
     {
-        if ($this->_check_lock_status($this->path)) {
+        if ($this->_check_lock_status($this->path))
+        {
             // destination lock status is always checked by the helper method
             $this->_copymove("move");
-        } else {
+        }
+        else
+        {
             $this->http_status("423 Locked");
         }
     }
@@ -1988,19 +2278,25 @@ 
         $options         = Array();
         $options["path"] = $this->path;
 
-        if (isset($this->_SERVER['HTTP_DEPTH'])) {
+        if (isset($this->_SERVER['HTTP_DEPTH']))
+        {
             $options["depth"] = $this->_SERVER["HTTP_DEPTH"];
-        } else {
+        }
+        else
+        {
             $options["depth"] = "infinity";
         }
 
-        if (isset($this->_SERVER["HTTP_TIMEOUT"])) {
+        if (isset($this->_SERVER["HTTP_TIMEOUT"]))
+        {
             $options["timeout"] = explode(",", $this->_SERVER["HTTP_TIMEOUT"]);
         }
 
-        if (empty($this->_SERVER['CONTENT_LENGTH']) && !empty($this->_SERVER['HTTP_IF'])) {
+        if (empty($this->_SERVER['CONTENT_LENGTH']) && !empty($this->_SERVER['HTTP_IF']))
+        {
             // check if locking is possible
-            if (!$this->_check_lock_status($this->path)) {
+            if (!$this->_check_lock_status($this->path))
+            {
                 $this->http_status("423 Locked");
                 return;
             }
@@ -2016,15 +2312,19 @@ 
 
 
             $stat = $this->LOCK($options);
-        } else {
+        }
+        else
+        {
             // extract lock request information from request XML payload
             $lockinfo = new _parse_lockinfo("php://input");
-            if (!$lockinfo->success) {
+            if (!$lockinfo->success)
+            {
                 $this->http_status("400 bad request");
             }
 
             // check if locking is possible
-            if (!$this->_check_lock_status($this->path, $lockinfo->lockscope === "shared")) {
+            if (!$this->_check_lock_status($this->path, $lockinfo->lockscope === "shared"))
+            {
                 $this->http_status("423 Locked");
                 return;
             }
@@ -2039,36 +2339,51 @@ 
             $stat = $this->LOCK($options);
         }
 
-        if (is_bool($stat)) {
+        if (is_bool($stat))
+        {
             $http_stat = $stat ? "200 OK" : "423 Locked";
-        } else {
+        }
+        else
+        {
             $http_stat = (string)$stat;
         }
         $this->http_status($http_stat);
 
-        if ($http_stat{0} == 2) { // 2xx states are ok
-            if ($options["timeout"]) {
+        if ($http_stat{0} == 2)
+        {
+// 2xx states are ok
+            if ($options["timeout"])
+            {
                 // if multiple timeout values were given we take the first only
-                if (is_array($options["timeout"])) {
+                if (is_array($options["timeout"]))
+                {
                     reset($options["timeout"]);
                     $options["timeout"] = current($options["timeout"]);
                 }
                 // if the timeout is numeric only we need to reformat it
-                if (is_numeric($options["timeout"])) {
+                if (is_numeric($options["timeout"]))
+                {
                     // more than a million is considered an absolute timestamp
                     // less is more likely a relative value
-                    if ($options["timeout"]>1000000) {
+                    if ($options["timeout"]>1000000)
+                    {
                         $timeout = "Second-".($options['timeout']-time());
-                    } else {
+                    }
+                    else
+                    {
                         $timeout = "Second-$options[timeout]";
                     }
-                } else {
+                }
+                else
+                {
                     // non-numeric values are passed on verbatim,
                     // no error checking is performed here in this case
                     // TODO: send "Infinite" on invalid timeout strings?
                     $timeout = $options["timeout"];
                 }
-            } else {
+            }
+            else
+            {
                 $timeout = "Infinite";
             }
 
@@ -2106,9 +2421,12 @@ 
         $options         = Array();
         $options["path"] = $this->path;
 
-        if (isset($this->_SERVER['HTTP_DEPTH'])) {
+        if (isset($this->_SERVER['HTTP_DEPTH']))
+        {
             $options["depth"] = $this->_SERVER["HTTP_DEPTH"];
-        } else {
+        }
+        else
+        {
             $options["depth"] = "infinity";
         }
 
@@ -2137,9 +2455,12 @@ 
         $options['path'] = $this->path;
         $options['errors'] = array();
 
-        if (isset($this->_SERVER['HTTP_DEPTH'])) {
+        if (isset($this->_SERVER['HTTP_DEPTH']))
+        {
             $options['depth'] = $this->_SERVER['HTTP_DEPTH'];
-        } else {
+        }
+        else
+        {
             $options['depth'] = 'infinity';
         }
 
@@ -2150,18 +2471,26 @@ 
 		$this->http_status($status);
 		$content = '';
 
-        if (is_array($options['errors']) && count($options['errors'])) {
+        if (is_array($options['errors']) && count($options['errors']))
+        {
 	        header('Content-Type: text/xml; charset="utf-8"');
 	        // ... and payload
 	        $content .= "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
 	        $content .= "<D:error xmlns:D=\"DAV:\"> \n";
-	        foreach ($options['errors'] as $violation) {
+	        foreach ($options['errors'] as $violation)
+	        {
 	        	$content .= '<'.($this->crrnd?'':'D:')."$violation/>\n";
 	        }
 	        $content .=  '</'.($this->crrnd?'':'D:')."error>\n";
         }
-        if (!self::use_compression()) header("Content-Length: ".self::bytes($content));
-        if ($content) echo $options['content'];
+        if (!self::use_compression())
+        {
+        	header("Content-Length: ".self::bytes($content));
+        }
+        if ($content)
+        {
+        	echo $options['content'];
+        }
     }
 
     // }}}
@@ -2175,9 +2504,12 @@ 
         $options         = Array();
         $options["path"] = $this->path;
 
-        if (isset($this->_SERVER["HTTP_DEPTH"])) {
+        if (isset($this->_SERVER["HTTP_DEPTH"]))
+        {
             $options["depth"] = $this->_SERVER["HTTP_DEPTH"];
-        } else {
+        }
+        else
+        {
             $options["depth"] = "infinity";
         }
 
@@ -2186,33 +2518,45 @@ 
         $url  = parse_url($this->_SERVER["HTTP_DESTINATION"]);
         $path = urldecode($url["path"]);
 
-        if (isset($url["host"])) {
+        if (isset($url["host"]))
+        {
             // TODO check url scheme, too
             $http_host = $url["host"];
             if (isset($url["port"]) && $url["port"] != 80)
-                $http_host.= ":".$url["port"];
-        } else {
+            {
+                            $http_host.= ":".$url["port"];
+            }
+        }
+        else
+        {
             // only path given, set host to self
             $http_host = $http_header_host;
         }
 
         if ($http_host == $http_header_host &&
             !strncmp($this->_SERVER["SCRIPT_NAME"], $path,
-                     strlen($this->_SERVER["SCRIPT_NAME"]))) {
+                     strlen($this->_SERVER["SCRIPT_NAME"])))
+        {
             $options["dest"] = substr($path, strlen($this->_SERVER["SCRIPT_NAME"]));
-            if (!$this->_check_lock_status($options["dest"])) {
+            if (!$this->_check_lock_status($options["dest"]))
+            {
                 $this->http_status("423 Locked");
                 return;
             }
 
-        } else {
+        }
+        else
+        {
             $options["dest_url"] = $this->_SERVER["HTTP_DESTINATION"];
         }
 
         // see RFC 2518 Sections 9.6, 8.8.4 and 8.9.3
-        if (isset($this->_SERVER["HTTP_OVERWRITE"])) {
+        if (isset($this->_SERVER["HTTP_OVERWRITE"]))
+        {
             $options["overwrite"] = $this->_SERVER["HTTP_OVERWRITE"] == "T";
-        } else {
+        }
+        else
+        {
             $options["overwrite"] = true;
         }
 
@@ -2238,10 +2582,13 @@ 
         // all other METHODS need both a http_method() wrapper
         // and a method() implementation
         // the base class supplies wrappers only
-        foreach (get_class_methods($this) as $method) {
-            if (!strncmp("http_", $method, 5)) {
+        foreach (get_class_methods($this) as $method)
+        {
+            if (!strncmp("http_", $method, 5))
+            {
                 $method = strtoupper(substr($method, 5));
-                if (method_exists($this, $method)) {
+                if (method_exists($this, $method))
+                {
                     $allow[$method] = $method;
                 }
             }
@@ -2249,10 +2596,13 @@ 
 
         // we can emulate a missing HEAD implemetation using GET
         if (isset($allow["GET"]))
-            $allow["HEAD"] = "HEAD";
+        {
+                    $allow["HEAD"] = "HEAD";
+        }
 
         // no LOCK without checklok()
-        if (!method_exists($this, "checklock")) {
+        if (!method_exists($this, "checklock"))
+        {
             unset($allow["LOCK"]);
             unset($allow["UNLOCK"]);
         }
@@ -2274,7 +2624,8 @@ 
     public static function mkprop()
     {
 	    $args = func_get_args();
-	    switch (count($args)) {
+	    switch (count($args))
+	    {
 		    case 4:
 			    return array('ns'   => $args[0],
 				    'name' => $args[1],
@@ -2301,17 +2652,22 @@ 
      */
     function _check_auth()
     {
-        if (method_exists($this, "checkAuth")) {
+        if (method_exists($this, "checkAuth"))
+        {
             // PEAR style method name
             return $this->checkAuth(@$this->_SERVER["AUTH_TYPE"],
                                     @$this->_SERVER["PHP_AUTH_USER"],
                                     @$this->_SERVER["PHP_AUTH_PW"]);
-        } else if (method_exists($this, "check_auth")) {
+        }
+        else if (method_exists($this, "check_auth"))
+        {
             // old (pre 1.0) method name
             return $this->check_auth(@$this->_SERVER["AUTH_TYPE"],
                                      @$this->_SERVER["PHP_AUTH_USER"],
                                      @$this->_SERVER["PHP_AUTH_PW"]);
-        } else {
+        }
+        else
+        {
             // no method found -> no authentication required
             return true;
         }
@@ -2330,7 +2686,8 @@ 
     public static function _new_uuid()
     {
         // use uuid extension from PECL if available
-        if (function_exists("uuid_create")) {
+        if (function_exists("uuid_create"))
+        {
             return uuid_create();
         }
 
@@ -2376,12 +2733,14 @@ 
     function _if_header_lexer($string, &$pos)
     {
         // skip whitespace
-        while (ctype_space($string{$pos})) {
+        while (ctype_space($string{$pos}))
+        {
             ++$pos;
         }
 
         // already at end of string?
-        if (strlen($string) <= $pos) {
+        if (strlen($string) <= $pos)
+        {
             return false;
         }
 
@@ -2389,7 +2748,8 @@ 
         $c = $string{$pos++};
 
         // now it depends on what we found
-        switch ($c) {
+        switch ($c)
+        {
         case "<":
             // URIs are enclosed in <...>
             $pos2 = strpos($string, ">", $pos);
@@ -2399,10 +2759,13 @@ 
 
         case "[":
             //Etags are enclosed in [...]
-            if ($string{$pos} == "W") {
+            if ($string{$pos} == "W")
+            {
                 $type = "ETAG_WEAK";
                 $pos += 2;
-            } else {
+            }
+            else
+            {
                 $type = "ETAG_STRONG";
             }
             $pos2 = strpos($string, "]", $pos);
@@ -2434,35 +2797,44 @@ 
         $uris = array();
 
         // parser loop
-        while ($pos < $len) {
+        while ($pos < $len)
+        {
             // get next token
             $token = $this->_if_header_lexer($str, $pos);
 
             // check for URI
-            if ($token[0] == "URI") {
+            if ($token[0] == "URI")
+            {
                 $uri   = $token[1]; // remember URI
                 $token = $this->_if_header_lexer($str, $pos); // get next token
-            } else {
+            }
+            else
+            {
                 $uri = "";
             }
 
             // sanity check
-            if ($token[0] != "CHAR" || $token[1] != "(") {
+            if ($token[0] != "CHAR" || $token[1] != "(")
+            {
                 return false;
             }
 
             $list  = array();
             $level = 1;
             $not   = "";
-            while ($level) {
+            while ($level)
+            {
                 $token = $this->_if_header_lexer($str, $pos);
-                if ($token[0] == "NOT") {
+                if ($token[0] == "NOT")
+                {
                     $not = "!";
                     continue;
                 }
-                switch ($token[0]) {
+                switch ($token[0])
+                {
                 case "CHAR":
-                    switch ($token[1]) {
+                    switch ($token[1])
+                    {
                     case "(":
                         $level++;
                         break;
@@ -2492,9 +2864,12 @@ 
                 $not = "";
             }
 
-            if (@is_array($uris[$uri])) {
+            if (@is_array($uris[$uri]))
+            {
                 $uris[$uri] = array_merge($uris[$uri], $list);
-            } else {
+            }
+            else
+            {
                 $uris[$uri] = $list;
             }
         }
@@ -2513,27 +2888,34 @@ 
      */
     function _check_if_header_conditions()
     {
-        if (isset($this->_SERVER["HTTP_IF"])) {
+        if (isset($this->_SERVER["HTTP_IF"]))
+        {
             $this->_if_header_uris =
                 $this->_if_header_parser($this->_SERVER["HTTP_IF"]);
 
-            foreach ($this->_if_header_uris as $uri => $conditions) {
-                if ($uri == "") {
+            foreach ($this->_if_header_uris as $uri => $conditions)
+            {
+                if ($uri == "")
+                {
                     $uri = $this->uri;
                 }
                 // all must match
                 $state = true;
-                foreach ($conditions as $condition) {
+                foreach ($conditions as $condition)
+                {
                     // lock tokens may be free form (RFC2518 6.3)
                     // but if opaquelocktokens are used (RFC2518 6.4)
                     // we have to check the format (litmus tests this)
-                    if (!strncmp($condition, "<opaquelocktoken:", strlen("<opaquelocktoken"))) {
-                        if (!preg_match('/^<opaquelocktoken:[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}>$/', $condition)) {
+                    if (!strncmp($condition, "<opaquelocktoken:", strlen("<opaquelocktoken")))
+                    {
+                        if (!preg_match('/^<opaquelocktoken:[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}>$/', $condition))
+                        {
                             $this->http_status("423 Locked");
                             return false;
                         }
                     }
-                    if (!$this->_check_uri_condition($uri, $condition)) {
+                    if (!$this->_check_uri_condition($uri, $condition))
+                    {
                         $this->http_status("412 Precondition failed");
                         $state = false;
                         break;
@@ -2541,7 +2923,8 @@ 
                 }
 
                 // any match is ok
-                if ($state == true) {
+                if ($state == true)
+                {
                     return true;
                 }
             }
@@ -2568,7 +2951,8 @@ 
 
         // a lock token can never be from the DAV: scheme
         // litmus uses DAV:no-lock in some tests
-        if (!strncmp("<DAV:", $condition, 5)) {
+        if (!strncmp("<DAV:", $condition, 5))
+        {
             return false;
         }
 
@@ -2585,16 +2969,21 @@ 
     function _check_lock_status($path, $exclusive_only = false)
     {
         // FIXME depth -> ignored for now
-        if (method_exists($this, "checkLock")) {
+        if (method_exists($this, "checkLock"))
+        {
             // is locked?
             $lock = $this->checkLock($path);
 
             // ... and lock is not owned?
-            if (is_array($lock) && count($lock)) {
+            if (is_array($lock) && count($lock))
+            {
                 // FIXME doesn't check uri restrictions yet
-                if (!isset($this->_SERVER["HTTP_IF"]) || !strstr($this->_SERVER["HTTP_IF"], $lock["token"])) {
+                if (!isset($this->_SERVER["HTTP_IF"]) || !strstr($this->_SERVER["HTTP_IF"], $lock["token"]))
+                {
                     if (!$exclusive_only || ($lock["scope"] !== "shared"))
-                        return false;
+                    {
+                                            return false;
+                    }
                 }
             }
         }
@@ -2614,7 +3003,8 @@ 
     function lockdiscovery($path)
     {
         // no lock support without checklock() method
-        if (!method_exists($this, "checklock")) {
+        if (!method_exists($this, "checklock"))
+        {
             return "";
         }
 
@@ -2625,13 +3015,19 @@ 
         $lock = $this->checklock($path);
 
         // generate <activelock> block for returned data
-        if (is_array($lock) && count($lock)) {
+        if (is_array($lock) && count($lock))
+        {
             // check for 'timeout' or 'expires'
-            if (!empty($lock["expires"])) {
+            if (!empty($lock["expires"]))
+            {
                 $timeout = "Second-".($lock["expires"] - time());
-            } else if (!empty($lock["timeout"])) {
+            }
+            else if (!empty($lock["timeout"]))
+            {
                 $timeout = "Second-$lock[timeout]";
-            } else {
+            }
+            else
+            {
                 $timeout = "Infinite";
             }
 
@@ -2678,7 +3074,8 @@ 
     function http_status($status)
     {
         // simplified success case
-        if ($status === true) {
+        if ($status === true)
+        {
             $status = "200 OK";
         }
 
@@ -2763,18 +3160,24 @@ 
      * @return string
      */
 	function _hierarchical_prop_encode(array $props, $ns, &$ns_defs, array &$ns_hash)
-    {
+	{
     	$ret = '';
 
     	//error_log(__METHOD__.'('.array2string($props).')');
-    	if (isset($props['name'])) $props = array($props);
+    	if (isset($props['name']))
+    	{
+    		$props = array($props);
+    	}
 
     	foreach($props as $prop)
-		{
-	    	if (!isset($ns_hash[$prop['ns']])) // unknown namespace
+    	{
+	    	if (!isset($ns_hash[$prop['ns']]))
+	    	{
+	    		// unknown namespace
 	    	{
 		    	// register namespace
 		    	$ns_name = 'ns'.(count($ns_hash) + 1);
+	    	}
 		    	$ns_hash[$prop['ns']] = $ns_name;
 		    	$ns_defs .= ' xmlns:'.$ns_name.'="'.$prop['ns'].'"';
 	    	}
@@ -2792,7 +3195,7 @@ 
 			    	$vals = '';
 
 			    	foreach($subprop as $attr => $val)
-					{
+			    	{
 				    	$vals .= ' '.$attr.'="'.htmlspecialchars($val, ENT_NOQUOTES, 'utf-8').'"';
 					}
 
@@ -2809,9 +3212,11 @@ 
 		    	else
 		    	{
 			    	if(isset($prop['raw']))
-					{
+			    	{
 						$val = $this->_prop_encode('<![CDATA['.$prop['val'].']]>');
-					} else {
+					}
+					else
+					{
 						$val = $this->_prop_encode(htmlspecialchars($prop['val'], ENT_NOQUOTES, 'utf-8'));
 						// for href properties we need (minimalistic) urlencoding, eg. space
 						if ($prop['name'] == 'href')
@@ -2842,7 +3247,8 @@ 
 		//error_log( __METHOD__."\n" .print_r($text,true));
 		//error_log("prop-encode:" . print_r($this->_prop_encoding,true));
 
-		switch (strtolower($this->_prop_encoding)) {
+		switch (strtolower($this->_prop_encoding))
+		{
 			case "utf-8":
        			//error_log( __METHOD__."allready encoded\n" .print_r($text,true));
 				return $text;
@@ -2864,7 +3270,8 @@ 
     public static function _slashify($path)
     {
 		//error_log(__METHOD__." called with $path");
-		if ($path[self::bytes($path)-1] != '/') {
+		if ($path[self::bytes($path)-1] != '/')
+		{
 			//error_log(__METHOD__." added slash at the end of path");
 			$path = $path."/";
 		}
@@ -2880,7 +3287,8 @@ 
     public static function _unslashify($path)
     {
         //error_log(__METHOD__." called with $path");
-        if ($path[self::bytes($path)-1] == '/') {
+        if ($path[self::bytes($path)-1] == '/')
+        {
             $path = substr($path, 0, -1);
 			//error_log(__METHOD__." removed slash at the end of path");
         }
@@ -2898,9 +3306,12 @@ 
     {
         //error_log("merge called :\n$parent \n$child\n" . function_backtrace());
         //error_log("merge :\n".print_r($this->_mergePaths($this->_SERVER["SCRIPT_NAME"], $this->path)true));
-        if ($child{0} == '/') {
+        if ($child{0} == '/')
+        {
             return self::_unslashify($parent).$child;
-        } else {
+        }
+        else
+        {
             return self::_slashify($parent).$child;
         }
     }

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

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,

api/src/Mail/Imap.php

Switch Indentation +30 added lines, -30 removed lines

@@ -580,16 +580,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -664,16 +664,16 @@ 
 		$mailbox = '';
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$searchstring = $reference."*";
-				break;
-			case 1:
-				$mailbox = $searchstring = $reference;
-				//$reference = '%';
-				break;
-			case 2:
-				$searchstring = $reference."%";
-				break;
+				case 0:
+					$searchstring = $reference."*";
+					break;
+				case 1:
+					$mailbox = $searchstring = $reference;
+					//$reference = '%';
+					break;
+				case 2:
+					$searchstring = $reference."%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){
@@ -730,16 +730,16 @@ 
 
 		if ( is_int( $restriction_search ) ){
 			switch ( $restriction_search ) {
-			case 0:
-				$mailbox = $reference."*";
-				break;
-			case 1:
-				$mailbox = $reference;
-				$reference = '%';
-				break;
-			case 2:
-				$mailbox = "%";
-				break;
+				case 0:
+					$mailbox = $reference."*";
+					break;
+				case 1:
+					$mailbox = $reference;
+					$reference = '%';
+					break;
+				case 2:
+					$mailbox = "%";
+					break;
 			}
 		}else{
 			if ( is_string( $restriction_search ) ){

Braces +130 added lines, -42 removed lines

@@ -156,7 +156,10 @@ 
 		$this->loginType = $this->params['acc_imap_logintype'];
 		$this->domainName = $this->params['acc_domain'];
 
-		if (is_null($_timeout)) $_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		if (is_null($_timeout))
+		{
+			$_timeout = $this->params['acc_imap_timeout']?$this->params['acc_imap_timeout']:self::getTimeOut ();
+		}
 
 		// Horde use locale for translation of error messages
 		// need to set LC_CTYPE for charachter classification (eg. Umlauts)
@@ -169,7 +172,10 @@ 
 		{
 			$username = $this->getMailBoxUserName($username);
 		}
-		if ($_adminConnection) $this->adminConnection($username);
+		if ($_adminConnection)
+		{
+			$this->adminConnection($username);
+		}
 		$parent_params = array(
 			'username' => $this->params[$_adminConnection ? 'acc_imap_admin_username' : 'acc_imap_username'],
 			'password' => $this->params[$_adminConnection ? 'acc_imap_admin_password' : 'acc_imap_password'],
@@ -343,7 +349,11 @@ 
 	static function getTimeOut($_use='IMAP')
 	{
 		$timeout = $GLOBALS['egw_info']['user']['preferences']['mail']['connectionTimeout'];
-		if (empty($timeout) || !($timeout > 0)) $timeout = $_use == 'SIEVE' ? 10 : 20; // this is the default value
+		if (empty($timeout) || !($timeout > 0))
+		{
+			$timeout = $_use == 'SIEVE' ? 10 : 20;
+		}
+		// this is the default value
 		return $timeout;
 	}
 
@@ -406,7 +416,8 @@ 
 	 */
 	function encodeFolderName($_folderName)
 	{
-		if($this->mbAvailable) {
+		if($this->mbAvailable)
+		{
 			return mb_convert_encoding($_folderName, "UTF7-IMAP", Api\Translation::charset());
 		}
 
@@ -424,14 +435,21 @@ 
 	function getMailbox($mailbox)
 	{
 		$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_ALL);
-		if (empty($mailboxes)) $mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		if (empty($mailboxes))
+		{
+			$mailboxes = $this->listMailboxes($mailbox,Horde_Imap_Client::MBOX_UNSUBSCRIBED);
+		}
 		//error_log(__METHOD__.__LINE__.'->'.$mailbox.'/'.array2string($mailboxes));
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
 		foreach ($mboxes->getIterator() as $k =>$box)
 		{
 			//error_log(__METHOD__.__LINE__.'->'.$k);
-			if ($k!='user' && $k != '' && $k==$mailbox) return $box['mailbox']; //_debug_array(array($k => $client->status($k)));
+			if ($k!='user' && $k != '' && $k==$mailbox)
+			{
+				return $box['mailbox'];
+			}
+			//_debug_array(array($k => $client->status($k)));
 		}
 		return ($this->mailboxExist($mailbox)?$mailbox:false);
 	}
@@ -500,8 +518,14 @@ 
 			//throw new egw_exception(__METHOD__.' ('.__LINE__.") failed to ".__METHOD__." :".$e->getMessage());
 			unset($e);
 		}
-		if (!empty($mailbox)) return $mailbox['mailbox'];
-		if (empty($mailbox) && $this->mailboxExist('INBOX')) return 'INBOX';
+		if (!empty($mailbox))
+		{
+			return $mailbox['mailbox'];
+		}
+		if (empty($mailbox) && $this->mailboxExist('INBOX'))
+		{
+			return 'INBOX';
+		}
 		return null;
 	}
 
@@ -571,7 +595,10 @@ 
 			));
 
 		$flags = Horde_Imap_Client::STATUS_ALL;
-		if ($ignoreStatusCache) $flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		if ($ignoreStatusCache)
+		{
+			$flags |= Horde_Imap_Client::STATUS_FORCE_REFRESH;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//error_log(__METHOD__.__LINE__.array2string($mboxes->count()));
@@ -614,12 +641,15 @@ 
 	 */
 	function getMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -631,8 +661,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -698,12 +731,15 @@ 
 	 */
 	function listSubscribedMailboxes($reference = ''  , $restriction_search = 0, $returnAttributes = false)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 		$mailbox = '';
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$searchstring = $reference."*";
 				break;
@@ -715,8 +751,11 @@ 
 				$searchstring = $reference."%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $searchstring = $restriction_search;
 			}
 		}
@@ -764,12 +803,15 @@ 
 	 */
 	function listUnSubscribedMailboxes($reference = ''  , $restriction_search = 0)
 	{
-		if ( is_bool($restriction_search) ){
+		if ( is_bool($restriction_search) )
+		{
 			$restriction_search = (int) $restriction_search;
 		}
 
-		if ( is_int( $restriction_search ) ){
-			switch ( $restriction_search ) {
+		if ( is_int( $restriction_search ) )
+		{
+			switch ( $restriction_search )
+			{
 			case 0:
 				$mailbox = $reference."*";
 				break;
@@ -781,8 +823,11 @@ 
 				$mailbox = "%";
 				break;
 			}
-		}else{
-			if ( is_string( $restriction_search ) ){
+		}
+		else
+		{
+			if ( is_string( $restriction_search ) )
+			{
 				$mailbox = $restriction_search;
 			}
 		}
@@ -801,7 +846,10 @@ 
 		foreach ($unsubscribed as $box)
 		{
 			//error_log(__METHOD__.__LINE__.' Box:'.$k.'->'.array2string($box['mailbox']->utf8));
-			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX') $ret[]=$box['mailbox']->utf8;
+			if (!in_array($box['mailbox']->utf8,$sret) && $box['mailbox']->utf8!='INBOX')
+			{
+				$ret[]=$box['mailbox']->utf8;
+			}
 		}
 		return $ret;
 	}
@@ -815,10 +863,16 @@ 
 	 */
 	function examineMailbox($mailbox, $flags=null)
 	{
-		if ($mailbox=='') return false;
+		if ($mailbox=='')
+		{
+			return false;
+		}
 		$mailboxes = $this->listMailboxes($mailbox);
 
-		if (is_null($flags)) $flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		if (is_null($flags))
+		{
+			$flags = Horde_Imap_Client::STATUS_ALL | Horde_Imap_Client::STATUS_FLAGS | Horde_Imap_Client::STATUS_PERMFLAGS;
+		}
 
 		$mboxes = new Horde_Imap_Client_Mailbox_List($mailboxes);
 		//_debug_array($mboxes->count());
@@ -900,7 +954,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if ($this->debug) error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.__LINE__.' error querying for capability:'.$capability.' ->'.$e->getMessage());
+			}
 			return false;
 		}
 		if (!is_array($cap))
@@ -940,7 +997,10 @@ 
 	{
 		foreach($_nameSpace as &$singleNameSpace)
 		{
-			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix']) return $singleNameSpace['prefix'];
+			if (substr($_folderName,0,strlen($singleNameSpace['prefix'])) == $singleNameSpace['prefix'])
+			{
+				return $singleNameSpace['prefix'];
+			}
 		}
 		return "";
 	}
@@ -957,7 +1017,8 @@ 
 	 */
 	function getMailBoxesRecursive($_mailbox, $delimiter, $prefix, $reclevel=0)
 	{
-		if ($reclevel > 25) {
+		if ($reclevel > 25)
+		{
 			error_log( __METHOD__." Recursion Level Exeeded ($reclevel) while looking up $_mailbox$delimiter ");
 			return array();
 		}
@@ -973,7 +1034,8 @@ 
 		{
 			$buff = $this->getMailboxes($mbx[$mbxkeys[0]]['MAILBOX'].($mbx[$mbxkeys[0]]['MAILBOX'] == $prefix ? '':$delimiter),2,false);
 			$allMailboxes = array();
-			foreach ($buff as $mbxname) {
+			foreach ($buff as $mbxname)
+			{
 				$mbxname = preg_replace('~'.($delimiter == '.' ? "\\".$delimiter:$delimiter).'+~s',$delimiter,$mbxname['MAILBOX']);
 				#echo "About to recur in level $reclevel:".$mbxname."<br>";
 				if ( $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'] && $mbxname != $prefix  && $mbxname != $mbx[$mbxkeys[0]]['MAILBOX'].$delimiter)
@@ -981,7 +1043,10 @@ 
 					$allMailboxes = array_merge($allMailboxes, self::getMailBoxesRecursive($mbxname, $delimiter, $prefix, $reclevel));
 				}
 			}
-			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]))) $allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			if (!(in_array('\NoSelect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\Noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"]) || in_array('\noselect',$mbx[$mbxkeys[0]]["ATTRIBUTES"])))
+			{
+				$allMailboxes[] = $mbx[$mbxkeys[0]]['MAILBOX'];
+			}
 			return $allMailboxes;
 		}
 		else
@@ -1003,9 +1068,16 @@ 
 		static $nameSpace=null;
 		$foldersNameSpace = array();
 		$delimiter = $this->getDelimiter();
-		if (empty($delimiter)) $delimiter='/';
-		if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
-		if (is_array($nameSpace)) {
+		if (empty($delimiter))
+		{
+			$delimiter='/';
+		}
+		if (is_null($nameSpace))
+		{
+			$nameSpace = $this->getNameSpaceArray();
+		}
+		if (is_array($nameSpace))
+		{
 			foreach($nameSpace as $type => $singleNameSpaceArray)
 			{
 				foreach ($singleNameSpaceArray as $singleNameSpace)
@@ -1022,7 +1094,9 @@ 
 						$_foldersNameSpace['prefix_present'] = 'forced';
 						// uw-imap server with mailbox prefix or dovecot maybe
 						$_foldersNameSpace['prefix'] = 'mail';
-					} else {
+					}
+					else
+					{
 						$_foldersNameSpace['prefix_present'] = !empty($singleNameSpace['name']);
 						$_foldersNameSpace['prefix'] = $singleNameSpace['name'];
 					}
@@ -1062,7 +1136,10 @@ 
 		$namespaces = $this->getNamespaces();
 		foreach ($namespaces as $nsp)
 		{
-			if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
+			if ($nsp['type']==$type && $nsp['delimiter'])
+			{
+				return $nsp['delimiter'];
+			}
 		}
 		return "/";
 	}
@@ -1158,12 +1235,14 @@ 
 	{
 		$nameSpaces = $this->getNameSpaceArray();
 
-		if(!isset($nameSpaces['others'])) {
+		if(!isset($nameSpaces['others']))
+		{
 			return false;
 		}
 
 		$username = $this->getMailBoxUserName($_username);
-		if($this->loginType == 'vmailmgr' || $this->loginType == 'uidNumber') {
+		if($this->loginType == 'vmailmgr' || $this->loginType == 'uidNumber')
+		{
 			$username .= '@'. $this->domainName;
 		}
 
@@ -1315,7 +1394,10 @@ 
 	 */
 	public function __call($name,array $params=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'->'.$name.' with params:'.array2string($params));
+		}
 		switch($name)
 		{
 			case 'installScript':
@@ -1350,7 +1432,10 @@ 
 	 */
 	public function setVacationUser($_euser, array $_vacation, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser).' Scriptname:'.array2string($_scriptName).' VacationMessage:'.array2string($_vacation));
+		}
 
 		if (is_numeric($_euser))
 		{
@@ -1378,7 +1463,10 @@ 
 	 */
 	public function getVacationUser($_euser, $_scriptName=null)
 	{
-		if ($this->debug) error_log(__METHOD__.' User:'.array2string($_euser));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.' User:'.array2string($_euser));
+		}
 
 		if (is_numeric($_euser))
 		{

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

@@ -68,91 +68,91 @@
 
 switch($action)
 {
-	case '--version':
-	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
-		break;
-
-	case '--create-header':
-	case '--edit-header':
-	case '--upgrade-header':
-	case '--update-header':
-		do_header($action == '--create-header',$arguments);
-		break;
-
-	case '--install':
-		do_install($arguments);
-		break;
-
-	case '--config':
-		do_config($arguments);
-		break;
-
-	case '--admin':
-		do_admin($arguments[0]);
-		break;
-
-	case '--update':
-		do_update($arguments[0]);
-		break;
-
-	case '--register-hooks':
-	case '--register-all-hooks':
-		do_hooks($arguments[0]);
-		break;
-
-	case '--backup':
-		do_backup($arguments[0]);
-		break;
-
-	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
-		break;
-
-	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
-		break;
-
-	case '--exit-codes':
-		list_exit_codes();
-		break;
-
-	case '--help':
-	case '--usage':
-		do_usage($arguments[0]);
-		break;
-
-	default:
-		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
-		{
-			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+		case '--version':
+		case '--check':
+			setup_cmd::check_installed($arguments[0],0,true);
+			break;
+
+		case '--create-header':
+		case '--edit-header':
+		case '--upgrade-header':
+		case '--update-header':
+			do_header($action == '--create-header',$arguments);
+			break;
+
+		case '--install':
+			do_install($arguments);
+			break;
+
+		case '--config':
+			do_config($arguments);
+			break;
+
+		case '--admin':
+			do_admin($arguments[0]);
+			break;
+
+		case '--update':
+			do_update($arguments[0]);
+			break;
+
+		case '--register-hooks':
+		case '--register-all-hooks':
+			do_hooks($arguments[0]);
+			break;
+
+		case '--backup':
+			do_backup($arguments[0]);
+			break;
+
+		case '--languages':
+			echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+			break;
+
+		case '--charsets':
+			echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+			break;
+
+		case '--exit-codes':
+			list_exit_codes();
+			break;
+
+		case '--help':
+		case '--usage':
+			do_usage($arguments[0]);
+			break;
+
+		default:
+			// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
+			if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
+				is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
-				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
-				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				$args = array();
+				list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
+				foreach($arguments as $arg)
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
-					$args[$name][$sub] = $value;
-				}
-				else
-				{
-					$args[$name] = $value;
+					list($name,$value) = explode('=',$arg,2);
+					if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+					{
+						throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					}
+					if (substr($name,-1) == ']')	// allow 1-dim. arrays
+					{
+						list($name,$sub) = explode('[',substr($name,0,-1),2);
+						$args[$name][$sub] = $value;
+					}
+					else
+					{
+						$args[$name] = $value;
+					}
 				}
+				$cmd = new $class($args);
+				$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
+				if (is_array($msg)) $msg = print_r($msg,true);
+				echo "$msg\n";
+				break;
 			}
-			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
-			echo "$msg\n";
-			break;
-		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

Braces +69 added lines, -17 removed lines

@@ -15,10 +15,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>setup-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 $dry_run = false;
@@ -33,7 +36,11 @@ 
 	}
 	$arguments = $_SERVER['argv'];
 	$action = array_shift($arguments);
-	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0]))
+	{
+		list($_POST['FormDomain']) = explode(',',$arguments[0]);
+	}
+	// header include needs that to detects the right domain
 }
 else
 {
@@ -51,7 +58,10 @@ 
 // check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log
 if (!ini_get('date.timezone'))
 {
-	if (!($tz = date_default_timezone_get())) $tz = 'UTC';
+	if (!($tz = date_default_timezone_get()))
+	{
+		$tz = 'UTC';
+	}
 	echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n";
 	ini_set('date.timezone',$tz);
 }
@@ -132,13 +142,19 @@ 
 			foreach($arguments as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -148,7 +164,10 @@ 
 			}
 			$cmd = new $class($args);
 			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
+			if (is_array($msg))
+			{
+				$msg = print_r($msg,true);
+			}
 			echo "$msg\n";
 			break;
 		}
@@ -164,14 +183,20 @@ 
 function do_config($args)
 {
 	$arg0 = explode(',',array_shift($args));
-	if (!($domain = @array_shift($arg0))) $domain = 'default';
+	if (!($domain = @array_shift($arg0)))
+	{
+		$domain = 'default';
+	}
 	$user = @array_shift($arg0);
 	$password = @array_shift($arg0);
 	_fetch_user_password($user,$password);
 
-	if ($arg0)	// direct assignments (name=value,...) left
+	if ($arg0)
+	{
+		// direct assignments (name=value,...) left
 	{
 		array_unshift($args,implode(',',$arg0));
+	}
 		array_unshift($args,'--config');
 	}
 
@@ -238,9 +263,15 @@ 
 	{
 		$options[0] = $domain;
 
-		if ($quite_check) ob_start();
+		if ($quite_check)
+		{
+			ob_start();
+		}
 		_check_auth_config(implode(',',$options),14);
-		if ($quite_check) ob_end_clean();
+		if ($quite_check)
+		{
+			ob_end_clean();
+		}
 
 		if ($backup == 'no')
 		{
@@ -316,7 +347,10 @@ 
 function _check_auth_config($arg,$stop,$set_lang=true)
 {
 	$options = explode(',',$arg);
-	if (!($domain = array_shift($options))) $domain = 'default';
+	if (!($domain = array_shift($options)))
+	{
+		$domain = 'default';
+	}
 	$user = array_shift($options);
 	$password = array_shift($options);
 	_fetch_user_password($user,$password);
@@ -324,7 +358,10 @@ 
 	setup_cmd::check_installed($domain,$stop,true);
 
 	// reset charset for the output to the charset used by the OS
-	if ($set_lang) $GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	if ($set_lang)
+	{
+		$GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	}
 
 	setup_cmd::check_setup_auth($user,$password,$domain);
 
@@ -360,7 +397,10 @@ 
 function _fetch_user_password(&$user,&$password)
 {
 	// read password from enviroment or query it from user, if not given
-	if (!$user) $user = 'admin';
+	if (!$user)
+	{
+		$user = 'admin';
+	}
 	if (!$password && !($password = $_SERVER['EGW_CLI_PASSWORD']))
 	{
 		echo lang('Admin password to header manager').' ';
@@ -406,9 +446,15 @@ 
 		list($code,$language) = explode("\t",$line);
 		$languages[$code] = $language;
 	}
-	if (isset($languages[$lang.'-'.$nation])) return $lang.'-'.$nation;
+	if (isset($languages[$lang.'-'.$nation]))
+	{
+		return $lang.'-'.$nation;
+	}
 
-	if (isset($languages[$lang])) return $lang;
+	if (isset($languages[$lang]))
+	{
+		return $lang;
+	}
 
 	return 'en';
 }
@@ -448,7 +494,10 @@ 
 	if (!$what || $what == 'config')
 	{
 		echo '--config '.lang('domain(default),[config user(admin)],password,[name=value,...] sets config values beside:')."\n";
-		if (!$what) echo '	--help config '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help config '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'config')
 	{
@@ -477,7 +526,10 @@ 
 		echo lang('Create or edit the EGroupware configuration file: header.inc.php:')."\n";
 		echo '--create-header '.lang('header-password[,header-user(admin)]')."\n";
 		echo '--edit-header '.lang('[header-password],[header-user],[new-password],[new-user]')."\n";
-		if (!$what) echo '	--help header '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help header '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'header')
 	{

setup/index.php

Switch Indentation +93 added lines, -93 removed lines

@@ -184,17 +184,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -227,77 +227,77 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
-			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of eGroupWare.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of eGroupWare',
+				isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -376,7 +376,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (Api\Db\Exception $e)
 		{
@@ -388,21 +388,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your eGroupWare API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

filemanager/inc/class.filemanager_admin.inc.php

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

filemanager/inc/class.filemanager_merge.inc.php

Braces +21 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+		{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
@@ -151,12 +151,14 @@ 
 			// Try this first - a normal path /apps/appname/id/file
 			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+			{
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
 				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
 				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+				{
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
 					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
@@ -190,7 +192,10 @@ 
 		if(is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if($link['path'] && strpos($link['path'], '://') !== false)
+			{
+				$link['path'] = $file['path'];
+			}
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -211,7 +216,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -252,9 +260,15 @@ 
 		);
 		foreach($fields as $name => $label)
 		{
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}