EGroupware / egroupware

doc/config2xet.php

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
 			</columns>
 			<rows>
 ';
-foreach($trs[2] as $n => $tr)
+foreach ($trs[2] as $n => $tr)
 {
 	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"')) continue;
 
@@ -64,25 +64,25 @@ 
 	{
 		die("No td tags found in $n. tr: $tr");
 	}
-	if (($commented = !empty($trs[1][$n])? $trs[1][$n] : ''))
+	if (($commented = !empty($trs[1][$n]) ? $trs[1][$n] : ''))
 	{
 		echo "\t\t\t\t$commented\n";
 	}
 	echo "\t\t\t\t<row>\n";
-	foreach($tds[2] as $t => $td)
+	foreach ($tds[2] as $t => $td)
 	{
 		if (preg_match('|^\s*<([^ >]+)\s*([^/>]+)/?>(.*)\s*$|sui', $td, $matches))
 		{
 			$attrs = preg_match_all('|\s*([^=]+)="([^"]+)"|', $matches[2], $attrs) ?
 				array_combine($attrs[1], $attrs[2]) : array();
 
-			switch($matches[1])
+			switch ($matches[1])
 			{
 				case 'input':
 				case 'textarea':
 					echo "\t\t\t\t\t<textbox id=\"".$attrs['name'].'"';
 					unset($attrs['value'], $attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						if ($name == 'type' && $value == 'password') $value = 'passwd';
 						echo " $name=\"$value\"";
@@ -103,14 +103,14 @@ 
 				case 'select':
 					echo "\t\t\t\t\t<select id=\"".$attrs['name'].'"';
 					unset($attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						echo " $name=\"$value\"";
 					}
 					echo ">\n";
 					if (preg_match_all('|<option\s+value="([^"]*)"\s*({selected_[^}]+})?>(.*)</option>|Usui', $matches[3], $options))
 					{
-						foreach($options[3] as $i => $label)
+						foreach ($options[3] as $i => $label)
 						{
 							$label = preg_replace_callback('/{lang_([^}]+)}/', function($matches)
 							{
@@ -153,7 +153,7 @@ 
 			echo "/>\n";
 			if (!$commented && !empty($matches[3]) && trim($matches[3])) echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
 		}
-		elseif(!$commented)
+		elseif (!$commented)
 		{
 			echo "\t\t\t\t\t<!-- ".trim($td)." -->\n";
 		}

Braces +16 added lines, -4 removed lines

@@ -58,7 +58,10 @@ 
 ';
 foreach($trs[2] as $n => $tr)
 {
-	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"')) continue;
+	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"'))
+	{
+		continue;
+	}
 
 	if (!preg_match_all('|<td\s*([^>]*)>(.*)</td>|Usui', $tr, $tds, PREG_PATTERN_ORDER))
 	{
@@ -84,7 +87,10 @@ 
 					unset($attrs['value'], $attrs['name']);
 					foreach($attrs as $name => $value)
 					{
-						if ($name == 'type' && $value == 'password') $value = 'passwd';
+						if ($name == 'type' && $value == 'password')
+						{
+							$value = 'passwd';
+						}
 						echo " $name=\"$value\"";
 					}
 					echo "/>\n";
@@ -139,7 +145,10 @@ 
 		elseif (preg_match('/^\s*([^{]*){lang_([^}]+)}\s*(.*)$/sui',
 			str_replace(array('&nbsp;', '<b>', '</b>'), '', $td), $matches))
 		{
-			if (!$commented && trim($matches[1])) echo "\t\t\t\t\t<!-- $matches[1] -->\n";
+			if (!$commented && trim($matches[1]))
+			{
+				echo "\t\t\t\t\t<!-- $matches[1] -->\n";
+			}
 			echo "\t\t\t\t\t<description value=\"".htmlspecialchars(str_replace('_', ' ', $matches[2])).'"';
 			if (trim($matches[3]) == ':')
 			{
@@ -151,7 +160,10 @@ 
 				echo ' span="all" class="subHeader"';
 			}
 			echo "/>\n";
-			if (!$commented && !empty($matches[3]) && trim($matches[3])) echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
+			if (!$commented && !empty($matches[3]) && trim($matches[3]))
+			{
+				echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
+			}
 		}
 		elseif(!$commented)
 		{

doc/rpm-build/header.inc.php

Indentation +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 // dummy setup file
 if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
 {
-        header('Location: /egroupware/setup/');
-        exit;
+		header('Location: /egroupware/setup/');
+		exit;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // dummy setup file
-if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
+if (strpos($_SERVER['PHP_SELF'], '/setup/') === false)
 {
         header('Location: /egroupware/setup/');
         exit;

doc/ldap/nis2rfc2307bis.php

Spacing +19 added lines, -19 removed lines

@@ -21,8 +21,8 @@ 
  * @version $Id: class.accounts.inc.php 22048 2006-07-08 21:41:42Z ralfbecker $
  */
 
-if ($argc <= 1 || in_array($argv[1],array('-v','--help')) || $argv[1] == '--accounts-dn' && $argc <= 3|| 
-	!is_readable($file = $argv[$argc-1]))
+if ($argc <= 1 || in_array($argv[1], array('-v', '--help')) || $argv[1] == '--accounts-dn' && $argc <= 3 || 
+	!is_readable($file = $argv[$argc - 1]))
 {
 	if ($file)
 	{
@@ -32,7 +32,7 @@ 
 }
 
 $lines = file($file);
-foreach($lines as $l => $line)
+foreach ($lines as $l => $line)
 {
 	$lines[$l] = rtrim($line);
 }
@@ -42,23 +42,23 @@ 
 {
 	$group2account = $argv[2];
 }
-$parts = explode('/',$group2account);
+$parts = explode('/', $group2account);
 if (count($parts) != 4)
 {
 	die("Wrong format for --group2accounts-dn, use something like '/cn=[^,]+,ou=groups/ou=accounts/'\n");
 }
 $replace_with = $parts[2]; unset($parts[2]);
-$replace = implode('/',$parts);
+$replace = implode('/', $parts);
 
 $block = array();
 $i = 0;
-$lines[] = '';	// extra empty line, if none is behind the last block
-foreach($lines as $l => $line)
+$lines[] = ''; // extra empty line, if none is behind the last block
+foreach ($lines as $l => $line)
 {
 	if ($line)
 	{
-		@list($attr,$value) = explode(': ',$line,2);
-		switch($attr)
+		@list($attr, $value) = explode(': ', $line, 2);
+		switch ($attr)
 		{
 			case 'dn':
 				$dn = $value;
@@ -70,8 +70,8 @@ 
 				$structural = $value;
 				break;
 			case 'memberUid':
-				$member_dn = 'uid='.$value.','.preg_replace($replace,$replace_with,$dn);
-				if (!in_array('dn: '.$member_dn,$lines)) continue;	// member does not exist --> ignore him!
+				$member_dn = 'uid='.$value.','.preg_replace($replace, $replace_with, $dn);
+				if (!in_array('dn: '.$member_dn, $lines)) continue; // member does not exist --> ignore him!
 				$members[] = 'member: '.$member_dn;
 				// fall-through
 			default:
@@ -84,17 +84,17 @@ 
 	if (!$block) continue;
 
 	// got a complete block
-	if (in_array('posixGroup',$objectclasses))
+	if (in_array('posixGroup', $objectclasses))
 	{
-		switch($structural)
+		switch ($structural)
 		{
 			case 'namedObject':	// regular SuSE
-				unset($objectclasses[array_search('namedObject',$objectclasses)]);
+				unset($objectclasses[array_search('namedObject', $objectclasses)]);
 				// fall-through
 			case 'posixGroup':	// nis
 				$objectclasses[] = $structural = 'groupOfNames';
-				if (!$members) $members[] = 'member: '.$dn;	// member is a required attribute!
-				$data = array_merge($members,$data);
+				if (!$members) $members[] = 'member: '.$dn; // member is a required attribute!
+				$data = array_merge($members, $data);
 				break;
 			case 'groupOfNames':	// ok, already what we want
 				break;
@@ -102,14 +102,14 @@ 
 				die("\nposixGroup dn: $dn has as structrualObjectClass $structural, not posixGroup, namedObject or groupOfNames!\n");
 		}
 		$block = array('dn: '.$dn,);
-		foreach($objectclasses as $class)
+		foreach ($objectclasses as $class)
 		{
 			$block[] = 'objectClass: '.$class;
 		}
 		$block[] = 'structuralObjectClass: '.$class;
-		$block = array_merge($block,$data);
+		$block = array_merge($block, $data);
 	}
-	echo implode("\n",$block)."\n\n";
+	echo implode("\n", $block)."\n\n";
 
 	// process next block
 	$block = $objectclasses = $members = $data = array();

Braces +14 added lines, -3 removed lines

@@ -71,7 +71,11 @@ 
 				break;
 			case 'memberUid':
 				$member_dn = 'uid='.$value.','.preg_replace($replace,$replace_with,$dn);
-				if (!in_array('dn: '.$member_dn,$lines)) continue;	// member does not exist --> ignore him!
+				if (!in_array('dn: '.$member_dn,$lines))
+				{
+					continue;
+				}
+				// member does not exist --> ignore him!
 				$members[] = 'member: '.$member_dn;
 				// fall-through
 			default:
@@ -81,7 +85,10 @@ 
 		$block[] = $line;
 		continue;
 	}
-	if (!$block) continue;
+	if (!$block)
+	{
+		continue;
+	}
 
 	// got a complete block
 	if (in_array('posixGroup',$objectclasses))
@@ -93,7 +100,11 @@ 
 				// fall-through
 			case 'posixGroup':	// nis
 				$objectclasses[] = $structural = 'groupOfNames';
-				if (!$members) $members[] = 'member: '.$dn;	// member is a required attribute!
+				if (!$members)
+				{
+					$members[] = 'member: '.$dn;
+				}
+				// member is a required attribute!
 				$data = array_merge($members,$data);
 				break;
 			case 'groupOfNames':	// ok, already what we want

doc/fix_api.php

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 
 // raw replacements
 $add_use_api = array(
-	"#use EGroupware\\\\Api;\n#" => '',	// remove evtl. use EGroupware\Api, as we add it again below
+	"#use EGroupware\\\\Api;\n#" => '', // remove evtl. use EGroupware\Api, as we add it again below
 	"#<\?php\n+\s*/\*+?(.*)\*/#msU" => "<?php\n/**$1*/\n\nuse EGroupware\\Api;",
 );
 $replace = array(
@@ -46,7 +46,7 @@ 
 // enclose class-names and static methods with some syntax check
 $class_start = '#(?<!function)([\[\s,;().!=])';
 $class_end = '(::|\\(|\\)|;|\?|:|\\s|,|$)#';
-foreach(array(
+foreach (array(
 	'accounts' => 'Api\\Accounts',
 	'acl' => 'Api\\Acl',
 	'EGW_ACL_READ' => 'Api\\Acl::READ',
@@ -189,10 +189,10 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api($file, $dry_run=false)
+function fix_api($file, $dry_run = false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = $content_in = file_get_contents($file)) === false) return false;
 
@@ -203,12 +203,12 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in) return true; // nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
 	// shorten some classes, if used, with further use declarations
-	foreach(array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
+	foreach (array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
 	{
 		if (strpos($content, $namespace) !== false && strpos($content, 'use EGroupware\\'.$namespace) === false)
 		{
@@ -247,11 +247,11 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api_recursive($dir, $dry_run=false)
+function fix_api_recursive($dir, $dry_run = false)
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -259,13 +259,13 @@ 
 		{
 			fix_api_recursive($dir.'/'.$file, $dry_run);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
 			fix_api($dir.'/'.$file, $dry_run);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -274,7 +274,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
@@ -288,9 +288,9 @@ 
 if (!$args) usage();
 
 $dry_run = false;
-while(($arg = array_shift($args)) && $arg[0] == '-')
+while (($arg = array_shift($args)) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -323,4 +323,4 @@ 
 		fix_api_recursive($arg, $dry_run);
 	}
 }
-while(($arg = array_shift($args)));
+while (($arg = array_shift($args)));

Braces +42 added lines, -10 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>fix_api.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 // raw replacements
 $add_use_api = array(
@@ -192,9 +195,16 @@ 
 function fix_api($file, $dry_run=false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
-	if (($content = $content_in = file_get_contents($file)) === false) return false;
+	if (($content = $content_in = file_get_contents($file)) === false)
+	{
+		return false;
+	}
 
 	if (!preg_match("|<\?php\n+\s*/\*\*?.*\*/|msU", $content))
 	{
@@ -203,7 +213,11 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in)
+	{
+		return true;
+	}
+	// nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
@@ -249,11 +263,17 @@ 
  */
 function fix_api_recursive($dir, $dry_run=false)
 {
-	if (!is_dir($dir)) return false;
+	if (!is_dir($dir))
+	{
+		return false;
+	}
 
 	foreach(scandir($dir) as $file)
 	{
-		if ($file == '.' || $file == '..') continue;
+		if ($file == '.' || $file == '..')
+		{
+			continue;
+		}
 
 		if (is_dir($dir.'/'.$file))
 		{
@@ -278,14 +298,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
-	if ($error) echo $error."\n\n";
+	if ($error)
+	{
+		echo $error."\n\n";
+	}
 	exit($error ? 1 : 0);
 }
 
 $args = $_SERVER['argv'];
 $prog = basename(array_shift($args));
 
-if (!$args) usage();
+if (!$args)
+{
+	usage();
+}
 
 $dry_run = false;
 while(($arg = array_shift($args)) && $arg[0] == '-')
@@ -303,16 +329,22 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
 do {
-	if (!file_exists($arg)) usage("Error: $arg not found!");
+	if (!file_exists($arg))
+	{
+		usage("Error: $arg not found!");
+	}
 
 	if (!is_dir($arg))
 	{

home/setup/tables_update.inc.php

Spacing +9 added lines, -9 removed lines

@@ -41,13 +41,13 @@ 
 	// Previously all portlets were together in a sub-array, for defaults they
 	// need to be moved to top level
 	$preferences = array();
-	foreach($GLOBALS['egw_setup']->db->select('egw_preferences','preference_owner,preference_app,preference_value',array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_preferences', 'preference_owner,preference_app,preference_value', array(
 		'preference_app' => 'home',
-	),__LINE__,__FILE__) as $row)
+	), __LINE__, __FILE__) as $row)
 	{
 		$preferences[] = $row;
 	}
-	foreach($preferences as $row)
+	foreach ($preferences as $row)
 	{
 		// The following replacement is required for PostgreSQL to work
 		$app = trim($row['preference_app']);
@@ -62,21 +62,21 @@ 
 			// Too old, skip it
 			continue;
 		}
-		if($values['portlets'] && is_array($values['portlets']))
+		if ($values['portlets'] && is_array($values['portlets']))
 		{
-			foreach($values['portlets'] as $id => $settings)
+			foreach ($values['portlets'] as $id => $settings)
 			{
 				$values["portlet_$id"] = $settings;
 			}
 			unset($values['portlets']);
 		}
 		$GLOBALS['egw_setup']->db->insert(
-			'egw_preferences',array(
+			'egw_preferences', array(
 				'preference_value' => json_encode($values),
-			),array(
+			), array(
 				'preference_owner' => $row['preference_owner'],
 				'preference_app'   => $app,
-			),__LINE__,__FILE__
+			), __LINE__, __FILE__
 		);
 	}
 
@@ -91,7 +91,7 @@ 
 function home_upgrade14_1_001()
 {
 	// rename "home-accounts" to "api-accounts"
-	foreach(array('link_app1', 'link_app2') as $col)
+	foreach (array('link_app1', 'link_app2') as $col)
 	{
 		$GLOBALS['egw_setup']->db->update('egw_links', array(
 				$col => 'api-accounts',

home/inc/class.home_birthday_portlet.inc.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
-  * Egroupware
-  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-  * @package home
-  * @subpackage portlet
-  * @link http://www.egroupware.org
-  * @author Nathan Gray
-  * @version $Id$
-  */
+ * Egroupware
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package home
+ * @subpackage portlet
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @version $Id$
+ */
 
 use EGroupware\Api;
 use EGroupware\Api\Etemplate;

Braces +13 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
   *
   */
  class home_birthday_portlet extends home_portlet
-{
+ {
 	/**
 	 * Constructor sets up the portlet according to the user's saved property values
 	 * for this particular portlet.  It is possible to have multiple instances of the
@@ -32,7 +32,10 @@ 
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
 		unset($need_reload);	// not used, but required by function signature
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
 		$this->context = $context;
 	}
@@ -70,10 +73,13 @@ 
 
 		$etemplate->read('home.birthdays');
 
-		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')	// calendar Api\Config
+		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
+		{
+			// calendar Api\Config
 		{
 			$content = $this->get_birthdays();
 		}
+		}
 		$etemplate->set_dom_id($id);
 
 		$etemplate->exec('home.home_list_portlet.exec',$content);
@@ -123,7 +129,10 @@ 
 				{
 					if(substr($contact['bday'],-6) == $day)
 					{
-						if (!$ab_lang_loaded++) Api\Translation::add_app('addressbook');
+						if (!$ab_lang_loaded++)
+						{
+							Api\Translation::add_app('addressbook');
+						}
 						switch($n)
 						{
 							case 0:

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

@@ -29,7 +29,7 @@
 	 * @param context Array portlet settings such as size, as well as values for properties
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		unset($need_reload);	// not used, but required by function signature
 		if (false) parent::__construct();

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		unset($need_reload);	// not used, but required by function signature
+		unset($need_reload); // not used, but required by function signature
 		if (false) parent::__construct();
 
 		$this->context = $context;
@@ -76,7 +76,7 @@ 
 		}
 		$etemplate->set_dom_id($id);
 
-		$etemplate->exec('home.home_list_portlet.exec',$content);
+		$etemplate->exec('home.home_list_portlet.exec', $content);
 	}
 
 	/**
@@ -85,30 +85,30 @@ 
 	protected function get_birthdays()
 	{
 		$contacts = new Api\Contacts();
-		$month_start = date('-m-',$contacts->now_su);
+		$month_start = date('-m-', $contacts->now_su);
 		$days = $this->context['days'];
 		$birthdays = array();
 
-		$bdays =& $contacts->search(array('bday' => $month_start),array('id','n_family','n_given','bday'),'n_given,n_family','','%');
+		$bdays = & $contacts->search(array('bday' => $month_start), array('id', 'n_family', 'n_given', 'bday'), 'n_given,n_family', '', '%');
 		// search accounts too, if not stored in accounts repository
 		$extra_accounts_search = $contacts->account_repository == 'ldap' && !is_null($contacts->so_accounts) &&
 			$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== '1';
-		if ($extra_accounts_search && ($bdays2 = $contacts->search(array('bday' => $month_start),array('id','n_family','n_given','bday'),
-			'n_given,n_family','','%',false,'AND',false,array('owner' => 0))))
+		if ($extra_accounts_search && ($bdays2 = $contacts->search(array('bday' => $month_start), array('id', 'n_family', 'n_given', 'bday'),
+			'n_given,n_family', '', '%', false, 'AND', false, array('owner' => 0))))
 		{
-			$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
+			$bdays = !$bdays ? $bdays2 : array_merge($bdays, $bdays2);
 		}
-		if (($month_end = date('-m-',$contacts->now_su+$days*24*3600)) != $month_start)
+		if (($month_end = date('-m-', $contacts->now_su + $days * 24 * 3600)) != $month_start)
 		{
-			if (($bdays2 =& $contacts->search(array('bday' => $month_end),array('id','n_family','n_given','bday'),'n_given,n_family','','%')))
+			if (($bdays2 = & $contacts->search(array('bday' => $month_end), array('id', 'n_family', 'n_given', 'bday'), 'n_given,n_family', '', '%')))
 			{
-				$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
+				$bdays = !$bdays ? $bdays2 : array_merge($bdays, $bdays2);
 			}
 			// search accounts too, if not stored in accounts repository
-			if ($extra_accounts_search && ($bdays2 = $contacts->search(array('bday' => $month_end),array('id','n_family','n_given','bday'),
-				'n_given,n_family','','%',false,'AND',false,array('owner' => 0))))
+			if ($extra_accounts_search && ($bdays2 = $contacts->search(array('bday' => $month_end), array('id', 'n_family', 'n_given', 'bday'),
+				'n_given,n_family', '', '%', false, 'AND', false, array('owner' => 0))))
 			{
-				$bdays = !$bdays ? $bdays2 : array_merge($bdays,$bdays2);
+				$bdays = !$bdays ? $bdays2 : array_merge($bdays, $bdays2);
 			}
 		}
 		unset($bdays2); unset($extra_accounts_search);
@@ -116,15 +116,15 @@ 
 		if ($bdays)
 		{
 			$ab_lang_loaded = 0;
-			for($n = 0; $n <= $days; ++$n)
+			for ($n = 0; $n <= $days; ++$n)
 			{
-				$day = date('-m-d',$contacts->now_su+$n*24*3600);
-				foreach($bdays as $contact)
+				$day = date('-m-d', $contacts->now_su + $n * 24 * 3600);
+				foreach ($bdays as $contact)
 				{
-					if(substr($contact['bday'],-6) == $day)
+					if (substr($contact['bday'], -6) == $day)
 					{
 						if (!$ab_lang_loaded++) Api\Translation::add_app('addressbook');
-						switch($n)
+						switch ($n)
 						{
 							case 0:
 								$text = lang("Today is %1's birthday!", $contact['n_given'].' '.$contact['n_family']);

home/index.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 );
 
 include('../header.inc.php');
-$GLOBALS['egw_info']['flags']['nonavbar']=false;
+$GLOBALS['egw_info']['flags']['nonavbar'] = false;
 
 // Home is treated specially, so a redirect won't work.
 $home = new home_ui();

filemanager/inc/class.filemanager_ui.inc.php

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

@@ -1420,7 +1420,7 @@
 					if (Vfs::file_exists($target) && $app_dir)
 					{
 						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
-						error_log("Symlinking $target to $app_dir");
+						error_log("symlinking $target to $app_dir");
 						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
 					}
 				}

Spacing +205 added lines, -207 removed lines

@@ -81,12 +81,12 @@ 
 		if (!static::$views_init)
 		{
 			// translate our labels
-			foreach(static::$views as &$label)
+			foreach (static::$views as &$label)
 			{
 				$label = lang($label);
 			}
 			// search for plugins with additional filemanager views
-			foreach(Api\Hooks::process('filemanager_views') as $views)
+			foreach (Api\Hooks::process('filemanager_views') as $views)
 			{
 				if (is_array($views)) static::$views += $views;
 			}
@@ -102,7 +102,7 @@ 
 	 */
 	public static function get_view()
 	{
-		$view =& Api\Cache::getSession('filemanager', 'view');
+		$view = & Api\Cache::getSession('filemanager', 'view');
 		if (isset($_GET['view']))
 		{
 			$view = $_GET['view'];
@@ -120,12 +120,12 @@ 
 	 * @param type $actions
 	 * @return type
 	 */
-	public static function convertActionsToselOptions ($actions)
+	public static function convertActionsToselOptions($actions)
 	{
-		$sel_options = array ();
+		$sel_options = array();
 		foreach ($actions as $action => $value)
 		{
-			$sel_options[$action] = array (
+			$sel_options[$action] = array(
 				'label' => $value['caption'],
 				'icon'	=> $value['icon']
 			);
@@ -144,7 +144,7 @@ 
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => '',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'allowOnMultiple' => false,
 				'onExecute' => 'javaScript:app.filemanager.open',
 				'default' => true
@@ -153,8 +153,8 @@ 
 				'caption' => 'New',
 				'group' => $group,
 				'disableClass' => 'noEdit',
-				'children' => array (
-					'document' => array (
+				'children' => array(
+					'document' => array(
 						'caption' => 'Document',
 						'icon' => 'new',
 						'onExecute' => 'javaScript:app.filemanager.create_new',
@@ -173,7 +173,7 @@ 
 				'caption' => lang('Edit settings'),
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.filemanager.viewEntry':'javaScript:app.filemanager.editprefs',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.filemanager.viewEntry' : 'javaScript:app.filemanager.editprefs',
 				'mobileViewTemplate' => 'file?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/filemanager/templates/mobile/file.xet'))
 			),
 			'saveas' => array(
@@ -230,7 +230,7 @@ 
 			),
 			// DRAG and DROP events
 			'file_drag' => array(
-				'dragType' => array('file','link'),
+				'dragType' => array('file', 'link'),
 				'type' => 'drag',
 				'onExecute' => 'javaScript:app.filemanager.drag'
 			),
@@ -274,7 +274,7 @@ 
 				'order' => 0,
 				'allowOnMultiple' => true,
 			);
-			foreach(Vfs\Sharing::$modes as $mode => $data)
+			foreach (Vfs\Sharing::$modes as $mode => $data)
 			{
 				$actions['share']['children']['share_mail']['children']['mail_'.$mode] = array(
 					'caption' => $data['label'],
@@ -292,12 +292,12 @@ 
 		}
 
 		// This would be done automatically, but we're overriding
-		foreach($actions as $action_id => $action)
+		foreach ($actions as $action_id => $action)
 		{
-			if($action['type'] == 'drop' && $action['caption'])
+			if ($action['type'] == 'drop' && $action['caption'])
 			{
 				$action['type'] = 'popup';
-				if($action['acceptedTypes'] == 'file')
+				if ($action['acceptedTypes'] == 'file')
 				{
 					$action['enabled'] = 'javaScript:app.filemanager.paste_enabled';
 				}
@@ -317,10 +317,10 @@ 
 	 *
 	 * @return string merge application or NULL if no property found
 	 */
-	private static function get_mergeapp($path, $scope='self')
+	private static function get_mergeapp($path, $scope = 'self')
 	{
 		$app = null;
-		switch($scope)
+		switch ($scope)
 		{
 			case 'self':
 				$props = Vfs::propfind($path, static::$merge_prop_namespace);
@@ -329,10 +329,10 @@ 
 			case 'parents':
 				// search for props in parent directories
 				$currentpath = $path;
-				while($dir = Vfs::dirname($currentpath))
+				while ($dir = Vfs::dirname($currentpath))
 				{
 					$props = Vfs::propfind($dir, static::$merge_prop_namespace);
-					if(!empty($props))
+					if (!empty($props))
 					{
 						// found prop in parent directory
 						return $app = $props[0]['val'];
@@ -351,7 +351,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -361,16 +361,16 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows'       =>	'filemanager.filemanager_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'filter'         => '',	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => True,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'name',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'ASC',	// IO direction of the sort: 'ASC' or 'DESC'
-					'default_cols'   => '!comment,ctime',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+					'get_rows'       =>	'filemanager.filemanager_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'filter'         => '', // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => True, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'name', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+					'default_cols'   => '!comment,ctime', // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 					'row_id'         => 'path',
@@ -384,7 +384,7 @@ 
 			$content['nm']['actions'] = static::get_actions();
 			$content['nm']['home_dir'] = static::get_home_dir();
 			$content['nm']['view'] = $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view'];
-			$content['nm']['placeholder_actions'] = array('mkdir','paste','share','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink');
+			$content['nm']['placeholder_actions'] = array('mkdir', 'paste', 'share', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink');
 
 			if (isset($_GET['msg'])) $msg = $_GET['msg'];
 
@@ -400,7 +400,7 @@ 
 			}
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
-				switch($path)
+				switch ($path)
 				{
 					case '..':
 						$path = Vfs::dirname($content['nm']['path']);
@@ -409,7 +409,7 @@ 
 						$path = static::get_home_dir();
 						break;
 				}
-				if ($path && $path[0] == '/' && Vfs::stat($path,true) && Vfs::is_dir($path) && Vfs::check_access($path,Vfs::READABLE))
+				if ($path && $path[0] == '/' && Vfs::stat($path, true) && Vfs::is_dir($path) && Vfs::check_access($path, Vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
 				}
@@ -425,7 +425,7 @@ 
 		}
 		$view = static::get_view();
 
-		call_user_func($view,$content,$msg);
+		call_user_func($view, $content, $msg);
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	 * @param boolean &$is_setup=null on return true if authenticated user is setup config user, false otherwise
 	 * @return boolean true is root user given, false otherwise (including logout / empty $user)
 	 */
-	protected function sudo($user='',$password=null,&$is_setup=null)
+	protected function sudo($user = '', $password = null, &$is_setup = null)
 	{
 		if (!$user)
 		{
@@ -447,15 +447,15 @@ 
 		else
 		{
 			// config user & password
-			$is_setup = Api\Session::user_pw_hash($user,$password) === $GLOBALS['egw_info']['server']['config_hash'];
+			$is_setup = Api\Session::user_pw_hash($user, $password) === $GLOBALS['egw_info']['server']['config_hash'];
 			// or vfs root user from setup >> configuration
-			$is_root = $is_setup ||	$GLOBALS['egw_info']['server']['vfs_root_user'] &&
-				in_array($user,preg_split('/, */',$GLOBALS['egw_info']['server']['vfs_root_user'])) &&
+			$is_root = $is_setup || $GLOBALS['egw_info']['server']['vfs_root_user'] &&
+				in_array($user, preg_split('/, */', $GLOBALS['egw_info']['server']['vfs_root_user'])) &&
 				$GLOBALS['egw']->auth->authenticate($user, $password, 'text');
 		}
 		//error_log(__METHOD__."('$user','$password',$is_setup) user_pw_hash(...)='".Api\Session::user_pw_hash($user,$password)."', config_hash='{$GLOBALS['egw_info']['server']['config_hash']}' --> returning ".array2string($is_root));
-		Api\Cache::setSession('filemanager', 'is_setup',$is_setup);
-		Api\Cache::setSession('filemanager', 'is_root',Vfs::$is_root = $is_root);
+		Api\Cache::setSession('filemanager', 'is_setup', $is_setup);
+		Api\Cache::setSession('filemanager', 'is_root', Vfs::$is_root = $is_root);
 		return Vfs::$is_root;
 	}
 
@@ -465,18 +465,18 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function listview(array $content=null,$msg=null)
+	function listview(array $content = null, $msg = null)
 	{
 		$tpl = new Etemplate('filemanager.index');
 
-		if($msg) Framework::message($msg);
+		if ($msg) Framework::message($msg);
 
 		if (($content['nm']['action'] || $content['nm']['rows']) && (empty($content['button']) || !isset($content['button'])))
 		{
 			if ($content['nm']['action'])
 			{
-				$msg = static::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				$msg = static::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['selected']);
@@ -487,10 +487,10 @@ 
 				// we dont use ['nm']['rows']['delete'], so unset it, if it is present
 				if (isset($content['nm']['rows']['delete'])) unset($content['nm']['rows']['delete']);
 			}
-			elseif($content['nm']['rows']['delete'])
+			elseif ($content['nm']['rows']['delete'])
 			{
-				$msg = static::action('delete',array_keys($content['nm']['rows']['delete']),$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				$msg = static::action('delete', array_keys($content['nm']['rows']['delete']), $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
@@ -502,11 +502,11 @@ 
 				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
 			}
 			unset($content['nm']['rows']);
-			Api\Cache::setSession('filemanager', 'index',$content['nm']);
+			Api\Cache::setSession('filemanager', 'index', $content['nm']);
 		}
 
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'],true) && Vfs::stat(urldecode($content['nm']['path'])))
+		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'], true) && Vfs::stat(urldecode($content['nm']['path'])))
 		{
 			$content['nm']['path'] = urldecode($content['nm']['path']);
 		}
@@ -517,22 +517,22 @@ 
 				$button = key($content['button']);
 				unset($content['button']);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'upload':
 					if (!$content['upload'])
 					{
-						Framework::message(lang('You need to select some files first!'),'error');
+						Framework::message(lang('You need to select some files first!'), 'error');
 						break;
 					}
 					$upload_success = $upload_failure = array();
-					foreach(isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
+					foreach (isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
 					{
 						// encode chars which special meaning in url/vfs (some like / get removed!)
-						$to = Vfs::concat($content['nm']['path'],Vfs::encodePathComponent($upload['name']));
+						$to = Vfs::concat($content['nm']['path'], Vfs::encodePathComponent($upload['name']));
 						if ($upload &&
 							(Vfs::is_writable($content['nm']['path']) || Vfs::is_writable($to)) &&
-							copy($upload['tmp_name'],Vfs::PREFIX.$to))
+							copy($upload['tmp_name'], Vfs::PREFIX.$to))
 						{
 							$upload_success[] = $upload['name'];
 						}
@@ -544,12 +544,11 @@ 
 					$content['nm']['msg'] = '';
 					if ($upload_success)
 					{
-						Framework::message( count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') :
-							lang('%1 successful uploaded.',implode(', ',$upload_success)));
+						Framework::message(count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') : lang('%1 successful uploaded.', implode(', ', $upload_success)));
 					}
 					if ($upload_failure)
 					{
-						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(),'error');
+						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(), 'error');
 					}
 					break;
 			}
@@ -573,16 +572,16 @@ 
 			$tpl->setElementAttribute('nm[buttons][upload]', 'drop_target', 'popupMainDiv');
 		}
 		// Set view button to match current settings
-		if($content['nm']['view'] == 'tile')
+		if ($content['nm']['view'] == 'tile')
 		{
-			$tpl->setElementAttribute('nm[button][change_view]','statustext',lang('List view'));
-			$tpl->setElementAttribute('nm[button][change_view]','image','list_row');
+			$tpl->setElementAttribute('nm[button][change_view]', 'statustext', lang('List view'));
+			$tpl->setElementAttribute('nm[button][change_view]', 'image', 'list_row');
 		}
 		// if initial load is done via GET request (idots template or share.php)
 		// get_rows cant call app.filemanager.set_readonly, so we need to do that here
 		$content['initial_path_readonly'] = !Vfs::is_writable($content['nm']['path']);
 
-		$tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
+		$tpl->exec('filemanager.filemanager_ui.index', $content, $sel_options, $readonlys, array('nm' => $content['nm']));
 	}
 
 	/**
@@ -618,7 +617,7 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string success or failure message displayed to the user
 	 */
-	static public function action($action,$selected,$dir=null,&$errs=null,&$files=null,&$dirs=null)
+	static public function action($action, $selected, $dir = null, &$errs = null, &$files = null, &$dirs = null)
 	{
 		if (!count($selected))
 		{
@@ -626,20 +625,20 @@ 
 		}
 		$errs = $dirs = $files = 0;
 
-		switch($action)
+		switch ($action)
 		{
 
 			case 'delete':
-				return static::do_delete($selected,$errs,$files,$dirs);
+				return static::do_delete($selected, $errs, $files, $dirs);
 
 			case 'mail':
 			case 'copy':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
 					if (strpos($path, 'mail::') === 0 && $path = substr($path, 6))
 					{
 						// Support for dropping mail in filemanager - Pass mail back to mail app
-						if(ExecMethod2('mail.mail_ui.vfsSaveMessages', $path, $dir))
+						if (ExecMethod2('mail.mail_ui.vfsSaveMessages', $path, $dir))
 						{
 							++$files;
 						}
@@ -650,8 +649,8 @@ 
 					}
 					elseif (!Vfs::is_dir($path))
 					{
-						$to = Vfs::concat($dir,Vfs::basename($path));
-						if ($path != $to && Vfs::copy($path,$to))
+						$to = Vfs::concat($dir, Vfs::basename($path));
+						if ($path != $to && Vfs::copy($path, $to))
 						{
 							++$files;
 						}
@@ -663,19 +662,19 @@ 
 					else
 					{
 						$len = strlen(dirname($path));
-						foreach(Vfs::find($path) as $p)
+						foreach (Vfs::find($path) as $p)
 						{
-							$to = $dir.substr($p,$len);
+							$to = $dir.substr($p, $len);
 							if ($to == $p)	// cant copy into itself!
 							{
 								++$errs;
 								continue;
 							}
-							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
+							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to, null, STREAM_MKDIR_RECURSIVE))
 							{
 								++$dirs;
 							}
-							elseif(!$is_dir && Vfs::copy($p,$to))
+							elseif (!$is_dir && Vfs::copy($p, $to))
 							{
 								++$files;
 							}
@@ -688,15 +687,15 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors copying (%2 diretories and %3 files copied)!',$errs,$dirs,$files);
+					return lang('%1 errors copying (%2 diretories and %3 files copied)!', $errs, $dirs, $files);
 				}
-				return $dirs ? lang('%1 directories and %2 files copied.',$dirs,$files) : lang('%1 files copied.',$files);
+				return $dirs ? lang('%1 directories and %2 files copied.', $dirs, $files) : lang('%1 files copied.', $files);
 
 			case 'move':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
-					$to = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir,Vfs::basename($path)) : $dir;
-					if ($path != $to && Vfs::rename($path,$to))
+					$to = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir, Vfs::basename($path)) : $dir;
+					if ($path != $to && Vfs::rename($path, $to))
 					{
 						++$files;
 					}
@@ -707,17 +706,17 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors moving (%2 files moved)!',$errs,$files);
+					return lang('%1 errors moving (%2 files moved)!', $errs, $files);
 				}
-				return lang('%1 files moved.',$files);
+				return lang('%1 files moved.', $files);
 
 			case 'symlink':	// symlink given files to $dir
-				foreach((array)$selected as $target)
+				foreach ((array)$selected as $target)
 				{
 					$link = Vfs::concat($dir, Vfs::basename($target));
-					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir,0,true)))
+					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir, 0, true)))
 					{
-						if(!$ok)
+						if (!$ok)
 						{
 							$errs++;
 							continue;
@@ -739,15 +738,14 @@ 
 				}
 				if (count((array)$selected) == 1)
 				{
-					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) :
-						lang('Error creating symlink to target %1!', Vfs::decodePath($target));
+					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) : lang('Error creating symlink to target %1!', Vfs::decodePath($target));
 				}
 				$ret = lang('%1 elements linked.', $files);
 				if ($errs)
 				{
-					$ret = lang('%1 errors linking (%2)!',$errs, $ret);
+					$ret = lang('%1 errors linking (%2)!', $errs, $ret);
 				}
-				return $ret;//." Vfs::symlink('$target', '$link')";
+				return $ret; //." Vfs::symlink('$target', '$link')";
 
 			case 'createdir':
 				$dst = Vfs::concat($dir, is_array($selected) ? $selected[0] : $selected);
@@ -763,13 +761,13 @@ 
 
 			default:
 				list($action, $settings) = explode('_', $action, 2);
-				switch($action)
+				switch ($action)
 				{
 					case 'document':
 						if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
 						$document_merge = new filemanager_merge(Vfs::decodePath($dir));
 						$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
-						if($msg) return $msg;
+						if ($msg) return $msg;
 						$errs = count($selected);
 						return false;
 				}
@@ -786,12 +784,12 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string
 	 */
-	public static function do_delete(array $selected, &$errs=null, &$dirs=null, &$files=null)
+	public static function do_delete(array $selected, &$errs = null, &$dirs = null, &$files = null)
 	{
 		$dirs = $files = $errs = 0;
 		// we first delete all selected links (and files)
 		// feeding the links to dirs to Vfs::find() deletes the content of the dirs, not just the link!
-		foreach($selected as $key => $path)
+		foreach ($selected as $key => $path)
 		{
 			if (!Vfs::is_dir($path) || Vfs::is_link($path))
 			{
@@ -809,21 +807,21 @@ 
 		if ($selected)	// somethings left to delete
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home
-			foreach((array)$selected as $path)
+			foreach ((array)$selected as $path)
 			{
 				if (Vfs::isProtectedDir($path))
 				{
 					$errs++;
-					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
+					return lang("Cautiously rejecting to remove folder '%1'!", Vfs::decodePath($path));
 				}
 			}
 			// now we use find to loop through all files and dirs: (selected only contains dirs now)
 			// - depth=true to get first the files and then the dir containing it
 			// - hidden=true to also return hidden files (eg. Thumbs.db), as we cant delete non-empty dirs
 			// - show-deleted=false to not (finally) deleted versioned files
-			foreach(Vfs::find($selected,array('depth'=>true,'hidden'=>true,'show-deleted'=>false)) as $path)
+			foreach (Vfs::find($selected, array('depth'=>true, 'hidden'=>true, 'show-deleted'=>false)) as $path)
 			{
-				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path,0))
+				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path, 0))
 				{
 					++$dirs;
 				}
@@ -839,13 +837,13 @@ 
 		}
 		if ($errs)
 		{
-			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!',$errs,$dirs,$files);
+			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!', $errs, $dirs, $files);
 		}
 		if ($dirs)
 		{
-			return lang('%1 directories and %2 files deleted.',$dirs,$files);
+			return lang('%1 directories and %2 files deleted.', $dirs, $files);
 		}
-		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.',$files);
+		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.', $files);
 	}
 
 	/**
@@ -860,37 +858,37 @@ 
 		if (!$query['csv_export'])
 		{
 			Api\Cache::setSession('filemanager', 'index',
-				array_diff_key ($query, array_flip(array('rows','actions','action_links','placeholder_actions'))));
+				array_diff_key($query, array_flip(array('rows', 'actions', 'action_links', 'placeholder_actions'))));
 		}
-		if(!$query['path']) $query['path'] = static::get_home_dir();
+		if (!$query['path']) $query['path'] = static::get_home_dir();
 
 		// Change template to match selected view
-		if($query['view'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.index.rows' : 'filemanager.tile');
 
 			// Store as preference but only for index, not home
-			if($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
+			if ($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
 			{
-				$GLOBALS['egw']->preferences->add('filemanager','nm_view',$query['view']);
+				$GLOBALS['egw']->preferences->add('filemanager', 'nm_view', $query['view']);
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if (!Vfs::stat($query['path'],true) && Vfs::stat(urldecode($query['path'])))
+		if (!Vfs::stat($query['path'], true) && Vfs::stat(urldecode($query['path'])))
 		{
 			$query['path'] = urldecode($query['path']);
 		}
-		if (!Vfs::stat($query['path'],true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'],Vfs::READABLE))
+		if (!Vfs::stat($query['path'], true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'], Vfs::READABLE))
 		{
 			// only redirect, if it would be to some other location, gives redirect-loop otherwise
 			if ($query['path'] != ($path = static::get_home_dir()))
 			{
 				// we will leave here, since we are not allowed, or the location does not exist. Index must handle that, and give
 				// an appropriate message
-				Egw::redirect_link('/index.php',array('menuaction'=>'filemanager.filemanager_ui.index',
+				Egw::redirect_link('/index.php', array('menuaction'=>'filemanager.filemanager_ui.index',
 					'path' => $path,
-					'msg' => lang('The requested path %1 is not available.',Vfs::decodePath($query['path'])),
+					'msg' => lang('The requested path %1 is not available.', Vfs::decodePath($query['path'])),
 					'ajax' => 'true'
 				));
 			}
@@ -900,7 +898,7 @@ 
 		$GLOBALS['egw']->session->commit_session();
 		$rows = $dir_is_writable = array();
 		$vfs_options = $this->get_vfs_options($query);
-		foreach(Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],$vfs_options,true) as $path => $row)
+		foreach (Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'], $vfs_options, true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
 
@@ -918,7 +916,7 @@ 
 
 				$row['class'] .= 'isDir ';
 				$row['is_dir'] = 1;
-				if(!$dir_is_writable[$path])
+				if (!$dir_is_writable[$path])
 				{
 					$row['class'] .= 'noEdit ';
 				}
@@ -930,32 +928,32 @@ 
 
 			$row['class'] .= !$dir_is_writable[$dir] ? 'noDelete' : '';
 			$row['download_url'] = Vfs::download_url($path);
-			$row['gid'] = -abs($row['gid']);	// gid are positive, but we use negagive account_id for groups internal
+			$row['gid'] = -abs($row['gid']); // gid are positive, but we use negagive account_id for groups internal
 
 			$rows[++$n] = $row;
 			$path2n[$path] = $n;
 		}
 		// query comments and cf's for the displayed rows
-		$cols_to_show = explode(',',$GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
+		$cols_to_show = explode(',', $GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
 
 		// Always include comment in tiles
-		if($query['view'] == 'tile')
+		if ($query['view'] == 'tile')
 		{
 			$cols_to_show[] = 'comment';
 		}
-		$all_cfs = in_array('customfields',$cols_to_show) && $cols_to_show[count($cols_to_show)-1][0] != '#';
-		if ($path2n && (in_array('comment',$cols_to_show) || in_array('customfields',$cols_to_show)) &&
+		$all_cfs = in_array('customfields', $cols_to_show) && $cols_to_show[count($cols_to_show) - 1][0] != '#';
+		if ($path2n && (in_array('comment', $cols_to_show) || in_array('customfields', $cols_to_show)) &&
 			($path2props = Vfs::propfind(array_keys($path2n))))
 		{
-			foreach($path2props as $path => $props)
+			foreach ($path2props as $path => $props)
 			{
-				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
-				$row =& $rows[$path2n[$path]];
-				if ( !is_array($props) ) continue;
-				foreach($props as $prop)
+				unset($row); // fixes a weird problem with php5.1, does NOT happen with php5.2
+				$row = & $rows[$path2n[$path]];
+				if (!is_array($props)) continue;
+				foreach ($props as $prop)
 				{
-					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;
-					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'],0,64).' ...';
+					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'], $cols_to_show)) continue;
+					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'], 0, 64).' ...';
 				}
 			}
 		}
@@ -967,7 +965,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'projectmanager')
 		{
 			// we need our app.css file
-			if (!file_exists(EGW_SERVER_ROOT.($css_file='/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
+			if (!file_exists(EGW_SERVER_ROOT.($css_file = '/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
 			{
 				$css_file = '/filemanager/templates/default/app.css';
 			}
@@ -983,35 +981,35 @@ 
 	 */
 	protected function get_vfs_options($query)
 	{
-		if($query['searchletter'] && !empty($query['search']))
+		if ($query['searchletter'] && !empty($query['search']))
 		{
-			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 			if ($query['searchletter'] == strtolower($query['search'][0]))
 			{
-				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'|'.
-					str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).')/i';
+				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'|'.
+					str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).')/i';
 			}
 		}
 		elseif ($query['searchletter'])
 		{
 			$namefilter = '/^'.$query['searchletter'].'/i';
 		}
-		elseif(!empty($query['search']))
+		elseif (!empty($query['search']))
 		{
-			$namefilter = '/'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 		}
 
 		// Re-map so 'No filters' favorite ('') is depth 1
 		$filter = $query['filter'] === '' ? 1 : $query['filter'];
 
 		$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
-		if($filter == 5) $maxdepth = 2;
+		if ($filter == 5) $maxdepth = 2;
 		$n = 0;
 		$vfs_options = array(
 			'mindepth' => 1,
 			'maxdepth' => $maxdepth,
 			'dirsontop' => $filter <= 1,
-			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F':'f'),
+			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F' : 'f'),
 			'order' => $query['order'], 'sort' => $query['sort'],
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
@@ -1019,7 +1017,7 @@ 
 			'hidden' => $filter == 3,
 			'follow' => $filter == 5,
 		);
-		if($query['col_filter']['mime'])
+		if ($query['col_filter']['mime'])
 		{
 			$vfs_options['mime'] = $query['col_filter']['mime'];
 		}
@@ -1033,7 +1031,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function file(array $content=null,$msg='')
+	function file(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('filemanager.file');
 
@@ -1043,9 +1041,9 @@ 
 			{
 				$msg .= $_GET['msg'];
 			}
-			if (!($path = str_replace(array('#','?'),array('%23','%3F'),$_GET['path'])) ||	// ?, # need to stay encoded!
+			if (!($path = str_replace(array('#', '?'), array('%23', '%3F'), $_GET['path'])) || // ?, # need to stay encoded!
 				// actions enclose pathes containing comma with "
-				($path[0] == '"' && substr($path,-1) == '"' && !($path = substr(str_replace('""','"',$path),1,-1))) ||
+				($path[0] == '"' && substr($path, -1) == '"' && !($path = substr(str_replace('""', '"', $path), 1, -1))) ||
 				!($stat = Vfs::lstat($path)))
 			{
 				$msg .= lang('File or directory not found!')." path='$path', stat=".array2string($stat);
@@ -1058,10 +1056,10 @@ 
 				$content['path'] = $path;
 				$content['hsize'] = Vfs::hsize($stat['size']);
 				$content['mime'] = Vfs::mime_content_type($path);
-				$content['gid'] *= -1;	// our widgets use negative gid's
+				$content['gid'] *= -1; // our widgets use negative gid's
 				if (($props = Vfs::propfind($path)))
 				{
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$content[$prop['name']] = $prop['val'];
 					}
@@ -1074,9 +1072,9 @@ 
 			$content['tabs'] = $_GET['tabs'];
 			if (!($content['is_dir'] = Vfs::is_dir($path) && !Vfs::is_link($path)))
 			{
-				$content['perms']['executable'] = (int)!!($content['mode'] & 0111);
+				$content['perms']['executable'] = (int)!!($content['mode']&0111);
 				$mask = 6;
-				if (preg_match('/^text/',$content['mime']) && $content['size'] < 100000)
+				if (preg_match('/^text/', $content['mime']) && $content['size'] < 100000)
 				{
 					$content['text_content'] = file_get_contents(Vfs::PREFIX.$path);
 				}
@@ -1086,20 +1084,20 @@ 
 				//currently not implemented in backend $content['perms']['sticky'] = (int)!!($content['mode'] & 0x201);
 				$mask = 7;
 			}
-			foreach(array('owner' => 6,'group' => 3,'other' => 0) as $name => $shift)
+			foreach (array('owner' => 6, 'group' => 3, 'other' => 0) as $name => $shift)
 			{
-				$content['perms'][$name] = ($content['mode'] >> $shift) & $mask;
+				$content['perms'][$name] = ($content['mode'] >> $shift)&$mask;
 			}
-			$content['is_owner'] = Vfs::has_owner_rights($path,$content);
+			$content['is_owner'] = Vfs::has_owner_rights($path, $content);
 		}
 		else
 		{
 			//_debug_array($content);
-			$path =& $content['path'];
+			$path = & $content['path'];
 
 			$button = @key($content['button']);
 			unset($content['button']);
-			if(!$button && $content['sudo'])
+			if (!$button && $content['sudo'])
 			{
 				// Button to stop sudo is not in button namespace
 				$button = 'sudo';
@@ -1108,21 +1106,21 @@ 
 			// need to check 'setup' button (submit button in sudo popup), as some browsers (eg. chrome) also fill the hidden field
 			if ($button == 'sudo' && Vfs::$is_root || $button == 'setup' && $content['sudo']['user'])
 			{
-				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '',$content['sudo']['passwd']) ?
+				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '', $content['sudo']['passwd']) ?
 					lang('Root access granted.') : ($button == 'setup' && $content['sudo']['user'] ?
 					lang('Wrong username or password!') : lang('Root access stopped.'));
 				unset($content['sudo']);
 				$content['is_owner'] = Vfs::has_owner_rights($path);
 			}
-			if (in_array($button,array('save','apply')))
+			if (in_array($button, array('save', 'apply')))
 			{
 				$props = array();
 				$perm_changed = $perm_failed = 0;
-				foreach($content['old'] as $name => $old_value)
+				foreach ($content['old'] as $name => $old_value)
 				{
 					if (isset($content[$name]) && ($old_value != $content[$name] ||
 						// do not check for modification, if modify_subs is checked!
-						$content['modify_subs'] && in_array($name,array('uid','gid','perms'))) &&
+						$content['modify_subs'] && in_array($name, array('uid', 'gid', 'perms'))) &&
 						($name != 'uid' || Vfs::$is_root))
 					{
 						if ($name == 'name')
@@ -1136,23 +1134,23 @@ 
 							$to = Vfs::concat($dir, $content['name']);
 							if (file_exists(Vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to)
 							{
-								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
-									lang('To overwrite the existing file store again.',lang($button)));
+								$tpl->set_validation_error('name', lang("There's already a file with that name!").'<br />'.
+									lang('To overwrite the existing file store again.', lang($button)));
 								$content['confirm_overwrite'] = $to;
 								if ($button == 'save') $button = 'apply';
 								continue;
 							}
-							if (Vfs::rename($path,$to))
+							if (Vfs::rename($path, $to))
 							{
-								$msg .= lang('Renamed %1 to %2.',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Renamed %1 to %2.', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								$content['old']['name'] = $content[$name];
 								$path = $to;
-								$content['mime'] = Api\MimeMagic::filename2mime($path);	// recheck mime type
-								$refresh_path = Vfs::dirname($path);	// for renames, we have to refresh the parent
+								$content['mime'] = Api\MimeMagic::filename2mime($path); // recheck mime type
+								$refresh_path = Vfs::dirname($path); // for renames, we have to refresh the parent
 							}
 							else
 							{
-								$msg .= lang('Rename of %1 to %2 failed!',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Rename of %1 to %2 failed!', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								if (Vfs::deny_script($to))
 								{
 									$msg .= lang('You are NOT allowed to upload a script!').' ';
@@ -1172,7 +1170,7 @@ 
 									'val'	=> (!empty($content[$name]) ? $content[$name] : null),
 								),
 							);
-							if (Vfs::proppatch($path,$mergeprop))
+							if (Vfs::proppatch($path, $mergeprop))
 							{
 								$content['old'][$name] = $content[$name];
 								$msg .= lang('Setting for document merge saved.');
@@ -1184,22 +1182,22 @@ 
 						}
 						else
 						{
-							static $name2cmd = array('uid' => 'chown','gid' => 'chgrp','perms' => 'chmod');
-							$cmd = array('EGroupware\\Api\\Vfs',$name2cmd[$name]);
+							static $name2cmd = array('uid' => 'chown', 'gid' => 'chgrp', 'perms' => 'chmod');
+							$cmd = array('EGroupware\\Api\\Vfs', $name2cmd[$name]);
 							$value = $name == 'perms' ? static::perms2mode($content['perms']) : $content[$name];
 							if ($content['modify_subs'])
 							{
 								if ($name == 'perms')
 								{
-									$changed = Vfs::find($path,array('type'=>'d'),$cmd,array($value));
-									$changed += Vfs::find($path,array('type'=>'f'),$cmd,array($value & 0666));	// no execute for files
+									$changed = Vfs::find($path, array('type'=>'d'), $cmd, array($value));
+									$changed += Vfs::find($path, array('type'=>'f'), $cmd, array($value&0666)); // no execute for files
 								}
 								else
 								{
-									$changed = Vfs::find($path,null,$cmd,array($value));
+									$changed = Vfs::find($path, null, $cmd, array($value));
 								}
 								$ok = $failed = 0;
-								foreach($changed as &$r)
+								foreach ($changed as &$r)
 								{
 									if ($r)
 									{
@@ -1212,32 +1210,32 @@ 
 								}
 								if ($ok && !$failed)
 								{
-									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if (!$perm_changed++) $msg .= lang('Permissions of %1 changed.', $path.' '.lang('and all it\'s childeren'));
 									$content['old'][$name] = $content[$name];
 								}
-								elseif($failed)
+								elseif ($failed)
 								{
-									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
-										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
+									if (!$perm_failed++) $msg .= lang('Failed to change permissions of %1!', $path.lang('and all it\'s childeren').
+										($ok ? ' ('.lang('%1 failed, %2 succeded', $failed, $ok).')' : ''));
 								}
 							}
-							elseif (call_user_func_array($cmd,array($path,$value)))
+							elseif (call_user_func_array($cmd, array($path, $value)))
 							{
-								$msg .= lang('Permissions of %1 changed.',$path);
+								$msg .= lang('Permissions of %1 changed.', $path);
 								$content['old'][$name] = $content[$name];
 							}
 							else
 							{
-								$msg .= lang('Failed to change permissions of %1!',$path);
+								$msg .= lang('Failed to change permissions of %1!', $path);
 							}
 						}
 					}
 				}
 				if ($props)
 				{
-					if (Vfs::proppatch($path,$props))
+					if (Vfs::proppatch($path, $props))
 					{
-						foreach($props as $prop)
+						foreach ($props as $prop)
 						{
 							$content['old'][$prop['name']] = $prop['val'];
 						}
@@ -1254,8 +1252,8 @@ 
 				if ($content['eacl']['delete'])
 				{
 					$ino_owner = key($content['eacl']['delete']);
-					list(, $owner) = explode('-',$ino_owner,2);	// $owner is a group and starts with a minus!
-					$msg .= Vfs::eacl($path,null,$owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
+					list(, $owner) = explode('-', $ino_owner, 2); // $owner is a group and starts with a minus!
+					$msg .= Vfs::eacl($path, null, $owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
 				}
 				elseif ($button == 'eacl')
 				{
@@ -1265,7 +1263,7 @@ 
 					}
 					else
 					{
-						$msg .= Vfs::eacl($path,$content['eacl']['rights'],$content['eacl_owner']) ?
+						$msg .= Vfs::eacl($path, $content['eacl']['rights'], $content['eacl_owner']) ?
 							lang('ACL added.') : lang('Error adding the ACL!');
 					}
 				}
@@ -1275,7 +1273,7 @@ 
 		}
 		if ($content['is_link'] && !Vfs::stat($path))
 		{
-			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!',$content['symlink']);
+			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!', $content['symlink']);
 		}
 		$content['link'] = Egw::link(Vfs::download_url($path));
 		$content['icon'] = Vfs::mime_icon($content['mime']);
@@ -1284,11 +1282,11 @@ 
 		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
-			Vfs::parse_url(Vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs') ||// no uid, gid or perms in oldvfs
+			Vfs::parse_url(Vfs::resolve_url($content['path']), PHP_URL_SCHEME) == 'oldvfs') || // no uid, gid or perms in oldvfs
 				 !Vfs::is_writable($path))
 		{
 			if (!$content['gid']) $content['ro_gid_root'] = 'root';
-			foreach($content['perms'] as $name => $value)
+			foreach ($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
 			}
@@ -1307,38 +1305,38 @@ 
 		}
 		elseif (!Vfs::is_writable($path))
 		{
-			foreach($cfs as $name => $data)
+			foreach ($cfs as $name => $data)
 			{
 				$readonlys['#'.$name] = true;
 			}
 		}
-		$readonlys['tabs']['filemanager.file.eacl'] = true;	// eacl off by default
+		$readonlys['tabs']['filemanager.file.eacl'] = true; // eacl off by default
 		if ($content['is_dir'])
 		{
-			$readonlys['tabs']['filemanager.file.preview'] = true;	// no preview tab for dirs
-			$sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$readonlys['tabs']['filemanager.file.preview'] = true; // no preview tab for dirs
+			$sel_options['rights'] = $sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				7 => lang('Display and modification of content'),
 				5 => lang('Display of content'),
 				0 => lang('No access'),
 			);
-			if(($content['eacl'] = Vfs::get_eacl($content['path'])) !== false &&	// backend supports eacl
+			if (($content['eacl'] = Vfs::get_eacl($content['path'])) !== false && // backend supports eacl
 				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)	// leave eACL tab disabled for sharing
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
-				foreach($content['eacl'] as &$eacl)
+				unset($readonlys['tabs']['filemanager.file.eacl']); // --> switch the tab on again
+				foreach ($content['eacl'] as &$eacl)
 				{
-					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
+					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'], PHP_URL_PATH), '/');
 					$readonlys['delete['.$eacl['ino'].'-'.$eacl['owner'].']'] = $eacl['ino'] != $content['ino'] ||
 						$eacl['path'] != $content['path'] || !$content['is_owner'];
 				}
-				array_unshift($content['eacl'],false);	// make the keys start with 1, not 0
+				array_unshift($content['eacl'], false); // make the keys start with 1, not 0
 				$content['eacl']['owner'] = 0;
 				$content['eacl']['rights'] = 5;
 			}
 		}
 		else
 		{
-			$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				6 => lang('Read & write access'),
 				4 => lang('Read access only'),
 				0 => lang('No access'),
@@ -1348,11 +1346,11 @@ 
 		// mergeapp
 		$content['mergeapp'] = static::get_mergeapp($path, 'self');
 		$content['mergeapp_parent'] = static::get_mergeapp($path, 'parents');
-		if(!empty($content['mergeapp']))
+		if (!empty($content['mergeapp']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp'];
 		}
-		elseif(!empty($content['mergeapp_parent']))
+		elseif (!empty($content['mergeapp_parent']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp_parent'];
 		}
@@ -1364,7 +1362,7 @@ 
 		$mergeapp_list = Link::app_list('merge');
 		unset($mergeapp_list[$GLOBALS['egw_info']['flags']['currentapp']]); // exclude filemanager from list
 		$mergeapp_empty = !empty($content['mergeapp_parent'])
-			? $mergeapp_list[$content['mergeapp_parent']] . ' (parent setting)' : '';
+			? $mergeapp_list[$content['mergeapp_parent']].' (parent setting)' : '';
 		$sel_options['mergeapp'] = array(''	=> $mergeapp_empty);
 		$sel_options['mergeapp'] = $sel_options['mergeapp'] + $mergeapp_list;
 		// mergeapp other gui options
@@ -1381,7 +1379,7 @@ 
 				'comment' => (string)$content['comment'],
 				'mergeapp' => $content['mergeapp']
 			);
-			if ($cfs) foreach($cfs as $name => $data)
+			if ($cfs) foreach ($cfs as $name => $data)
 			{
 				$preserve['old']['#'.$name] = (string)$content['#'.$name];
 			}
@@ -1389,31 +1387,31 @@ 
 		if (Vfs::$is_root)
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Logout');
-			$tpl->setElementAttribute('sudouser', 'help','Log out as superuser');
+			$tpl->setElementAttribute('sudouser', 'help', 'Log out as superuser');
 			// Need a more complex submit because button type is buttononly, which doesn't submit
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"login")');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"login")');
 
 		}
 		elseif ($button == 'sudo')
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Superuser');
-			$tpl->setElementAttribute('sudouser', 'help','Enter setup user and password to get root rights');
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"logout")');
+			$tpl->setElementAttribute('sudouser', 'help', 'Enter setup user and password to get root rights');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"logout")');
 		}
 		else if (self::is_anonymous($GLOBALS['egw_info']['user']['account_id']))
 		{
 			// Just hide sudo for anonymous users
 			$readonlys['sudouser'] = true;
 		}
-		if (($extra_tabs = Vfs::getExtraInfo($path,$content)))
+		if (($extra_tabs = Vfs::getExtraInfo($path, $content)))
 		{
 			// add to existing tabs in template
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
-			$tabs =& $tpl->getElementAttribute('tabs','tabs');
+			$tabs = & $tpl->getElementAttribute('tabs', 'tabs');
 			if (true) $tabs = array();
 
-			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach (isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				$tabs[] = array(
 					'label' =>	$extra_tab['label'],
@@ -1436,7 +1434,7 @@ 
 		Framework::window_focus();
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Preferences').' '.Vfs::decodePath($path);
 
-		$tpl->exec('filemanager.filemanager_ui.file',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_ui.file', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -1458,7 +1456,7 @@ 
 	 * @param string $dir=null current directory
 	 * @see static::action()
 	 */
-	public static function ajax_action($action, $selected, $dir=null, $props=null)
+	public static function ajax_action($action, $selected, $dir = null, $props = null)
 	{
 		// do we have root rights, need to run here too, as method is static and therefore does NOT run __construct
 		if (Api\Cache::getSession('filemanager', 'is_root'))
@@ -1477,15 +1475,15 @@ 
 
 		if (!isset($dir)) $dir = array_pop($selected);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'upload':
 				$script_error = 0;
-				foreach($selected as $tmp_name => &$data)
+				foreach ($selected as $tmp_name => &$data)
 				{
 					$path = Vfs::concat($dir, Vfs::encodePathComponent($data['name']));
 
-					if(Vfs::deny_script($path))
+					if (Vfs::deny_script($path))
 					{
 						if (!isset($script_error))
 						{
@@ -1507,7 +1505,7 @@ 
 					{
 						if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 						{
-							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . basename($tmp_name);
+							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($tmp_name);
 						}
 						else
 						{
@@ -1566,16 +1564,16 @@ 
 			case 'link':
 				// First upload
 				$arr = static::ajax_action('upload', $selected, $dir, $props);
-				$app_dir = Link::vfs_path($props['entry']['app'],$props['entry']['id'],'',true);
+				$app_dir = Link::vfs_path($props['entry']['app'], $props['entry']['id'], '', true);
 
-				foreach($arr['uploaded'] as $file)
+				foreach ($arr['uploaded'] as $file)
 				{
-					$target=Vfs::concat($dir,Vfs::encodePathComponent($file['name']));
+					$target = Vfs::concat($dir, Vfs::encodePathComponent($file['name']));
 					if (Vfs::file_exists($target) && $app_dir)
 					{
 						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
 						error_log("Symlinking $target to $app_dir");
-						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
+						Vfs::symlink($target, Vfs::concat($app_dir, Vfs::encodePathComponent($file['name'])));
 					}
 				}
 				// Must return to avoid adding to $response again
@@ -1597,7 +1595,7 @@ 
 	 */
 	private function perms2mode(array $perms)
 	{
-		$mode = $perms['owner'] << 6 | $perms['group'] << 3 | $perms['other'];
+		$mode = $perms['owner'] << 6|$perms['group'] << 3|$perms['other'];
 		if ($mode['executable'])
 		{
 			$mode |= 0111;

Braces +144 added lines, -37 removed lines

@@ -88,7 +88,10 @@ 
 			// search for plugins with additional filemanager views
 			foreach(Api\Hooks::process('filemanager_views') as $views)
 			{
-				if (is_array($views)) static::$views += $views;
+				if (is_array($views))
+				{
+					static::$views += $views;
+				}
 			}
 			static::$views_init = true;
 		}
@@ -266,7 +269,8 @@ 
 
 		// This one makes no sense in filemanager
 		unset($actions['share']['children']['shareFilemanager']);
-		if (isset($GLOBALS['egw_info']['user']['apps']['mail'])) {
+		if (isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
 			$actions['share']['children']['share_mail'] = array(
 				'caption' => lang('Mail'),
 				'icon' => 'mail',
@@ -386,7 +390,10 @@ 
 			$content['nm']['view'] = $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view'];
 			$content['nm']['placeholder_actions'] = array('mkdir','paste','share','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink');
 
-			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+			if (isset($_GET['msg']))
+			{
+				$msg = $_GET['msg'];
+			}
 
 			// Blank favorite set via GET needs special handling for path
 			if (isset($_GET['favorite']) && $_GET['favorite'] == 'blank')
@@ -420,7 +427,10 @@ 
 				// reset lettersearch as it confuses users (they think the dir is empty)
 				$content['nm']['searchletter'] = false;
 				// switch recusive display off
-				if (!$content['nm']['filter']) $content['nm']['filter'] = '';
+				if (!$content['nm']['filter'])
+				{
+					$content['nm']['filter'] = '';
+				}
 			}
 		}
 		$view = static::get_view();
@@ -469,37 +479,70 @@ 
 	{
 		$tpl = new Etemplate('filemanager.index');
 
-		if($msg) Framework::message($msg);
+		if($msg)
+		{
+			Framework::message($msg);
+		}
 
 		if (($content['nm']['action'] || $content['nm']['rows']) && (empty($content['button']) || !isset($content['button'])))
 		{
 			if ($content['nm']['action'])
 			{
 				$msg = static::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				if($msg)
+				{
+					Framework::message($msg);
+				}
 
 				// clean up after action
 				unset($content['nm']['selected']);
 				// reset any occasion where action may be stored, as it may be ressurected out of the helpers by etemplate, which is quite unconvenient in case of action delete
-				if (isset($content['nm']['action'])) unset($content['nm']['action']);
-				if (isset($content['nm']['nm_action'])) unset($content['nm']['nm_action']);
-				if (isset($content['nm_action'])) unset($content['nm_action']);
+				if (isset($content['nm']['action']))
+				{
+					unset($content['nm']['action']);
+				}
+				if (isset($content['nm']['nm_action']))
+				{
+					unset($content['nm']['nm_action']);
+				}
+				if (isset($content['nm_action']))
+				{
+					unset($content['nm_action']);
+				}
 				// we dont use ['nm']['rows']['delete'], so unset it, if it is present
-				if (isset($content['nm']['rows']['delete'])) unset($content['nm']['rows']['delete']);
+				if (isset($content['nm']['rows']['delete']))
+				{
+					unset($content['nm']['rows']['delete']);
+				}
 			}
 			elseif($content['nm']['rows']['delete'])
 			{
 				$msg = static::action('delete',array_keys($content['nm']['rows']['delete']),$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				if($msg)
+				{
+					Framework::message($msg);
+				}
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
 				// reset any occasion where action may be stored, as we use ['nm']['rows']['delete'] anyhow
 				// we clean this up, as it may be ressurected out of the helpers by etemplate, which is quite unconvenient in case of action delete
-				if (isset($content['nm']['action'])) unset($content['nm']['action']);
-				if (isset($content['nm']['nm_action'])) unset($content['nm']['nm_action']);
-				if (isset($content['nm_action'])) unset($content['nm_action']);
-				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
+				if (isset($content['nm']['action']))
+				{
+					unset($content['nm']['action']);
+				}
+				if (isset($content['nm']['nm_action']))
+				{
+					unset($content['nm']['nm_action']);
+				}
+				if (isset($content['nm_action']))
+				{
+					unset($content['nm_action']);
+				}
+				if (isset($content['nm']['selected']))
+				{
+					unset($content['nm']['selected']);
+				}
 			}
 			unset($content['nm']['rows']);
 			Api\Cache::setSession('filemanager', 'index',$content['nm']);
@@ -666,9 +709,12 @@ 
 						foreach(Vfs::find($path) as $p)
 						{
 							$to = $dir.substr($p,$len);
-							if ($to == $p)	// cant copy into itself!
+							if ($to == $p)
+							{
+								// cant copy into itself!
 							{
 								++$errs;
+							}
 								continue;
 							}
 							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
@@ -723,7 +769,10 @@ 
 							continue;
 						}
 					}
-					if ($target[0] != '/') $target = Vfs::concat($dir, $target);
+					if ($target[0] != '/')
+					{
+						$target = Vfs::concat($dir, $target);
+					}
 					if (!Vfs::stat($target))
 					{
 						return lang('Link target %1 not found!', Vfs::decodePath($target));
@@ -766,10 +815,16 @@ 
 				switch($action)
 				{
 					case 'document':
-						if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
+						if (!$settings)
+						{
+							$settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
+						}
 						$document_merge = new filemanager_merge(Vfs::decodePath($dir));
 						$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
-						if($msg) return $msg;
+						if($msg)
+						{
+							return $msg;
+						}
 						$errs = count($selected);
 						return false;
 				}
@@ -806,7 +861,9 @@ 
 				unset($selected[$key]);
 			}
 		}
-		if ($selected)	// somethings left to delete
+		if ($selected)
+		{
+			// somethings left to delete
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home
 			foreach((array)$selected as $path)
@@ -814,6 +871,7 @@ 
 				if (Vfs::isProtectedDir($path))
 				{
 					$errs++;
+		}
 					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
 				}
 			}
@@ -862,7 +920,10 @@ 
 			Api\Cache::setSession('filemanager', 'index',
 				array_diff_key ($query, array_flip(array('rows','actions','action_links','placeholder_actions'))));
 		}
-		if(!$query['path']) $query['path'] = static::get_home_dir();
+		if(!$query['path'])
+		{
+			$query['path'] = static::get_home_dir();
+		}
 
 		// Change template to match selected view
 		if($query['view'])
@@ -951,10 +1012,16 @@ 
 			{
 				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
 				$row =& $rows[$path2n[$path]];
-				if ( !is_array($props) ) continue;
+				if ( !is_array($props) )
+				{
+					continue;
+				}
 				foreach($props as $prop)
 				{
-					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;
+					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show))
+					{
+						continue;
+					}
 					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'],0,64).' ...';
 				}
 			}
@@ -1005,7 +1072,10 @@ 
 		$filter = $query['filter'] === '' ? 1 : $query['filter'];
 
 		$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
-		if($filter == 5) $maxdepth = 2;
+		if($filter == 5)
+		{
+			$maxdepth = 2;
+		}
 		$n = 0;
 		$vfs_options = array(
 			'mindepth' => 1,
@@ -1130,7 +1200,10 @@ 
 							if (!($dir = Vfs::dirname($path)))
 							{
 								$msg .= lang('File or directory not found!')." Vfs::dirname('$path')===false";
-								if ($button == 'save') $button = 'apply';
+								if ($button == 'save')
+								{
+									$button = 'apply';
+								}
 								continue;
 							}
 							$to = Vfs::concat($dir, $content['name']);
@@ -1139,7 +1212,10 @@ 
 								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
 									lang('To overwrite the existing file store again.',lang($button)));
 								$content['confirm_overwrite'] = $to;
-								if ($button == 'save') $button = 'apply';
+								if ($button == 'save')
+								{
+									$button = 'apply';
+								}
 								continue;
 							}
 							if (Vfs::rename($path,$to))
@@ -1212,13 +1288,19 @@ 
 								}
 								if ($ok && !$failed)
 								{
-									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if(!$perm_changed++)
+									{
+										$msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									}
 									$content['old'][$name] = $content[$name];
 								}
 								elseif($failed)
 								{
-									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
+									if(!$perm_failed++)
+									{
+										$msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
 										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
+									}
 								}
 							}
 							elseif (call_user_func_array($cmd,array($path,$value)))
@@ -1271,7 +1353,10 @@ 
 				}
 			}
 			Framework::refresh_opener($msg, 'filemanager', $refresh_path ? $refresh_path : $path, 'edit', null, '&path=[^&]*');
-			if ($button == 'save') Framework::window_close();
+			if ($button == 'save')
+			{
+				Framework::window_close();
+			}
 		}
 		if ($content['is_link'] && !Vfs::stat($path))
 		{
@@ -1281,13 +1366,19 @@ 
 		$content['icon'] = Vfs::mime_icon($content['mime']);
 		$content['msg'] = $msg;
 
-		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid']) $content['ro_uid_root'] = 'root';
+		if (($readonlys['uid'] = !Vfs::$is_root) && !$content['uid'])
+		{
+			$content['ro_uid_root'] = 'root';
+		}
 		// only owner can change group & perms
 		if (($readonlys['gid'] = !$content['is_owner'] ||
 			Vfs::parse_url(Vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs') ||// no uid, gid or perms in oldvfs
 				 !Vfs::is_writable($path))
 		{
-			if (!$content['gid']) $content['ro_gid_root'] = 'root';
+			if (!$content['gid'])
+			{
+				$content['ro_gid_root'] = 'root';
+			}
 			foreach($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
@@ -1322,9 +1413,13 @@ 
 				0 => lang('No access'),
 			);
 			if(($content['eacl'] = Vfs::get_eacl($content['path'])) !== false &&	// backend supports eacl
-				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)	// leave eACL tab disabled for sharing
+				$GLOBALS['egw_info']['user']['account_id'] == Vfs::$user)
+			{
+				// leave eACL tab disabled for sharing
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
+				unset($readonlys['tabs']['filemanager.file.eacl']);
+			}
+			// --> switch the tab on again
 				foreach($content['eacl'] as &$eacl)
 				{
 					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
@@ -1381,10 +1476,13 @@ 
 				'comment' => (string)$content['comment'],
 				'mergeapp' => $content['mergeapp']
 			);
-			if ($cfs) foreach($cfs as $name => $data)
+			if ($cfs)
+			{
+				foreach($cfs as $name => $data)
 			{
 				$preserve['old']['#'.$name] = (string)$content['#'.$name];
 			}
+			}
 		}
 		if (Vfs::$is_root)
 		{
@@ -1411,7 +1509,10 @@ 
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
 			$tabs =& $tpl->getElementAttribute('tabs','tabs');
-			if (true) $tabs = array();
+			if (true)
+			{
+				$tabs = array();
+			}
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
@@ -1475,7 +1576,10 @@ 
 			'files' => 0,
 		);
 
-		if (!isset($dir)) $dir = array_pop($selected);
+		if (!isset($dir))
+		{
+			$dir = array_pop($selected);
+		}
 
 		switch($action)
 		{
@@ -1573,7 +1677,10 @@ 
 					$target=Vfs::concat($dir,Vfs::encodePathComponent($file['name']));
 					if (Vfs::file_exists($target) && $app_dir)
 					{
-						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
+						if (!Vfs::file_exists($app_dir))
+						{
+							Vfs::mkdir($app_dir);
+						}
 						error_log("Symlinking $target to $app_dir");
 						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
 					}

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))
 		{

Spacing +24 added lines, -24 removed lines

@@ -78,14 +78,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -99,14 +99,14 @@ 
 				Vfs::chgrp($path, 'Admins');
 				Vfs::chmod($path, 075);
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -122,18 +122,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -143,7 +143,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -154,8 +154,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -200,8 +200,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -215,7 +215,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -238,10 +238,10 @@ 
 		{
 			// 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))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -257,16 +257,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -276,13 +276,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new Etemplate('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -302,10 +302,10 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= Api\Html::form('<p>'.($check_only&&is_array($msgs) ?
+		$content .= Api\Html::form('<p>'.($check_only && is_array($msgs) ?
 			Api\Html::submit_button('fix', lang('Fix reported problems')) : '').
 			Api\Html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}