EGroupware / egroupware

filemanager/cli.php

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
 	{
@@ -98,34 +98,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;
 			}
@@ -181,11 +181,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)
@@ -193,13 +193,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))
@@ -216,16 +216,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";
 			}
@@ -245,7 +245,7 @@ 
 		break;
 
 	case 'find':
-		do_find($argv,$find_options);
+		do_find($argv, $find_options);
 		break;
 
 	case 'lntree':
@@ -253,14 +253,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':
@@ -268,21 +268,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";
 		}
@@ -293,24 +293,24 @@ 
 		break;
 
 	default:
-		while($argv)
+		while ($argv)
 		{
 			$url = array_shift($argv);
 
 			load_wrapper($url);
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.")\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
@@ -324,27 +324,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);
 							}
-							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)
+							if (strpos($mode, '+') !== false || strpos($mode, '-') !== false)
 							{
 								$stat = stat($url);
 								$set = $stat['mode'];
@@ -355,19 +355,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);
-								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;
@@ -378,34 +378,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':
@@ -415,35 +415,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";
 						}
@@ -451,7 +451,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);
@@ -459,7 +459,7 @@ 
 					}
 					else
 					{
-						do_stat($url,$long,$numeric,false,$inode);
+						do_stat($url, $long, $numeric, false, $inode);
 					}
 					if (!$long && $cmd == 'ls') echo "\n";
 					break;
@@ -474,10 +474,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':
@@ -485,10 +485,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');
@@ -509,7 +509,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;
@@ -521,7 +521,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(
@@ -533,7 +533,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -559,7 +559,7 @@ 
 	}
 
 	$cmd = $GLOBALS['cmd'];
-	if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
+	if (!in_array($cmd, array('ls', 'find', 'mount', 'umount', 'eacl')) && $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";
@@ -590,22 +590,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;
@@ -613,7 +613,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";
 	}
@@ -628,10 +628,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)
 	{
@@ -662,25 +662,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));
 		}
@@ -699,12 +697,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);
@@ -716,13 +714,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;
@@ -731,43 +729,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";
 
@@ -780,11 +778,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',
@@ -793,27 +791,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;
@@ -876,33 +874,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 = '-';
 	}
@@ -912,22 +910,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;
 }

api/src/loader.php

Spacing +11 added lines, -11 removed lines

@@ -24,19 +24,19 @@ 
 // Only variables should be assigned by reference, eg. soetemplate::tree_walk()
 // Declaration of <extended method> should be compatible with <parent method>, varios places where method parameters change
 // --> switching it off for now, as it makes error-log unusable
-error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting(E_ALL&~E_NOTICE&~E_STRICT);
 if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
 {
 	set_magic_quotes_runtime(false);
 }
 
 $egw_min_php_version = '5.4';
-if (!function_exists('version_compare') || version_compare(PHP_VERSION,$egw_min_php_version) < 0)
+if (!function_exists('version_compare') || version_compare(PHP_VERSION, $egw_min_php_version) < 0)
 {
 	die("EGroupware requires PHP $egw_min_php_version or greater.<br />Please contact your System Administrator to upgrade PHP!");
 }
 
-if (!defined('EGW_API_INC')) define('EGW_API_INC',PHPGW_API_INC);	// this is to support the header upgrade
+if (!defined('EGW_API_INC')) define('EGW_API_INC', PHPGW_API_INC); // this is to support the header upgrade
 
 /* Make sure the header.inc.php is current. */
 if (!isset($GLOBALS['egw_domain']) || $GLOBALS['egw_info']['server']['versions']['header'] < $GLOBALS['egw_info']['server']['versions']['current_header'])
@@ -67,12 +67,12 @@ 
 			$GLOBALS['egw_info']['flags']['restored_from_session'] = true;
 
 			// restoring the egw_info-array
-			$GLOBALS['egw_info'] = array_merge($_SESSION[Session::EGW_INFO_CACHE],array('flags' => $GLOBALS['egw_info']['flags']));
+			$GLOBALS['egw_info'] = array_merge($_SESSION[Session::EGW_INFO_CACHE], array('flags' => $GLOBALS['egw_info']['flags']));
 
 			// include required class-definitions
 			if (is_array($_SESSION[Session::EGW_REQUIRED_FILES]))	// all classes, which can not be autoloaded
 			{
-				foreach($_SESSION[Session::EGW_REQUIRED_FILES] as $file)
+				foreach ($_SESSION[Session::EGW_REQUIRED_FILES] as $file)
 				{
 					require_once($file);
 				}
@@ -81,10 +81,10 @@ 
 
 			if (is_object($GLOBALS['egw']) && ($GLOBALS['egw'] instanceof Egw))	// only egw object has wakeup2, setups egw_minimal eg. has not!
 			{
-				$GLOBALS['egw']->wakeup2();	// adapt the restored egw-object/enviroment to this request (eg. changed current app)
+				$GLOBALS['egw']->wakeup2(); // adapt the restored egw-object/enviroment to this request (eg. changed current app)
 
 				$GLOBALS['egw_info']['flags']['session_restore_time'] = microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time'];
-				if (is_object($GLOBALS['egw']->translation)) return;	// exit this file, as the rest of the file creates a new egw-object and -enviroment
+				if (is_object($GLOBALS['egw']->translation)) return; // exit this file, as the rest of the file creates a new egw-object and -enviroment
 			}
 			// egw object could NOT be restored from the session, create a new one
 			unset($GLOBALS['egw']);
@@ -109,8 +109,8 @@ 
 
 $GLOBALS['egw_info']['user']['domain'] = Session::search_instance(
 	isset($_POST['login']) ? $_POST['login'] : (isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : $_SERVER['REMOTE_USER']),
-	Session::get_request('domain'),$GLOBALS['egw_info']['server']['default_domain'],
-	array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']),$GLOBALS['egw_domain']);
+	Session::get_request('domain'), $GLOBALS['egw_info']['server']['default_domain'],
+	array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']), $GLOBALS['egw_domain']);
 
 $GLOBALS['egw_info']['server'] += $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']];
 
@@ -119,7 +119,7 @@ 
 
 // store domain config user&pw as a hash (originals get unset)
 $GLOBALS['egw_info']['server']['config_hash'] = Session::user_pw_hash($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_user'],
-	$GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_passwd'],true);
+	$GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['config_passwd'], true);
 
 if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login' && !$GLOBALS['egw_info']['server']['show_domain_selectbox'])
 {
@@ -132,7 +132,7 @@ 
 if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login')
 {
 	$_SESSION[Session::EGW_INFO_CACHE] = $GLOBALS['egw_info'];
-	unset($_SESSION[Session::EGW_INFO_CACHE]['flags']);	// dont save the flags, they change on each request
+	unset($_SESSION[Session::EGW_INFO_CACHE]['flags']); // dont save the flags, they change on each request
 
 	// dont save preferences, as Session::verify restores them from instance cache anyway
 	$_SESSION[Session::EGW_INFO_CACHE]['user']['preferences'] = array(

api/src/Egw/Applications.php

Spacing +4 added lines, -4 removed lines

@@ -58,11 +58,11 @@ 
 	 */
 	function read_repository()
 	{
-		if (!isset($GLOBALS['egw_info']['apps']) ||	!is_array($GLOBALS['egw_info']['apps']))
+		if (!isset($GLOBALS['egw_info']['apps']) || !is_array($GLOBALS['egw_info']['apps']))
 		{
 			$this->read_installed_apps();
 		}
-		if(!$this->account_id)
+		if (!$this->account_id)
 		{
 			return False;
 		}
@@ -79,7 +79,7 @@ 
 		$GLOBALS['egw_info']['apps'] = Api\Cache::getInstance(__CLASS__, 'apps', function()
 		{
 			$apps = array();
-			foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
+			foreach ($this->db->select($this->table_name, '*', false, __LINE__, __FILE__, false, 'ORDER BY app_order ASC') as $row)
 			{
 				$apps[$row['app_name']] = Array(
 					'title'   => $row['app_name'],
@@ -99,7 +99,7 @@ 
 
 		if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
-			foreach($GLOBALS['egw_info']['apps'] as &$app)
+			foreach ($GLOBALS['egw_info']['apps'] as &$app)
 			{
 				$app['title'] = lang($app['title']);
 			}

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

@@ -81,7 +81,7 @@
 			$apps = array();
 			foreach($this->db->select($this->table_name,'*',false,__LINE__,__FILE__,false,'ORDER BY app_order ASC') as $row)
 			{
-				$apps[$row['app_name']] = Array(
+				$apps[$row['app_name']] = array(
 					'title'   => $row['app_name'],
 					'name'    => $row['app_name'],
 					'enabled' => True,