EGroupware / egroupware

api/src/WebDAV/Tools/_parse_propfind.php

Braces +42 added lines, -16 removed lines

@@ -127,7 +127,8 @@ 
 
         // open input stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -149,17 +150,23 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
+            if ($store_request)
+            {
+            	$this->request .= $line;
+            }
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
         // finish parsing
-        if ($had_input) {
+        if ($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -170,7 +177,11 @@ 
         fclose($f_in);
 
         // if no input was parsed it was a request
-        if(!count($this->props)) $this->props = "all"; // default
+        if(!count($this->props))
+        {
+        	$this->props = "all";
+        }
+        // default
     }
 
 
@@ -185,21 +196,28 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // name space handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // record root tag
-        if ($this->depth == 0) {
+        if ($this->depth == 0)
+        {
         	$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
         }
         // special tags at level 1: <allprop> and <propname>
-        if ($this->depth == 1) {
+        if ($this->depth == 1)
+        {
          	$this->use = 'props';
             switch ($tag)
             {
@@ -225,11 +243,15 @@ 
         // requested properties are found at level 2
         // CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
         if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
-        	$this->use == 'props' && $this->depth >= 2) {
+        	$this->use == 'props' && $this->depth >= 2)
+        {
             $prop = array("name" => $tag);
             if ($ns)
-                $prop["xmlns"] = $ns;
-            if ($this->use != 'props' || $this->depth > 2) {
+            {
+                            $prop["xmlns"] = $ns;
+            }
+            if ($this->use != 'props' || $this->depth > 2)
+            {
             	$prop['attrs'] = $attrs;
             	$prop['depth'] = $this->depth;
             }
@@ -243,7 +265,10 @@ 
             {
 	         	// this can happen if we have allprop and prop in one propfind:
 	        	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
-	            if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
+	            if (!is_array($this->{$this->use}) && $this->{$this->use})
+	            {
+	            	$this->{$this->use} = array($this->{$this->use});
+	            }
 	            $this->{$this->use}[] =& $prop;
 	            $this->last_prop =& $prop;
 	            unset($prop);
@@ -278,7 +303,8 @@ 
      */
     function _charData($parser, $data)
     {
-        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
+        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data)))
+        {
         	$this->{$this->use}[$n-1]['data'] = $data;
         }
     }

api/src/WebDAV/Server/Filesystem.php

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/Header/ContentSecurityPolicy.php

Braces +8 added lines, -2 removed lines

@@ -57,7 +57,10 @@ 
 				{
 					foreach($app_additional as $addtional)
 					{
-						if ($addtional) $attrs = array_unique(array_merge($attrs, $addtional));
+						if ($addtional)
+						{
+							$attrs = array_unique(array_merge($attrs, $addtional));
+						}
 					}
 				}
 			}
@@ -154,10 +157,13 @@ 
 		{
 			header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 		}
-		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')	// Edge is reported as 'edge'!
+		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')
+		{
+			// Edge is reported as 'edge'!
 		{
 			header("X-Content-Security-Policy: $csp");
 		}
+		}
 		else
 		{
 			header("Content-Security-Policy: $csp");

api/src/Header/UserAgent.php

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 			}
 		}
 		list(,self::$user_agent,self::$ua_version) = $parts;
-		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
+		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version')
+		{
+			self::$user_agent = 'opera';
+		}
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
 		if (self::$user_agent=='trident')
 		{

api/src/Header/Content.php

Braces +10 added lines, -3 removed lines

@@ -80,9 +80,13 @@ 
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
 				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
-				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
+				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				// iOS 7
+			{
+				$csp = "script-src 'none'";
+			}
+			// forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
 				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
@@ -96,7 +100,10 @@ 
 		}
 		if ($no_content_type)
 		{
-			if ($force_download) self::disposition(Api\Vfs::basename($path), $force_download);
+			if ($force_download)
+			{
+				self::disposition(Api\Vfs::basename($path), $force_download);
+			}
 		}
 		else
 		{

api/src/Header/Referer.php

Braces +14 added lines, -4 removed lines

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

api/src/Etemplate/Widget/Entry.php

Braces +8 added lines, -2 removed lines

@@ -71,7 +71,10 @@ 
 		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
 
 		// No need to proceed
-		if(!$data_id) return;
+		if(!$data_id)
+		{
+			return;
+		}
 
 		// Find out which record to load
 		$value = self::get_array(self::$request->content, $form_name, false, true);
@@ -93,7 +96,10 @@ 
 
 		// Set the new value so transformer can find it.  Use prefix to avoid changing the original value
 		$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
-		if (true) $new_value = $data;
+		if (true)
+		{
+			$new_value = $data;
+		}
 		$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
 
 		$old_type = self::getElementAttribute($this->id, 'type');

api/src/Etemplate/Widget/Url.php

Braces +4 added lines, -1 removed lines

@@ -114,7 +114,10 @@
 						break;
 				}
 			}
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value));
 		}
 	}

api/src/Etemplate/Widget/Template.php

Braces +16 added lines, -4 removed lines

@@ -86,7 +86,10 @@ 
 					}
 
 					$parts = explode('.',$c_name);
-					if($name == $parts[count($parts)-1]) return $c_template;
+					if($name == $parts[count($parts)-1])
+					{
+						return $c_template;
+					}
 				}
 			}
 			// Template not found, try again with content expansion
@@ -106,7 +109,10 @@ 
 			return false;
 		}
 		$reader = new XMLReader();
-		if (!$reader->open(self::rel2path($path))) return false;
+		if (!$reader->open(self::rel2path($path)))
+		{
+			return false;
+		}
 
 		while($reader->read())
 		{
@@ -208,7 +214,10 @@ 
 			{
 				$url = Api\Vfs::download_url($path);
 
-				if ($url[0] == '/') $url = Api\Framework::link($url);
+				if ($url[0] == '/')
+				{
+					$url = Api\Framework::link($url);
+				}
 
 				// mtime postfix has to use '?download=', as our WebDAV treats everything else literal and not ignore them like Apache for static files!
 				$url .= '?download='.filemtime($path);
@@ -231,7 +240,10 @@ 
 	{
 		$cname =& $params[0];
 		$old_cname = $params[0];
-		if ($this->attrs['content']) $cname = self::form_name($cname, $this->attrs['content'], $params[1]);
+		if ($this->attrs['content'])
+		{
+			$cname = self::form_name($cname, $this->attrs['content'], $params[1]);
+		}
 
 		// Check for template from content, and run over it
 		// templates included via template tag have their name to load them from in attribute "template"