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,7 +205,8 @@ 
         $dest         = $this->base . $options["dest"];
         $destdir      = Vfs::dirname($dest);
 
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+        if (!file_exists($destdir) || !is_dir($destdir))
+        {
 			//error_log(__METHOD__."(".array2string($options).", $del) file_exists('$destdir')=".array2string(file_exists($destdir)).", is_dir('$destdir')=".array2string(is_dir($destdir)));
             return "409 Conflict";
         }
@@ -195,69 +214,96 @@ 
         $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 .= Vfs::basename($source);
-                if (file_exists($dest)) {
+                if (file_exists($dest))
+                {
                     $options["dest"] .= Vfs::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";
                     }
                 }
@@ -307,17 +353,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');
 			}
@@ -389,7 +441,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
@@ -428,16 +483,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;
 	}
 
@@ -489,7 +550,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'])
 			{
@@ -506,7 +568,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;
@@ -535,7 +600,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;
@@ -545,15 +613,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 ...
@@ -567,7 +644,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']))
 		{
@@ -593,7 +673,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/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))
 		{

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_shares.inc.php

Braces +4 added lines, -1 removed lines

@@ -101,7 +101,10 @@
 				$row['type'] = $row['share_writable'] ? Sharing::WRITABLE : Sharing::READONLY;
 			}
 			$row['share_passwd'] = (boolean)$row['share_passwd'];
-			if ($row['share_with']) $row['share_with'] = preg_replace('/,([^ ])/', ', $1', $row['share_with']);
+			if ($row['share_with'])
+			{
+				$row['share_with'] = preg_replace('/,([^ ])/', ', $1', $row['share_with']);
+			}
 		}
 		return $total;
 	}

filemanager/inc/class.filemanager_favorite_portlet.inc.php

Braces +4 added lines, -1 removed lines

@@ -104,7 +104,10 @@
 		if ($content['nm']['action'])
 		{
 			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
+			if($msg)
+			{
+				Api\Json\Response::get()->apply('egw.message',array($msg));
+			}
 			foreach($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;

filemanager/test.php

Braces +12 added lines, -3 removed lines

@@ -22,7 +22,10 @@ 
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
-if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
+if (isset($_REQUEST['path']))
+{
+	$path = $_REQUEST['path'];
+}
 echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
 	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
 
@@ -53,9 +56,12 @@ 
 	$stime = number_format(1000*(microtime(true)-$time),1);
 
 	$time2 = microtime(true);
-	if ($is_dir)// && ($d = Vfs::opendir($path)))
+	if ($is_dir)
+	{
+		// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
+	}
 		//while(($file = readdir($d)))
 		foreach(Vfs::scandir($path) as $file)
 		{
@@ -69,7 +75,10 @@ 
 		//closedir($d);
 		$time2f = number_format(1000*(microtime(true)-$time2),1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if($files)
+		{
+			echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		}
 	}
 
 	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';

calendar/sitemgr/class.module_calendar_planner.inc.php

Braces +24 added lines, -9 removed lines

@@ -178,15 +178,17 @@ 
 		$acl = new Acl($anon_user);
 		$acl->read_repository();
  		foreach ($calendar_bo->resources as $type => $data)
-		{
+ 		{
 			// Check anon user's permissions - must have at least run for the hook to be available
 			if($acl->check('run',EGW_ACL_READ, $data['app']) &&
 				$type != '' && $data['app'] && Link::get_registry($data['app'], 'query')
-			)
-			{
+			) {
 				$_results = Link::query($data['app'], $query,$options);
 			}
-			if(!$_results) continue;
+			if(!$_results)
+			{
+				continue;
+			}
 			$_results = array_unique($_results);
 			foreach ($_results as $key => $value)
 			{
@@ -223,8 +225,14 @@ 
 			$arguments['sortby'] = 'month';
 			$arguments['date'] = substr($arguments['date'],0,4).'0101';
 		}
-		if (isset($_GET['date'])) $arguments['date'] = $_GET['date'];
-		if (empty($arguments['cat_id'])) $arguments['cat_id'] = '';
+		if (isset($_GET['date']))
+		{
+			$arguments['date'] = $_GET['date'];
+		}
+		if (empty($arguments['cat_id']))
+		{
+			$arguments['cat_id'] = '';
+		}
 		if(isset($arguments['resources']) && in_array('r0', $arguments['resources']))
 		{
 			foreach($arguments['resources'] as $index => $value)
@@ -259,7 +267,8 @@ 
 		if (is_array($params['owner']))
 		{
 			// Buffer, and add anything that gets cleared to the content
-			ob_start(function($buffer) use(&$html) {
+			ob_start(function($buffer) use(&$html)
+			{
 				$html .= $buffer;
 				return '';
 			});
@@ -268,20 +277,26 @@ 
 			$ui->sortby = $arguments['sortby'];
 			$ui->owner = $params['owner'];
 
-			if (!$ui->planner_view || $ui->planner_view == 'month')	// planner monthview
+			if (!$ui->planner_view || $ui->planner_view == 'month')
+			{
+				// planner monthview
 			{
 				if ($ui->day < 15)	// show one complete month
 				{
 					$ui->_week_align_month($ui->first,$ui->last);
+			}
 				}
 				else	// show 2 half month
 				{
 					$ui->_week_align_month($ui->first,$ui->last,15);
 				}
 			}
-			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')	// weeekview
+			elseif ($ui->planner_view == 'week' || $ui->planner_view == 'weekN')
+			{
+				// weeekview
 			{
 				$start = new Api\DateTime($ui->date);
+			}
 				$start->setWeekstart();
 				$ui->first = $start->format('ts');
 				$ui->last = $ui->bo->date2array($this->first);