EGroupware / egroupware

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

Braces +259 added lines, -68 removed lines

@@ -290,7 +290,10 @@ 
 		);
 		//_debug_array($this->contact_fields);
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
-		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		if (!is_array($this->own_account_acl))
+		{
+			$this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		}
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
 		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
 		{
@@ -299,7 +302,10 @@ 
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
 			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
-			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
+			if (!is_array($this->org_fields))
+			{
+				$this->org_fields = unserialize($this->org_fields);
+			}
 
 			// Set country code if country name is selected
 			$supported_fields = $this->get_fields('supported',null,0);
@@ -356,7 +362,10 @@ 
 		}
 
 		$addressbooks = $to_sort = array();
-		if ($extra_label) $addressbooks[''] = $extra_label;
+		if ($extra_label)
+		{
+			$addressbooks[''] = $extra_label;
+		}
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
 		foreach($grants as $uid => $rights)
@@ -410,10 +419,19 @@ 
 	 */
 	function fileas($contact,$type=null, $isUpdate=false)
 	{
-		if (is_null($type)) $type = $contact['fileas_type'];
-		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		if (is_null($type))
+		{
+			$type = $contact['fileas_type'];
+		}
+		if (!$type)
+		{
+			$type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		}
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type,'n_fn') !== false)
+		{
+			$contact['n_fn'] = $this->fullname($contact);
+		}
 
 		if($isUpdate)
 		{
@@ -423,7 +441,10 @@ 
 			{
 				if(!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if(is_null($old))
+					{
+						$old = $this->read($contact['id']);
+					}
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -466,7 +487,10 @@ 
 	 */
 	function fileas_type($contact,$file_as=null)
 	{
-		if (is_null($file_as)) $file_as = $contact['n_fileas'];
+		if (is_null($file_as))
+		{
+			$file_as = $contact['n_fileas'];
+		}
 
 		if ($file_as)
 		{
@@ -519,7 +543,10 @@ 
 		);
 		foreach(array_keys($labels) as $name)
 		{
-			if ($contact[$name]) $labels[$name] = $contact[$name];
+			if ($contact[$name])
+			{
+				$labels[$name] = $contact[$name];
+			}
 		}
 		foreach($this->fileas_types as $fileas_type)
 		{
@@ -632,7 +659,11 @@ 
 				$fields_to_update = array();
 				foreach($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if($fields_exclude[$field_name] === true)
+					{
+						continue;
+					}
+					// dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -691,15 +722,21 @@ 
 	 */
 	function fullname($contact)
 	{
-		if (empty($contact['n_family']) && empty($contact['n_given'])) {
+		if (empty($contact['n_family']) && empty($contact['n_given']))
+		{
 			$cpart = array('org_name');
-		} else {
+		}
+		else
+		{
 			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
 		}
 		$parts = array();
 		foreach($cpart as $n)
 		{
-			if ($contact[$n]) $parts[] = $contact[$n];
+			if ($contact[$n])
+			{
+				$parts[] = $contact[$n];
+			}
 		}
 		return implode(' ',$parts);
 	}
@@ -810,7 +847,10 @@ 
 			$ok = false;
 			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
 			{
-				if (!($old = $this->read($id))) return false;
+				if (!($old = $this->read($id)))
+				{
+					return false;
+				}
 				// check if we only mark contacts as deleted, or really delete them
 				// already marked as deleted item and accounts are always really deleted
 				// we cant mark accounts as deleted, as no such thing exists for accounts!
@@ -818,8 +858,15 @@ 
 				{
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
-					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
+					if ($check_etag)
+					{
+						$delete['etag'] = $check_etag;
+					}
+					if (($ok = $this->save($delete)))
+					{
+						$ok = true;
+					}
+					// we have to return true or false
 					Link::unlink(0,'addressbook',$id,'','','',true);
 				}
 				elseif (($ok = parent::delete($id,$check_etag)))
@@ -830,7 +877,10 @@ 
 				// Don't notify of final purge
 				if ($ok && $old['tid'] != self::DELETED_TYPE)
 				{
-					if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+					if (!isset($this->tracking))
+					{
+						$this->tracking = new Contacts\Tracking($this);
+					}
 					$this->tracking->track(array('id' => $id), array('id' => $id), null, true);
 				}
 			}
@@ -855,13 +905,16 @@ 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
 		{
-			if (!isset($contact['owner']) || !isset($contact['private']))	// owner/private not set on update, eg. SyncML
+			if (!isset($contact['owner']) || !isset($contact['private']))
+			{
+				// owner/private not set on update, eg. SyncML
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
 					if(!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
+			}
 					}
 					if(!isset($contact['private']))
 					{
@@ -877,18 +930,33 @@ 
 		else
 		{
 			// if no owner/addressbook set use the setting of the add_default prefs (if set, otherwise the users personal addressbook)
-			if (!isset($contact['owner'])) $contact['owner'] = $this->default_addressbook;
-			if (!isset($contact['private'])) $contact['private'] = (int)$this->default_private;
+			if (!isset($contact['owner']))
+			{
+				$contact['owner'] = $this->default_addressbook;
+			}
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$this->default_private;
+			}
 			// do NOT allow to create new accounts via addressbook, they are broken without an account_id
 			if (!$contact['owner'] && empty($contact['account_id']))
 			{
 				$contact['owner'] = $this->default_addressbook ? $this->default_addressbook : $this->user;
 			}
 			// allow admins to import contacts with creator / created date set
-			if (!$contact['creator'] || !$this->is_admin($contact)) $contact['creator'] = $this->user;
-			if (!$contact['created'] || !$this->is_admin($contact)) $contact['created'] = $this->now_su;
+			if (!$contact['creator'] || !$this->is_admin($contact))
+			{
+				$contact['creator'] = $this->user;
+			}
+			if (!$contact['created'] || !$this->is_admin($contact))
+			{
+				$contact['created'] = $this->now_su;
+			}
 
-			if (!$contact['tid']) $contact['tid'] = 'n';
+			if (!$contact['tid'])
+			{
+				$contact['tid'] = 'n';
+			}
 		}
 		// ensure accounts and group addressbooks are never private!
 		if ($contact['owner'] <= 0)
@@ -912,7 +980,8 @@ 
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+		foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+		{
 			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
@@ -939,7 +1008,10 @@ 
 		{
 			$contact['n_fn'] = $this->fullname($contact);
 		}
-		if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
+		if (isset($contact['org_name']))
+		{
+			$contact['n_fileas'] = $this->fileas($contact, null, false);
+		}
 
 		// Get old record for tracking changes
 		if (!isset($old) && $isUpdate)
@@ -1015,7 +1087,10 @@ 
 			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
-				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+				if (!isset($this->tracking))
+				{
+					$this->tracking = new Contacts\Tracking($this);
+				}
 				$this->tracking->track($to_write, $old ? $old : null, null, $deleted);
 			}
 		}
@@ -1097,10 +1172,12 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if($data['adr_one_countrycode'] != null)
+			{
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if($data['adr_two_countrycode'] != null)
+			{
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1126,7 +1203,10 @@ 
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1196,8 +1276,14 @@ 
 	 */
 	function read_org($org_id)
 	{
-		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (!$org_id)
+		{
+			return false;
+		}
+		if (strpos($org_id,'*AND*')!== false)
+		{
+			$org_id = str_replace('*AND*','&',$org_id);
+		}
 		$org = array();
 		foreach(explode('|||',$org_id) as $part)
 		{
@@ -1227,7 +1313,10 @@ 
 		}
 		// read the regular fields
 		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
-		if (!$contacts) return false;
+		if (!$contacts)
+		{
+			return false;
+		}
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
@@ -1275,7 +1364,10 @@ 
 		}
 		foreach($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name,$this->org_fields))
+			{
+				continue;
+			}
 
 			arsort($values,SORT_NUMERIC);
 			list($value,$num) = each($values);
@@ -1345,16 +1437,25 @@ 
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
 		{
-			if (!empty($from[$code])) $from[$name] = '';
-			if (!empty($to[$code])) $to[$name] = '';
+			if (!empty($from[$code]))
+			{
+				$from[$name] = '';
+			}
+			if (!empty($to[$code]))
+			{
+				$to[$name] = '';
+			}
 		}
 		$changed = array();
 		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name,array('modified','modifier')))
+			{
+				// never count these
 			{
 				continue;
 			}
+			}
 			if ((string) $from[$name] != (string) $to[$name])
 			{
 				$changed[$name] = $from[$name];
@@ -1374,13 +1475,19 @@ 
 	 */
 	function change_org($org_name,$from,$to,$members=null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from,$to,true)))
+		{
+			return false;
+		}
 
 		if (is_null($members) || !is_array($members))
 		{
 			$members = $this->org_similar($org_name,$changed);
 		}
-		if (!$members) return false;
+		if (!$members)
+		{
+			return false;
+		}
 
 		$ids = array();
 		foreach($members as $member)
@@ -1445,7 +1552,10 @@ 
 		$type = $this->prefs['link_title'];
 		if (!$type || $type === 'n_fileas')
 		{
-			if ($contact['n_fileas']) return $contact['n_fileas'];
+			if ($contact['n_fileas'])
+			{
+				return $contact['n_fileas'];
+			}
 			$type = null;
 		}
 		$title =  $this->fileas($contact,$type);
@@ -1513,7 +1623,10 @@ 
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
 		{
 			$ids = array();
@@ -1576,12 +1689,18 @@ 
 	 */
 	function calendar_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach(!is_array($ids) ? array($ids) : $ids as $id)
 		{
-			if (!($contact = $this->read($id))) continue;
+			if (!($contact = $this->read($id)))
+			{
+				continue;
+			}
 
 			$data[] = array(
 				'res_id' => $id,
@@ -1603,21 +1722,33 @@ 
 	 */
 	function read_calendar($ids,$extra_title=true)
 	{
-		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
+		if (!$GLOBALS['egw_info']['user']['apps']['calendar'])
+		{
+			return array();
+		}
 
 		$uids = array();
 		foreach($ids as $id)
 		{
-			if (is_numeric($id)) $uids[] = 'c'.$id;
+			if (is_numeric($id))
+			{
+				$uids[] = 'c'.$id;
+			}
+		}
+		if (!$uids)
+		{
+			return array();
 		}
-		if (!$uids) return array();
 
 		$bocal = new calendar_bo();
 		$events = $bocal->search(array(
 			'users' => $uids,
 			'enum_recuring' => true,
 		));
-		if (!$events) return array();
+		if (!$events)
+		{
+			return array();
+		}
 
 		//_debug_array($events);
 		$calendars = array();
@@ -1631,11 +1762,14 @@ 
 				}
 				$id = (int)substr($uid,1);
 
-				if ($event['start'] < $this->now_su)	// past event --> check for last event
+				if ($event['start'] < $this->now_su)
+				{
+					// past event --> check for last event
 				{
 					if (!isset($calendars[$id]['last_event']) || $event['start'] > $calendars[$id]['last_event'])
 					{
 						$calendars[$id]['last_event'] = $event['start'];
+				}
 						$link = array(
 							'id' => $event['id'],
 							'app' => 'calendar',
@@ -1737,27 +1871,36 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach(parent::search(array('id'=>$ids),false) as $contact)
+		{
+			// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
+		}
 					return false;	// we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
 			}
 			// Add in custom fields
-			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			if (is_array($custom_field_list[$contact['id']]))
+			{
+				$contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			}
 
 			$pos = array_search($contact['id'],$ids);
 			$contacts[$pos] = $contact;
 		}
-		if (!is_null($account))	// we found an account, so we merge the contacts into it
+		if (!is_null($account))
+		{
+			// we found an account, so we merge the contacts into it
 		{
 			$target = $account;
+		}
 			unset($account);
 		}
 		else					// we found no account, so we merge all but the first into the first
@@ -1774,7 +1917,10 @@ 
 		{
 			foreach($contact as $name => $value)
 			{
-				if (!$value) continue;
+				if (!$value)
+				{
+					continue;
+				}
 
 				switch($name)
 				{
@@ -1786,25 +1932,39 @@ 
 						break;	// ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						if (!is_array($target['cat_id']))
+						{
+							$target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						}
 						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if($name[0] == '#')
+						{
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1)
+							{
+								if (!is_array($target[$name]))
+								{
+									$target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+								}
 								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
 							}
 						}
-						if (!$target[$name]) $target[$name] = $value;
+						if (!$target[$name])
+						{
+							$target[$name] = $value;
+						}
 						break;
 				}
 			}
 		}
-		if (!$this->save($target)) return 0;
+		if (!$this->save($target))
+		{
+			return 0;
+		}
 
 		$success = 1;
 		foreach($contacts as $contact)
@@ -1834,7 +1994,10 @@ 
 					unset($newlinkID);
 				}
 			}
-			if ($this->delete($contact['id'])) $success++;
+			if ($this->delete($contact['id']))
+			{
+				$success++;
+			}
 		}
 		return $success;
 	}
@@ -1875,11 +2038,17 @@ 
 	 */
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner))
+		{
+			return false;
+		}
 
 		try {
 			$ret = parent::add_list($keys,$owner,$contacts,$data);
-			if ($ret) unset(self::$list_cache[$ret]);
+			if ($ret)
+			{
+				unset(self::$list_cache[$ret]);
+			}
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
 		catch(Api\Db\Exception\InvalidSql $e) {
@@ -1899,7 +2068,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		unset(self::$list_cache[$list]);
 
@@ -1915,7 +2087,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		if ($list)
 		{
@@ -1937,7 +2112,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,Acl::DELETE)) return false;
+		if (!$this->check_list($list,Acl::DELETE))
+		{
+			return false;
+		}
 
 		foreach((array)$list as $l)
 		{
@@ -1955,7 +2133,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (isset(self::$list_cache[$list])) return self::$list_cache[$list];
+		if (isset(self::$list_cache[$list]))
+		{
+			return self::$list_cache[$list];
+		}
 
 		return self::$list_cache[$list] = parent::read_list($list);
 	}
@@ -2210,7 +2391,10 @@ 
 
 		foreach ($columns_to_search as $field)
 		{
-			if ($relax && in_array($field, $tolerance_fields)) continue;
+			if ($relax && in_array($field, $tolerance_fields))
+			{
+				continue;
+			}
 
 			if (empty($contact[$field]))
 			{
@@ -2275,7 +2459,10 @@ 
 		}
 
 		// No need for more searches for relaxed matching
-		if ($relax || count($matchingContacts)) return $matchingContacts;
+		if ($relax || count($matchingContacts))
+		{
+			return $matchingContacts;
+		}
 
 
 		if (!$empty_addr_one && $empty_addr_two)
@@ -2328,7 +2515,8 @@ 
 			}
 		}
 		elseif (!$empty_addr_one && !$empty_addr_two)
-		{ // try again after address swap
+		{
+// try again after address swap
 
 			foreach ($addr_one_fields as $key => $field)
 			{
@@ -2375,7 +2563,10 @@ 
 	{
 		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
-		if (!is_null($owner)) $filter['owner'] = $owner;
+		if (!is_null($owner))
+		{
+			$filter['owner'] = $owner;
+		}
 
 		// should we hide the accounts addressbook
 		if (!$owner && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])

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

Braces +42 added lines, -11 removed lines

@@ -82,7 +82,10 @@ 
 			error_log(__METHOD__.'() PHP_AUTH_USER='.array2string($_SERVER['PHP_AUTH_USER']).', PHP_AUTH_PW='.array2string($pw).', PHP_AUTH_DIGEST='.array2string($_SERVER['PHP_AUTH_DIGEST']));
 		}
 		$realm = $GLOBALS['egw_info']['flags']['auth_realm'];
-		if (empty($realm)) $realm = 'EGroupware';
+		if (empty($realm))
+		{
+			$realm = 'EGroupware';
+		}
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
@@ -109,7 +112,10 @@ 
 		if (!isset($username) || !($sessionid = $GLOBALS['egw']->session->create($username, $password, 'text', true)))
 		{
 			// if the session class gives a reason why the login failed --> append it to the REALM
-			if ($GLOBALS['egw']->session->reason) $realm .= ': '.$GLOBALS['egw']->session->reason;
+			if ($GLOBALS['egw']->session->reason)
+			{
+				$realm .= ': '.$GLOBALS['egw']->session->reason;
+			}
 
 			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
 			self::digest_header($realm);
@@ -135,7 +141,8 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches)
+				{
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -163,7 +170,10 @@ 
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
-			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			}
 			return false;	// no plain-text passwords used
 		}
 		// check for specific user, if given
@@ -171,10 +181,16 @@ 
 			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
 		{
 			unset($user_pw);
-			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			}
 			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw,0,7) == '{PLAIN}')
+		{
+			$user_pw = substr($user_pw,7);
+		}
 
 		if (self::ERROR_LOG)
 		{
@@ -196,7 +212,10 @@ 
 		{
 			$nonce = uniqid();
    			header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
-			if (self::ERROR_LOG) error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			}
 		}
 	}
 
@@ -211,7 +230,10 @@ 
 	 */
 	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
 	{
-		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		if (is_null($auth_digest))
+		{
+			$auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		}
 
 		$data = self::parse_digest($auth_digest);
 
@@ -224,7 +246,10 @@ 
 
 		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
 
-		if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		if (self::ERROR_LOG)
+		{
+			error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		}
 		return $data['response'] === $valid_response;
 	}
 
@@ -243,10 +268,16 @@ 
 		{
 			return false;
 		}
-		if (is_null($password)) $password = $user_pw;
+		if (is_null($password))
+		{
+			$password = $user_pw;
+		}
 
 		$A1 = md5($username . ':' . $realm . ':' . $password);
-		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		if (self::ERROR_LOG > 1)
+		{
+			error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		}
 		return $A1;
 	}
 

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/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"