EGroupware / egroupware

filemanager/inc/class.filemanager_ui.inc.php

Braces +138 added lines, -35 removed lines

@@ -87,7 +87,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;
 		}
@@ -310,7 +313,10 @@ 
 			$content['nm']['home_dir'] = static::get_home_dir();
 			$content['nm']['view'] = $GLOBALS['egw_info']['user']['preferences']['filemanager']['nm_view'];
 
-			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')
@@ -344,7 +350,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();
@@ -392,37 +401,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']);
@@ -586,9 +628,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))
@@ -643,7 +688,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));
@@ -686,10 +734,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;
 				}
@@ -726,7 +780,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)
@@ -734,6 +790,7 @@ 
 				if (preg_match('/^\/?(home|apps|)\/*$/',$path))
 				{
 					$errs++;
+		}
 					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
 				}
 			}
@@ -786,7 +843,10 @@ 
 		{
 			Api\Cache::setSession('filemanager', 'index',$query);
 		}
-		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'])
@@ -844,7 +904,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,
@@ -897,10 +960,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).' ...';
 				}
 			}
@@ -1028,7 +1097,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))
@@ -1101,13 +1173,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)))
@@ -1160,7 +1238,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))
 		{
@@ -1170,12 +1251,18 @@ 
 		$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::parse_url(Vfs::resolve_url($content['path']),PHP_URL_SCHEME) == 'oldvfs'))
+		{
+			// no uid, gid or perms in oldvfs
 		{
 			if (!$content['gid']) $content['ro_gid_root'] = 'root';
+		}
 			foreach($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
@@ -1208,9 +1295,13 @@ 
 				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)
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
+				// backend supports 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),'/');
@@ -1267,10 +1358,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)
 		{
@@ -1292,7 +1386,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)
 			{
@@ -1345,7 +1442,10 @@ 
 			'files' => 0,
 		);
 
-		if (!isset($dir)) $dir = array_pop($selected);
+		if (!isset($dir))
+		{
+			$dir = array_pop($selected);
+		}
 
 		switch($action)
 		{
@@ -1419,7 +1519,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_hooks.inc.php

Braces +12 added lines, -3 removed lines

@@ -85,7 +85,10 @@ 
 			$file['Shared files'] = Egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
 			display_sidebox(self::$appname,$title,$file);
 		}
-		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
+			self::admin(self::$appname);
+		}
 	}
 
 	/**
@@ -95,7 +98,10 @@ 
 	 */
 	static function admin($location = 'admin')
 	{
-		if (is_array($location)) $location = $location['location'];
+		if (is_array($location))
+		{
+			$location = $location['location'];
+		}
 
 		$file = Array(
 			//'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname='.self::$appname.'&ajax=true'),
@@ -121,7 +127,10 @@ 
 	static function settings()
 	{
 		$config = Api\Config::read(self::$appname);
-		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
+		if (!empty($config['max_folderlinks']))
+		{
+			self::$foldercount = (int)$config['max_folderlinks'];
+		}
 
 		$yes_no = array(
 			'no'  => lang('No'),

filemanager/inc/class.filemanager_admin.inc.php

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

filemanager/inc/class.filemanager_select.inc.php

Braces +35 added lines, -8 removed lines

@@ -169,7 +169,10 @@ 
 								$files[] = Vfs::concat($content['path'],$name);
 							}
 							//Add an uploaded file to the files result array2string
-							if ($copy_result === true) $files[] = $to_path;
+							if ($copy_result === true)
+							{
+								$files[] = $to_path;
+							}
 							break;
 
 						case 'select-dir':
@@ -193,7 +196,10 @@ 
 					else if ($content['method'] == 'ckeditor_return')
 					{
 						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
-						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
+						if ($download_url[0] == '/')
+						{
+							$download_url = Egw::link($download_url);
+						}
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
@@ -223,7 +229,10 @@ 
 		elseif(isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
-			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
+			if ($app == 'home')
+			{
+				$content['path'] = filemanager_ui::get_home_dir();
+			}
 		}
 
 		//Deactivate the opload field if the current directory is not writeable or
@@ -257,8 +266,15 @@ 
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if(!$path)
+				{
+					continue;
+				}
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -289,7 +305,11 @@ 
 			$content['dir'] = array('mode' => $content['mode']);
 			foreach($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
@@ -310,7 +330,11 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n)
+			{
+				$readonlys['selected[]'] = true;
+			}
+			// remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -348,7 +372,10 @@ 
 	static function get_apps()
 	{
 		$apps = array(false);	// index starting from 1
-		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
+		if (isset($GLOBALS['egw_info']['apps']['stylite']))
+		{
+			$apps = array('favorites' => lang('Favorites'));
+		}
 		$apps += Link::app_list('query');
 
 		unset($apps['mydms']);	// they do NOT support adding files to VFS

filemanager/inc/class.filemanager_merge.inc.php

Braces +21 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+		{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
@@ -151,12 +151,14 @@ 
 			// Try this first - a normal path /apps/appname/id/file
 			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+			{
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
 				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
 				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+				{
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
 					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
@@ -190,7 +192,10 @@ 
 		if(is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if($link['path'] && strpos($link['path'], '://') !== false)
+			{
+				$link['path'] = $file['path'];
+			}
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -211,7 +216,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -252,9 +260,15 @@ 
 		);
 		foreach($fields as $name => $label)
 		{
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 

filemanager/inc/class.filemanager_shares.inc.php

Braces +4 added lines, -1 removed lines

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

filemanager/inc/class.filemanager_favorite_portlet.inc.php

Braces +4 added lines, -1 removed lines

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

filemanager/cli.php

Braces +131 added lines, -32 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,14 +90,20 @@ 
 	$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
 	{
 		$argv[] = $option;
+	}
 		continue;
 	}
 
@@ -192,7 +201,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");
@@ -257,7 +269,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]);
@@ -268,7 +283,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)
 		{
@@ -281,7 +300,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";
@@ -324,7 +346,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':
@@ -342,7 +367,11 @@ 
 								$mode = $url;	// first param is mode
 								$url = array_shift($argv);
 							}
-							if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or Vfs::mode2int otherwise!
+							if (Vfs::parse_url($url,PHP_URL_SCHEME))
+							{
+								load_wrapper($url);
+							}
+							// cant use stat or Vfs::mode2int otherwise!
 
 							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
 							{
@@ -367,7 +396,11 @@ 
 							{
 								$owner = $url;	// first param is owner/group
 								$url = array_shift($argv);
-								if (Vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (Vfs::parse_url($url,PHP_URL_SCHEME))
+								{
+									load_wrapper($url);
+								}
+								// we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -423,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) == '/')
 						{
@@ -461,7 +500,10 @@ 
 					{
 						do_stat($url,$long,$numeric,false,$inode);
 					}
-					if (!$long && $cmd == 'ls') echo "\n";
+					if (!$long && $cmd == 'ls')
+					{
+						echo "\n";
+					}
 					break;
 			}
 		}
@@ -665,18 +707,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']);
@@ -699,8 +759,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));
 }
 
@@ -734,14 +800,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);
+			}
 		}
 	}
 }
@@ -770,7 +842,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);
 
@@ -817,7 +892,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))
@@ -879,34 +957,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';

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').')';