EGroupware / egroupware

doc/rpm-build/checkout-build-archives.php

Doc Comments +2 added lines, -1 removed lines

@@ -464,6 +464,7 @@ 
  *
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
+ * @return string
  */
 function config_translate($name, $value=null)
 {
@@ -1194,7 +1195,7 @@ 
  * Runs given shell command, exists with error-code after echoing the output of the failed command (if not already running verbose)
  *
  * @param string $cmd
- * @param array& $output=null $output of command, only if !$verbose !!!
+ * @param array& $output $output of command, only if !$verbose !!!
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @return int exit code of $cmd
  */

Braces +236 added lines, -58 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
 
 $verbose = 0;
@@ -137,7 +140,10 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value)
+				{
+					array_unshift($config['run'],$name);
+				}
 				break;
 
 			case 'editchangelog':
@@ -153,7 +159,10 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs',$config['run']))
+				{
+					$config['run'][] = 'obs';
+				}
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -211,7 +220,10 @@ 
 	}
 
 	$cmd = $config['git'].' log '.escapeshellarg($last_tag.'..HEAD');
-	if (getcwd() != $path) $cmd = 'cd '.$path.'; '.$cmd;
+	if (getcwd() != $path)
+	{
+		$cmd = 'cd '.$path.'; '.$cmd;
+	}
 	$output = null;
 	run_cmd($cmd, $output);
 
@@ -242,7 +254,10 @@ 
 {
 	global $config, $verbose;
 
-	if ($verbose) echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	if ($verbose)
+	{
+		echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	}
 
 	if (!is_dir($config['checkoutdir']))
 	{
@@ -273,12 +288,21 @@ 
 		elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches))
 		{
 			$repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[5] : $matches[3];
-			if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			if (substr($matches[1], 0, 3) == 'svn')
+			{
+				$repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			}
 			$modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url;
-			if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url);
+			if ($module === '' && !isset($baseurl))
+			{
+				$baseurl = str_replace('/egroupware.git', '', $url);
+			}
 		}
 	}
-	if ($verbose) print_r($modules);
+	if ($verbose)
+	{
+		print_r($modules);
+	}
 	return $modules;
 }
 
@@ -345,7 +369,11 @@ 
 
 	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -361,7 +389,10 @@ 
 	global $config,$verbose;
 
 	// push local changes to Github incl. tags
-	if ($verbose) echo "Pushing changes and tags\n";
+	if ($verbose)
+	{
+		echo "Pushing changes and tags\n";
+	}
 	chdir($config['checkoutdir']);
 	run_cmd($config['mr']. ' up');		// in case someone else pushed something
 	chdir($config['checkoutdir']);
@@ -429,7 +460,10 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose)
+		{
+			echo "Uploading $path as $content_type\n";
+		}
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -441,7 +475,10 @@ 
 	{
 		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
-		if ($verbose) echo $cmd."\n";
+		if ($verbose)
+		{
+			echo $cmd."\n";
+		}
 		passthru($cmd);
 	}
 }
@@ -474,25 +511,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -503,7 +555,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);
 
@@ -520,13 +575,19 @@ 
 {
 	global $config;
 
-	if (!isset($value)) $value = $config[$name];
+	if (!isset($value))
+	{
+		$value = $config[$name];
+	}
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
 		foreach($config as $n => $val)
 		{
-			if (is_string($val)) $translate['$'.$n] = $val;
+			if (is_string($val))
+			{
+				$translate['$'.$n] = $val;
+			}
 		}
 		$value = strtr($value, $translate);
 	}
@@ -628,7 +689,10 @@ 
 	if (is_null($revision))
 	{
 		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
-		if (empty($branch)) $branch = $config['version'];
+		if (empty($branch))
+		{
+			$branch = $config['version'];
+		}
 		$tags_url .= '/tags';
 		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
@@ -654,11 +718,18 @@ 
 	$message = '';
 	foreach($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix)))
+		{
+			continue;
+		}
+		// no match --> ignore
 
 		$message .= $msg."\n";
 	}
-	if ($verbose) echo $message;
+	if ($verbose)
+	{
+		echo $message;
+	}
 
 	return $message;
 }
@@ -689,7 +760,10 @@ 
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix)
+	{
+		$msg = $prefix.$msg;
+	}
 
 	return $msg;
 }
@@ -726,7 +800,10 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose)
+			{
+				echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			}
 			return (int)$log['revision'];
 		}
 	}
@@ -746,7 +823,10 @@ 
 	{
 		usage("Path '$config[obs]' not found!");
 	}
-	if ($verbose) echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	if ($verbose)
+	{
+		echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	}
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
@@ -766,10 +846,16 @@ 
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
-				if ($verbose) echo "rm $path\n";
+				if ($verbose)
+				{
+					echo "rm $path\n";
+				}
 			}
 			copy($new_name,dirname($path).'/'.basename($new_name));
-			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
+			if ($verbose)
+			{
+				echo "cp $new_name ".dirname($path)."/\n";
+			}
 			++$n;
 		}
 		// if we have no changelog (eg. because commands run separate), try parsing it from changelog file
@@ -807,7 +893,10 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose)
+				{
+					echo "Updated $path\n";
+				}
 				++$n;
 			}
 		}
@@ -845,9 +934,12 @@ 
 			}
 			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while($lines[$n])
+			{
+				// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
+			}
 				++$n;
 			}
 			return substr($logentry, 0, -1);	// remove training "\n"
@@ -868,7 +960,10 @@ 
 
 	list($header) = explode("\n", $content);
 	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	if (substr($config['changelog'],0,2) != '  ')
+	{
+		$config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	}
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -882,10 +977,13 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
 	if (!file_exists($sumsfile))
@@ -896,11 +994,17 @@ 
 	// signing it
 	if (empty($config['gpg']) || !file_exists($config['gpg']))
 	{
-		if (!empty($config['gpg'])) echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		if (!empty($config['gpg']))
+		{
+			echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		}
 		return;
 	}
 	echo "Signing sha1sum file:\n";
-	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
+	if (file_exists($sumsfile.'.asc'))
+	{
+		unlink($sumsfile.'.asc');
+	}
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
 	unlink($sumsfile);	// delete the unsigned file
@@ -913,11 +1017,17 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir']))
+	{
+		mkdir($config['sourcedir'],0755,true);
+	}
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
@@ -955,12 +1065,22 @@ 
 				{
 					foreach((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
-						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
+						if (substr($add, -4) != '.tar')
+						{
+							continue;
+						}
+						// probably a module
+						if (!($tar = realpath($add)))
+						{
+							throw new Exception("File '$add' not found!");
+						}
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
 				}
-				if (file_exists($file.'.bz2')) $cmd .= '; rm -f '.$file.'.bz2';
+				if (file_exists($file.'.bz2'))
+				{
+					$cmd .= '; rm -f '.$file.'.bz2';
+				}
 				$cmd .= '; '.$config['bzip2'].' '.$file;
 				// run cmd now and continue without adding all tar-ball to sums, as we dont want to publish it
 				run_cmd($cmd);
@@ -981,7 +1101,10 @@ 
 
 		foreach($config['extra'] as $name => $modules)
 		{
-			if (is_numeric($name)) $name = $modules;
+			if (is_numeric($name))
+			{
+				$name = $modules;
+			}
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
 			switch($type)
@@ -1022,7 +1145,10 @@ 
 	{
 		echo "Updating virus signatures\n";
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
-		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
+		if (!$verbose && function_exists('posix_getuid') && posix_getuid())
+		{
+			echo $cmd."\n";
+		}
 		$output = null;
 		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
 	}
@@ -1050,7 +1176,10 @@ 
 	}
 
 	// we need to stash uncommited changes like .mrconfig, before copying
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("cd $config[checkoutdir]; git stash");
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("cd $config[checkoutdir]; git stash");
+	}
 
 	try {
 		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude .mrconfig --exclude node_modules/ '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
@@ -1059,8 +1188,14 @@ 
 	catch (Exception $e) {
 		// catch failures to pop stash, before throwing exception
 	}
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("git stash pop");
-	if (isset($e)) throw $e;
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("git stash pop");
+	}
+	if (isset($e))
+	{
+		throw $e;
+	}
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
@@ -1145,9 +1280,12 @@ 
 				if ($ret || substr($line,0,5) == 'URL: ')
 				{
 					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)
+					{
+						// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
+					}
 						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
 						clearstatcache();
 					}
@@ -1194,19 +1332,31 @@ 
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
 	$url = $svnbranch.'/'.$config['svnalias'];
 	$cmd = $svn.' propget svn:externals --strict '.$url;
-	if ($verbose) echo $cmd."\n";
+	if ($verbose)
+	{
+		echo $cmd."\n";
+	}
 	$output = $ret = null;
 	exec($cmd,$output,$ret);
 	$config['modules'] = array();
 	foreach($output as $line)
 	{
 		$line = trim($line);
-		if (empty($line) || $line[0] == '#') continue;
+		if (empty($line) || $line[0] == '#')
+		{
+			continue;
+		}
 		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
@@ -1215,13 +1365,25 @@ 
 		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
 		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module,'://') !== false)
+		{
+			$module = basename($module);
+		}
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
 	}
-	if ($verbose) print_r($config['modules']);
+	if ($verbose)
+	{
+		print_r($config['modules']);
+	}
 	return $config['modules'];
 }
 
@@ -1232,7 +1394,11 @@ 
 {
 	global $config,$svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
 
@@ -1271,11 +1437,17 @@ 
 	{
 		$output[] = $cmd;
 		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		if ($verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 	}
 	if ($ret && !in_array($ret,(array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
+		if (!$verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 		throw new Exception("Error during '$cmd' --> aborting",$ret);
 	}
 	return $ret;
@@ -1321,7 +1493,10 @@ 
 	echo "options and their defaults:\n";
 	if ($verbose)
 	{
-		if (!isset($config['modules'])) $config['modules'] = get_modules_per_repo();
+		if (!isset($config['modules']))
+		{
+			$config['modules'] = get_modules_per_repo();
+		}
 	}
 	else
 	{
@@ -1329,7 +1504,10 @@ 
 	}
 	foreach($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		if (is_array($default))
+		{
+			$default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		}
 		echo '--'.str_pad($name,20).$default."\n";
 	}
 	if ($error)

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

@@ -403,7 +403,7 @@ 
 	}
 
 	$archives = config_translate('upload');
-	echo "Uploading $archives to $config[upload_url]\n";
+	echo "uploading $archives to $config[upload_url]\n";
 
 	foreach(glob($archives, GLOB_BRACE) as $path)
 	{
@@ -429,7 +429,7 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose) echo "uploading $path as $content_type\n";
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -492,7 +492,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -726,7 +726,7 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -807,7 +807,7 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose) echo "updated $path\n";
 				++$n;
 			}
 		}
@@ -942,7 +942,7 @@ 
 	}
 	foreach($config['types'] as $type)
 	{
-		echo "Creating $type archives\n";
+		echo "creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
@@ -1064,7 +1064,7 @@ 
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
-		echo "Running $cmd\n";
+		echo "running $cmd\n";
 		run_cmd($cmd);
 	}
 	// fix permissions

Spacing +178 added lines, -178 removed lines

@@ -14,15 +14,15 @@ 
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
-date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
+date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings
 
 $verbose = 0;
 $config = array(
 	'packagename' => 'egroupware-epl',
-	'version' => '16.1',        // '14.3'
+	'version' => '16.1', // '14.3'
 	'packaging' => date('Ymd'), // '20160520'
-	'branch'  => 'master',        // checked out branch
-	'tag' => '$version.$packaging',	// name of tag
+	'branch'  => 'master', // checked out branch
+	'tag' => '$version.$packaging', // name of tag
 	'checkoutdir' => realpath(__DIR__.'/../..'),
 	'egw_buildroot' => '/tmp/build_root/epl_16.1_buildroot',
 	'sourcedir' => '/home/download/stylite-epl/egroupware-epl-16.1',
@@ -34,11 +34,11 @@ 
 	'svnalias' => 'aliases/default-ssh',    // default alias
 	'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro', '$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'),
 	*/
-	'extra' => array('stylite', 'esyncpro', 'archive',	// create an extra archive for given apps
+	'extra' => array('stylite', 'esyncpro', 'archive', // create an extra archive for given apps
 		// these apps are placed in egroupware-epl-contrib archive
 		'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sambaadmin', 'sitemgr', 'phpfreechat')),
-	'aliasdir' => 'egroupware',             // directory created by the alias
-	'types' => array('tar.bz2','tar.gz','zip','all.tar.bz2'),
+	'aliasdir' => 'egroupware', // directory created by the alias
+	'types' => array('tar.bz2', 'tar.gz', 'zip', 'all.tar.bz2'),
 	// add given extra-apps or (uncompressed!) archives to above all.tar.bz2 archive
 	'all-add' => array('contrib', '/home/stylite/epl-trunk/phpfreechat_data_public.tar'),
 	// diverse binaries we need
@@ -55,12 +55,12 @@ 
 	'gpg' => trim(`which gpg`),
 	'editor' => trim(`which vi`),
 	'rsync' => trim(`which rsync`).' --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"',
-	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs --no-dev' : '',
+	'composer' => ($composer = trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs --no-dev' : '',
 	'after-checkout' => 'rm -rf */source */templates/*/source',
 	'packager' => 'build@stylite.de',
 	'obs' => '/home/stylite/obs/stylite-epl-trunk',
-	'obs_package_alias' => '',	// name used in obs package, if different from packagename
-	'changelog' => false,   // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
+	'obs_package_alias' => '', // name used in obs package, if different from packagename
+	'changelog' => false, // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
 	'changelog_packager' => 'Ralf Becker <rb@stylite.de>',
 	'editchangelog' => '* ',
 	//'sfuser' => 'ralfbecker',
@@ -69,23 +69,23 @@ 
 	'upload' => '$sourcedir/*egroupware-epl{,-contrib}-$version.$packaging*',
 	'copychangelog' => '$sourcedir/README', //'$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README',
 	'skip' => array(),
-	'run' => array('checkout','editchangelog','tag','copy','virusscan','create','sign','obs','copychangelog'),
+	'run' => array('checkout', 'editchangelog', 'tag', 'copy', 'virusscan', 'create', 'sign', 'obs', 'copychangelog'),
 	'patchCmd' => '# run cmd after copy eg. "cd $egw_buildroot; patch -p1 /path/to/patch"',
-	'github_user' => 'ralfbecker',	// Github user for following token
-	'github_token' => '',	// Github repo personal access token from above user
+	'github_user' => 'ralfbecker', // Github user for following token
+	'github_token' => '', // Github repo personal access token from above user
 );
 
 // process config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
 
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		++$verbose;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		if (in_array('editchangelog', $config['skip']) || !in_array('editchangelog', $config['run']))
 		{
@@ -93,10 +93,10 @@ 
 		}
 		usage();
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$value = array_shift($argv);
-		switch($name)
+		switch ($name)
 		{
 			case 'extra':	// stored as array and allow to add/delete items with +/- prefix
 			case 'types':
@@ -119,7 +119,7 @@ 
 				{
 					$value = array_unique(preg_split('/[ ,]+/', $value));
 				}
-				switch($op)
+				switch ($op)
 				{
 					case '+':
 						$config[$name] = array_unique(array_merge($config[$name], $value));
@@ -137,14 +137,14 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value) array_unshift($config['run'], $name);
 				break;
 
 			case 'editchangelog':
 				$config[$name] = $value ? $value : true;
-				if (!in_array('editchangelog',$config['run']))
+				if (!in_array('editchangelog', $config['run']))
 				{
-					array_unshift($config['run'],'editchangelog');
+					array_unshift($config['run'], 'editchangelog');
 				}
 				break;
 
@@ -153,7 +153,7 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs', $config['run'])) $config['run'][] = 'obs';
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -171,16 +171,16 @@ 
 }
 $svn = $config['svn'];
 
-$run = array_diff($config['run'],$config['skip']);
+$run = array_diff($config['run'], $config['skip']);
 
 // if we dont edit the changelog, set packaging from changelog
 if (!in_array('editchangelog', $run))
 {
 	parse_current_changelog(true);
 }
-foreach($run as $func)
+foreach ($run as $func)
 {
-	chdir(dirname(__FILE__));	// make relative filenames work, if other command changes dir
+	chdir(dirname(__FILE__)); // make relative filenames work, if other command changes dir
 	call_user_func('do_'.$func);
 }
 
@@ -195,7 +195,7 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_git($_path, $log_pattern=null, &$last_tag=null, $prefix='* ')
+function get_changelog_from_git($_path, $log_pattern = null, &$last_tag = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
 	global $config;
@@ -216,7 +216,7 @@ 
 	run_cmd($cmd, $output);
 
 	$changelog = '';
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		if (substr($line, 0, 4) == "    " && ($msg = _match_log_pattern(substr($line, 4), $log_pattern, $prefix)))
 		{
@@ -248,13 +248,13 @@ 
 	{
 		throw new Exception("checkout directory '{$config['checkoutdir']} does NOT exists or is NO directory!");
 	}
-	if (!($mrconfig = file_get_contents($path=$config['checkoutdir'].'/.mrconfig')))
+	if (!($mrconfig = file_get_contents($path = $config['checkoutdir'].'/.mrconfig')))
 	{
 		throw new Exception("$path not found!");
 	}
 	$module = $baseurl = null;
 	$modules = array();
-	foreach(explode("\n", $mrconfig) as $line)
+	foreach (explode("\n", $mrconfig) as $line)
 	{
 		$matches = null;
 		if (isset($baseurl))
@@ -319,7 +319,7 @@ 
 		$cmd = $config['git'].' clone '.(!empty($config['branch']) ? ' -b '.$config['branch'] : '').
 			' git@github.com:EGroupware/egroupware.git '.$config['checkoutdir'];
 		run_cmd($cmd);
-		run_cmd('mr up');	// need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
+		run_cmd('mr up'); // need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -343,9 +343,9 @@ 
 	}
 	chdir($config['checkoutdir']);
 
-	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
+	$config['tag'] = config_translate('tag'); // allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag'])) return; // otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -358,16 +358,16 @@ 
  */
 function do_release()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	// push local changes to Github incl. tags
 	if ($verbose) echo "Pushing changes and tags\n";
 	chdir($config['checkoutdir']);
-	run_cmd($config['mr']. ' up');		// in case someone else pushed something
+	run_cmd($config['mr'].' up'); // in case someone else pushed something
 	chdir($config['checkoutdir']);
-	run_cmd($config['git'].' push');	// regular commits like changelog
+	run_cmd($config['git'].' push'); // regular commits like changelog
 	$tag = config_translate('tag');
-	run_cmd($config['mr']. ' push origin '.$tag);	// pushing tags in all apps
+	run_cmd($config['mr'].' push origin '.$tag); // pushing tags in all apps
 
 	if (empty($config['github_user']) || empty($config['github_token']))
 	{
@@ -384,7 +384,7 @@ 
 		'body' => $config['changelog'],
 	);
 	$response = github_api("/repos/EGroupware/egroupware/releases", $data);
-	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']);	// remove {?name,label} template
+	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']); // remove {?name,label} template
 
 	do_upload();
 }
@@ -394,33 +394,33 @@ 
  */
 function do_upload()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (empty($config['upload_url']))
 	{
 		$response = github_api("/repos/EGroupware/egroupware/releases", array(), 'GET');
-		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']);	// remove {?name,label} template
+		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']); // remove {?name,label} template
 	}
 
 	$archives = config_translate('upload');
 	echo "Uploading $archives to $config[upload_url]\n";
 
-	foreach(glob($archives, GLOB_BRACE) as $path)
+	foreach (glob($archives, GLOB_BRACE) as $path)
 	{
 		$label = null;
 		if (substr($path, -4) == '.zip')
 		{
 			$content_type = 'application/zip';
 		}
-		elseif(substr($path, -7) == '.tar.gz')
+		elseif (substr($path, -7) == '.tar.gz')
 		{
 			$content_type = 'application/x-gzip';
 		}
-		elseif(substr($path, -8) == '.tar.bz2')
+		elseif (substr($path, -8) == '.tar.bz2')
 		{
 			$content_type = 'application/x-bzip2';
 		}
-		elseif(substr($path, -8) == '.txt.asc')
+		elseif (substr($path, -8) == '.txt.asc')
 		{
 			$content_type = 'text/plain';
 			$label = 'Signed hashes of downloads';
@@ -439,7 +439,7 @@ 
 
 	if (!empty($config['release']))
 	{
-		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
+		$target = config_translate('release'); // allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
 		if ($verbose) echo $cmd."\n";
 		passthru($cmd);
@@ -457,7 +457,7 @@ 
  * @throws Exception
  * @return array with response
  */
-function github_api($_url, $data, $method='POST', $upload=null, $content_type=null)
+function github_api($_url, $data, $method = 'POST', $upload = null, $content_type = null)
 {
 	global $config, $verbose;
 
@@ -470,7 +470,7 @@ 
 	curl_setopt($c, CURLOPT_TIMEOUT, 240);
 	curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
 
-	switch($method)
+	switch ($method)
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
@@ -478,13 +478,13 @@ 
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
@@ -492,7 +492,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "Sending $method request to $url ".(isset($short_data) && $method != 'GET' ? $short_data : '')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -500,7 +500,7 @@ 
 		curl_setopt($c, CURLOPT_HEADER, true);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, false);
 		curl_exec($c);
-		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
+		throw new Exception("$method request to $url failed ".(isset($short_data) && $method != 'GET' ? $short_data : ''));
 	}
 
 	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
@@ -516,7 +516,7 @@ 
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
  */
-function config_translate($name, $value=null)
+function config_translate($name, $value = null)
 {
 	global $config;
 
@@ -524,7 +524,7 @@ 
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
-		foreach($config as $n => $val)
+		foreach ($config as $n => $val)
 		{
 			if (is_string($val)) $translate['$'.$n] = $val;
 		}
@@ -550,7 +550,7 @@ 
  */
 function do_editchangelog()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Querying changelog from Git/SVN\n";
 	if (!isset($config['modules']))
@@ -560,7 +560,7 @@ 
 	// query changelog per repo
 	$changelog = '';
 	$last_tag = null;
-	foreach($config['modules'] as $branch_url => $modules)
+	foreach ($config['modules'] as $branch_url => $modules)
 	{
 		$revision = null;
 		if (substr($branch_url, -4) == '.git')
@@ -573,15 +573,15 @@ 
 			$changelog .= get_changelog_from_svn($branch_url, $config['editchangelog'], $revision);
 		}
 	}
-	$logfile = tempnam('/tmp','checkout-build-archives');
-	file_put_contents($logfile,$changelog);
+	$logfile = tempnam('/tmp', 'checkout-build-archives');
+	file_put_contents($logfile, $changelog);
 	$cmd = $config['editor'].' '.escapeshellarg($logfile);
 	passthru($cmd);
 	$config['changelog'] = file_get_contents($logfile);
 	// remove trailing newlines
-	while (substr($config['changelog'],-1) == "\n")
+	while (substr($config['changelog'], -1) == "\n")
 	{
-		$config['changelog'] = substr($config['changelog'],0,-1);
+		$config['changelog'] = substr($config['changelog'], 0, -1);
 	}
 	// allow user to abort, by deleting the changelog
 	if (strlen($config['changelog']) <= 2)
@@ -606,7 +606,7 @@ 
 	run_cmd($cmd);
 
 	// update obs changelogs (so all changlogs are updated in case of a later error and changelog step can be skiped)
-	do_obs(true);	// true: only update debian.changes in obs checkouts
+	do_obs(true); // true: only update debian.changes in obs checkouts
 }
 
 /**
@@ -620,41 +620,41 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_svn($branch_url, $log_pattern=null, &$revision=null, $prefix='* ')
+function get_changelog_from_svn($branch_url, $log_pattern = null, &$revision = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
-	global $config,$verbose,$svn;
+	global $config, $verbose, $svn;
 
 	if (is_null($revision))
 	{
-		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
+		list($tags_url, $branch) = preg_split('#/(branches/|trunk)#', $branch_url);
 		if (empty($branch)) $branch = $config['version'];
 		$tags_url .= '/tags';
-		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
+		$pattern = '|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
-		$revision = get_last_svn_tag($tags_url,$pattern,$matches);
+		$revision = get_last_svn_tag($tags_url, $pattern, $matches);
 		$tag = $matches[1];
 	}
-	elseif(!is_numeric($revision))
+	elseif (!is_numeric($revision))
 	{
-		$revision = get_last_svn_tag($tags_url,$tag=$revision);
+		$revision = get_last_svn_tag($tags_url, $tag = $revision);
 	}
 	$cmd = $svn.' log --xml -r '.escapeshellarg($revision.':HEAD').' '.escapeshellarg($branch_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for log from r$revision".($tag ? " ($tag)" : '').":\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$message = '';
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue; // no match --> ignore
 
 		$message .= $msg."\n";
 	}
@@ -671,25 +671,25 @@ 
  * @param string $prefix ='* '
  * @return string
  */
-function _match_log_pattern($msg, $log_pattern, $prefix='* ')
+function _match_log_pattern($msg, $log_pattern, $prefix = '* ')
 {
 	$pattern_len = strlen($log_pattern);
 	$prefix_len = strlen($prefix);
 
 	$matches = null;
-	if ($log_pattern[0] == '/' && preg_match($log_pattern,$msg,$matches))
+	if ($log_pattern[0] == '/' && preg_match($log_pattern, $msg, $matches))
 	{
 		$msg = $matches[1];
 	}
-	elseif($log_pattern && $log_pattern[0] != '/' && substr($msg,0,$pattern_len) == $log_pattern)
+	elseif ($log_pattern && $log_pattern[0] != '/' && substr($msg, 0, $pattern_len) == $log_pattern)
 	{
-		list($msg) = explode("\n",$msg);
+		list($msg) = explode("\n", $msg);
 	}
-	elseif($log_pattern)
+	elseif ($log_pattern)
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg, 0, $prefix_len) != $prefix) $msg = $prefix.$msg;
 
 	return $msg;
 }
@@ -703,30 +703,30 @@ 
  * @param array &$matches=null on return matches of preg_match
  * @return int revision of last svn tag matching pattern
  */
-function get_last_svn_tag($tags_url,$pattern,&$matches=null)
+function get_last_svn_tag($tags_url, $pattern, &$matches = null)
 {
-	global $verbose,$svn;
+	global $verbose, $svn;
 
 	$cmd = $svn.' log --xml --limit 40 -v '.escapeshellarg($tags_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for last tags\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$is_regexp = $pattern[0] == substr($pattern, -1);
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
 		//print_r($log);
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "Revision {$log['revision']} matches".($matches ? ': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -738,9 +738,9 @@ 
  *
  * @param boolean $only_update_changelog =false true update debian.changes, but nothing else, nor commit it
  */
-function do_obs($only_update_changelog=false)
+function do_obs($only_update_changelog = false)
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!is_dir($config['obs']))
 	{
@@ -750,25 +750,25 @@ 
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
-	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
+	foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
 	{
 		if (basename(dirname($path)) == '.osc' ||
 			!preg_match('/\/('.preg_quote($config['packagename']).
 				($config['obs_package_alias'] ? '|'.preg_quote($config['obs_package_alias']) : '').
-				')[a-z-]*-('.preg_quote($config['version']).'|14.2|trunk)/',$path))
+				')[a-z-]*-('.preg_quote($config['version']).'|14.2|trunk)/', $path))
 		{
 			continue;
 		}
 		$matches = null;
-		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/',$path,$matches) &&
-			file_exists($new_name=$config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
+		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/', $path, $matches) &&
+			file_exists($new_name = $config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
 		{
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
 				if ($verbose) echo "rm $path\n";
 			}
-			copy($new_name,dirname($path).'/'.basename($new_name));
+			copy($new_name, dirname($path).'/'.basename($new_name));
 			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
 			++$n;
 		}
@@ -778,35 +778,35 @@ 
 			$config['changelog'] = parse_current_changelog();
 		}
 		// updating dsc, spec and changelog files
-		if (!$only_update_changelog && (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec') ||
+		if (!$only_update_changelog && (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec') ||
 			!empty($config['changelog']) && basename($path) == 'debian.changes')
 		{
 			$content = $content_was = file_get_contents($path);
 
-			if (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec')
+			if (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec')
 			{
-				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m','Version: '.$config['version'].'.'.$config['packaging'],$content);
+				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m', 'Version: '.$config['version'].'.'.$config['packaging'], $content);
 			}
-			if (substr($path,-4) == '.dsc')
+			if (substr($path, -4) == '.dsc')
 			{
 				$content = preg_replace('/^(Debtransform-Tar: '.preg_quote($config['packagename']).'[a-z-]*)-'.
 					preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/m',
-					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2',$content);
+					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2', $content);
 			}
-			if (basename($path) == 'debian.changes' && strpos($content,$config['version'].'.'.$config['packaging']) === false)
+			if (basename($path) == 'debian.changes' && strpos($content, $config['version'].'.'.$config['packaging']) === false)
 			{
 				$content = update_changelog($content);
 			}
-			if (!empty($config['changelog']) && substr($path,-5) == '.spec' &&
-				($pos_changelog = strpos($content,'%changelog')) !== false)
+			if (!empty($config['changelog']) && substr($path, -5) == '.spec' &&
+				($pos_changelog = strpos($content, '%changelog')) !== false)
 			{
 				$pos_changelog += strlen("%changelog\n");
-				$content = substr($content,0,$pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
-					$config['changelog']."\n".substr($content,$pos_changelog);
+				$content = substr($content, 0, $pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
+					$config['changelog']."\n".substr($content, $pos_changelog);
 			}
 			if ($content != $content_was)
 			{
-				file_put_contents($path,$content);
+				file_put_contents($path, $content);
 				if ($verbose) echo "Updated $path\n";
 				++$n;
 			}
@@ -827,33 +827,33 @@ 
  * @param boolean $set_packaging =false true: set packaging from last changelog entry
  * @return string changelog entries without header and footer lines
  */
-function parse_current_changelog($set_packaging=false)
+function parse_current_changelog($set_packaging = false)
 {
 	global $config;
 
 	$changelog = file_get_contents($config['checkoutdir'].'/doc/rpm-build/debian.changes');
 	$lines = explode("\n", $changelog, 100);
 	$matches = null;
-	foreach($lines as $n => $line)
+	foreach ($lines as $n => $line)
 	{
-		if (preg_match($preg='/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
+		if (preg_match($preg = '/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
 			($set_packaging ? '([0-9]+)' : preg_quote($config['packaging'])).'/', $line, $matches))
 		{
 			if ($set_packaging)
 			{
 				$config['packaging'] = $matches[1];
 			}
-			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
+			$n += empty($lines[$n + 1]) ? 2 : 1; // overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while ($lines[$n])	// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
 				++$n;
 			}
-			return substr($logentry, 0, -1);	// remove training "\n"
+			return substr($logentry, 0, -1); // remove training "\n"
 		}
 	}
-	return null;	// paragraph for current version NOT found
+	return null; // paragraph for current version NOT found
 }
 
 /**
@@ -867,8 +867,8 @@ 
 	global $config;
 
 	list($header) = explode("\n", $content);
-	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/', '('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
+	if (substr($config['changelog'], 0, 2) != '  ') $config['changelog'] = '  '.implode("\n  ", explode("\n", $config['changelog']));
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -882,9 +882,9 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
@@ -903,7 +903,7 @@ 
 	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
-	unlink($sumsfile);	// delete the unsigned file
+	unlink($sumsfile); // delete the unsigned file
 }
 
 /**
@@ -913,22 +913,22 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'], 0755, true);
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
 	chdir($config['egw_buildroot']);
 
-	if($config['extra'])
+	if ($config['extra'])
 	{
 		$exclude = $exclude_all = array();
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
-			foreach((array)$modules as $module)
+			foreach ((array)$modules as $module)
 			{
 				$exclude[] = basename($module);
 				if (!empty($config['all-add']) && !in_array($module, $config['all-add']) && (is_int($name) || !in_array($name, $config['all-add'])))
@@ -938,24 +938,24 @@ 
 			}
 		}
 		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude);
-		$exclude_all_extra =  $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
+		$exclude_all_extra = $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
 	}
-	foreach($config['types'] as $type)
+	foreach ($config['types'] as $type)
 	{
 		echo "Creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-		switch($type)
+		switch ($type)
 		{
 			case 'all.tar.bz2':	// single tar-ball for debian builds not easily supporting to use multiple
 				$file = $config['sourcedir'].'/'.$config['packagename'].'-all-'.$config['version'].'.'.$config['packaging'].'.tar';
 				$cmd = $config['tar'].' --owner=root --group=root -cf '.$file.$exclude_all_extra.' egroupware';
 				if (!empty($config['all-add']))
 				{
-					foreach((array)$config['all-add'] as $add)
+					foreach ((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
+						if (substr($add, -4) != '.tar') continue; // probably a module
 						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
@@ -979,15 +979,15 @@ 
 		run_cmd($cmd);
 		$sums .= sha1_file($file)."\t".basename($file)."\n";
 
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
 			if (is_numeric($name)) $name = $modules;
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-			switch($type)
+			switch ($type)
 			{
 				case 'all.tar.bz2':
-					break;	// nothing to do
+					break; // nothing to do
 				case 'tar.bz2':
 				case 'tar.gz':
 					$cmd = $config['tar'].' --owner=root --group=root -c'.$tar_type.'f '.$file.$dirs;
@@ -1002,7 +1002,7 @@ 
 		}
 	}
 	// writing sha1sum file
-	file_put_contents($sumsfile,$sums);
+	file_put_contents($sumsfile, $sums);
 }
 
 /**
@@ -1010,7 +1010,7 @@ 
  */
 function do_virusscan()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!file_exists($config['clamscan']) || !is_executable($config['clamscan']))
 	{
@@ -1024,7 +1024,7 @@ 
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
 		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
 		$output = null;
-		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
+		run_cmd($cmd, $output, 1); // 1 = ignore already up to date database
 	}
 	echo "Starting virusscan\n";
 	$cmd = $config['clamscan'].' --quiet -r '.$config['egw_buildroot'];
@@ -1081,12 +1081,12 @@ 
  */
 function do_svncheckout()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Starting svn checkout/update\n";
 	if (!file_exists($config['checkoutdir']))
 	{
-		mkdir($config['checkoutdir'],0755,true);
+		mkdir($config['checkoutdir'], 0755, true);
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -1101,17 +1101,17 @@ 
 		{
 			get_modules_per_repo();
 		}
-		$config['svntag'] = config_translate('svntag');	// in case svntag command did not run, translate tag name
+		$config['svntag'] = config_translate('svntag'); // in case svntag command did not run, translate tag name
 
 		if (file_exists($config['aliasdir']))
 		{
-			system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout, as we dont implement switching tags
+			system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout, as we dont implement switching tags
 			clearstatcache();
 		}
-		foreach($config['modules'] as $repo => $modules)
+		foreach ($config['modules'] as $repo => $modules)
 		{
 			$cmd = $svn.' co ';
-			foreach($modules as $path => $url)
+			foreach ($modules as $path => $url)
 			{
 				if ($path == $config['aliasdir'])
 				{
@@ -1121,7 +1121,7 @@ 
 					$cmd = $svn.' co ';
 					continue;
 				}
-				if(file_exists($config['aliasdir']))
+				if (file_exists($config['aliasdir']))
 				{
 					die("'egroupware' applications must be first one in externals!\n");
 				}
@@ -1139,16 +1139,16 @@ 
 			// check if correct branch
 			$cmd = 'LANG=C '.$svn.' info';
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
-			foreach($output as $line)
+			exec($cmd, $output, $ret);
+			foreach ($output as $line)
 			{
-				if ($ret || substr($line,0,5) == 'URL: ')
+				if ($ret || substr($line, 0, 5) == 'URL: ')
 				{
-					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					$url = substr($line, 5);
+					if ($ret || substr($url, 0, strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
-						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
+						system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout
 						clearstatcache();
 					}
 					break;
@@ -1160,10 +1160,10 @@ 
 		run_cmd($cmd);
 
 		chdir($config['aliasdir']);
-		foreach($config['extra'] as $module)
+		foreach ($config['extra'] as $module)
 		{
-			$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-			$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+			$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+			$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 			$url .= $module;
 			$cmd = $svn.' co '.$url;
 			run_cmd($cmd);
@@ -1188,7 +1188,7 @@ 
  */
 function get_modules_per_svn_repo()
 {
-	global $config,$svn,$verbose;
+	global $config, $svn, $verbose;
 
 	// process alias/externals
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
@@ -1196,27 +1196,27 @@ 
 	$cmd = $svn.' propget svn:externals --strict '.$url;
 	if ($verbose) echo $cmd."\n";
 	$output = $ret = null;
-	exec($cmd,$output,$ret);
+	exec($cmd, $output, $ret);
 	$config['modules'] = array();
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		$line = trim($line);
 		if (empty($line) || $line[0] == '#') continue;
-		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
+		list($path, $url) = preg_split('/[ \t\r\n]+/', $line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
-	foreach($config['extra'] as $module)
+	foreach ($config['extra'] as $module)
 	{
-		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+		$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+		$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module, '://') !== false) $module = basename($module);
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
@@ -1230,11 +1230,11 @@ 
  */
 function do_svntag()
 {
-	global $config,$svn;
+	global $config, $svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag'])) return; // otherwise we copy everything in svn root!
 
-	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
+	$config['svntag'] = config_translate('svntag'); // allow to use config vars like $version in tag
 
 	echo "Creating SVN tag $config[svntag]\n";
 	if (!isset($config['modules']))
@@ -1242,9 +1242,9 @@ 
 		get_modules_per_repo();
 	}
 	// create tags (per repo)
-	foreach($config['modules'] as $repo => $modules)
+	foreach ($config['modules'] as $repo => $modules)
 	{
-		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
+		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ', $modules).' '.$repo.'/'.$config['svntag'].'/';
 		run_cmd($cmd);
 	}
 }
@@ -1257,7 +1257,7 @@ 
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -1265,18 +1265,18 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		exec($cmd, $output, $ret);
+		if ($verbose) echo implode("\n", $output)."\n";
 	}
-	if ($ret && !in_array($ret,(array)$no_bailout))
+	if ($ret && !in_array($ret, (array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
-		throw new Exception("Error during '$cmd' --> aborting",$ret);
+		if (!$verbose) echo implode("\n", $output)."\n";
+		throw new Exception("Error during '$cmd' --> aborting", $ret);
 	}
 	return $ret;
 }
@@ -1303,7 +1303,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -1313,9 +1313,9 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config,$verbose;
+	global $prog, $config, $verbose;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
 	echo "options and their defaults:\n";
@@ -1325,12 +1325,12 @@ 
 	}
 	else
 	{
-		unset($config['modules']);	// they give an error, because of nested array and are quite lengthy
+		unset($config['modules']); // they give an error, because of nested array and are quite lengthy
 	}
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
-		echo '--'.str_pad($name,20).$default."\n";
+		if (is_array($default)) $default = json_encode($default, JSON_UNESCAPED_SLASHES);
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{

doc/rpm-build/post_install.php

Doc Comments +2 added lines, -2 removed lines

@@ -485,7 +485,7 @@ 
  *
  * @param string $cmd
  * @param array &$output=null $output of command
- * @param int|array|true $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
+ * @param integer $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
  * @return int exit code of $cmd
  */
 function run_cmd($cmd,array &$output=null,$no_bailout=null)
@@ -712,7 +712,7 @@ 
  * Read one Univention secret/password eg. _ucr_secret('mysql')
  *
  * @param string $name
- * @return string|boolean
+ * @return false|string
  */
 function _ucr_secret($name)
 {

Spacing +80 added lines, -83 removed lines

@@ -18,7 +18,7 @@ 
 	'php'         => '/usr/bin/php',
 	'source_dir'  => '/usr/share/egroupware',
 	'data_dir'    => '/var/lib/egroupware',
-	'header'      => '$data_dir/header.inc.php',	// symlinked to source_dir by rpm
+	'header'      => '$data_dir/header.inc.php', // symlinked to source_dir by rpm
 	'setup-cli'   => '$source_dir/setup/setup-cli.php',
 	'domain'      => 'default',
 	'config_user' => 'admin',
@@ -30,13 +30,13 @@ 
 	'db_user'     => 'egroupware',
 	'db_pass'     => randomstring(),
 	'db_grant_host' => 'localhost',
-	'db_root'     => 'root',	// mysql root user/pw to create database
+	'db_root'     => 'root', // mysql root user/pw to create database
 	'db_root_pw'  => '',
 	'backup'      => '',
 	'admin_user'  => 'sysop',
 	'admin_passwd'=> randomstring(),
 	'admin_email' => '',
-	'lang'        => 'en',	// languages for admin user and extra lang to install
+	'lang'        => 'en', // languages for admin user and extra lang to install
 	'charset'     => 'utf-8',
 	'start_db'    => '/sbin/service mysqld',
 	'autostart_db' => '/sbin/chkconfig --level 345 mysqld on',
@@ -56,23 +56,23 @@ 
 	'ldap_search_filter' => '(uid=%user)',
 	'ldap_group_context' => 'ou=groups,$base',
 	'ldap_encryption_type' => '',
-	'sambaadmin/sambasid'=> '',	// SID for sambaadmin
+	'sambaadmin/sambasid'=> '', // SID for sambaadmin
 	'mailserver'    => '',
 	'smtpserver'    => 'localhost,25',
-	'smtp'          => '',	// see setup-cli.php --help config
+	'smtp'          => '', // see setup-cli.php --help config
 	'imap'          => '',
 	'sieve'         => '',
 	'folder'        => '',
-	'install-update-app' => '',	// install or update a single (non-default) app
-	'webserver_user'=> 'apache',	// required to fix permissions
+	'install-update-app' => '', // install or update a single (non-default) app
+	'webserver_user'=> 'apache', // required to fix permissions
 	'php5enmod'     => '',
 );
 
 // read language from LANG enviroment variable
 if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : (isset($_SERVER['LANG']) ? $_SERVER['LANG'] : null)))
 {
-	@list($lang,$nat) = preg_split('/[_.]/',$lang);
-	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
+	@list($lang, $nat) = preg_split('/[_.]/', $lang);
+	if (in_array($lang.'-'.strtolower($nat), array('es-es', 'pt-br', 'zh-tw')))
 	{
 		$lang .= '-'.strtolower($nat);
 	}
@@ -85,16 +85,13 @@ 
  *
  * @param string $distro =null default autodetect
  */
-function set_distro_defaults($distro=null)
+function set_distro_defaults($distro = null)
 {
 	global $config;
 	if (is_null($distro))
 	{
-		$distro = file_exists('/etc/SuSE-release') ? 'suse' :
-			(file_exists('/etc/mandriva-release') ? 'mandriva' :
-			(file_exists('/etc/lsb-release') && preg_match('/^DISTRIB_ID="?Univention"?$/mi',
-				file_get_contents('/etc/lsb-release')) ? 'univention' :
-			(file_exists('/etc/debian_version') ? 'debian' : 'rh')));
+		$distro = file_exists('/etc/SuSE-release') ? 'suse' : (file_exists('/etc/mandriva-release') ? 'mandriva' : (file_exists('/etc/lsb-release') && preg_match('/^DISTRIB_ID="?Univention"?$/mi',
+				file_get_contents('/etc/lsb-release')) ? 'univention' : (file_exists('/etc/debian_version') ? 'debian' : 'rh')));
 	}
 	switch (($config['distro'] = $distro))
 	{
@@ -162,9 +159,9 @@ 
 			}
 			elseif (!file_exists('/etc/init.d/mysqld') && file_exists('/etc/init.d/mysql'))
 			{
-				foreach(array('start_db','autostart_db') as $name)
+				foreach (array('start_db', 'autostart_db') as $name)
 				{
-					$config[$name] = str_replace('mysqld','mysql',$config[$name]);
+					$config[$name] = str_replace('mysqld', 'mysql', $config[$name]);
 				}
 			}
 			break;
@@ -180,48 +177,48 @@ 
 if (($config_set = isset($_ENV['EGW_POST_INSTALL']) ? $_ENV['EGW_POST_INSTALL'] : @$_SERVER['EGW_POST_INSTALL']))
 {
 	$conf = array();
-	$config_set = preg_split('/[ \t]+/',trim($config_set));
-	while($config_set)
+	$config_set = preg_split('/[ \t]+/', trim($config_set));
+	while ($config_set)
 	{
 		$val = array_shift($config_set);
 		if (($quote = $val[0]) == "'" || $quote == '"')	// arguments might be quoted with ' or "
 		{
-			while (substr($val,-1) != $quote)
+			while (substr($val, -1) != $quote)
 			{
 				if (!$config_set) throw new Exception('Invalid EGW_POST_INSTALL enviroment variable!');
 				$val .= ' '.array_shift($config_set);
 			}
-			$val = substr($val,1,-1);
+			$val = substr($val, 1, -1);
 		}
 		$conf[] = $val;
 	}
-	$argv = array_merge($conf,$argv);
+	$argv = array_merge($conf, $argv);
 }
 
 $auth_type_given = false;
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		$verbose = true;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		usage();
 	}
-	elseif($arg == '--suse')
+	elseif ($arg == '--suse')
 	{
 		set_distro_defaults('suse');
 	}
-	elseif($arg == '--distro')
+	elseif ($arg == '--distro')
 	{
 		set_distro_defaults(array_shift($argv));
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$config[$name] = array_shift($argv);
 
-		switch($name)
+		switch ($name)
 		{
 			case 'auth_type':
 				$auth_type_given = true;
@@ -242,18 +239,18 @@ 
 }
 
 $replace = array();
-foreach($config as $name => $value)
+foreach ($config as $name => $value)
 {
 	$replace['$'.$name] = $value;
-	if (strpos($value,'$') !== false)
+	if (strpos($value, '$') !== false)
 	{
-		$config[$name] = strtr($value,$replace);
+		$config[$name] = strtr($value, $replace);
 	}
 }
 // basic config checks
-foreach(array('php','source_dir','data_dir','setup-cli') as $name)
+foreach (array('php', 'source_dir', 'data_dir', 'setup-cli') as $name)
 {
-	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
+	if (!file_exists($config[$name])) bail_out(1, $config[$name].' not found!');
 }
 
 // fix important php.ini and conf.d/*.ini settings
@@ -278,7 +275,7 @@ 
 	}
 	// create database
 	$setup_db = $setup_cli.' --setup-cmd-database sub_command=create_db';
-	foreach(array('domain','db_type','db_host','db_port','db_name','db_user','db_pass','db_root','db_root_pw','db_grant_host') as $name)
+	foreach (array('domain', 'db_type', 'db_host', 'db_port', 'db_name', 'db_user', 'db_pass', 'db_root', 'db_root_pw', 'db_grant_host') as $name)
 	{
 		$setup_db .= ' '.escapeshellarg($name.'='.$config[$name]);
 	}
@@ -286,7 +283,7 @@ 
 
 	// check if ldap is required and initialise it
 	// we need to specify account_repository and auth_type to --install as extra config, otherwise install happens for sql!
-	@list($config['account_repository'],$config['auth_type'],$rest) = explode(',',$config['account-auth'],3);
+	@list($config['account_repository'], $config['auth_type'], $rest) = explode(',', $config['account-auth'], 3);
 	$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
 	$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
 	if (empty($rest)) unset($config['account-auth']);
@@ -297,15 +294,15 @@ 
 
 		$setup_ldap = $setup_cli.' --setup-cmd-ldap sub_command='.
 			($config['account_repository'] == 'ldap' ? 'create_ldap' : 'test_ldap');
-		foreach(array(
-			'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw',	// non-egw params: only used for create
-			'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context',	// egw params
+		foreach (array(
+			'domain', 'ldap_suffix', 'ldap_host', 'ldap_admin', 'ldap_admin_pw', // non-egw params: only used for create
+			'ldap_base', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_search_filter', 'ldap_group_context', // egw params
 			'ldap_encryption_type', 'sambaadmin/sambasid',
 		) as $name)
 		{
-			if (strpos($value=$config[$name],'$') !== false)
+			if (strpos($value = $config[$name], '$') !== false)
 			{
-				$config[$name] = $value = strtr($value,array(
+				$config[$name] = $value = strtr($value, array(
 					'$suffix' => $config['ldap_suffix'],
 					'$base' => $config['ldap_base'],
 					'$admin_pw' => $config['ldap_admin_pw'],
@@ -313,7 +310,7 @@ 
 			}
 			$setup_ldap .= ' '.escapeshellarg($name.'='.$value);
 
-			if (!in_array($name,array('domain','ldap_suffix','ldap_admin','ldap_admin_pw')))
+			if (!in_array($name, array('domain', 'ldap_suffix', 'ldap_admin', 'ldap_admin_pw')))
 			{
 				$extra_config .= ' '.escapeshellarg($name.'='.$value);
 			}
@@ -346,7 +343,7 @@ 
 	}
 	// create mailserver config (fmail requires at least minimal config given as default, otherwise fatal error)
 	$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']);
-	foreach(array('account-auth','smtpserver','smtp','postfix','mailserver','imap','cyrus','sieve','folder') as $name)
+	foreach (array('account-auth', 'smtpserver', 'smtp', 'postfix', 'mailserver', 'imap', 'cyrus', 'sieve', 'folder') as $name)
 	{
 		if (!empty($config[$name])) $setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
 	}
@@ -360,7 +357,7 @@ 
 	// check if webserver is started and start it (permanent) if not
 	if ($config['start_webserver'])
 	{
-		exec(build_cmd('start_webserver', 'status'),$dummy,$ret);
+		exec(build_cmd('start_webserver', 'status'), $dummy, $ret);
 		if ($ret)
 		{
 			system(build_cmd('start_webserver', 'start'));
@@ -399,7 +396,7 @@ 
 	// --> existing install --> update
 
 	// get user from header and replace password, as we dont know it
-	$old_password = patch_header($config['header'],$config['config_user'],$config['config_passwd']);
+	$old_password = patch_header($config['header'], $config['config_user'], $config['config_passwd']);
 	// register a shutdown function to put old password back in any case
 	register_shutdown_function(function() use (&$config, $old_password)
 	{
@@ -408,18 +405,18 @@ 
 
 	// update egroupware
 	$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd'].',,'.$config['install-update-app']);
-	$ret = run_cmd($setup_update,$output,array(4,15));
+	$ret = run_cmd($setup_update, $output, array(4, 15));
 
-	switch($ret)
+	switch ($ret)
 	{
 		case 4:		// header needs an update
 			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
 			run_cmd($header_update);
-			$ret = run_cmd($setup_update,$output,15);
+			$ret = run_cmd($setup_update, $output, 15);
 			if ($ret != 15) break;
 			// fall through
 		case 15:	// missing configuration (eg. mailserver)
-			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			if (!$verbose) echo implode("\n", (array)$output)."\n";
 			break;
 
 		case 0:
@@ -462,18 +459,18 @@ 
  * @param string $password new password
  * @return string old password
  */
-function patch_header($filename,&$user,$password)
+function patch_header($filename, &$user, $password)
 {
 	$header = file_get_contents($filename);
 
 	$umatches = $pmatches = null;
-	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '", '/')."([^']+)';/m",$header,$umatches) ||
-		!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",$header,$pmatches))
+	if (!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_user'] = '", '/')."([^']+)';/m", $header, $umatches) ||
+		!preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m", $header, $pmatches))
 	{
-		bail_out(99,"$filename is no regular EGroupware header.inc.php!");
+		bail_out(99, "$filename is no regular EGroupware header.inc.php!");
 	}
-	file_put_contents($filename,preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
-		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';",$header));
+	file_put_contents($filename, preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
+		"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';", $header));
 
 	$user = $umatches[1];
 
@@ -488,7 +485,7 @@ 
  * @param int|array|true $no_bailout =null exit code(s) to NOT bail out, or true to never bail out
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -496,16 +493,16 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
+		exec($cmd, $output, $ret);
 	}
-	if ($ret && $no_bailout !== true && !in_array($ret,(array)$no_bailout))
+	if ($ret && $no_bailout !== true && !in_array($ret, (array)$no_bailout))
 	{
-		bail_out($ret,$verbose?null:$output);
+		bail_out($ret, $verbose ? null : $output);
 	}
 	return $ret;
 }
@@ -516,9 +513,9 @@ 
  * @param int $ret =1
  * @param array|string $output line(s) to output before temination notice
  */
-function bail_out($ret=1,$output=null)
+function bail_out($ret = 1, $output = null)
 {
-	if ($output) echo implode("\n",(array)$output);
+	if ($output) echo implode("\n", (array)$output);
 	echo "\n\nInstallation failed --> exiting!\n\n";
 	exit($ret);
 }
@@ -529,21 +526,21 @@ 
  * @param int $len =16
  * @return string
  */
-function randomstring($len=16)
+function randomstring($len = 16)
 {
 	static $usedchars = array(
-		'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-		'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-		'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-		'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-		'@','!','%','&','(',')','=','?',';',':','#','_','-','<',
-		'>','|','[',']','}',	// dont add /\,'"{ as we have problems dealing with them
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+		'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+		'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+		'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+		'@', '!', '%', '&', '(', ')', '=', '?', ';', ':', '#', '_', '-', '<',
+		'>', '|', '[', ']', '}', // dont add /\,'"{ as we have problems dealing with them
 	);
 
 	$str = '';
-	for($i=0; $i < $len; $i++)
+	for ($i = 0; $i < $len; $i++)
 	{
-		$str .= $usedchars[mt_rand(0,count($usedchars)-1)];
+		$str .= $usedchars[mt_rand(0, count($usedchars) - 1)];
 	}
 	return $str;
 }
@@ -553,20 +550,20 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config;
+	global $prog, $config;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [--distro=(suse|rh|debian)] [options, ...]\n\n";
 	echo "options and their defaults:\n";
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
-		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
+		if (in_array($name, array('postfix', 'cyrus'))) continue; // do NOT report deprecated options
+		if (in_array($name, array('config_passwd', 'db_pass', 'admin_passwd', 'ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
 		}
-		echo '--'.str_pad($name,20).$default."\n";
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{
@@ -616,8 +613,8 @@ 
 	$config['distro'] = 'univention';
 
 	// set lang from ucr locale, as cloud-config at least never has anything but EN set in enviroment
-	@list($lang,$nat) = preg_split('/[_.]/', _ucr_get('locale/default'));
-	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
+	@list($lang, $nat) = preg_split('/[_.]/', _ucr_get('locale/default'));
+	if (in_array($lang.'-'.strtolower($nat), array('es-es', 'pt-br', 'zh-tw')))
 	{
 		$lang .= '-'.strtolower($nat);
 	}
@@ -642,7 +639,7 @@ 
 		// ldap password hash (our default blowfish_crypt seems not to work)
 		$config['ldap_encryption_type'] = 'sha512_crypt';
 
-		$config['account_min_id'] = 1200;	// UCS use 11xx for internal users/groups
+		$config['account_min_id'] = 1200; // UCS use 11xx for internal users/groups
 
 		$config['account-auth'] = 'univention,ldap';
 
@@ -652,7 +649,7 @@ 
 		// mailserver, see setup-cli.php --help config
 		if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) &&
 			// only set on host mailserver app is installed: _ucr_get('mail/cyrus/imap') == 'yes' &&
-			($domains=_ucr_get('mail/hosteddomains')))
+			($domains = _ucr_get('mail/hosteddomains')))
 		{
 			if (!is_array($domains)) $domains = explode("\n", $domains);
 			$domain = array_shift($domains);
@@ -692,12 +689,12 @@ 
  */
 function _ucr_get($name)
 {
-	static $values=null;
+	static $values = null;
 	if (!isset($values))
 	{
 		$output = $matches = null;
 		exec('/usr/sbin/ucr dump', $output);
-		foreach($output as $line)
+		foreach ($output as $line)
 		{
 			if (preg_match("/^([^:]+): (.*)\n?$/", $line, $matches))
 			{
@@ -773,7 +770,7 @@ 
  */
 function _size_with_unit($size)
 {
-	switch(strtoupper(substr($size, -1)))
+	switch (strtoupper(substr($size, -1)))
 	{
 		case 'G':
 			$size *= 1024;

Braces +86 added lines, -22 removed lines

@@ -9,10 +9,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling post_install as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling post_install as web-page
 {
 	die('<h1>post_install.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 $verbose = false;
 $config = array(
 	'php'         => '/usr/bin/php',
@@ -100,7 +103,10 @@ 
 	{
 		case 'suse':
 			// openSUSE 12.1+ no longer uses php5
-			if (file_exists('/usr/bin/php5')) $config['php'] = '/usr/bin/php5';
+			if (file_exists('/usr/bin/php5'))
+			{
+				$config['php'] = '/usr/bin/php5';
+			}
 			$config['start_db'] = '/sbin/service mysql';
 			$config['autostart_db'] = '/sbin/chkconfig --level 345 mysql on';
 			$config['start_webserver'] = '/sbin/service apache2';
@@ -145,9 +151,12 @@ 
 			// fall through
 		case 'rh':
 			// some MySQL packages (mysql.com, MariaDB, ...) use "mysql" as service name instead of RH default "mysqld"
-			if (file_exists('/usr/bin/systemctl'))	// RHEL 7
+			if (file_exists('/usr/bin/systemctl'))
+			{
+				// RHEL 7
 			{
 				$config['start_db'] = '/usr/bin/systemctl %s mariadb';
+			}
 				$config['autostart_db'] = build_cmd('start_db', 'enable');
 				$config['start_webserver'] = '/usr/bin/systemctl %s httpd';
 				$config['autostart_webserver'] = build_cmd('start_webserver', 'enable');
@@ -176,11 +185,14 @@ 
 	while($config_set)
 	{
 		$val = array_shift($config_set);
-		if (($quote = $val[0]) == "'" || $quote == '"')	// arguments might be quoted with ' or "
+		if (($quote = $val[0]) == "'" || $quote == '"')
+		{
+			// arguments might be quoted with ' or "
 		{
 			while (substr($val,-1) != $quote)
 			{
 				if (!$config_set) throw new Exception('Invalid EGW_POST_INSTALL enviroment variable!');
+		}
 				$val .= ' '.array_shift($config_set);
 			}
 			$val = substr($val,1,-1);
@@ -245,18 +257,24 @@ 
 // basic config checks
 foreach(array('php','source_dir','data_dir','setup-cli') as $name)
 {
-	if (!file_exists($config[$name])) bail_out(1,$config[$name].' not found!');
-}
+	if (!file_exists($config[$name]))
+	{
+		bail_out(1,$config[$name].' not found!');
+	}
+	}
 
 // fix important php.ini and conf.d/*.ini settings
 check_fix_php_apc_ini();
 
 $setup_cli = $config['php'].' -d memory_limit=256M '.$config['setup-cli'];
 
-if (!file_exists($config['header']) || filesize($config['header']) < 200)	// default header redirecting to setup is 147 bytes
+if (!file_exists($config['header']) || filesize($config['header']) < 200)
+{
+	// default header redirecting to setup is 147 bytes
 {
 	// --> new install
 	$extra_config = '';
+}
 
 	// check for localhost if database server is started and start it (permanent) if not
 	if ($config['db_host'] == 'localhost' && $config['start_db'])
@@ -265,7 +283,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_db', 'start'));
-			if (!empty($config['autostart_db'])) system($config['autostart_db']);
+			if (!empty($config['autostart_db']))
+			{
+				system($config['autostart_db']);
+			}
 		}
 	}
 	// create database
@@ -281,7 +302,10 @@ 
 	@list($config['account_repository'],$config['auth_type'],$rest) = explode(',',$config['account-auth'],3);
 	$extra_config .= ' '.escapeshellarg('account_repository='.$config['account_repository']);
 	$extra_config .= ' '.escapeshellarg('auth_type='.(empty($config['auth_type']) ? $config['account_repository'] : $config['auth_type']));
-	if (empty($rest)) unset($config['account-auth']);
+	if (empty($rest))
+	{
+		unset($config['account-auth']);
+	}
 	if ($config['account_repository'] == 'ldap' || $config['auth_type'] == 'ldap')
 	{
 		// set account_min_id to 1100 if not specified to NOT clash with system accounts
@@ -340,7 +364,10 @@ 
 	$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']);
 	foreach(array('account-auth','smtpserver','smtp','postfix','mailserver','imap','cyrus','sieve','folder') as $name)
 	{
-		if (!empty($config[$name])) $setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		if (!empty($config[$name]))
+		{
+			$setup_mailserver .= ' --'.$name.' '.escapeshellarg($config[$name]);
+		}
 	}
 	run_cmd($setup_mailserver);
 
@@ -356,7 +383,10 @@ 
 		if ($ret)
 		{
 			system(build_cmd('start_webserver', 'start'));
-			if (!empty($config['autostart_webserver'])) system($config['autostart_webserver']);
+			if (!empty($config['autostart_webserver']))
+			{
+				system($config['autostart_webserver']);
+			}
 		}
 		else
 		{
@@ -408,10 +438,16 @@ 
 			$header_update = $setup_cli.' --update-header '.escapeshellarg($config['config_passwd'].','.$config['config_user']);
 			run_cmd($header_update);
 			$ret = run_cmd($setup_update,$output,15);
-			if ($ret != 15) break;
+			if ($ret != 15)
+			{
+				break;
+			}
 			// fall through
 		case 15:	// missing configuration (eg. mailserver)
-			if (!$verbose) echo implode("\n",(array)$output)."\n";
+			if (!$verbose)
+			{
+				echo implode("\n",(array)$output)."\n";
+			}
 			break;
 
 		case 0:
@@ -439,9 +475,15 @@ 
 {
 	global $config;
 
-	if (isset($config[$cmd])) $cmd = $config[$cmd];
+	if (isset($config[$cmd]))
+	{
+		$cmd = $config[$cmd];
+	}
 
-	if (strpos($cmd, '%s')) return str_replace('%s', $arg, $cmd);
+	if (strpos($cmd, '%s'))
+	{
+		return str_replace('%s', $arg, $cmd);
+	}
 
 	return $cmd.' '.$arg;
 }
@@ -510,7 +552,10 @@ 
  */
 function bail_out($ret=1,$output=null)
 {
-	if ($output) echo implode("\n",(array)$output);
+	if ($output)
+	{
+		echo implode("\n",(array)$output);
+	}
 	echo "\n\nInstallation failed --> exiting!\n\n";
 	exit($ret);
 }
@@ -553,7 +598,11 @@ 
 	echo "options and their defaults:\n";
 	foreach($config as $name => $default)
 	{
-		if (in_array($name, array('postfix','cyrus'))) continue;	// do NOT report deprecated options
+		if (in_array($name, array('postfix','cyrus')))
+		{
+			continue;
+		}
+		// do NOT report deprecated options
 		if (in_array($name,array('config_passwd','db_pass','admin_passwd','ldap_root_pw')) && strlen($config[$name]) == 16)
 		{
 			$default = '<16 char random string>';
@@ -646,7 +695,10 @@ 
 			// only set on host mailserver app is installed: _ucr_get('mail/cyrus/imap') == 'yes' &&
 			($domains=_ucr_get('mail/hosteddomains')))
 		{
-			if (!is_array($domains)) $domains = explode("\n", $domains);
+			if (!is_array($domains))
+			{
+				$domains = explode("\n", $domains);
+			}
 			$domain = array_shift($domains);
 			// set "use auth with session credentials",tls,"not user editable","further identities"
 			$config['smtpserver'] = "$mailserver,465,,,yes,tls,no,yes";
@@ -656,13 +708,19 @@ 
 			{
 				$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',Imap\\Dovecot';
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/dovecot/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			else
 			{
 				$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',Imap\\Cyrus';
 				// default with sieve port to 4190, as config is only available on host mailserver app is installed
-				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port'))) $sieve_port = 4190;
+				if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port')))
+				{
+					$sieve_port = 4190;
+				}
 			}
 			// set folders so mail creates them on first login, UCS does not automatic
 			$config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,INBOX/Spam';
@@ -727,7 +785,10 @@ 
 		$shm_size = ini_get('apc.shm_size');
 		$shm_segments = ini_get('apc.shm_segments');
 		// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
-		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576)) $shm_size .= 'M';
+		if (($numeric_size = is_numeric($shm_size) && $shm_size <= 1048576))
+		{
+			$shm_size .= 'M';
+		}
 
 		$size = _size_with_unit($shm_size) * $shm_segments;
 		//echo "shm_size=$shm_size, shm_segments=$shm_segments --> $size, numeric_size=$numeric_size\n";
@@ -743,7 +804,10 @@ 
 				file_exists($path = $matches[1]) && ($apc_ini = file_get_contents($path)))
 			{
 				$new_shm_size = 128 / $shm_segments;
-				if (!$numeric_size) $new_shm_size .= 'M';
+				if (!$numeric_size)
+				{
+					$new_shm_size .= 'M';
+				}
 				if (preg_match('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', $apc_ini))
 				{
 					file_put_contents($path, preg_replace('|^apc.shm_size\s*=\s*(\d+[KMG]?)$|m', 'apc.shm_size='.$new_shm_size, $apc_ini));

filemanager/inc/class.filemanager_hooks.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	/**
 	 * Entries for filemanagers's admin menu
 	 *
-	 * @param string|array $location ='admin' hook name or params
+	 * @param string $location ='admin' hook name or params
 	 */
 	static function admin($location = 'admin')
 	{

Indentation +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+			display_section(self::$appname,$file);
 		}
 		else
 		{
@@ -128,7 +128,7 @@ 
 			'yes' => lang('Yes')
 		);
 
-        $settings = array(
+		$settings = array(
 			'startfolder'	=> array(
 				'type'		=> 'input',
 				'name'		=> 'startfolder',

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

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

Braces +8 added lines, -2 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'),

Spacing +23 added lines, -23 removed lines

@@ -36,12 +36,12 @@ 
 		$basepath = '/home';
 		$homepath = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 		//echo "<p>admin_prefs_sidebox_hooks::all_hooks(".print_r($args,True).") appname='$appname', location='$location'</p>\n";
-		$file_prefs    = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
+		$file_prefs = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
 		if ($location == 'sidebox_menu')
 		{
-			$title = $GLOBALS['egw_info']['apps'][self::$appname]['title'] . ' '. lang('Menu');
+			$title = $GLOBALS['egw_info']['apps'][self::$appname]['title'].' '.lang('Menu');
 			$file = array();
-			if($GLOBALS['egw_info']['apps']['stylite'])
+			if ($GLOBALS['egw_info']['apps']['stylite'])
 			{
 				// add "file a file" (upload) dialog
 				$file[] = array(
@@ -54,9 +54,9 @@ 
 			// add selection for available views, if we have more then one
 			if (count(filemanager_ui::init_views()) > 1)
 			{
-				$index_url = Egw::link('/index.php',array('menuaction' => 'filemanager.filemanager_ui.index'),false);
+				$index_url = Egw::link('/index.php', array('menuaction' => 'filemanager.filemanager_ui.index'), false);
 				$file[] = array(
-					'text' => Api\Html::select('filemanager_view',filemanager_ui::get_view(),filemanager_ui::$views,false,
+					'text' => Api\Html::select('filemanager_view', filemanager_ui::get_view(), filemanager_ui::$views, false,
 						' onchange="'."egw_appWindow('filemanager').location='$index_url&view='+this.value;".
 						'" style="width: 100%;"'),
 					'no_lang' => True,
@@ -65,23 +65,23 @@ 
 			}
 			if ($file_prefs['showhome'] != 'no')
 			{
-				$file['Your home directory'] = Egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$homepath,'ajax'=>'true'));
+				$file['Your home directory'] = Egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$homepath, 'ajax'=>'true'));
 			}
 			if ($file_prefs['showusers'] != 'no')
 			{
-				$file['Users and groups'] = Egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$basepath,'ajax'=>'true'));
+				$file['Users and groups'] = Egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$basepath, 'ajax'=>'true'));
 			}
-			if (!empty($file_prefs['showbase']) && $file_prefs['showbase']=='yes')
+			if (!empty($file_prefs['showbase']) && $file_prefs['showbase'] == 'yes')
 			{
-				$file['Basedirectory'] = Egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$rootpath,'ajax'=>'true'));
+				$file['Basedirectory'] = Egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$rootpath, 'ajax'=>'true'));
 			}
 			if (!empty($file_prefs['startfolder']))
 			{
-				$file['Startfolder']= Egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
+				$file['Startfolder'] = Egw::link('/index.php', array('menuaction'=>self::$appname.'.filemanager_ui.index', 'path'=>$file_prefs['startfolder'], 'ajax'=>'true'));
 			}
-			$file['Placeholders'] = Egw::link('/index.php','menuaction=filemanager.filemanager_merge.show_replacements');
-			$file['Shared files'] = Egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
-			display_sidebox(self::$appname,$title,$file);
+			$file['Placeholders'] = Egw::link('/index.php', 'menuaction=filemanager.filemanager_merge.show_replacements');
+			$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);
 	}
@@ -97,17 +97,17 @@ 
 
 		$file = Array(
 			//'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname='.self::$appname.'&ajax=true'),
-			'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname='.self::$appname.'&ajax=true'),
-			'Check virtual filesystem' => Egw::link('/index.php','menuaction=filemanager.filemanager_admin.fsck'),
+			'Custom fields' => Egw::link('/index.php', 'menuaction=admin.customfields.index&appname='.self::$appname.'&ajax=true'),
+			'Check virtual filesystem' => Egw::link('/index.php', 'menuaction=filemanager.filemanager_admin.fsck'),
 			'VFS mounts and versioning' => Egw::link('/index.php', 'menuaction=filemanager.filemanager_admin.index'),
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+        	display_section(self::$appname, $file);
 		}
 		else
 		{
-			display_sidebox(self::$appname,lang('Admin'),$file);
+			display_sidebox(self::$appname, lang('Admin'), $file);
 		}
 	}
 
@@ -150,7 +150,7 @@ 
 				'type'		=> 'select',
 				'name'		=> 'showhome',
 				'values'	=> $yes_no,
-				'label' 	=> lang('Show link "%1" in side box menu?',lang('Your home directory')),
+				'label' 	=> lang('Show link "%1" in side box menu?', lang('Your home directory')),
 				'xmlrpc'	=> True,
 				'admin'		=> False,
 				'forced'   => 'yes',
@@ -159,7 +159,7 @@ 
 				'type'		=> 'select',
 				'name'		=> 'showusers',
 				'values'	=> $yes_no,
-				'label' 	=> lang('Show link "%1" in side box menu?',lang('Users and groups')),
+				'label' 	=> lang('Show link "%1" in side box menu?', lang('Users and groups')),
 				'xmlrpc'	=> True,
 				'admin'		=> False,
 				'forced'   => 'yes',
@@ -171,9 +171,9 @@ 
 			'size'   => 60,
 			'label'  => 'Default document to insert entries',
 			'name'   => 'default_document',
-			'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('filemanager')).' '.
+			'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('filemanager')).' '.
 				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name').' '.
-				lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc' => True,
 			'admin'  => False,
@@ -184,8 +184,8 @@ 
 			'label'  => 'Directory with documents to insert entries',
 			'name'   => 'document_dir',
 			'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('filemanager')).' '.
-				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','name').' '.
-				lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'name').' '.
+				lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 			'run_lang' => false,
 			'xmlrpc' => True,
 			'admin'  => False,

filemanager/inc/class.filemanager_shares.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Spacing +12 added lines, -12 removed lines

@@ -89,7 +89,7 @@ 
 		$readonlys = null;
 		$total = Sharing::so()->get_rows($query, $rows, $readonlys);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if (substr($row['share_path'], 0, strlen(self::$tmp_dir)) === self::$tmp_dir)
 			{
@@ -130,21 +130,21 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (!is_array($content))
 		{
 			$content = array(
 				'nm' => array(
-					'get_rows'       =>	'filemanager.filemanager_shares.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter'      => True,	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => false,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'share_created',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'DESC',	// IO direction of the sort: 'ASC' or 'DESC'
+					'get_rows'       =>	'filemanager.filemanager_shares.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter'      => True, // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => false, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'share_created', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 					//'default_cols'   => '!',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
@@ -156,7 +156,7 @@ 
 		}
 		elseif ($content['nm']['action'])
 		{
-			switch($content['nm']['action'])
+			switch ($content['nm']['action'])
 			{
 				case 'delete':
 					$where = array('share_owner' => $GLOBALS['egw_info']['user']['account_id']);

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_ui.inc.php

Doc Comments +6 added lines, -1 removed lines

@@ -536,6 +536,9 @@ 
 	 * @param int &$errs=null on return number of errors
 	 * @param int &$dirs=null on return number of dirs deleted
 	 * @param int &$files=null on return number of files deleted
+	 * @param integer $errs
+	 * @param integer $files
+	 * @param integer $dirs
 	 * @return string success or failure message displayed to the user
 	 */
 	static public function action($action,$selected,$dir=null,&$errs=null,&$files=null,&$dirs=null)
@@ -704,6 +707,9 @@ 
 	 * @param int &$errs=null on return number of errors
 	 * @param int &$dirs=null on return number of dirs deleted
 	 * @param int &$files=null on return number of files deleted
+	 * @param integer $errs
+	 * @param integer $dirs
+	 * @param integer $files
 	 * @return string
 	 */
 	public static function do_delete(array $selected, &$errs=null, &$dirs=null, &$files=null)
@@ -1325,7 +1331,6 @@ 
 	 *
 	 * @param string $action eg. 'delete', ...
 	 * @param array $selected selected path(s)
-	 * @param string $dir=null current directory
 	 * @see static::action()
 	 */
 	public static function ajax_action($action, $selected, $dir=null, $props=null)

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

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

Braces +142 added lines, -36 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();
@@ -393,37 +402,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']);
@@ -587,9 +629,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))
@@ -644,7 +689,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));
@@ -687,10 +735,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;
 				}
@@ -727,7 +781,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)
@@ -735,6 +791,7 @@ 
 				if (preg_match('/^\/?(home|apps|)\/*$/',$path))
 				{
 					$errs++;
+		}
 					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
 				}
 			}
@@ -782,7 +839,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'])
@@ -840,7 +900,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,
@@ -893,10 +956,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).' ...';
 				}
 			}
@@ -1021,7 +1090,10 @@ 
 							if (!($dir = Vfs::dirname($path)))
 							{
 								$msg .= lang('File or directory not found!')." Vfs::dirname('$path')===false";
-								if ($button == 'save') $button = 'apply';
+								if ($button == 'save')
+								{
+									$button = 'apply';
+								}
 								continue;
 							}
 							$to = Vfs::concat($dir, $content['name']);
@@ -1030,7 +1102,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))
@@ -1103,13 +1178,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)))
@@ -1162,7 +1243,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))
 		{
@@ -1172,12 +1256,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;
@@ -1210,9 +1300,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),'/');
@@ -1269,10 +1363,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)
 		{
@@ -1294,7 +1391,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)
 			{
@@ -1347,7 +1447,10 @@ 
 			'files' => 0,
 		);
 
-		if (!isset($dir)) $dir = array_pop($selected);
+		if (!isset($dir))
+		{
+			$dir = array_pop($selected);
+		}
 
 		switch($action)
 		{
@@ -1421,7 +1524,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'])));
 					}

Spacing +197 added lines, -199 removed lines

@@ -80,12 +80,12 @@ 
 		if (!static::$views_init)
 		{
 			// translate our labels
-			foreach(static::$views as &$label)
+			foreach (static::$views as &$label)
 			{
 				$label = lang($label);
 			}
 			// search for plugins with additional filemanager views
-			foreach(Api\Hooks::process('filemanager_views') as $views)
+			foreach (Api\Hooks::process('filemanager_views') as $views)
 			{
 				if (is_array($views)) static::$views += $views;
 			}
@@ -101,7 +101,7 @@ 
 	 */
 	public static function get_view()
 	{
-		$view =& Api\Cache::getSession('filemanager', 'view');
+		$view = & Api\Cache::getSession('filemanager', 'view');
 		if (isset($_GET['view']))
 		{
 			$view = $_GET['view'];
@@ -125,7 +125,7 @@ 
 			'open' => array(
 				'caption' => lang('Open'),
 				'icon' => '',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'allowOnMultiple' => false,
 				'onExecute' => 'javaScript:app.filemanager.open',
 				'default' => true
@@ -150,7 +150,7 @@ 
 				'caption' => lang('Edit settings'),
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.filemanager.viewEntry':'javaScript:app.filemanager.editprefs',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.filemanager.viewEntry' : 'javaScript:app.filemanager.editprefs',
 				'mobileViewTemplate' => 'file?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/filemanager/templates/mobile/file.xet'))
 			),
 			'mkdir' => array(
@@ -179,7 +179,7 @@ 
 			),
 			// DRAG and DROP events
 			'file_drag' => array(
-				'dragType' => array('file','link'),
+				'dragType' => array('file', 'link'),
 				'type' => 'drag',
 				'onExecute' => 'javaScript:app.filemanager.drag'
 			),
@@ -218,7 +218,7 @@ 
 		}
 		else
 		{
-			foreach(Vfs\Sharing::$modes as $mode => $data)
+			foreach (Vfs\Sharing::$modes as $mode => $data)
 			{
 				$actions['mail']['children']['mail_'.$mode] = array(
 					'caption' => $data['label'],
@@ -240,10 +240,10 @@ 
 	 *
 	 * @return string merge application or NULL if no property found
 	 */
-	private static function get_mergeapp($path, $scope='self')
+	private static function get_mergeapp($path, $scope = 'self')
 	{
 		$app = null;
-		switch($scope)
+		switch ($scope)
 		{
 			case 'self':
 				$props = Vfs::propfind($path, static::$merge_prop_namespace);
@@ -252,10 +252,10 @@ 
 			case 'parents':
 				// search for props in parent directories
 				$currentpath = $path;
-				while($dir = Vfs::dirname($currentpath))
+				while ($dir = Vfs::dirname($currentpath))
 				{
 					$props = Vfs::propfind($dir, static::$merge_prop_namespace);
-					if(!empty($props))
+					if (!empty($props))
 					{
 						// found prop in parent directory
 						return $app = $props[0]['val'];
@@ -274,7 +274,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -284,16 +284,16 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows'       =>	'filemanager.filemanager_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'filter'         => '',	// current dir only
-					'no_filter2'     => True,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat'         => True,	// I  disable the cat-selectbox
-					'lettersearch'   => True,	// I  show a lettersearch
-					'searchletter'   =>	false,	// I0 active letter of the lettersearch or false for [all]
-					'start'          =>	0,		// IO position in list
-					'order'          =>	'name',	// IO name of the column to sort after (optional for the sortheaders)
-					'sort'           =>	'ASC',	// IO direction of the sort: 'ASC' or 'DESC'
-					'default_cols'   => '!comment,ctime',	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
+					'get_rows'       =>	'filemanager.filemanager_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'filter'         => '', // current dir only
+					'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat'         => True, // I  disable the cat-selectbox
+					'lettersearch'   => True, // I  show a lettersearch
+					'searchletter'   =>	false, // I0 active letter of the lettersearch or false for [all]
+					'start'          =>	0, // IO position in list
+					'order'          =>	'name', // IO name of the column to sort after (optional for the sortheaders)
+					'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
+					'default_cols'   => '!comment,ctime', // I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 					'csv_fields'     =>	false, // I  false=disable csv export, true or unset=enable it with auto-detected fieldnames,
 									//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
 					'actions'        => static::get_actions(),
@@ -303,7 +303,7 @@ 
 					'is_parent'      => 'mime',
 					'is_parent_value'=> Vfs::DIR_MIME_TYPE,
 					'favorites'      => true,
-					'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+					'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 				);
 				$content['nm']['path'] = static::get_home_dir();
 			}
@@ -324,7 +324,7 @@ 
 			}
 			if (isset($_GET['path']) && ($path = $_GET['path']))
 			{
-				switch($path)
+				switch ($path)
 				{
 					case '..':
 						$path = Vfs::dirname($content['nm']['path']);
@@ -333,7 +333,7 @@ 
 						$path = static::get_home_dir();
 						break;
 				}
-				if ($path && $path[0] == '/' && Vfs::stat($path,true) && Vfs::is_dir($path) && Vfs::check_access($path,Vfs::READABLE))
+				if ($path && $path[0] == '/' && Vfs::stat($path, true) && Vfs::is_dir($path) && Vfs::check_access($path, Vfs::READABLE))
 				{
 					$content['nm']['path'] = $path;
 				}
@@ -349,7 +349,7 @@ 
 		}
 		$view = static::get_view();
 
-		call_user_func($view,$content,$msg);
+		call_user_func($view, $content, $msg);
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	 * @param boolean &$is_setup=null on return true if authenticated user is setup config user, false otherwise
 	 * @return boolean true is root user given, false otherwise (including logout / empty $user)
 	 */
-	protected function sudo($user='',$password=null,&$is_setup=null)
+	protected function sudo($user = '', $password = null, &$is_setup = null)
 	{
 		if (!$user)
 		{
@@ -371,15 +371,15 @@ 
 		else
 		{
 			// config user & password
-			$is_setup = Api\Session::user_pw_hash($user,$password) === $GLOBALS['egw_info']['server']['config_hash'];
+			$is_setup = Api\Session::user_pw_hash($user, $password) === $GLOBALS['egw_info']['server']['config_hash'];
 			// or vfs root user from setup >> configuration
-			$is_root = $is_setup ||	$GLOBALS['egw_info']['server']['vfs_root_user'] &&
-				in_array($user,preg_split('/, */',$GLOBALS['egw_info']['server']['vfs_root_user'])) &&
+			$is_root = $is_setup || $GLOBALS['egw_info']['server']['vfs_root_user'] &&
+				in_array($user, preg_split('/, */', $GLOBALS['egw_info']['server']['vfs_root_user'])) &&
 				$GLOBALS['egw']->auth->authenticate($user, $password, 'text');
 		}
 		//error_log(__METHOD__."('$user','$password',$is_setup) user_pw_hash(...)='".Api\Session::user_pw_hash($user,$password)."', config_hash='{$GLOBALS['egw_info']['server']['config_hash']}' --> returning ".array2string($is_root));
-		Api\Cache::setSession('filemanager', 'is_setup',$is_setup);
-		Api\Cache::setSession('filemanager', 'is_root',Vfs::$is_root = $is_root);
+		Api\Cache::setSession('filemanager', 'is_setup', $is_setup);
+		Api\Cache::setSession('filemanager', 'is_root', Vfs::$is_root = $is_root);
 		return Vfs::$is_root;
 	}
 
@@ -389,18 +389,18 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function listview(array $content=null,$msg=null)
+	function listview(array $content = null, $msg = null)
 	{
 		$tpl = new Etemplate('filemanager.index');
 
-		if($msg) Framework::message($msg);
+		if ($msg) Framework::message($msg);
 
 		if (($content['nm']['action'] || $content['nm']['rows']) && (empty($content['button']) || !isset($content['button'])))
 		{
 			if ($content['nm']['action'])
 			{
-				$msg = static::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				$msg = static::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['selected']);
@@ -411,10 +411,10 @@ 
 				// we dont use ['nm']['rows']['delete'], so unset it, if it is present
 				if (isset($content['nm']['rows']['delete'])) unset($content['nm']['rows']['delete']);
 			}
-			elseif($content['nm']['rows']['delete'])
+			elseif ($content['nm']['rows']['delete'])
 			{
-				$msg = static::action('delete',array_keys($content['nm']['rows']['delete']),$content['nm']['path']);
-				if($msg) Framework::message($msg);
+				$msg = static::action('delete', array_keys($content['nm']['rows']['delete']), $content['nm']['path']);
+				if ($msg) Framework::message($msg);
 
 				// clean up after action
 				unset($content['nm']['rows']['delete']);
@@ -426,11 +426,11 @@ 
 				if (isset($content['nm']['selected'])) unset($content['nm']['selected']);
 			}
 			unset($content['nm']['rows']);
-			Api\Cache::setSession('filemanager', 'index',$content['nm']);
+			Api\Cache::setSession('filemanager', 'index', $content['nm']);
 		}
 
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'],true) && Vfs::stat(urldecode($content['nm']['path'])))
+		if ($content['nm']['path'][0] == '/' && !Vfs::stat($content['nm']['path'], true) && Vfs::stat(urldecode($content['nm']['path'])))
 		{
 			$content['nm']['path'] = urldecode($content['nm']['path']);
 		}
@@ -441,22 +441,22 @@ 
 				list($button) = each($content['button']);
 				unset($content['button']);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'upload':
 					if (!$content['upload'])
 					{
-						Framework::message(lang('You need to select some files first!'),'error');
+						Framework::message(lang('You need to select some files first!'), 'error');
 						break;
 					}
 					$upload_success = $upload_failure = array();
-					foreach(isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
+					foreach (isset($content['upload'][0]) ? $content['upload'] : array($content['upload']) as $upload)
 					{
 						// encode chars which special meaning in url/vfs (some like / get removed!)
-						$to = Vfs::concat($content['nm']['path'],Vfs::encodePathComponent($upload['name']));
+						$to = Vfs::concat($content['nm']['path'], Vfs::encodePathComponent($upload['name']));
 						if ($upload &&
 							(Vfs::is_writable($content['nm']['path']) || Vfs::is_writable($to)) &&
-							copy($upload['tmp_name'],Vfs::PREFIX.$to))
+							copy($upload['tmp_name'], Vfs::PREFIX.$to))
 						{
 							$upload_success[] = $upload['name'];
 						}
@@ -468,12 +468,11 @@ 
 					$content['nm']['msg'] = '';
 					if ($upload_success)
 					{
-						Framework::message( count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') :
-							lang('%1 successful uploaded.',implode(', ',$upload_success)));
+						Framework::message(count($upload_success) == 1 && !$upload_failure ? lang('File successful uploaded.') : lang('%1 successful uploaded.', implode(', ', $upload_success)));
 					}
 					if ($upload_failure)
 					{
-						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(),'error');
+						Framework::message(lang('Error uploading file!')."\n".etemplate::max_upload_size_message(), 'error');
 					}
 					break;
 			}
@@ -494,16 +493,16 @@ 
 			$tpl->setElementAttribute('nm[buttons][upload]', 'drop_target', 'popupMainDiv');
 		}
 		// Set view button to match current settings
-		if($content['nm']['view'] == 'tile')
+		if ($content['nm']['view'] == 'tile')
 		{
-			$tpl->setElementAttribute('nm[button][change_view]','statustext',lang('List view'));
-			$tpl->setElementAttribute('nm[button][change_view]','image','list_row');
+			$tpl->setElementAttribute('nm[button][change_view]', 'statustext', lang('List view'));
+			$tpl->setElementAttribute('nm[button][change_view]', 'image', 'list_row');
 		}
 		// if initial load is done via GET request (idots template or share.php)
 		// get_rows cant call app.filemanager.set_readonly, so we need to do that here
 		$content['initial_path_readonly'] = !Vfs::is_writable($content['nm']['path']);
 
-		$tpl->exec('filemanager.filemanager_ui.index',$content,$sel_options,$readonlys,array('nm' => $content['nm']));
+		$tpl->exec('filemanager.filemanager_ui.index', $content, $sel_options, $readonlys, array('nm' => $content['nm']));
 	}
 
 	/**
@@ -539,7 +538,7 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string success or failure message displayed to the user
 	 */
-	static public function action($action,$selected,$dir=null,&$errs=null,&$files=null,&$dirs=null)
+	static public function action($action, $selected, $dir = null, &$errs = null, &$files = null, &$dirs = null)
 	{
 		if (!count($selected))
 		{
@@ -547,20 +546,20 @@ 
 		}
 		$errs = $dirs = $files = 0;
 
-		switch($action)
+		switch ($action)
 		{
 
 			case 'delete':
-				return static::do_delete($selected,$errs,$files,$dirs);
+				return static::do_delete($selected, $errs, $files, $dirs);
 
 			case 'mail':
 			case 'copy':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
 					if (strpos($path, 'mail::') === 0 && $path = substr($path, 6))
 					{
 						// Support for dropping mail in filemanager - Pass mail back to mail app
-						if(ExecMethod2('mail.mail_ui.vfsSaveMessage', $path, $dir, false))
+						if (ExecMethod2('mail.mail_ui.vfsSaveMessage', $path, $dir, false))
 						{
 							++$files;
 						}
@@ -571,8 +570,8 @@ 
 					}
 					elseif (!Vfs::is_dir($path))
 					{
-						$to = Vfs::concat($dir,Vfs::basename($path));
-						if ($path != $to && Vfs::copy($path,$to))
+						$to = Vfs::concat($dir, Vfs::basename($path));
+						if ($path != $to && Vfs::copy($path, $to))
 						{
 							++$files;
 						}
@@ -584,19 +583,19 @@ 
 					else
 					{
 						$len = strlen(dirname($path));
-						foreach(Vfs::find($path) as $p)
+						foreach (Vfs::find($path) as $p)
 						{
-							$to = $dir.substr($p,$len);
+							$to = $dir.substr($p, $len);
 							if ($to == $p)	// cant copy into itself!
 							{
 								++$errs;
 								continue;
 							}
-							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
+							if (($is_dir = Vfs::is_dir($p)) && Vfs::mkdir($to, null, STREAM_MKDIR_RECURSIVE))
 							{
 								++$dirs;
 							}
-							elseif(!$is_dir && Vfs::copy($p,$to))
+							elseif (!$is_dir && Vfs::copy($p, $to))
 							{
 								++$files;
 							}
@@ -609,15 +608,15 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors copying (%2 diretories and %3 files copied)!',$errs,$dirs,$files);
+					return lang('%1 errors copying (%2 diretories and %3 files copied)!', $errs, $dirs, $files);
 				}
-				return $dirs ? lang('%1 directories and %2 files copied.',$dirs,$files) : lang('%1 files copied.',$files);
+				return $dirs ? lang('%1 directories and %2 files copied.', $dirs, $files) : lang('%1 files copied.', $files);
 
 			case 'move':
-				foreach($selected as $path)
+				foreach ($selected as $path)
 				{
-					$to = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir,Vfs::basename($path)) : $dir;
-					if ($path != $to && Vfs::rename($path,$to))
+					$to = Vfs::is_dir($dir) || count($selected) > 1 ? Vfs::concat($dir, Vfs::basename($path)) : $dir;
+					if ($path != $to && Vfs::rename($path, $to))
 					{
 						++$files;
 					}
@@ -628,17 +627,17 @@ 
 				}
 				if ($errs)
 				{
-					return lang('%1 errors moving (%2 files moved)!',$errs,$files);
+					return lang('%1 errors moving (%2 files moved)!', $errs, $files);
 				}
-				return lang('%1 files moved.',$files);
+				return lang('%1 files moved.', $files);
 
 			case 'symlink':	// symlink given files to $dir
-				foreach((array)$selected as $target)
+				foreach ((array)$selected as $target)
 				{
 					$link = Vfs::concat($dir, Vfs::basename($target));
-					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir,0,true)))
+					if (!Vfs::stat($dir) || ($ok = Vfs::mkdir($dir, 0, true)))
 					{
-						if(!$ok)
+						if (!$ok)
 						{
 							$errs++;
 							continue;
@@ -660,15 +659,14 @@ 
 				}
 				if (count((array)$selected) == 1)
 				{
-					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) :
-						lang('Error creating symlink to target %1!', Vfs::decodePath($target));
+					return $files ? lang('Symlink to %1 created.', Vfs::decodePath($target)) : lang('Error creating symlink to target %1!', Vfs::decodePath($target));
 				}
 				$ret = lang('%1 elements linked.', $files);
 				if ($errs)
 				{
-					$ret = lang('%1 errors linking (%2)!',$errs, $ret);
+					$ret = lang('%1 errors linking (%2)!', $errs, $ret);
 				}
-				return $ret;//." Vfs::symlink('$target', '$link')";
+				return $ret; //." Vfs::symlink('$target', '$link')";
 
 			case 'createdir':
 				$dst = Vfs::concat($dir, is_array($selected) ? $selected[0] : $selected);
@@ -684,13 +682,13 @@ 
 
 			default:
 				list($action, $settings) = explode('_', $action, 2);
-				switch($action)
+				switch ($action)
 				{
 					case 'document':
 						if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['filemanager']['default_document'];
 						$document_merge = new filemanager_merge(Vfs::decodePath($dir));
 						$msg = $document_merge->download($settings, $selected, '', $GLOBALS['egw_info']['user']['preferences']['filemanager']['document_dir']);
-						if($msg) return $msg;
+						if ($msg) return $msg;
 						$errs = count($selected);
 						return false;
 				}
@@ -707,12 +705,12 @@ 
 	 * @param int &$files=null on return number of files deleted
 	 * @return string
 	 */
-	public static function do_delete(array $selected, &$errs=null, &$dirs=null, &$files=null)
+	public static function do_delete(array $selected, &$errs = null, &$dirs = null, &$files = null)
 	{
 		$dirs = $files = $errs = 0;
 		// we first delete all selected links (and files)
 		// feeding the links to dirs to Vfs::find() deletes the content of the dirs, not just the link!
-		foreach($selected as $key => $path)
+		foreach ($selected as $key => $path)
 		{
 			if (!Vfs::is_dir($path) || Vfs::is_link($path))
 			{
@@ -730,21 +728,21 @@ 
 		if ($selected)	// somethings left to delete
 		{
 			// some precaution to never allow to (recursivly) remove /, /apps or /home
-			foreach((array)$selected as $path)
+			foreach ((array)$selected as $path)
 			{
-				if (preg_match('/^\/?(home|apps|)\/*$/',$path))
+				if (preg_match('/^\/?(home|apps|)\/*$/', $path))
 				{
 					$errs++;
-					return lang("Cautiously rejecting to remove folder '%1'!",Vfs::decodePath($path));
+					return lang("Cautiously rejecting to remove folder '%1'!", Vfs::decodePath($path));
 				}
 			}
 			// now we use find to loop through all files and dirs: (selected only contains dirs now)
 			// - depth=true to get first the files and then the dir containing it
 			// - hidden=true to also return hidden files (eg. Thumbs.db), as we cant delete non-empty dirs
 			// - show-deleted=false to not (finally) deleted versioned files
-			foreach(Vfs::find($selected,array('depth'=>true,'hidden'=>true,'show-deleted'=>false)) as $path)
+			foreach (Vfs::find($selected, array('depth'=>true, 'hidden'=>true, 'show-deleted'=>false)) as $path)
 			{
-				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path,0))
+				if (($is_dir = Vfs::is_dir($path) && !Vfs::is_link($path)) && Vfs::rmdir($path, 0))
 				{
 					++$dirs;
 				}
@@ -760,13 +758,13 @@ 
 		}
 		if ($errs)
 		{
-			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!',$errs,$dirs,$files);
+			return lang('%1 errors deleteting (%2 directories and %3 files deleted)!', $errs, $dirs, $files);
 		}
 		if ($dirs)
 		{
-			return lang('%1 directories and %2 files deleted.',$dirs,$files);
+			return lang('%1 directories and %2 files deleted.', $dirs, $files);
 		}
-		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.',$files);
+		return $files == 1 ? lang('File deleted.') : lang('%1 files deleted.', $files);
 	}
 
 	/**
@@ -780,37 +778,37 @@ 
 		// do NOT store query, if hierarchical data / children are requested
 		if (!$query['csv_export'])
 		{
-			Api\Cache::setSession('filemanager', 'index',$query);
+			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'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.index.rows' : 'filemanager.tile');
 
 			// Store as preference but only for index, not home
-			if($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
+			if ($query['get_rows'] == 'filemanager.filemanager_ui.get_rows')
 			{
-				$GLOBALS['egw']->preferences->add('filemanager','nm_view',$query['view']);
+				$GLOBALS['egw']->preferences->add('filemanager', 'nm_view', $query['view']);
 				$GLOBALS['egw']->preferences->save_repository();
 			}
 		}
 		// be tolerant with (in previous versions) not correct urlencoded pathes
-		if (!Vfs::stat($query['path'],true) && Vfs::stat(urldecode($query['path'])))
+		if (!Vfs::stat($query['path'], true) && Vfs::stat(urldecode($query['path'])))
 		{
 			$query['path'] = urldecode($query['path']);
 		}
-		if (!Vfs::stat($query['path'],true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'],Vfs::READABLE))
+		if (!Vfs::stat($query['path'], true) || !Vfs::is_dir($query['path']) || !Vfs::check_access($query['path'], Vfs::READABLE))
 		{
 			// only redirect, if it would be to some other location, gives redirect-loop otherwise
 			if ($query['path'] != ($path = static::get_home_dir()))
 			{
 				// we will leave here, since we are not allowed, or the location does not exist. Index must handle that, and give
 				// an appropriate message
-				Egw::redirect_link('/index.php',array('menuaction'=>'filemanager.filemanager_ui.index',
+				Egw::redirect_link('/index.php', array('menuaction'=>'filemanager.filemanager_ui.index',
 					'path' => $path,
-					'msg' => lang('The requested path %1 is not available.',Vfs::decodePath($query['path'])),
+					'msg' => lang('The requested path %1 is not available.', Vfs::decodePath($query['path'])),
 					'ajax' => 'true'
 				));
 			}
@@ -818,35 +816,35 @@ 
 			return 0;
 		}
 		$rows = $dir_is_writable = array();
-		if($query['searchletter'] && !empty($query['search']))
+		if ($query['searchletter'] && !empty($query['search']))
 		{
-			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/^'.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 			if ($query['searchletter'] == strtolower($query['search'][0]))
 			{
-				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'|'.
-					str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).')/i';
+				$namefilter = '/^('.$query['searchletter'].'.*'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'|'.
+					str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).')/i';
 			}
 		}
 		elseif ($query['searchletter'])
 		{
 			$namefilter = '/^'.$query['searchletter'].'/i';
 		}
-		elseif(!empty($query['search']))
+		elseif (!empty($query['search']))
 		{
-			$namefilter = '/'.str_replace(array('\\?','\\*'),array('.{1}','.*'),preg_quote($query['search'])).'/i';
+			$namefilter = '/'.str_replace(array('\\?', '\\*'), array('.{1}', '.*'), preg_quote($query['search'])).'/i';
 		}
 
 		// Re-map so 'No filters' favorite ('') is depth 1
 		$filter = $query['filter'] === '' ? 1 : $query['filter'];
 
 		$maxdepth = $filter && $filter != 4 ? (int)(boolean)$filter : null;
-		if($filter == 5) $maxdepth = 2;
+		if ($filter == 5) $maxdepth = 2;
 		$n = 0;
 		$vfs_options = array(
 			'mindepth' => 1,
 			'maxdepth' => $maxdepth,
 			'dirsontop' => $filter <= 1,
-			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F':'f'),
+			'type' => $filter && $filter != 5 ? ($filter == 4 ? 'd' : null) : ($filter == 5 ? 'F' : 'f'),
 			'order' => $query['order'], 'sort' => $query['sort'],
 			'limit' => (int)$query['num_rows'].','.(int)$query['start'],
 			'need_mime' => true,
@@ -854,11 +852,11 @@ 
 			'hidden' => $filter == 3,
 			'follow' => $filter == 5,
 		);
-		if($query['col_filter']['mime'])
+		if ($query['col_filter']['mime'])
 		{
 			$vfs_options['mime'] = $query['col_filter']['mime'];
 		}
-		foreach(Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],$vfs_options,true) as $path => $row)
+		foreach (Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'], $vfs_options, true) as $path => $row)
 		{
 			//echo $path; _debug_array($row);
 
@@ -872,32 +870,32 @@ 
 				$row['class'] = 'isDir';
 			}
 			$row['download_url'] = Vfs::download_url($path);
-			$row['gid'] = -abs($row['gid']);	// gid are positive, but we use negagive account_id for groups internal
+			$row['gid'] = -abs($row['gid']); // gid are positive, but we use negagive account_id for groups internal
 
 			$rows[++$n] = $row;
 			$path2n[$path] = $n;
 		}
 		// query comments and cf's for the displayed rows
-		$cols_to_show = explode(',',$GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
+		$cols_to_show = explode(',', $GLOBALS['egw_info']['user']['preferences']['filemanager']['nextmatch-filemanager.index.rows']);
 
 		// Always include comment in tiles
-		if($query['view'] == 'tile')
+		if ($query['view'] == 'tile')
 		{
 			$cols_to_show[] = 'comment';
 		}
-		$all_cfs = in_array('customfields',$cols_to_show) && $cols_to_show[count($cols_to_show)-1][0] != '#';
-		if ($path2n && (in_array('comment',$cols_to_show) || in_array('customfields',$cols_to_show)) &&
+		$all_cfs = in_array('customfields', $cols_to_show) && $cols_to_show[count($cols_to_show) - 1][0] != '#';
+		if ($path2n && (in_array('comment', $cols_to_show) || in_array('customfields', $cols_to_show)) &&
 			($path2props = Vfs::propfind(array_keys($path2n))))
 		{
-			foreach($path2props as $path => $props)
+			foreach ($path2props as $path => $props)
 			{
-				unset($row);	// fixes a weird problem with php5.1, does NOT happen with php5.2
-				$row =& $rows[$path2n[$path]];
-				if ( !is_array($props) ) continue;
-				foreach($props as $prop)
+				unset($row); // fixes a weird problem with php5.1, does NOT happen with php5.2
+				$row = & $rows[$path2n[$path]];
+				if (!is_array($props)) continue;
+				foreach ($props as $prop)
 				{
-					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'],$cols_to_show)) continue;
-					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'],0,64).' ...';
+					if (!$all_cfs && $prop['name'][0] == '#' && !in_array($prop['name'], $cols_to_show)) continue;
+					$row[$prop['name']] = strlen($prop['val']) < 64 ? $prop['val'] : substr($prop['val'], 0, 64).' ...';
 				}
 			}
 		}
@@ -909,7 +907,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'projectmanager')
 		{
 			// we need our app.css file
-			if (!file_exists(EGW_SERVER_ROOT.($css_file='/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
+			if (!file_exists(EGW_SERVER_ROOT.($css_file = '/filemanager/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css')))
 			{
 				$css_file = '/filemanager/templates/default/app.css';
 			}
@@ -925,7 +923,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function file(array $content=null,$msg='')
+	function file(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('filemanager.file');
 
@@ -935,9 +933,9 @@ 
 			{
 				$msg .= $_GET['msg'];
 			}
-			if (!($path = str_replace(array('#','?'),array('%23','%3F'),$_GET['path'])) ||	// ?, # need to stay encoded!
+			if (!($path = str_replace(array('#', '?'), array('%23', '%3F'), $_GET['path'])) || // ?, # need to stay encoded!
 				// actions enclose pathes containing comma with "
-				($path[0] == '"' && substr($path,-1) == '"' && !($path = substr(str_replace('""','"',$path),1,-1))) ||
+				($path[0] == '"' && substr($path, -1) == '"' && !($path = substr(str_replace('""', '"', $path), 1, -1))) ||
 				!($stat = Vfs::lstat($path)))
 			{
 				$msg .= lang('File or directory not found!')." path='$path', stat=".array2string($stat);
@@ -950,10 +948,10 @@ 
 				$content['path'] = $path;
 				$content['hsize'] = Vfs::hsize($stat['size']);
 				$content['mime'] = Vfs::mime_content_type($path);
-				$content['gid'] *= -1;	// our widgets use negative gid's
+				$content['gid'] *= -1; // our widgets use negative gid's
 				if (($props = Vfs::propfind($path)))
 				{
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$content[$prop['name']] = $prop['val'];
 					}
@@ -966,9 +964,9 @@ 
 			$content['tabs'] = $_GET['tabs'];
 			if (!($content['is_dir'] = Vfs::is_dir($path) && !Vfs::is_link($path)))
 			{
-				$content['perms']['executable'] = (int)!!($content['mode'] & 0111);
+				$content['perms']['executable'] = (int)!!($content['mode']&0111);
 				$mask = 6;
-				if (preg_match('/^text/',$content['mime']) && $content['size'] < 100000)
+				if (preg_match('/^text/', $content['mime']) && $content['size'] < 100000)
 				{
 					$content['text_content'] = file_get_contents(Vfs::PREFIX.$path);
 				}
@@ -978,19 +976,19 @@ 
 				//currently not implemented in backend $content['perms']['sticky'] = (int)!!($content['mode'] & 0x201);
 				$mask = 7;
 			}
-			foreach(array('owner' => 6,'group' => 3,'other' => 0) as $name => $shift)
+			foreach (array('owner' => 6, 'group' => 3, 'other' => 0) as $name => $shift)
 			{
-				$content['perms'][$name] = ($content['mode'] >> $shift) & $mask;
+				$content['perms'][$name] = ($content['mode'] >> $shift)&$mask;
 			}
-			$content['is_owner'] = Vfs::has_owner_rights($path,$content);
+			$content['is_owner'] = Vfs::has_owner_rights($path, $content);
 		}
 		else
 		{
 			//_debug_array($content);
-			$path =& $content['path'];
+			$path = & $content['path'];
 
 			list($button) = @each($content['button']); unset($content['button']);
-			if(!$button && $content['sudo'])
+			if (!$button && $content['sudo'])
 			{
 				// Button to stop sudo is not in button namespace
 				$button = 'sudo';
@@ -999,21 +997,21 @@ 
 			// need to check 'setup' button (submit button in sudo popup), as some browsers (eg. chrome) also fill the hidden field
 			if ($button == 'sudo' && Vfs::$is_root || $button == 'setup' && $content['sudo']['user'])
 			{
-				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '',$content['sudo']['passwd']) ?
+				$msg = $this->sudo($button == 'setup' ? $content['sudo']['user'] : '', $content['sudo']['passwd']) ?
 					lang('Root access granted.') : ($button == 'setup' && $content['sudo']['user'] ?
 					lang('Wrong username or password!') : lang('Root access stopped.'));
 				unset($content['sudo']);
 				$content['is_owner'] = Vfs::has_owner_rights($path);
 			}
-			if (in_array($button,array('save','apply')))
+			if (in_array($button, array('save', 'apply')))
 			{
 				$props = array();
 				$perm_changed = $perm_failed = 0;
-				foreach($content['old'] as $name => $old_value)
+				foreach ($content['old'] as $name => $old_value)
 				{
 					if (isset($content[$name]) && ($old_value != $content[$name] ||
 						// do not check for modification, if modify_subs is checked!
-						$content['modify_subs'] && in_array($name,array('uid','gid','perms'))) &&
+						$content['modify_subs'] && in_array($name, array('uid', 'gid', 'perms'))) &&
 						($name != 'uid' || Vfs::$is_root))
 					{
 						if ($name == 'name')
@@ -1027,23 +1025,23 @@ 
 							$to = Vfs::concat($dir, $content['name']);
 							if (file_exists(Vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to)
 							{
-								$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
-									lang('To overwrite the existing file store again.',lang($button)));
+								$tpl->set_validation_error('name', lang("There's already a file with that name!").'<br />'.
+									lang('To overwrite the existing file store again.', lang($button)));
 								$content['confirm_overwrite'] = $to;
 								if ($button == 'save') $button = 'apply';
 								continue;
 							}
-							if (Vfs::rename($path,$to))
+							if (Vfs::rename($path, $to))
 							{
-								$msg .= lang('Renamed %1 to %2.',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Renamed %1 to %2.', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								$content['old']['name'] = $content[$name];
 								$path = $to;
-								$content['mime'] = Api\MimeMagic::filename2mime($path);	// recheck mime type
-								$refresh_path = Vfs::dirname($path);	// for renames, we have to refresh the parent
+								$content['mime'] = Api\MimeMagic::filename2mime($path); // recheck mime type
+								$refresh_path = Vfs::dirname($path); // for renames, we have to refresh the parent
 							}
 							else
 							{
-								$msg .= lang('Rename of %1 to %2 failed!',Vfs::decodePath(basename($path)),Vfs::decodePath(basename($to))).' ';
+								$msg .= lang('Rename of %1 to %2 failed!', Vfs::decodePath(basename($path)), Vfs::decodePath(basename($to))).' ';
 								if (Vfs::deny_script($to))
 								{
 									$msg .= lang('You are NOT allowed to upload a script!').' ';
@@ -1063,7 +1061,7 @@ 
 									'val'	=> (!empty($content[$name]) ? $content[$name] : null),
 								),
 							);
-							if (Vfs::proppatch($path,$mergeprop))
+							if (Vfs::proppatch($path, $mergeprop))
 							{
 								$content['old'][$name] = $content[$name];
 								$msg .= lang('Setting for document merge saved.');
@@ -1075,22 +1073,22 @@ 
 						}
 						else
 						{
-							static $name2cmd = array('uid' => 'chown','gid' => 'chgrp','perms' => 'chmod');
-							$cmd = array('egw_vfs',$name2cmd[$name]);
+							static $name2cmd = array('uid' => 'chown', 'gid' => 'chgrp', 'perms' => 'chmod');
+							$cmd = array('egw_vfs', $name2cmd[$name]);
 							$value = $name == 'perms' ? static::perms2mode($content['perms']) : $content[$name];
 							if ($content['modify_subs'])
 							{
 								if ($name == 'perms')
 								{
-									$changed = Vfs::find($path,array('type'=>'d'),$cmd,array($value));
-									$changed += Vfs::find($path,array('type'=>'f'),$cmd,array($value & 0666));	// no execute for files
+									$changed = Vfs::find($path, array('type'=>'d'), $cmd, array($value));
+									$changed += Vfs::find($path, array('type'=>'f'), $cmd, array($value&0666)); // no execute for files
 								}
 								else
 								{
-									$changed = Vfs::find($path,null,$cmd,array($value));
+									$changed = Vfs::find($path, null, $cmd, array($value));
 								}
 								$ok = $failed = 0;
-								foreach($changed as &$r)
+								foreach ($changed as &$r)
 								{
 									if ($r)
 									{
@@ -1103,32 +1101,32 @@ 
 								}
 								if ($ok && !$failed)
 								{
-									if(!$perm_changed++) $msg .= lang('Permissions of %1 changed.',$path.' '.lang('and all it\'s childeren'));
+									if (!$perm_changed++) $msg .= lang('Permissions of %1 changed.', $path.' '.lang('and all it\'s childeren'));
 									$content['old'][$name] = $content[$name];
 								}
-								elseif($failed)
+								elseif ($failed)
 								{
-									if(!$perm_failed++) $msg .= lang('Failed to change permissions of %1!',$path.lang('and all it\'s childeren').
-										($ok ? ' ('.lang('%1 failed, %2 succeded',$failed,$ok).')' : ''));
+									if (!$perm_failed++) $msg .= lang('Failed to change permissions of %1!', $path.lang('and all it\'s childeren').
+										($ok ? ' ('.lang('%1 failed, %2 succeded', $failed, $ok).')' : ''));
 								}
 							}
-							elseif (call_user_func_array($cmd,array($path,$value)))
+							elseif (call_user_func_array($cmd, array($path, $value)))
 							{
-								$msg .= lang('Permissions of %1 changed.',$path);
+								$msg .= lang('Permissions of %1 changed.', $path);
 								$content['old'][$name] = $content[$name];
 							}
 							else
 							{
-								$msg .= lang('Failed to change permissions of %1!',$path);
+								$msg .= lang('Failed to change permissions of %1!', $path);
 							}
 						}
 					}
 				}
 				if ($props)
 				{
-					if (Vfs::proppatch($path,$props))
+					if (Vfs::proppatch($path, $props))
 					{
-						foreach($props as $prop)
+						foreach ($props as $prop)
 						{
 							$content['old'][$prop['name']] = $prop['val'];
 						}
@@ -1145,8 +1143,8 @@ 
 				if ($content['eacl']['delete'])
 				{
 					list($ino_owner) = each($content['eacl']['delete']);
-					list(, $owner) = explode('-',$ino_owner,2);	// $owner is a group and starts with a minus!
-					$msg .= Vfs::eacl($path,null,$owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
+					list(, $owner) = explode('-', $ino_owner, 2); // $owner is a group and starts with a minus!
+					$msg .= Vfs::eacl($path, null, $owner) ? lang('ACL deleted.') : lang('Error deleting the ACL entry!');
 				}
 				elseif ($button == 'eacl')
 				{
@@ -1156,7 +1154,7 @@ 
 					}
 					else
 					{
-						$msg .= Vfs::eacl($path,$content['eacl']['rights'],$content['eacl_owner']) ?
+						$msg .= Vfs::eacl($path, $content['eacl']['rights'], $content['eacl_owner']) ?
 							lang('ACL added.') : lang('Error adding the ACL!');
 					}
 				}
@@ -1166,7 +1164,7 @@ 
 		}
 		if ($content['is_link'] && !Vfs::stat($path))
 		{
-			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!',$content['symlink']);
+			$msg .= ($msg ? "\n" : '').lang('Link target %1 not found!', $content['symlink']);
 		}
 		$content['link'] = Egw::link(Vfs::download_url($path));
 		$content['icon'] = Vfs::mime_icon($content['mime']);
@@ -1175,10 +1173,10 @@ 
 		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)
+			foreach ($content['perms'] as $name => $value)
 			{
 				$readonlys['perms['.$name.']'] = true;
 			}
@@ -1196,37 +1194,37 @@ 
 		}
 		elseif (!Vfs::is_writable($path))
 		{
-			foreach($cfs as $name => $data)
+			foreach ($cfs as $name => $data)
 			{
 				$readonlys['#'.$name] = true;
 			}
 		}
-		$readonlys['tabs']['filemanager.file.eacl'] = true;	// eacl off by default
+		$readonlys['tabs']['filemanager.file.eacl'] = true; // eacl off by default
 		if ($content['is_dir'])
 		{
-			$readonlys['tabs']['filemanager.file.preview'] = true;	// no preview tab for dirs
-			$sel_options['rights']=$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$readonlys['tabs']['filemanager.file.preview'] = true; // no preview tab for dirs
+			$sel_options['rights'] = $sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				7 => lang('Display and modification of content'),
 				5 => lang('Display of content'),
 				0 => lang('No access'),
 			);
-			if(($content['eacl'] = Vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
+			if (($content['eacl'] = Vfs::get_eacl($content['path'])) !== false)	// backend supports eacl
 			{
-				unset($readonlys['tabs']['filemanager.file.eacl']);	// --> switch the tab on again
-				foreach($content['eacl'] as &$eacl)
+				unset($readonlys['tabs']['filemanager.file.eacl']); // --> switch the tab on again
+				foreach ($content['eacl'] as &$eacl)
 				{
-					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'],PHP_URL_PATH),'/');
+					$eacl['path'] = rtrim(Vfs::parse_url($eacl['path'], PHP_URL_PATH), '/');
 					$readonlys['delete['.$eacl['ino'].'-'.$eacl['owner'].']'] = $eacl['ino'] != $content['ino'] ||
 						$eacl['path'] != $content['path'] || !$content['is_owner'];
 				}
-				array_unshift($content['eacl'],false);	// make the keys start with 1, not 0
+				array_unshift($content['eacl'], false); // make the keys start with 1, not 0
 				$content['eacl']['owner'] = 0;
 				$content['eacl']['rights'] = 5;
 			}
 		}
 		else
 		{
-			$sel_options['owner']=$sel_options['group']=$sel_options['other'] = array(
+			$sel_options['owner'] = $sel_options['group'] = $sel_options['other'] = array(
 				6 => lang('Read & write access'),
 				4 => lang('Read access only'),
 				0 => lang('No access'),
@@ -1236,11 +1234,11 @@ 
 		// mergeapp
 		$content['mergeapp'] = static::get_mergeapp($path, 'self');
 		$content['mergeapp_parent'] = static::get_mergeapp($path, 'parents');
-		if(!empty($content['mergeapp']))
+		if (!empty($content['mergeapp']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp'];
 		}
-		elseif(!empty($content['mergeapp_parent']))
+		elseif (!empty($content['mergeapp_parent']))
 		{
 			$content['mergeapp_effective'] = $content['mergeapp_parent'];
 		}
@@ -1252,7 +1250,7 @@ 
 		$mergeapp_list = Link::app_list('merge');
 		unset($mergeapp_list[$GLOBALS['egw_info']['flags']['currentapp']]); // exclude filemanager from list
 		$mergeapp_empty = !empty($content['mergeapp_parent'])
-			? $mergeapp_list[$content['mergeapp_parent']] . ' (parent setting)' : '';
+			? $mergeapp_list[$content['mergeapp_parent']].' (parent setting)' : '';
 		$sel_options['mergeapp'] = array(''	=> $mergeapp_empty);
 		$sel_options['mergeapp'] = $sel_options['mergeapp'] + $mergeapp_list;
 		// mergeapp other gui options
@@ -1269,7 +1267,7 @@ 
 				'comment' => (string)$content['comment'],
 				'mergeapp' => $content['mergeapp']
 			);
-			if ($cfs) foreach($cfs as $name => $data)
+			if ($cfs) foreach ($cfs as $name => $data)
 			{
 				$preserve['old']['#'.$name] = (string)$content['#'.$name];
 			}
@@ -1277,26 +1275,26 @@ 
 		if (Vfs::$is_root)
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Logout');
-			$tpl->setElementAttribute('sudouser', 'help','Log out as superuser');
+			$tpl->setElementAttribute('sudouser', 'help', 'Log out as superuser');
 			// Need a more complex submit because button type is buttononly, which doesn't submit
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"login")');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"login")');
 
 		}
 		elseif ($button == 'sudo')
 		{
 			$tpl->setElementAttribute('sudouser', 'label', 'Superuser');
-			$tpl->setElementAttribute('sudouser', 'help','Enter setup user and password to get root rights');
-			$tpl->setElementAttribute('sudouser', 'onclick','app.filemanager.set_sudoButton(widget,"logout")');
+			$tpl->setElementAttribute('sudouser', 'help', 'Enter setup user and password to get root rights');
+			$tpl->setElementAttribute('sudouser', 'onclick', 'app.filemanager.set_sudoButton(widget,"logout")');
 		}
-		if (($extra_tabs = Vfs::getExtraInfo($path,$content)))
+		if (($extra_tabs = Vfs::getExtraInfo($path, $content)))
 		{
 			// add to existing tabs in template
 			$tpl->setElementAttribute('tabs', 'add_tabs', true);
 
-			$tabs =& $tpl->getElementAttribute('tabs','tabs');
+			$tabs = & $tpl->getElementAttribute('tabs', 'tabs');
 			if (true) $tabs = array();
 
-			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach (isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				$tabs[] = array(
 					'label' =>	$extra_tab['label'],
@@ -1319,7 +1317,7 @@ 
 		Framework::window_focus();
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Preferences').' '.Vfs::decodePath($path);
 
-		$tpl->exec('filemanager.filemanager_ui.file',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_ui.file', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -1330,7 +1328,7 @@ 
 	 * @param string $dir=null current directory
 	 * @see static::action()
 	 */
-	public static function ajax_action($action, $selected, $dir=null, $props=null)
+	public static function ajax_action($action, $selected, $dir = null, $props = null)
 	{
 		// do we have root rights, need to run here too, as method is static and therefore does NOT run __construct
 		if (Api\Cache::getSession('filemanager', 'is_root'))
@@ -1349,15 +1347,15 @@ 
 
 		if (!isset($dir)) $dir = array_pop($selected);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'upload':
 				$script_error = 0;
-				foreach($selected as $tmp_name => &$data)
+				foreach ($selected as $tmp_name => &$data)
 				{
 					$path = Vfs::concat($dir, Vfs::encodePathComponent($data['name']));
 
-					if(Vfs::deny_script($path))
+					if (Vfs::deny_script($path))
 					{
 						if (!isset($script_error))
 						{
@@ -1379,7 +1377,7 @@ 
 					{
 						if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 						{
-							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . basename($tmp_name);
+							$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.basename($tmp_name);
 						}
 						else
 						{
@@ -1414,16 +1412,16 @@ 
 			case 'link':
 				// First upload
 				$arr = static::ajax_action('upload', $selected, $dir, $props);
-				$app_dir = Link::vfs_path($props['entry']['app'],$props['entry']['id'],'',true);
+				$app_dir = Link::vfs_path($props['entry']['app'], $props['entry']['id'], '', true);
 
-				foreach($arr['uploaded'] as $file)
+				foreach ($arr['uploaded'] as $file)
 				{
-					$target=Vfs::concat($dir,Vfs::encodePathComponent($file['name']));
+					$target = Vfs::concat($dir, Vfs::encodePathComponent($file['name']));
 					if (Vfs::file_exists($target) && $app_dir)
 					{
 						if (!Vfs::file_exists($app_dir)) Vfs::mkdir($app_dir);
 						error_log("Symlinking $target to $app_dir");
-						Vfs::symlink($target, Vfs::concat($app_dir,Vfs::encodePathComponent($file['name'])));
+						Vfs::symlink($target, Vfs::concat($app_dir, Vfs::encodePathComponent($file['name'])));
 					}
 				}
 				// Must return to avoid adding to $response again
@@ -1445,7 +1443,7 @@ 
 	 */
 	private function perms2mode(array $perms)
 	{
-		$mode = $perms['owner'] << 6 | $perms['group'] << 3 | $perms['other'];
+		$mode = $perms['owner'] << 6|$perms['group'] << 3|$perms['other'];
 		if ($mode['executable'])
 		{
 			$mode |= 0111;

home/inc/class.home_list_portlet.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 	/**
 	 * This portlet accepts files and links
 	 *
-	 * @return boolean|String[]
+	 * @return string[]
 	 */
 	public function accept_drop()
 	{

Spacing +15 added lines, -15 removed lines

@@ -42,16 +42,16 @@ 
 	{
 		if (false) parent::__construct();
 
-		if(!is_array($context['list'])) $context['list'] = array();
+		if (!is_array($context['list'])) $context['list'] = array();
 
 		// Process dropped data (Should be GUIDs) into something useable
-		if($context['dropped_data'])
+		if ($context['dropped_data'])
 		{
-			foreach((Array)$context['dropped_data'] as $dropped)
+			foreach ((Array)$context['dropped_data'] as $dropped)
 			{
 				$add = array();
 				list($add['app'], $add['id']) = explode('::', $dropped, 2);
-				if($add['app'] && $add['id'])
+				if ($add['app'] && $add['id'])
 				{
 					$context['list'][] = $add;
 				}
@@ -60,13 +60,13 @@ 
 			unset($context['dropped_data']);
 			$need_reload = true;
 		}
-		if($context['title'])
+		if ($context['title'])
 		{
 			$this->title = $context['title'];
 		}
-		foreach($context['list'] as &$item)
+		foreach ($context['list'] as &$item)
 		{
-			if($item['app'] == 'filemanager' || $item['app'] == 'file')
+			if ($item['app'] == 'filemanager' || $item['app'] == 'file')
 			{
 				$item['app'] = 'file';
 				$item['type'] = Vfs::mime_content_type($item['id']);
@@ -105,21 +105,21 @@ 
 	 * 	unique, if needed.
 	 * @return string HTML fragment for display
 	 */
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$etemplate->read('home.list');
 
 		$etemplate->set_dom_id($id);
 		$content = $this->context;
-		if(!is_array($content['list']))
+		if (!is_array($content['list']))
 		{
 			$content['list'] = Array();
 		}
 		// Filemanager support - links need app = 'file' and type set
-		foreach($content['list'] as &$list)
+		foreach ($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
-			if($list['app'] == 'file')
+			if ($list['app'] == 'filemanager') $list['app'] = 'file';
+			if ($list['app'] == 'file')
 			{
 				$list['app'] = 'file';
 				$list['path'] = $list['title'] = $list['icon'] = $list['id'];
@@ -127,7 +127,7 @@ 
 			}
 		}
 
-		$etemplate->exec('home.home_list_portlet.exec',$content);
+		$etemplate->exec('home.home_list_portlet.exec', $content);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 				'type' => 'drop',
 				'caption' => lang('add'),
 				'onExecute' => 'javaScript:app.home.add_link',
-				'acceptedTypes' => array('file','link') + array_keys($GLOBALS['egw_info']['apps']),
+				'acceptedTypes' => array('file', 'link') + array_keys($GLOBALS['egw_info']['apps']),
 			)
 		);
 		return $actions;
@@ -202,6 +202,6 @@ 
 	 */
 	public function accept_drop()
 	{
-		return array('file','link');
+		return array('file', 'link');
 	}
 }

Braces +12 added lines, -3 removed lines

@@ -40,9 +40,15 @@ 
 	 */
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
-		if (false) parent::__construct();
+		if (false)
+		{
+			parent::__construct();
+		}
 
-		if(!is_array($context['list'])) $context['list'] = array();
+		if(!is_array($context['list']))
+		{
+			$context['list'] = array();
+		}
 
 		// Process dropped data (Should be GUIDs) into something useable
 		if($context['dropped_data'])
@@ -118,7 +124,10 @@ 
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)
 		{
-			if($list['app'] == 'filemanager') $list['app'] = 'file';
+			if($list['app'] == 'filemanager')
+			{
+				$list['app'] = 'file';
+			}
 			if($list['app'] == 'file')
 			{
 				$list['app'] = 'file';

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

@@ -38,7 +38,7 @@ 
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 
@@ -113,7 +113,7 @@ 
 		$content = $this->context;
 		if(!is_array($content['list']))
 		{
-			$content['list'] = Array();
+			$content['list'] = array();
 		}
 		// Filemanager support - links need app = 'file' and type set
 		foreach($content['list'] as &$list)

home/inc/class.home_portlet.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	 * If this portlet can be created by dropping, these are the drop types
 	 * that are accepted
 	 *
-	 * @return boolean|String[]
+	 * @return boolean
 	 */
 	public function accept_drop()
 	{

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	 * 	unique, if needed.
 	 * @param Etemplate $etemplate eTemplate to generate content
 	 */
-	public abstract function exec($id = null, Etemplate &$etemplate = null);
+	public abstract function exec($id = null, Etemplate&$etemplate = null);
 
 	/**
 	 * Return a list of settings to customize the portlet.
@@ -78,7 +78,7 @@ 
 	{
 		// Include the common attributes, or they won't get saved
 		$properties = array();
-		foreach(self::$common_attributes as $prop)
+		foreach (self::$common_attributes as $prop)
 		{
 			$properties[$prop] = array('name' => $prop);
 		}
@@ -123,6 +123,6 @@ 
 
 	public function __toString()
 	{
-		return get_called_class() . ' Context:' . array2string($this->context);
+		return get_called_class().' Context:'.array2string($this->context);
 	}
 }

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

@@ -34,7 +34,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 abstract function __construct(Array &$context = array(), &$need_reload = false);
+	public abstract function __construct(array &$context = array(), &$need_reload = false);
 
 	/**
 	 * Some descriptive information about the portlet, so that users can decide if

home/inc/class.home_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	 * Get a list of the user's portlets, and their associated values & settings, for display
 	 *
 	 * Actual portlet content is provided by each portlet.
-	 * @param template etemplate so attributes can be set
+	 * @param template Etemplate so attributes can be set
 	 */
 	protected function get_user_portlets(Etemplate &$template)
 	{

Spacing +108 added lines, -108 removed lines

@@ -49,21 +49,21 @@ 
 		$content = array(
 			'portlets' => $this->get_user_portlets($template)
 		);
-		$template->setElementAttribute('home.index','actions',$this->get_actions());
+		$template->setElementAttribute('home.index', 'actions', $this->get_actions());
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('home');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'home';
 
 		// Main screen message
 		Api\Translation::add_app('mainscreen');
-		$greeting = Api\Translation::translate('mainscreen_message',false,'');
+		$greeting = Api\Translation::translate('mainscreen_message', false, '');
 
-		if($greeting == 'mainscreen_message'|| empty($greeting))
+		if ($greeting == 'mainscreen_message' || empty($greeting))
 		{
-			Api\Translation::add_app('mainscreen','en');    // trying the en one
-			$greeting = Api\Translation::translate('mainscreen_message',false,'');
+			Api\Translation::add_app('mainscreen', 'en'); // trying the en one
+			$greeting = Api\Translation::translate('mainscreen_message', false, '');
 		}
-		if(!($greeting == 'mainscreen_message'|| empty($greeting)))
+		if (!($greeting == 'mainscreen_message' || empty($greeting)))
 		{
 			$content['mainscreen_message'] = $greeting;
 		}
@@ -72,11 +72,11 @@ 
 
 		// Now run the portlets themselves
 		$attrs = array();
-		foreach($content['portlets'] as $portlet => $p_data)
+		foreach ($content['portlets'] as $portlet => $p_data)
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if (!$id) continue;
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -94,15 +94,15 @@ 
 		$add_portlets = $portlets;
 		$change_for_add = function(&$add_portlets) use (&$change_for_add)
 		{
-			foreach($add_portlets as $id => &$add)
+			foreach ($add_portlets as $id => &$add)
 			{
-				if(is_array($add['children']))
+				if (is_array($add['children']))
 				{
 					$change_for_add($add['children']);
 				}
-				if($id && !$add['children'])
+				if ($id && !$add['children'])
 				{
-					$add['id'] = 'add_' . $id;
+					$add['id'] = 'add_'.$id;
 					$add['class'] = 'add_'.$id;
 				}
 			}
@@ -121,10 +121,10 @@ 
 
 		// Add all known portlets as drop actions too.  If there are multiple matches, there will be a menu
 		$drop_execute = 'javaScript:app.home.add_from_drop';
-		foreach($portlets as $app => &$children)
+		foreach ($portlets as $app => &$children)
 		{
 			// Home portlets - uses link system, so all apps that support that are accepted
-			if(!$children['children'])
+			if (!$children['children'])
 			{
 				$children['class'] = $app;
 				$children['onExecute'] = $drop_execute;
@@ -133,11 +133,11 @@ 
 			}
 			else
 			{
-				foreach($children['children'] as $portlet => $app_portlet)
+				foreach ($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if (!is_array($app_portlet)) continue;
 					$app_portlet['class'] = $portlet;
-					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
+					$app_portlet['id'] = 'drop_'.$app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
 					$app_portlet['acceptedTypes'] = $app;
 					$app_portlet['type'] = 'drop';
@@ -157,13 +157,13 @@ 
 	 * Actual portlet content is provided by each portlet.
 	 * @param template etemplate so attributes can be set
 	 */
-	protected function get_user_portlets(Etemplate &$template)
+	protected function get_user_portlets(Etemplate&$template)
 	{
 		$portlets = array();
 
-		foreach((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
 		{
-			if(strpos($id,'portlet_') !== 0 || // Not a portlet
+			if (strpos($id, 'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
 			) continue;
@@ -171,9 +171,9 @@ 
 			$classname = $context['class'];
 
 			// Avoid portlets for apps user can't use (eg. from defaults/forced)
-			list($app,$other) = explode('_',$classname);
-			if(!$GLOBALS['egw_info']['apps'][$app]) $app .='_'.$other;
-			if(!$GLOBALS['egw_info']['user']['apps'][$app]) {
+			list($app, $other) = explode('_', $classname);
+			if (!$GLOBALS['egw_info']['apps'][$app]) $app .= '_'.$other;
+			if (!$GLOBALS['egw_info']['user']['apps'][$app]) {
 				continue;
 			}
 
@@ -187,12 +187,12 @@ 
 			// Get settings
 			// Exclude common attributes changed through UI and settings lacking a type
 			$settings = $portlet->get_properties();
-			foreach($settings as $key => $setting)
+			foreach ($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 			}
 			$settings += $context;
-			foreach(home_portlet::$common_attributes as $attr)
+			foreach (home_portlet::$common_attributes as $attr)
 			{
 				unset($settings[$attr]);
 			}
@@ -205,7 +205,7 @@ 
 			// Add in default for admins
 			self::create_default_actions($actions, $id);
 
-			$template->setElementAttribute("portlets[" . count($portlets) . "[$id]", 'actions', $actions);
+			$template->setElementAttribute("portlets[".count($portlets)."[$id]", 'actions', $actions);
 
 			$portlets[] = $portlet_content;
 		}
@@ -229,11 +229,11 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if (!$context['class']) $context['class'] = 'home_link_portlet';
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
-		if(Api\Json\Response::isJSONResponse())
+		if (Api\Json\Response::isJSONResponse())
 		{
 			$GLOBALS['egw']->framework->response = Api\Json\Response::get();
 		}
@@ -248,12 +248,12 @@ 
 
 		// Exclude common attributes changed through UI and settings lacking a type
 		$settings = $portlet->get_properties();
-		foreach($settings as $key => $setting)
+		foreach ($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 		}
 		$settings += $context;
-		foreach(home_portlet::$common_attributes as $attr)
+		foreach (home_portlet::$common_attributes as $attr)
 		{
 			unset($settings[$attr]);
 		}
@@ -268,31 +268,31 @@ 
 		self::create_default_actions($attributes['actions'], $id);
 
 		// Set any provided common attributes (size, etc)
-		foreach(home_portlet::$common_attributes as $name)
+		foreach (home_portlet::$common_attributes as $name)
 		{
-			if(array_key_exists($name, $context))
+			if (array_key_exists($name, $context))
 			{
 				$attributes[$name] = $context[$name];
 			}
 		}
-		foreach($attributes as $attr => $value)
+		foreach ($attributes as $attr => $value)
 		{
 			$etemplate->setElementAttribute($id, $attr, $value);
 		}
 
 		// Make sure custom javascript is loaded
 		$appname = $context['appname'];
-		if(!$appname)
+		if (!$appname)
 		{
-			list($app) = explode('_',$classname);
-			if($GLOBALS['egw_info']['apps'][$app])
+			list($app) = explode('_', $classname);
+			if ($GLOBALS['egw_info']['apps'][$app])
 			{
 				$appname = $app;
 			}
 		}
 		Framework::includeJS('', $classname, $appname ? $appname : 'home');
 
-		if($full_exec)
+		if ($full_exec)
 		{
 			$content = $portlet->exec($id, $etemplate, $full_exec ? 2 : -1);
 		}
@@ -309,23 +309,23 @@ 
 	protected function get_legacy_portlets(&$content, &$attributes)
 	{
 		$sorted_apps = array_keys($GLOBALS['egw_info']['user']['apps']);
-		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents','homeShowLatest','mainscreen_showmail','mainscreen_showbirthdays','mainscreen_show_new_updated', 'homepage_display');
+		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents', 'homeShowLatest', 'mainscreen_showmail', 'mainscreen_showbirthdays', 'mainscreen_show_new_updated', 'homepage_display');
 
-		foreach($sorted_apps as $appname)
+		foreach ($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if ($content[$appname]) continue;
 			$no_pref = true;
-			foreach($portal_oldvarnames as $varcheck)
+			foreach ($portal_oldvarnames as $varcheck)
 			{
 				$thisd = $GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck];
-				if($thisd)
+				if ($thisd)
 				{
 					$no_pref = false;
 					break;
 				}
 			}
-			if($no_pref || !Api\Hooks::exists('home', $appname))
+			if ($no_pref || !Api\Hooks::exists('home', $appname))
 			{
 				continue;
 			}
@@ -336,7 +336,7 @@ 
 			$_content = '';
 			$_attributes = array();
 			$this->get_portlet($appname, $context, $_content, $_attributes);
-			if(trim($_content))
+			if (trim($_content))
 			{
 				$content[$appname] = $_content;
 				$attributes[$appname] = $_attributes;
@@ -355,24 +355,24 @@ 
 
 			// Ignore some problem files and base classes that shouldn't be options
 			$ignore = array(
-				'.','..',
+				'.', '..',
 				'class.home_portlet.inc.php',
 				'class.home_legacy_portlet.inc.php',
 				'class.home_favorite_portlet.inc.php'
 			);
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
-			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
+			foreach (array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
-				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if (in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				$files = (array)@scandir(EGW_SERVER_ROOT.'/'.$appname.'/inc/');
+				if (!$files) continue;
 
-				foreach($files as $entry)
+				foreach ($files as $entry)
 				{
-					if (!in_array($entry, $ignore) && substr($entry,-8) == '.inc.php' && strpos($entry,'portlet'))
+					if (!in_array($entry, $ignore) && substr($entry, -8) == '.inc.php' && strpos($entry, 'portlet'))
 					{
 						list(,$classname) = explode('.', $entry);
-						if(class_exists($classname) &&
+						if (class_exists($classname) &&
 							in_array('home_portlet', class_parents($classname, false)))
 						{
 							$classes[$appname][] = $classname;
@@ -384,19 +384,19 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if (!$classes[$appname]) continue;
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
-				$add_to =& $list;
-				if($classes[$appname] && $appname != 'home')
+				$add_to = & $list;
+				if ($classes[$appname] && $appname != 'home')
 				{
 					$list[$appname] = array(
 						'caption' => lang($appname),
 					);
-					$add_to =& $list[$appname]['children'];
+					$add_to = & $list[$appname]['children'];
 				}
-				foreach($classes[$appname] as $portlet)
+				foreach ($classes[$appname] as $portlet)
 				{
 					$instance = new $portlet();
 					$desc = $instance->get_description();
@@ -416,10 +416,10 @@ 
 		}, array(), 60);
 
 		// Filter list by current user's permissions
-		foreach(array_keys($list) as $appname)
+		foreach (array_keys($list) as $appname)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
-				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			if (in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+				if (!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
 				}
@@ -436,7 +436,7 @@ 
 	 */
 	protected static function create_default_actions(&$actions, $portlet_id = null)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$actions['add_default'] = array(
 				'type'		=> 'popup',
@@ -446,25 +446,25 @@ 
 				'icon'		=> 'preference'
 			);
 			// Customize for the given portlet
-			if($portlet_id !== null)
+			if ($portlet_id !== null)
 			{
-				foreach(array('forced','group','default') as $location)
+				foreach (array('forced', 'group', 'default') as $location)
 				{
 					$loc = $GLOBALS['egw']->preferences->$location;
 
-					if($loc['home'][$portlet_id])
+					if ($loc['home'][$portlet_id])
 					{
 						// If it's forced, no point in setting default
-						if($location == 'forced')
+						if ($location == 'forced')
 						{
 							unset($actions['add_default']);
 						}
 						// If it's a group, we'd like to know which
-						if($location == 'group')
+						if ($location == 'group')
 						{
 							$options = array('account_type' => 'groups');
-							$groups = Api\Accounts::link_query('',$options);
-							foreach(array_keys($groups) as $gid)
+							$groups = Api\Accounts::link_query('', $options);
+							foreach (array_keys($groups) as $gid)
 							{
 								$prefs = new Api\Preferences($gid);
 								$prefs->read_repository();
@@ -477,7 +477,7 @@ 
 						}
 						$actions['remove_default_'.$location] = array(
 							'type'		=> 'popup',
-							'caption'	=> lang('Remove as default for %1',is_numeric($location) ? Api\Accounts::id2name($location,'account_fullname') : $location),
+							'caption'	=> lang('Remove as default for %1', is_numeric($location) ? Api\Accounts::id2name($location, 'account_fullname') : $location),
 							'onExecute'	=> 'javaScript:app.home.set_default',
 							'group'		=> 'Admins',
 							'portlet_group' => $location
@@ -488,14 +488,14 @@ 
 		}
 
 		// Change action for forced
-		if($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+		if ($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 		{
 			// No one can remove it
 			$actions['remove_portlet']['enabled'] = false;
-			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced') .')';
+			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced').')';
 
 			// Non-admins can't edit it
-			if($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if ($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$actions['edit_settings']['enabled'] = false;
 				$actions['edit_settings']['visible'] = false;
@@ -514,14 +514,14 @@ 
 	public function ajax_set_properties($portlet_id, $attributes, $values, $group = false)
 	{
 		//error_log(__METHOD__ . "($portlet_id, " .array2string($attributes).','.array2string($values).",$group)");
-		if(!$attributes)
+		if (!$attributes)
 		{
 			$attributes = array();
 		}
 
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			if($group == 'forced')
+			if ($group == 'forced')
 			{
 				// Quietly reject
 				return;
@@ -529,7 +529,7 @@ 
 			// Not an admin, can only override.
 			$group = false;
 		}
-		if($group && $GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($group && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$prefs = new Api\Preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -543,23 +543,23 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($values =='~reload~')
+		if ($values == '~reload~')
 		{
 			$full_exec = true;
 			$values = array();
 		}
-		if($values == '~remove~')
+		if ($values == '~remove~')
 		{
 			// Already removed client side, needs to be removed permanently
-			$default = $prefs->default_prefs('home',$portlet_id) || $prefs->group['home'][$portlet_id];
+			$default = $prefs->default_prefs('home', $portlet_id) || $prefs->group['home'][$portlet_id];
 
-			if($default)
+			if ($default)
 			{
 				// Can't delete forced - not a UI option though
-				if(!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+				if (!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 				{
 					// Set a flag to override default instead of just delete
-					$GLOBALS['egw']->preferences->add('home',$portlet_id, 'deleted');
+					$GLOBALS['egw']->preferences->add('home', $portlet_id, 'deleted');
 					$GLOBALS['egw']->preferences->save_repository();
 				}
 			}
@@ -576,19 +576,19 @@ 
 			// Remove some constant stuff that winds up here
 			unset($values['edit_template']);
 			unset($values['readonly']);
-			unset($values['disabled']);unset($values['no_lang']);
+			unset($values['disabled']); unset($values['no_lang']);
 			unset($values['actions']);
 			unset($values['statustext']);
-			unset($values['type']);unset($values['label']);unset($values['status']);
-			unset($values['value']);unset($values['align']);
+			unset($values['type']); unset($values['label']); unset($values['status']);
+			unset($values['value']); unset($values['align']);
 
 			// Get portlet settings, and merge new with old
 			$context = array_merge((array)$portlets[$portlet_id], $values);
 			$context['group'] = $group;
 
 			// Handle add IDs
-			$classname =& $context['class'];
-			if(strpos($classname,'add_') == 0 && !class_exists($classname))
+			$classname = & $context['class'];
+			if (strpos($classname, 'add_') == 0 && !class_exists($classname))
 			{
 				$add = true;
 				$classname = substr($classname, 4);
@@ -597,13 +597,13 @@ 
 			$portlet = $this->get_portlet($portlet_id, $context, $content, $attributes, $full_exec);
 
 			$context['class'] = get_class($portlet);
-			foreach($portlet->get_properties() as $property)
+			foreach ($portlet->get_properties() as $property)
 			{
-				if($values[$property['name']])
+				if ($values[$property['name']])
 				{
 					$context[$property['name']] = $values[$property['name']];
 				}
-				elseif($portlets[$portlet_id][$property['name']])
+				elseif ($portlets[$portlet_id][$property['name']])
 				{
 					$context[$property['name']] = $portlets[$portlet_id][$property['name']];
 				}
@@ -613,7 +613,7 @@ 
 			$update = array('attributes' => $attributes);
 
 			// New portlet?  Flag going straight to edit mode
-			if($add)
+			if ($add)
 			{
 				$update['edit_settings'] = true;
 			}
@@ -625,7 +625,7 @@ 
 		}
 
 		// Save updated preferences
-		$prefs->save_repository(True,$type);
+		$prefs->save_repository(True, $type);
 	}
 
 	/**
@@ -638,10 +638,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if (!$GLOBALS['egw_info']['apps']['admin']) return;
 
 		// Load the appropriate group
-		if($group)
+		if ($group)
 		{
 			$prefs = new Api\Preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -653,30 +653,30 @@ 
 
 		$type = is_numeric($group) ? "user" : $group;
 
-		if($action == 'add')
+		if ($action == 'add')
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				Api\Json\Response::get()->call('egw.message', lang("Set default"));
 				// Current user is setting the default, copy their settings
 				$settings = $GLOBALS['egw_info']['user']['preferences']['home'][$id];
 				$settings['group'] = $group;
-				$prefs->add('home',$id,$settings,$type);
+				$prefs->add('home', $id, $settings, $type);
 
 				// Remove user's copy
-				$GLOBALS['egw']->preferences->delete('home',$id);
+				$GLOBALS['egw']->preferences->delete('home', $id);
 				$GLOBALS['egw']->preferences->save_repository(true);
 			}
 		}
 		else if ($action == "delete")
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				Api\Json\Response::get()->call('egw.message', lang("Removed default"));
-				$prefs->delete('home',$id, $type);
+				$prefs->delete('home', $id, $type);
 			}
 		}
-		$prefs->save_repository(false,$type);
+		$prefs->save_repository(false, $type);
 
 		// Update Api\Preferences client side for consistency
 		$prefs = $GLOBALS['egw']->preferences;
@@ -729,7 +729,7 @@ 
 						'state' => array(
 							'cat_id' => '0',
 							'filter' => 'default',
-							'owner' => 0,	// current user
+							'owner' => 0, // current user
 							'sortby' => 'user',
 							'planner_days' => '0',
 							'view' => 'week',
@@ -778,9 +778,9 @@ 
 		{
 			unset($app_prefs['home']['portlet_setup142n']);
 		}
-		foreach($app_prefs as $app => $prefs)
+		foreach ($app_prefs as $app => $prefs)
 		{
-			foreach($prefs as $name => $value)
+			foreach ($prefs as $name => $value)
 			{
 				Api\Preferences::delete_preference($app, $name, 'default');
 				$preferences->add($app, $name, $value, 'default');
@@ -801,10 +801,10 @@ 
 	 */
 	public static function setup_default_home()
 	{
-		switch($GLOBALS['egw_info']['server'][self::HOME_VERSION])
+		switch ($GLOBALS['egw_info']['server'][self::HOME_VERSION])
 		{
 			case self::CURRENT_HOME_VERSION:
-				return;	// already up to date --> nothing to do
+				return; // already up to date --> nothing to do
 
 			default:
 				call_user_func(array(__CLASS__, 'setup_default_home_'.str_replace('.', '_', self::CURRENT_HOME_VERSION)));

Braces +58 added lines, -16 removed lines

@@ -76,7 +76,10 @@ 
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if(!$id)
+			{
+				continue;
+			}
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -135,7 +138,10 @@ 
 			{
 				foreach($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if(!is_array($app_portlet))
+					{
+						continue;
+					}
 					$app_portlet['class'] = $portlet;
 					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
@@ -166,14 +172,21 @@ 
 			if(strpos($id,'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
-			) continue;
+			)
+			{
+				continue;
+			}
 
 			$classname = $context['class'];
 
 			// Avoid portlets for apps user can't use (eg. from defaults/forced)
 			list($app,$other) = explode('_',$classname);
-			if(!$GLOBALS['egw_info']['apps'][$app]) $app .='_'.$other;
-			if(!$GLOBALS['egw_info']['user']['apps'][$app]) {
+			if(!$GLOBALS['egw_info']['apps'][$app])
+			{
+				$app .='_'.$other;
+			}
+			if(!$GLOBALS['egw_info']['user']['apps'][$app])
+			{
 				continue;
 			}
 
@@ -189,7 +202,10 @@ 
 			$settings = $portlet->get_properties();
 			foreach($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if(is_array($setting) && !array_key_exists('type',$setting))
+				{
+					unset($settings[$key]);
+				}
 			}
 			$settings += $context;
 			foreach(home_portlet::$common_attributes as $attr)
@@ -229,7 +245,10 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if(!$context['class'])
+		{
+			$context['class'] = 'home_link_portlet';
+		}
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
@@ -250,7 +269,10 @@ 
 		$settings = $portlet->get_properties();
 		foreach($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if(is_array($setting) && !array_key_exists('type',$setting))
+			{
+				unset($settings[$key]);
+			}
 		}
 		$settings += $context;
 		foreach(home_portlet::$common_attributes as $attr)
@@ -314,7 +336,10 @@ 
 		foreach($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if($content[$appname])
+			{
+				continue;
+			}
 			$no_pref = true;
 			foreach($portal_oldvarnames as $varcheck)
 			{
@@ -349,7 +374,8 @@ 
 	 */
 	protected function get_portlet_list()
 	{
-		$list = Api\Cache::getTree('home', 'portlet_classes', function() {
+		$list = Api\Cache::getTree('home', 'portlet_classes', function()
+		{
 			$list = array();
 			$classes = array();
 
@@ -363,9 +389,15 @@ 
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
 			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				if(in_array($appname, array('phpgwapi', 'felamimail')))
+				{
+					continue;
+				}
 				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if(!$files)
+				{
+					continue;
+				}
 
 				foreach($files as $entry)
 				{
@@ -384,7 +416,10 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if(!$classes[$appname])
+				{
+					continue;
+				}
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
@@ -418,7 +453,8 @@ 
 		// Filter list by current user's permissions
 		foreach(array_keys($list) as $appname)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps'])))
+			{
 				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
@@ -638,7 +674,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if(!$GLOBALS['egw_info']['apps']['admin'])
+		{
+			return;
+		}
 
 		// Load the appropriate group
 		if($group)
@@ -701,7 +740,10 @@ 
 		$preferences = $GLOBALS['egw']->preferences;
 		$preferences->read_repository();
 		$lang = $preferences->default['common']['lang'];
-		if (empty($lang)) $lang = 'en';
+		if (empty($lang))
+		{
+			$lang = 'en';
+		}
 
 		Api\Translation::add_app('calendar', $lang);
 		$weekview = lang('Weekview');

importexport/inc/class.importexport_basic_import_csv.inc.php

Doc Comments +5 added lines, -6 removed lines

@@ -118,8 +118,7 @@ 
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(
@@ -222,7 +221,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
@@ -274,7 +273,7 @@ 
 	 * @param condition array = array('string' => field name)
 	 * @param matches - On return, will be filled with matching records
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
 	{
@@ -451,7 +450,7 @@ 
 	/**
 	 * Allows an extending class to alter a row for preview
 	 *
-	 * @param egw_record $row_entry
+	 * @param importexport_iface_egw_record $row_entry
 	 */
 	protected function row_preview(importexport_iface_egw_record &$row_entry)
 	{
@@ -523,7 +522,7 @@ 
 	 * Get the primary key for an entry based on a custom field
 	 * Returns key, so regular linking can take over
 	 *
-	 * @param int $record_number Row number, used for errors
+	 * @param int $record_num Row number, used for errors
 	 * @param string $app Target application name
 	 * @param string $value CSV value in the form of custom_field_name:value
 	 */

Indentation +32 added lines, -32 removed lines

@@ -163,7 +163,7 @@ 
 		$record_class = isset(static::$record_class) ? static::$record_class : "{$app}_egw_record";
 
 		// Needed for categories to work right
-        $GLOBALS['egw_info']['flags']['currentapp'] = $app;
+		$GLOBALS['egw_info']['flags']['currentapp'] = $app;
 
 		$this->init($_definition);
 
@@ -215,15 +215,15 @@ 
 	}
 
 	/**
-	*Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 *Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		if ( $this->definition->plugin_options['conditions'] ) {
@@ -403,7 +403,7 @@ 
 	 * @param stream $stream
 	 * @param importexport_definition $definition
 	 * @return String HTML for preview
-         */
+	 */
 	public function preview( $stream, importexport_definition $definition )
 	{
 		$this->import($stream, $definition);
@@ -639,37 +639,37 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 			return $this->results;
 	}

Spacing +79 added lines, -79 removed lines

@@ -18,19 +18,19 @@ 
  * should get you started on building a CSV plugin for an application fairly quickly.
  *
  */
-abstract class importexport_basic_import_csv implements importexport_iface_import_plugin  {
+abstract class importexport_basic_import_csv implements importexport_iface_import_plugin {
 
 	protected static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'record_owner', 	// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'record_owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -48,7 +48,7 @@ 
 	 * Actions wich could be done to data entries
 	 * If your plugin supports different actions, be sure to modify this array
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * Conditions for actions
@@ -56,7 +56,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists', 'equal', 'less_than');
+	protected static $conditions = array('exists', 'equal', 'less_than');
 
 	/**
 	 * This is the definition that will be used to deal with the CSV file
@@ -121,8 +121,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -130,11 +130,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
@@ -143,9 +143,9 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -167,38 +167,38 @@ 
 
 		$this->init($_definition);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 
 			$warning = importexport_import_csv::convert($record, $record_class::$types, $app, $this->lookups, $_definition->plugin_options['convert']);
-				if($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
+				if ($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
 
 			$egw_record = new $record_class();
 			$egw_record->set_record($record);
 			$success = $this->import_record($egw_record, $import_csv);
 
-			if($success)
+			if ($success)
 			{
 				$this->do_special_fields($egw_record, $import_csv);
 			}
-			if($success) $count++;
+			if ($success) $count++;
 
 			// Add some more time
-			if($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
+			if ($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
 			{
 				set_time_limit(10);
 			}
 
 			// Keep a few records for preview, but process the whole file
-			if($this->dry_run && $import_csv->get_current_position() < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])
+			if ($this->dry_run && $import_csv->get_current_position() < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])
 			{
 				$this->preview_records[] = $egw_record;
 			}
-			if(count($this->warnings) > self::MAX_MESSAGES || count($this->errors) > self::MAX_MESSAGES)
+			if (count($this->warnings) > self::MAX_MESSAGES || count($this->errors) > self::MAX_MESSAGES)
 			{
 				$this->errors[] = 'Too many errors, aborted';
 				break;
@@ -210,7 +210,7 @@ 
 	/**
 	 * Stub to hook into import initialization - set lookups, etc.
 	 */
-	protected function init(importexport_definition &$definition)
+	protected function init(importexport_definition&$definition)
 	{
 	}
 
@@ -224,12 +224,12 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ($this->definition->plugin_options['conditions']) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$result = false;
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
 						// Check for that record
@@ -245,23 +245,23 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if($result)
+				if ($result)
 				{
 					// Apply true action to any matching records found
 					$action = $condition['true'];
-					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+					$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 				}
 				else
 				{
 					// Apply false action if no matching records found
 					$action = $condition['false'];
-					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+					$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 				}
 				if ($action['stop']) break;
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 
 		return $success;
@@ -276,7 +276,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
+	protected function exists(importexport_iface_egw_record&$record, Array &$condition, &$matches = array())
 	{
 	}
 
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function equal(importexport_iface_egw_record &$record, Array &$condition)
+	protected function equal(importexport_iface_egw_record&$record, Array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field == $condition['op_2'];
@@ -303,7 +303,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function less_than(importexport_iface_egw_record &$record, Array &$condition)
+	protected function less_than(importexport_iface_egw_record&$record, Array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field < $condition['op_2'];
@@ -322,7 +322,7 @@ 
 	 * @param int $record_num Which record number is being dealt with.  Used for error messages.
 	 * @return bool success or not
 	 */
-	protected abstract function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 );
+	protected abstract function action($_action, importexport_iface_egw_record&$record, $record_num = 0);
 
 	/**
 	 * Handle special fields
@@ -332,51 +332,51 @@ 
 	 *
 	 * @param importexport_iface_egw_record $record
 	 */
-	protected function do_special_fields(importexport_iface_egw_record &$record, &$import_csv)
+	protected function do_special_fields(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		$id = $record->get_identifier();
 
 		// Warn if there's no ID unless it's a dry_run because there probably won't be an ID then
-		if(!$this->dry_run && !$id)
+		if (!$this->dry_run && !$id)
 		{
 			$this->warnings[$import_csv->get_current_position()] .= "Unable to link, no identifier for record";
 			return;
 		}
 
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$record->$field) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $record->$field,2);
+		foreach (self::$special_fields as $field => $desc) {
+			if (!$record->$field) continue;
+			if (strpos($field, 'link') === 0) {
+				list($app, $app_id) = explode(':', $record->$field, 2);
 
-				list($link, $type) = explode('_',$field);
+				list($link, $type) = explode('_', $field);
 
 				// Searching, take first result
-				if($type == 'custom')
+				if ($type == 'custom')
 				{
 					$app_id = $this->link_by_cf($record, $app, $app_id, $import_csv->get_current_position());
 				}
-				else if($type == 'search')
+				else if ($type == 'search')
 				{
 					$result = Link::query($app, $app_id);
 					do
 					{
 						$app_id = key($result);
 						shift($result);
-					} while($result && !$app_id);
+					} while ($result && !$app_id);
 				}
 			} else if (in_array($field, array_keys($GLOBALS['egw_info']['apps']))) {
 				$app = $field;
 				$app_id = $record->$field;
 
 				// Searching, take first result
-				if(!is_numeric($app_id))
+				if (!is_numeric($app_id))
 				{
 					$result = Link::query($app, $app_id);
 					do
 					{
 						$app_id = key($result);
 						shift($result);
-					} while($result && !$app_id);
+					} while ($result && !$app_id);
 				}
 			}
 			else if ($field == 'contact')
@@ -387,7 +387,7 @@ 
 			}
 			if (!$this->dry_run && $app && $app_id && ($app != $this->definition->application || $app_id != $id))
 			{
-				$link_id = Link::link($this->definition->application,$id,$app,$app_id);
+				$link_id = Link::link($this->definition->application, $id, $app, $app_id);
 			}
 		}
 	}
@@ -404,13 +404,13 @@ 
 	 * @param importexport_definition $definition
 	 * @return String HTML for preview
          */
-	public function preview( $stream, importexport_definition $definition )
+	public function preview($stream, importexport_definition $definition)
 	{
 		$this->import($stream, $definition);
 		rewind($stream);
 
 		// Set up result
-		$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
+		$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
 
 		// Load labels for app
 		$record_class = get_class($this->preview_records[0]);
@@ -419,27 +419,27 @@ 
 		$labels = array_combine($definition->plugin_options['field_mapping'], $definition->plugin_options['field_mapping']);
 
 		$plugin = get_called_class();
-		$wizard_name = $definition->application . '_wizard_' . str_replace($definition->application . '_', '', $plugin);
+		$wizard_name = $definition->application.'_wizard_'.str_replace($definition->application.'_', '', $plugin);
 		try {
 			$wizard = new $wizard_name;
 			$fields = $wizard->get_import_fields();
-			foreach($labels as $field => &$label)
+			foreach ($labels as $field => &$label)
 			{
-				if($fields[$field]) $label = $fields[$field];
+				if ($fields[$field]) $label = $fields[$field];
 			}
 		} catch (Exception $e) {
 			Api\Translation::add_app($definition->application);
-			foreach($labels as $field => &$label) {
+			foreach ($labels as $field => &$label) {
 				$label = lang($label);
 			}
 		}
 
 		// Set up HTML
 		$rows['h1'] = $labels;
-		foreach($this->preview_records as $i => $row_data)
+		foreach ($this->preview_records as $i => $row_data)
 		{
 			// Convert to human-friendly
-			importexport_export_csv::convert($row_data,$record_class::$types,$definition->application,$this->lookups);
+			importexport_export_csv::convert($row_data, $record_class::$types, $definition->application, $this->lookups);
 			$this->row_preview($row_data);
 			$rows[] = $row_data->get_record_array();
 		}
@@ -453,7 +453,7 @@ 
 	 *
 	 * @param egw_record $row_entry
 	 */
-	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	protected function row_preview(importexport_iface_egw_record&$row_entry)
 	{
 	}
 
@@ -468,7 +468,7 @@ 
 	 * @param string $org_name
 	 * @return int|boolean Contact ID of first match, or false if none found
 	 */
-	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null) {
+	public static function addr_id($n_family, $n_given = null, $org_name = null, &$record = null) {
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -478,7 +478,7 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if (!is_null($n_given)) $n_given = trim($n_given);
 		if (!is_object($contacts))
 		{
 			$contacts = new Api\Contacts();
@@ -486,10 +486,10 @@ 
 		if (!is_null($org_name))	// org_name given?
 		{
 			$org_name = trim($org_name);
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,n_given=$n_given,org_name=$org_name");
 			if (!count($addrs))
 			{
-				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
+				$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,org_name=$org_name", '', 'n_family,org_name');
 			}
 		}
 		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
@@ -498,11 +498,11 @@ 
 		}
 		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
 		{
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_fn=$n_family", '', 'n_fn');
 		}
 		if (count($addrs))
 		{
-			if(!$record || !$record->get_identifier())
+			if (!$record || !$record->get_identifier())
 			{
 				return $addrs[0]['id'];
 			}
@@ -512,7 +512,7 @@ 
 				{
 					$id = key($addrs);
 					array_shift($addrs);
-				} while($addrs && !$id && $id == $record->get_identifier());
+				} while ($addrs && !$id && $id == $record->get_identifier());
 				return $id;
 			}
 		}
@@ -527,22 +527,22 @@ 
 	 * @param string $app Target application name
 	 * @param string $value CSV value in the form of custom_field_name:value
 	 */
-	protected function link_by_cf(importexport_iface_egw_record &$record, $app, $value,$record_num)
+	protected function link_by_cf(importexport_iface_egw_record&$record, $app, $value, $record_num)
 	{
 		$app_id = false;
 
-		list($custom_field, $value) = explode(':',$value);
+		list($custom_field, $value) = explode(':', $value);
 		// Find matching entry
-		if($app && $custom_field && $value)
+		if ($app && $custom_field && $value)
 		{
 			$cfs = Api\Storage\Customfields::get($app);
 			// Error if no custom fields, probably something wrong in definition
-			if(!$cfs[$custom_field])
+			if (!$cfs[$custom_field])
 			{
 				// Check for users specifing label instead of name
-				foreach($cfs as $name => $settings)
+				foreach ($cfs as $name => $settings)
 				{
-					if(strtolower($settings['label']) == strtolower($custom_field))
+					if (strtolower($settings['label']) == strtolower($custom_field))
 					{
 						$custom_field = $name;
 						break;
@@ -551,30 +551,30 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if (!$cfs[$custom_field] && !$cfs[substr($custom_field, 1)]) {
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if ($custom_field[0] != '#') $custom_field = '#'.$custom_field;
 error_log("Searching for $custom_field = $value");
 			// Search
-			if(Link::get_registry($app, 'query'))
+			if (Link::get_registry($app, 'query'))
 			{
-				$options = array('filter' => array("$custom_field = " . $GLOBALS['egw']->db->quote($value)));
+				$options = array('filter' => array("$custom_field = ".$GLOBALS['egw']->db->quote($value)));
 				$result = Link::query($app, '', $options);
 
 				// Only one allowed
-				if($record->get_identifier())
+				if ($record->get_identifier())
 				{
-					while(key($result) == $record->get_identifier())
+					while (key($result) == $record->get_identifier())
 					{
 						array_shift($result);
 					}
 				}
-				if(count($result) != 1)
+				if (count($result) != 1)
 				{
-					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '') .
+					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '').
 						lang('Unable to link to %3 by custom field "%1": "%4".  %2 matches.',
 						$custom_field, count($result), lang($app), $options['filter'][0]
 					);

Braces +96 added lines, -36 removed lines

@@ -18,7 +18,8 @@ 
  * should get you started on building a CSV plugin for an application fairly quickly.
  *
  */
-abstract class importexport_basic_import_csv implements importexport_iface_import_plugin  {
+abstract class importexport_basic_import_csv implements importexport_iface_import_plugin
+{
 
 	protected static $plugin_options = array(
 		'fieldsep', 		// char
@@ -121,7 +122,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -143,9 +145,12 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -167,15 +172,22 @@ 
 
 		$this->init($_definition);
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 
 			$warning = importexport_import_csv::convert($record, $record_class::$types, $app, $this->lookups, $_definition->plugin_options['convert']);
-				if($warning) $this->warnings[$import_csv->get_current_position()] = $warning;
+				if($warning)
+				{
+					$this->warnings[$import_csv->get_current_position()] = $warning;
+				}
 
 			$egw_record = new $record_class();
 			$egw_record->set_record($record);
@@ -185,7 +197,10 @@ 
 			{
 				$this->do_special_fields($egw_record, $import_csv);
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 
 			// Add some more time
 			if($success && $import_csv->get_current_position() > 0 && $import_csv->get_current_position() % 100 == 0)
@@ -226,10 +241,13 @@ 
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$result = false;
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
 						// Check for that record
@@ -257,9 +275,14 @@ 
 					$action = $condition['false'];
 					$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -343,9 +366,14 @@ 
 			return;
 		}
 
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$record->$field) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(self::$special_fields as $field => $desc)
+		{
+			if(!$record->$field)
+			{
+				continue;
+			}
+			if(strpos($field, 'link') === 0)
+			{
 				list($app, $app_id) = explode(':', $record->$field,2);
 
 				list($link, $type) = explode('_',$field);
@@ -364,7 +392,9 @@ 
 						shift($result);
 					} while($result && !$app_id);
 				}
-			} else if (in_array($field, array_keys($GLOBALS['egw_info']['apps']))) {
+			}
+			else if (in_array($field, array_keys($GLOBALS['egw_info']['apps'])))
+			{
 				$app = $field;
 				$app_id = $record->$field;
 
@@ -425,11 +455,16 @@ 
 			$fields = $wizard->get_import_fields();
 			foreach($labels as $field => &$label)
 			{
-				if($fields[$field]) $label = $fields[$field];
+				if($fields[$field])
+				{
+					$label = $fields[$field];
+				}
 			}
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			Api\Translation::add_app($definition->application);
-			foreach($labels as $field => &$label) {
+			foreach($labels as $field => &$label)
+			{
 				$label = lang($label);
 			}
 		}
@@ -468,7 +503,8 @@ 
 	 * @param string $org_name
 	 * @return int|boolean Contact ID of first match, or false if none found
 	 */
-	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null) {
+	public static function addr_id( $n_family,$n_given=null,$org_name=null, &$record=null)
+	{
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -478,28 +514,40 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if(!is_null($n_given))
+		{
+			$n_given = trim($n_given);
+		}
 		if (!is_object($contacts))
 		{
 			$contacts = new Api\Contacts();
 		}
-		if (!is_null($org_name))	// org_name given?
+		if (!is_null($org_name))
+		{
+			// org_name given?
 		{
 			$org_name = trim($org_name);
+		}
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
 			if (!count($addrs))
 			{
 				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
 			}
 		}
-		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
+		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))
+		{
+			// first name given and no result so far
 		{
 			$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
 		}
-		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
+		}
+		if (is_null($n_given) && is_null($org_name))
+		{
+			// just one name given, check against fn (= full name)
 		{
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
 		}
+		}
 		if (count($addrs))
 		{
 			if(!$record || !$record->get_identifier())
@@ -551,13 +599,17 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)])
+			{
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
-error_log("Searching for $custom_field = $value");
+			if($custom_field[0] != '#')
+			{
+				$custom_field = '#' . $custom_field;
+			}
+			error_log("Searching for $custom_field = $value");
 			// Search
 			if(Link::get_registry($app, 'query'))
 			{
@@ -591,7 +643,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Basic CSV import');
 	}
 
@@ -600,7 +653,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports information from a CSV file.  This is only a base class, and doesn't do anything on its own.");
 	}
 
@@ -609,7 +663,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -625,7 +680,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -634,7 +690,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -646,7 +703,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -658,7 +716,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -670,7 +729,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 			return $this->results;
 	}
 } // end of iface_export_plugin

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

@@ -276,7 +276,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$matches = array())
+	protected function exists(importexport_iface_egw_record &$record, array &$condition, &$matches = array())
 	{
 	}
 
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function equal(importexport_iface_egw_record &$record, Array &$condition)
+	protected function equal(importexport_iface_egw_record &$record, array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field == $condition['op_2'];
@@ -303,7 +303,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function less_than(importexport_iface_egw_record &$record, Array &$condition)
+	protected function less_than(importexport_iface_egw_record &$record, array &$condition)
 	{
 		$field = $condition['string'];
 		return $record->$field < $condition['op_2'];