EGroupware / egroupware

doc/check_namespace.php

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
 function check_namespace($file)
 {
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = file_get_contents($file)) === false) return false;
 
@@ -36,7 +36,7 @@ 
 
 	// find classes declared in file itself, in case they are used
 	$declared = array();
-	foreach(explode("\n", $lines) as $num => $line)
+	foreach (explode("\n", $lines) as $num => $line)
 	{
 		$matches = null;
 		if (preg_match('/class\s+([^ ]+)/', $line, $matches))
@@ -47,7 +47,7 @@ 
 	$namespace = '';
 	$use = array();
 	$allways = array('self', 'parent', 'static');
-	foreach(explode("\n", $lines) as $num => $line)
+	foreach (explode("\n", $lines) as $num => $line)
 	{
 		$matches = null;
 		if (preg_match('/namespace\s+([A-Za-z0-9_\\\\]+);/', $line, $matches))
@@ -59,7 +59,7 @@ 
 
 		if (preg_match('/use\s+([^;]+);/', $line, $matches))
 		{
-			foreach(preg_split('/,\s*/', $matches[1]) as $alias)
+			foreach (preg_split('/,\s*/', $matches[1]) as $alias)
 			{
 				$parts = explode('\\', $alias);
 				$use[$alias] = array_pop($parts);
@@ -75,7 +75,7 @@ 
 			$all_matches_raw = array_merge($all_matches_raw, $matches[1]);
 		}
 		$all_matches = array_unique($all_matches_raw);
-		foreach($all_matches as $c => $class)
+		foreach ($all_matches as $c => $class)
 		{
 			$parts = explode('\\', $class);
 			$first_part = array_shift($parts);
@@ -93,7 +93,7 @@ 
 		}
 		if ($all_matches)
 		{
-			echo (1+$num).":\t".$line."\n";
+			echo (1 + $num).":\t".$line."\n";
 			echo "--> ".implode(', ', $all_matches)."\n\n";
 		}
 	}
@@ -111,7 +111,7 @@ 
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -119,13 +119,13 @@ 
 		{
 			check_namespace_recursive($dir.'/'.$file);
 		}
-		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.': ';
 			check_namespace($dir.'/'.$file);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -134,7 +134,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] file or dir\n\n";
@@ -148,9 +148,9 @@ 
 if (!$args) usage();
 
 $replace_file = false;
-while(($arg = array_shift($args)))
+while (($arg = array_shift($args)))
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -170,9 +170,9 @@ 
 
 if (!is_dir($arg))
 {
-	check_namespace($arg,$replace_file);
+	check_namespace($arg, $replace_file);
 }
 else
 {
-	check_namespace_recursive($arg,$replace_file);
+	check_namespace_recursive($arg, $replace_file);
 }
\ No newline at end of file

Braces +41 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>check_namespace.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * Check namespace usage in converted code
@@ -24,9 +27,16 @@ 
 function check_namespace($file)
 {
 	global $prog;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
-	if (($content = file_get_contents($file)) === false) return false;
+	if (($content = file_get_contents($file)) === false)
+	{
+		return false;
+	}
 
 	// replace commented lines with empty ones
 	$lines = preg_replace_callback('#(//.*$|/\\*.*\\*/)#msU', function($matches)
@@ -55,7 +65,10 @@ 
 			$namespace = $matches[1];
 			$use = array();
 		}
-		if ($namespace === '') continue;
+		if ($namespace === '')
+		{
+			continue;
+		}
 
 		if (preg_match('/use\s+([^;]+);/', $line, $matches))
 		{
@@ -109,11 +122,17 @@ 
  */
 function check_namespace_recursive($dir)
 {
-	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))
 		{
@@ -138,14 +157,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] file or dir\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();
+}
 
 $replace_file = false;
 while(($arg = array_shift($args)))
@@ -158,15 +183,21 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
-if (!file_exists($arg)) usage("Error: $arg not found!");
+if (!file_exists($arg))
+{
+	usage("Error: $arg not found!");
+}
 
 if (!is_dir($arg))
 {

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

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

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

@@ -381,13 +381,13 @@ 
 									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
-										die("Unknown $type '$owner_was'!");
+										die("unknown $type '$owner_was'!");
 									}
 								}
 								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
-									die("Unknown $type '$owner_was'!");
+									die("unknown $type '$owner_was'!");
 								}
 							}
 							$params = array($url,$owner);
@@ -445,7 +445,7 @@ 
 					{
 						if (!($f = fopen($url,'r')))
 						{
-							echo "File $url not found !!!\n\n";
+							echo "file $url not found !!!\n\n";
 						}
 						else
 						{
@@ -761,7 +761,7 @@ 
 	}
 	if (!($from_fp = fopen($from,'r')))
 	{
-		die("File $from not found!\n");
+		die("file $from not found!\n");
 	}
 	if (!($to_fp = fopen($to,'w')))
 	{

Braces +125 added lines, -31 removed lines

@@ -20,10 +20,13 @@ 
 
 error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling filemanager/cli.php as web-page
 {
 	die('<h1>'.basename(__FILE__).' must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * callback if the session-check fails, creates session from user/passwd in $GLOBALS['egw_login_data']
@@ -87,17 +90,23 @@ 
 	$cmd = array_shift($args);
 }
 
-if (!$args) $args = array('-h');
+if (!$args)
+{
+	$args = array('-h');
+}
 
 $argv = $find_options = array();
 while(!is_null($option = array_shift($args)))
 {
-	if ($option == '-' || $option[0] != '-')	// no option --> argument
+	if ($option == '-' || $option[0] != '-')
+	{
+		// no option --> argument
 	{
 		// remove quotes from arguments
 		if (in_array($option[0], array('"', "'")) && $option[0] == substr($option, -1))
 		{
 			$option = substr($option, 1, -1);
+	}
 		}
 		$argv[] = $option;
 		continue;
@@ -197,7 +206,10 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		if (($url = $argv[0])) load_wrapper($url);
+		if (($url = $argv[0]))
+		{
+			load_wrapper($url);
+		}
 		if(!Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
@@ -262,7 +274,10 @@ 
 		break;
 
 	case 'rename':
-		if (count($argv) != 2) usage('Wrong number of parameters!');
+		if (count($argv) != 2)
+		{
+			usage('Wrong number of parameters!');
+		}
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
 		rename($argv[0],$argv[1]);
@@ -273,7 +288,11 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir']))
+		{
+			exit;
+		}
+		// we need write access, error msg already given
 		$fstab = Vfs::mount();
 		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
 		{
@@ -286,7 +305,10 @@ 
 		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs();	// throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
 		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
+		if (substr($new_url,-1) == '?')
+		{
+			$new_url = substr($new_url,0,-1);
+		}
 		if (Vfs::mount($new_url,'/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
@@ -302,7 +324,10 @@ 
 		{
 			$url = array_shift($argv);
 
-			if (strpos($url, '://')) load_wrapper($url);
+			if (strpos($url, '://'))
+			{
+				load_wrapper($url);
+			}
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.") ".implode(' ', $argv)."\n";
 
 			switch($cmd)
@@ -329,7 +354,10 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url,null,$recursive))
+					{
+						echo "Can't create directory, permission denied!\n";
+					}
 					break;
 
 				case 'touch':
@@ -428,13 +456,19 @@ 
 					{
 						if ($argc)
 						{
-							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH))))
+							{
+								$name = '/';
+							}
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
 						list($url,$query) = explode('?',$url,2);
-						if ($query) $query = '?'.$query;
+						if ($query)
+						{
+							$query = '?'.$query;
+						}
 
 						if (substr($url,-1) == '/')
 						{
@@ -466,7 +500,10 @@ 
 					{
 						do_stat($url,$long,$numeric,false,$inode);
 					}
-					if (!$long && $cmd == 'ls') echo "\n";
+					if (!$long && $cmd == 'ls')
+					{
+						echo "\n";
+					}
 					break;
 			}
 		}
@@ -669,18 +706,36 @@ 
 			{
 				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
 					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
-				if (is_array($uid)) $uid = $uid['name'];
-				if (empty($uid)) $uid = $stat['uid'];
+				if (is_array($uid))
+				{
+					$uid = $uid['name'];
+				}
+				if (empty($uid))
+				{
+					$uid = $stat['uid'];
+				}
+			}
+			if (!isset($uid))
+			{
+				$uid = 'root';
 			}
-			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
 				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
 					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
-				if (is_array($gid)) $gid = $gid['name'];
-				if (empty($gid)) $gid = $stat['gid'];
+				if (is_array($gid))
+				{
+					$gid = $gid['name'];
+				}
+				if (empty($gid))
+				{
+					$gid = $stat['gid'];
+				}
+			}
+			if (!isset($gid))
+			{
+				$gid = 'root';
 			}
-			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
 		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
@@ -703,8 +758,14 @@ 
 
 function hsize($size)
 {
-	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
+	if ($size < 1024)
+	{
+		return $size;
+	}
+	if ($size < 1024*1024)
+	{
+		return sprintf('%3.1lfk',(float)$size/1024);
+	}
 	return sprintf('%3.1lfM',(float)$size/(1024*1024));
 }
 
@@ -738,14 +799,20 @@ 
 					++$anz_files;
 					_cp($f,$t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms)
+				{
+					_cp_perms($f,$t);
+				}
 			}
 			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
 			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			if ($perms)
+			{
+				_cp_perms($from,$to);
+			}
 		}
 	}
 }
@@ -774,7 +841,10 @@ 
 	//stream_filter_append($from_fp,'convert.base64-decode');
 	$count = stream_copy_to_stream($from_fp,$to_fp);
 
-	if ($verbose) echo hsize($count)." bytes written to $to\n";
+	if ($verbose)
+	{
+		echo hsize($count)." bytes written to $to\n";
+	}
 
 	fclose($from_fp);
 
@@ -821,7 +891,10 @@ 
 function do_lntree($from,$to)
 {
 	echo "lntree $from $to\n";
-	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
+	if ($from[0] == '/')
+	{
+		$from = 'sqlfs://default'.$from;
+	}
 	load_wrapper($from);
 
 	if (!file_exists($from))
@@ -883,34 +956,55 @@ 
  */
 function int2mode( $mode )
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if(($mode & 0xA000) == 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	}
+	elseif(($mode & 0xC000) == 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	}
+	elseif($mode & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	}
+	elseif($mode & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	}
+	elseif($mode & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	}
+	elseif($mode & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	}
+	elseif($mode & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';

Spacing +136 added lines, -141 removed lines

@@ -16,9 +16,9 @@ 
 use EGroupware\Api;
 use EGroupware\Api\Vfs;
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
+error_reporting(error_reporting()&~E_NOTICE & ~E_DEPRECATED);
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
 {
@@ -47,7 +47,7 @@ 
  *
  * @param string $error_msg ='' error-message to be printed in front of usage
  */
-function usage($error_msg='')
+function usage($error_msg = '')
 {
 	if ($error_msg)
 	{
@@ -81,8 +81,8 @@ 
 }
 $long = $numeric = $recursive = $perms = $all = $inode = false;
 $args = $_SERVER['argv'];
-$cmd = basename(array_shift($args),'.php');
-if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0],'://') === false)
+$cmd = basename(array_shift($args), '.php');
+if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0], '://') === false)
 {
 	$cmd = array_shift($args);
 }
@@ -90,7 +90,7 @@ 
 if (!$args) $args = array('-h');
 
 $argv = $find_options = array();
-while(!is_null($option = array_shift($args)))
+while (!is_null($option = array_shift($args)))
 {
 	if ($option == '-' || $option[0] != '-')	// no option --> argument
 	{
@@ -103,34 +103,34 @@ 
 		continue;
 	}
 
-	switch($option)
+	switch ($option)
 	{
 		default:
 			if ($cmd == 'find')
 			{
-				if (!in_array($option,array('-type','-depth','-mindepth','-maxdepth','-name','-path',
-					'-uid','-user','-nouser','-gid','-group','-nogroup','-mime',
-					'-empty','-size','-cmin','-ctime','-mmin','-mtime','-limit','-order','-sort',
-					'-hidden','-show-deleted','-name-preg','-path','-path-preg')))
+				if (!in_array($option, array('-type', '-depth', '-mindepth', '-maxdepth', '-name', '-path',
+					'-uid', '-user', '-nouser', '-gid', '-group', '-nogroup', '-mime',
+					'-empty', '-size', '-cmin', '-ctime', '-mmin', '-mtime', '-limit', '-order', '-sort',
+					'-hidden', '-show-deleted', '-name-preg', '-path', '-path-preg')))
 				{
 					usage("Unknown find option '$option'!");
 				}
-				if (in_array($option,array('-empty','-depth','-nouser','-nogroup','-hidden','-show-deleted')))
+				if (in_array($option, array('-empty', '-depth', '-nouser', '-nogroup', '-hidden', '-show-deleted')))
 				{
-					$find_options[substr($option,1)] = true;
+					$find_options[substr($option, 1)] = true;
 				}
 				else
 				{
-					$find_options[str_replace('-','_',substr($option,1))] = array_shift($args);
+					$find_options[str_replace('-', '_', substr($option, 1))] = array_shift($args);
 				}
 				break;
 			}
 			// multiple options, eg. -rp --> -r -p
-			elseif($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
+			elseif ($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
 			{
-				for($i = 1; $i < strlen($option); ++$i)
+				for ($i = 1; $i < strlen($option); ++$i)
 				{
-					array_unshift($args,'-'.$option[$i]);
+					array_unshift($args, '-'.$option[$i]);
 				}
 				break;
 			}
@@ -186,11 +186,11 @@ 
 }
 if ($user && $passwd)
 {
-	load_egw($user,$passwd,$domain ? $domain : 'default');
+	load_egw($user, $passwd, $domain ? $domain : 'default');
 }
 $argc = count($argv);
 
-switch($cmd)
+switch ($cmd)
 {
 	case 'umount':
 		if ($argc != 1 && !$all)
@@ -198,13 +198,13 @@ 
 			usage('Wrong number of parameters!');
 		}
 		if (($url = $argv[0])) load_wrapper($url);
-		if(!Vfs::$is_root)
+		if (!Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
 		if ($all)
 		{
-			Api\Config::save_value('vfs_fstab',$GLOBALS['egw_info']['server']['vfs_fstab']='','phpgwapi');
+			Api\Config::save_value('vfs_fstab', $GLOBALS['egw_info']['server']['vfs_fstab'] = '', 'phpgwapi');
 			echo "Restored default mounts:\n";
 		}
 		elseif (!Vfs::umount($url))
@@ -221,16 +221,16 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		load_wrapper($url=$argv[0]);
+		load_wrapper($url = $argv[0]);
 
-		if($argc > 1 && !Vfs::$is_root)
+		if ($argc > 1 && !Vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
-		$fstab = Vfs::mount($url,$path=$argv[1]);
+		$fstab = Vfs::mount($url, $path = $argv[1]);
 		if (is_array($fstab))
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
@@ -250,7 +250,7 @@ 
 		break;
 
 	case 'find':
-		do_find($argv,$find_options);
+		do_find($argv, $find_options);
 		break;
 
 	case 'lntree':
@@ -258,14 +258,14 @@ 
 		break;
 
 	case 'cp':
-		do_cp($argv,$recursive,$perms);
+		do_cp($argv, $recursive, $perms);
 		break;
 
 	case 'rename':
 		if (count($argv) != 2) usage('Wrong number of parameters!');
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
-		rename($argv[0],$argv[1]);
+		rename($argv[0], $argv[1]);
 		break;
 
 	case 'migrate-db2fs':
@@ -273,21 +273,21 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit; // we need write access, error msg already given
 		$fstab = Vfs::mount();
-		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
+		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'], 'storage=db') === false)
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
 			die("\n/ NOT mounted with 'storage=db' --> no need to convert!\n\n");
 		}
-		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs();	// throws exception on error
+		$num_files = Vfs\Sqlfs\Utils::migrate_db2fs(); // throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
-		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
-		if (Vfs::mount($new_url,'/'))
+		$new_url = preg_replace('/storage=db&?/', '', $fstab['/']);
+		if (substr($new_url, -1) == '?') $new_url = substr($new_url, 0, -1);
+		if (Vfs::mount($new_url, '/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
 		}
@@ -298,24 +298,24 @@ 
 		break;
 
 	default:
-		while($argv)
+		while ($argv)
 		{
 			$url = array_shift($argv);
 
 			if (strpos($url, '://')) load_wrapper($url);
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.") ".implode(' ', $argv)."\n";
 
-			switch($cmd)
+			switch ($cmd)
 			{
 				case 'rm':
 					if ($recursive)
 					{
 						if (!class_exists('EGroupware\\Api\\Vfs'))
 						{
-							die("rm -r only implemented for eGW streams!");	// dont want to repeat the code here
+							die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here
 						}
-						array_unshift($argv,$url);
-						Vfs::remove($argv,true);
+						array_unshift($argv, $url);
+						Vfs::remove($argv, true);
 						$argv = array();
 					}
 					else
@@ -329,27 +329,27 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url, null, $recursive)) echo "Can't create directory, permission denied!\n";
 					break;
 
 				case 'touch':
 				case 'chmod':
 				case 'chown':
 				case 'chgrp':
-					switch($cmd)
+					switch ($cmd)
 					{
 						case 'touch':
-							$params = array($url,$time);
+							$params = array($url, $time);
 							break;
 						case 'chmod':
 							if (!isset($mode))
 							{
-								$mode = $url;	// first param is mode
+								$mode = $url; // first param is mode
 								$url = array_shift($argv);
-								load_wrapper($url);	// not loaded because mode was in url
+								load_wrapper($url); // not loaded because mode was in url
 							}
 
-							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
+							if (strpos($mode, '+') !== false || strpos($mode, '-') !== false)
 							{
 								$stat = stat($url);
 								$set = $stat['mode'];
@@ -360,19 +360,19 @@ 
 							}
 							if (!class_exists('EGroupware\\Api\\Vfs'))
 							{
-								die("chmod only implemented for eGW streams!");	// dont want to repeat the code here
+								die("chmod only implemented for eGW streams!"); // dont want to repeat the code here
 							}
-							$set = Vfs::mode2int($mode,$set);
-							$params = array($url,$set);
+							$set = Vfs::mode2int($mode, $set);
+							$params = array($url, $set);
 							break;
 						case 'chown':
 						case 'chgrp':
 							$type = $cmd == 'chgrp' ? 'group' : 'user';
 							if (!isset($owner))
 							{
-								$owner = $url;	// first param is owner/group
+								$owner = $url; // first param is owner/group
 								$url = array_shift($argv);
-								load_wrapper($url);	// not loaded because owner/group was in url
+								load_wrapper($url); // not loaded because owner/group was in url
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -383,34 +383,34 @@ 
 									{
 										die("only numeric user/group-id's allowed for non eGW streams!");
 									}
-									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
+									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was = $owner, 'account_lid', $type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
 										die("Unknown $type '$owner_was'!");
 									}
 								}
-								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
+								elseif ($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
 									die("Unknown $type '$owner_was'!");
 								}
 							}
-							$params = array($url,$owner);
+							$params = array($url, $owner);
 							break;
 					}
-					if (($scheme = Vfs::parse_url($url,PHP_URL_SCHEME)))
+					if (($scheme = Vfs::parse_url($url, PHP_URL_SCHEME)))
 					{
 						load_wrapper($url);
 					}
 					if ($recursive && class_exists('EGroupware\\Api\\Vfs'))
 					{
-						array_unshift($argv,$url);
-						$params = array($argv,null,$cmd,$params[1]);
-						$cmd = array('EGroupware\\Api\\Vfs','find');
-						$argv = array();	// we processed all url's
+						array_unshift($argv, $url);
+						$params = array($argv, null, $cmd, $params[1]);
+						$cmd = array('EGroupware\\Api\\Vfs', 'find');
+						$argv = array(); // we processed all url's
 					}
 					//echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n";
-					call_user_func_array($cmd,$params);
+					call_user_func_array($cmd, $params);
 					break;
 
 				case 'cat':
@@ -420,35 +420,35 @@ 
 					if ($cmd != 'cat' && $recursive && class_exists('EGroupware\\Api\\Vfs'))
 					{
 						load_wrapper($url);
-						array_unshift($argv,$url);
-						Vfs::find($argv,array('url'=>true,),'do_stat',array($long,$numeric,true,$inode));
+						array_unshift($argv, $url);
+						Vfs::find($argv, array('url'=>true,), 'do_stat', array($long, $numeric, true, $inode));
 						$argv = array();
 					}
 					elseif (is_dir($url) && ($dir = opendir($url)))
 					{
 						if ($argc)
 						{
-							if (!($name = basename(Vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(Vfs::parse_url($url, PHP_URL_PATH)))) $name = '/';
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
-						list($url,$query) = explode('?',$url,2);
+						list($url, $query) = explode('?', $url, 2);
 						if ($query) $query = '?'.$query;
 
-						if (substr($url,-1) == '/')
+						if (substr($url, -1) == '/')
 						{
-							$url = substr($url,0,-1);
+							$url = substr($url, 0, -1);
 						}
-						while(($file = readdir($dir)) !== false)
+						while (($file = readdir($dir)) !== false)
 						{
-							do_stat($url.'/'.$file.$query,$long,$numeric,false,$inode);
+							do_stat($url.'/'.$file.$query, $long, $numeric, false, $inode);
 						}
 						closedir($dir);
 					}
 					elseif ($cmd == 'cat')
 					{
-						if (!($f = fopen($url,'r')))
+						if (!($f = fopen($url, 'r')))
 						{
 							echo "File $url not found !!!\n\n";
 						}
@@ -456,7 +456,7 @@ 
 						{
 							if ($argc)
 							{
-								echo "\n".basename(Vfs::parse_url($url,PHP_URL_PATH)).":\n";
+								echo "\n".basename(Vfs::parse_url($url, PHP_URL_PATH)).":\n";
 							}
 							fpassthru($f);
 							fclose($f);
@@ -464,7 +464,7 @@ 
 					}
 					else
 					{
-						do_stat($url,$long,$numeric,false,$inode);
+						do_stat($url, $long, $numeric, false, $inode);
 					}
 					if (!$long && $cmd == 'ls') echo "\n";
 					break;
@@ -479,10 +479,10 @@ 
  */
 function load_wrapper($url)
 {
-	if (($scheme = parse_url($url,PHP_URL_SCHEME)) &&
+	if (($scheme = parse_url($url, PHP_URL_SCHEME)) &&
 		!in_array($scheme, stream_get_wrappers()))
 	{
-		switch($scheme)
+		switch ($scheme)
 		{
 			case 'webdav':
 			case 'webdavs':
@@ -490,10 +490,10 @@ 
 				break;
 
 			default:
-				if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')) &&
-					($user = parse_url($url,PHP_URL_USER)) && ($pass = parse_url($url,PHP_URL_PASS)))
+				if (!isset($GLOBALS['egw']) && !in_array($scheme, array('smb', 'imap')) &&
+					($user = parse_url($url, PHP_URL_USER)) && ($pass = parse_url($url, PHP_URL_PASS)))
 				{
-					load_egw($user, $pass, ($host = parse_url($url,PHP_URL_HOST)) ? $host : 'default');
+					load_egw($user, $pass, ($host = parse_url($url, PHP_URL_HOST)) ? $host : 'default');
 				}
 				// get eGW's __autoload() function
 				include_once(EGW_SERVER_ROOT.'/api/src/loader/common.php');
@@ -514,7 +514,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -526,7 +526,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -538,7 +538,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -564,7 +564,7 @@ 
 	}
 
 	$cmd = $GLOBALS['cmd'];
-	if (!in_array($cmd,array('ls','find','mount','umount','eacl','touch','chmod','chown','chgrp')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
+	if (!in_array($cmd, array('ls', 'find', 'mount', 'umount', 'eacl', 'touch', 'chmod', 'chown', 'chgrp')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
 	{
 		echo "\nError: eGroupWare's files directory {$GLOBALS['egw_info']['server']['files_dir']} is NOT writable by the user running ".basename(__FILE__)."!\n".
 			"--> Please run it as the same user the webserver uses or root, otherwise the $cmd command will fail!\n\n";
@@ -595,22 +595,22 @@ 
 	}
 	if ($argc == 1)
 	{
-		foreach(Vfs::get_eacl($url) as $acl)
+		foreach (Vfs::get_eacl($url) as $acl)
 		{
-			$mode = ($acl['rights'] & Vfs::READABLE ? 'r' : '-').
-				($acl['rights'] & Vfs::WRITABLE ? 'w' : '-').
-				($acl['rights'] & Vfs::EXECUTABLE ? 'x' : '-');
+			$mode = ($acl['rights']&Vfs::READABLE ? 'r' : '-').
+				($acl['rights']&Vfs::WRITABLE ? 'w' : '-').
+				($acl['rights']&Vfs::EXECUTABLE ? 'x' : '-');
 			echo $acl['path']."\t$mode\t".$GLOBALS['egw']->accounts->id2name($acl['owner'])."\n";
 		}
 		return;
 	}
 	if ($argc > 1 && !is_numeric($argv[1]))
 	{
-		$mode=$argv[1];
+		$mode = $argv[1];
 		$argv[1] = null;
-		for($i = 0; $mode[$i]; ++$i)
+		for ($i = 0; $mode[$i]; ++$i)
 		{
-			switch($mode[$i])
+			switch ($mode[$i])
 			{
 				case 'x': $argv[1] |= Vfs::EXECUTABLE; break;
 				case 'w': $argv[1] |= Vfs::WRITABLE; break;
@@ -618,7 +618,7 @@ 
 			}
 		}
 	}
-	if (!Vfs::eacl($url,$argv[1],$argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
+	if (!Vfs::eacl($url, $argv[1], $argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
 	{
 		echo "Error setting extended Acl for $argv[0]!\n";
 	}
@@ -633,10 +633,10 @@ 
  * @param boolean $full_path =false true=give full path instead of just filename
  * @param boolean $inode =false true=display inode (sqlfs id)
  */
-function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
+function do_stat($url, $long = false, $numeric = false, $full_path = false, $inode = false)
 {
 	//echo "do_stat($url,$long,$numeric,$full_path)\n";
-	$bname = Vfs::parse_url($url,PHP_URL_PATH);
+	$bname = Vfs::parse_url($url, PHP_URL_PATH);
 
 	if (!$full_path)
 	{
@@ -667,25 +667,23 @@ 
 		{
 			if ($stat['uid'])
 			{
-				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
-					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
+				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) : (function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
 				if (is_array($uid)) $uid = $uid['name'];
 				if (empty($uid)) $uid = $stat['uid'];
 			}
 			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
-				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
-					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
+				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) : (function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
 				if (is_array($gid)) $gid = $gid['name'];
 				if (empty($gid)) $gid = $stat['gid'];
 			}
 			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
-		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
+		$mtime = date('Y-m-d H:i:s', $stat['mtime']);
 		$nlink = $stat['nlink'];
-		if (($stat['mode'] & 0xA000) == 0xA000)
+		if (($stat['mode']&0xA000) == 0xA000)
 		{
 			$symlink = " -> ".(class_exists('EGroupware\\Api\\Vfs') ? Vfs::readlink($url) : readlink($url));
 		}
@@ -704,12 +702,12 @@ 
 function hsize($size)
 {
 	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-	return sprintf('%3.1lfM',(float)$size/(1024*1024));
+	if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+	return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
 }
 
 
-function do_cp($argv,$recursive=false,$perms=false)
+function do_cp($argv, $recursive = false, $perms = false)
 {
 	$to = array_pop($argv);
 	load_wrapper($to);
@@ -721,13 +719,13 @@ 
 		usage("No such directory '$to'!");
 	}
 	$anz_dirs = $anz_files = 0;
-	foreach($argv as $from)
+	foreach ($argv as $from)
 	{
 		if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('EGroupware\\Api\\Vfs'))
 		{
-			foreach(Vfs::find($from,array('url' => true)) as $f)
+			foreach (Vfs::find($from, array('url' => true)) as $f)
 			{
-				$t = $to.substr($f,strlen($from));
+				$t = $to.substr($f, strlen($from));
 				if (is_dir($f))
 				{
 					++$anz_dirs;
@@ -736,43 +734,43 @@ 
 				else
 				{
 					++$anz_files;
-					_cp($f,$t);
+					_cp($f, $t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms) _cp_perms($f, $t);
 			}
-			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
+			echo ($anz_dirs ? "$anz_dirs dir(s) created and " : '')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
-			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			_cp($from, $to, true);
+			if ($perms) _cp_perms($from, $to);
 		}
 	}
 }
 
-function _cp($from,$to,$verbose=false)
+function _cp($from, $to, $verbose = false)
 {
 	load_wrapper($from);
 
 	if (is_dir($to))
 	{
-		$path = Vfs::parse_url($from,PHP_URL_PATH);
+		$path = Vfs::parse_url($from, PHP_URL_PATH);
 		if (is_dir($to))
 		{
-			list($to,$query) = explode('?',$to,2);
+			list($to, $query) = explode('?', $to, 2);
 			$to .= '/'.basename($path).($query ? '?'.$query : '');
 		}
 	}
-	if (!($from_fp = fopen($from,'r')))
+	if (!($from_fp = fopen($from, 'r')))
 	{
 		die("File $from not found!\n");
 	}
-	if (!($to_fp = fopen($to,'w')))
+	if (!($to_fp = fopen($to, 'w')))
 	{
 		die("Can't open $to for writing!\n");
 	}
 	//stream_filter_append($from_fp,'convert.base64-decode');
-	$count = stream_copy_to_stream($from_fp,$to_fp);
+	$count = stream_copy_to_stream($from_fp, $to_fp);
 
 	if ($verbose) echo hsize($count)." bytes written to $to\n";
 
@@ -785,11 +783,11 @@ 
 }
 
 
-function _cp_perms($from,$to)
+function _cp_perms($from, $to)
 {
 	if (($from_stat = stat($from)) && ($to_stat = stat($to)))
 	{
-		foreach(array(
+		foreach (array(
 			'mode' => 'chmod',
 			'uid'  => 'chown',
 			'gid'  => 'chgrp',
@@ -798,27 +796,27 @@ 
 			if ($from_stat[$perm] != $to_stat[$perm])
 			{
 				//echo "Vfs::$cmd($to,{$from_stat[$perm]}\n";
-				call_user_func(array('EGroupware\\Api\\Vfs',$cmd),$to,$from_stat[$perm]);
+				call_user_func(array('EGroupware\\Api\\Vfs', $cmd), $to, $from_stat[$perm]);
 			}
 		}
 	}
 }
 
-function do_find($bases,$options)
+function do_find($bases, $options)
 {
-	foreach($bases as $url)
+	foreach ($bases as $url)
 	{
 		load_wrapper($url);
 	}
-	$options['url'] = true;	// we use url's not vfs pathes in filemanager/cli.php
+	$options['url'] = true; // we use url's not vfs pathes in filemanager/cli.php
 
-	foreach(Vfs::find($bases,$options) as $path)
+	foreach (Vfs::find($bases, $options) as $path)
 	{
 		echo "$path\n";
 	}
 }
 
-function do_lntree($from,$to)
+function do_lntree($from, $to)
 {
 	echo "lntree $from $to\n";
 	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
@@ -881,33 +879,33 @@ 
  * @param int $mode
  * @return string
  */
-function int2mode( $mode )
+function int2mode($mode)
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if (($mode&0xA000) == 0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	elseif (($mode&0xC000) == 0xC000) // Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	elseif ($mode&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	elseif ($mode&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	elseif ($mode&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	elseif ($mode&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	elseif ($mode&0x8000) // Regular
 	{
 		$sP = '-';
 	}
@@ -917,22 +915,19 @@ 
 	}
 
 	// owner
-	$sP .= (($mode & 0x0100) ? 'r' : '-') .
-	(($mode & 0x0080) ? 'w' : '-') .
-	(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-	(($mode & 0x0800) ? 'S' : '-'));
+	$sP .= (($mode&0x0100) ? 'r' : '-').
+	(($mode&0x0080) ? 'w' : '-').
+	(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($mode & 0x0020) ? 'r' : '-') .
-	(($mode & 0x0010) ? 'w' : '-') .
-	(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-	(($mode & 0x0400) ? 'S' : '-'));
+	$sP .= (($mode&0x0020) ? 'r' : '-').
+	(($mode&0x0010) ? 'w' : '-').
+	(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($mode & 0x0004) ? 'r' : '-') .
-	(($mode & 0x0002) ? 'w' : '-') .
-	(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-	(($mode & 0x0200) ? 'T' : '-'));
+	$sP .= (($mode&0x0004) ? 'r' : '-').
+	(($mode&0x0002) ? 'w' : '-').
+	(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 	return $sP;
 }

filemanager/test.php

Braces +12 added lines, -3 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -18,13 +18,13 @@ 
 );
 include('../header.inc.php');
 
-if (!($path = Api\Cache::getSession('filemanger','test')))
+if (!($path = Api\Cache::getSession('filemanger', 'test')))
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
 if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
-echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
-	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
+echo Api\Html::form("<p>Path: ".Api\Html::input('path', $path, 'text', 'size="40"').
+	Api\Html::submit_button('', lang('Submit'))."</p>\n", array(), '', '', '', '', 'GET');
 
 if (isset($path) && !empty($path))
 {
@@ -32,13 +32,13 @@ 
 	{
 		throw new Api\Exception\WrongUserinput('Not an absolute path!');
 	}
-	Api\Cache::setSession('filemanger','test',$path);
+	Api\Cache::setSession('filemanger', 'test', $path);
 
 	echo "<h2>";
-	foreach(explode('/',$path) as $n => $part)
+	foreach (explode('/', $path) as $n => $part)
 	{
 		$p .= ($p != '/' ? '/' : '').$part;
-		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ','/filemanager/test.php',array('path'=>$p,'cd'=>'no'));
+		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ', '/filemanager/test.php', array('path'=>$p, 'cd'=>'no'));
 	}
 	echo "</h2>\n";
 
@@ -50,29 +50,29 @@ 
 
 	$time = microtime(true);
 	$stat = Vfs::stat($path);
-	$stime = number_format(1000*(microtime(true)-$time),1);
+	$stime = number_format(1000 * (microtime(true) - $time), 1);
 
 	$time2 = microtime(true);
 	if ($is_dir)// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
 		//while(($file = readdir($d)))
-		foreach(Vfs::scandir($path) as $file)
+		foreach (Vfs::scandir($path) as $file)
 		{
-			if (Vfs::is_readable($fpath=Vfs::concat($path,$file)))
+			if (Vfs::is_readable($fpath = Vfs::concat($path, $file)))
 			{
-				$file = Api\Html::a_href($file,'/filemanager/test.php',array('path'=>$fpath,'cd'=>'no'));
+				$file = Api\Html::a_href($file, '/filemanager/test.php', array('path'=>$fpath, 'cd'=>'no'));
 			}
 			$file .= ' ('.Vfs::mime_content_type($fpath).')';
 			$files[] = $file;
 		}
 		//closedir($d);
-		$time2f = number_format(1000*(microtime(true)-$time2),1);
+		$time2f = number_format(1000 * (microtime(true) - $time2), 1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if ($files) echo '<ol><li>'.implode("</li>\n<li>", $files).'</ol>'."\n";
 	}
 
-	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';
+	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode']) ?sprintf('%o', $stat['mode']).' = '.Vfs::int2mode($stat['mode']) : 'NULL').')';
 	if (is_array($stat))
 	{
 		_debug_array($stat);
@@ -89,8 +89,8 @@ 
 	echo "<p><b>readlink('$path')</b>=".array2string(Vfs::readlink($path))."</p>\n";
 	$time3 = microtime(true);
 	$lstat = Vfs::lstat($path);
-	$time3f = number_format(1000*(microtime(true)-$time3),1);
-	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode'])?sprintf('%o',$lstat['mode']).' = '.Vfs::int2mode($lstat['mode']):'NULL').')';
+	$time3f = number_format(1000 * (microtime(true) - $time3), 1);
+	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode']) ?sprintf('%o', $lstat['mode']).' = '.Vfs::int2mode($lstat['mode']) : 'NULL').')';
 	if (is_array($lstat))
 	{
 		_debug_array($lstat);