EGroupware / egroupware

api/config.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 $etag = '"'.md5($config.$link_registry).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
+Api\Session::cache_control(86400); // cache for one day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -47,7 +47,7 @@ 
 $content .= 'egw.set_link_registry('.$link_registry.", undefined, egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

api/js/etemplate/test/test.php

Spacing +5 added lines, -5 removed lines

@@ -16,18 +16,18 @@
 
 use EGroupware\Api;
 
-Api\Framework::includeJS('.','etemplate2','etemplate');
-Api\Framework::includeJS('jquery','jquery.tools.min','phpgwapi'); // Not needed once JS require works for files like this
-Api\Framework::includeJS('jquery','jquery.html5_upload','phpgwapi'); // Not needed once JS require works for files like this
+Api\Framework::includeJS('.', 'etemplate2', 'etemplate');
+Api\Framework::includeJS('jquery', 'jquery.tools.min', 'phpgwapi'); // Not needed once JS require works for files like this
+Api\Framework::includeJS('jquery', 'jquery.html5_upload', 'phpgwapi'); // Not needed once JS require works for files like this
 Api\Framework::includeCSS('/api/js/etemplate/test/test.css');
 
 /*
 * Test using any actual template
 */
 	$template = 'etemplate.et2_test_file_upload';
-	if($template) {
+	if ($template) {
 		$etemplate = new Api\Etemplate('etemplate.et2_test_file_upload');
-		$etemplate->exec('',array());
+		$etemplate->exec('', array());
 		return;
 	}
 	echo $GLOBALS['egw']->framework->header();

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 * Test using any actual template
 */
 	$template = 'etemplate.et2_test_file_upload';
-	if($template) {
+	if($template)
+	{
 		$etemplate = new Api\Etemplate('etemplate.et2_test_file_upload');
 		$etemplate->exec('',array());
 		return;

api/categories.php

Spacing +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@ 
 $appname = $_GET['app'] && $GLOBALS['egw_info']['apps'][$_GET['app']] ? $_GET['app'] : Api\Categories::GLOBAL_APPNAME;
 
 $cats = new Api\Categories('', $appname);
-$categories = $cats->return_array('all',0, false, '', 'ASC','',$appname==Api\Categories::GLOBAL_APPNAME);
+$categories = $cats->return_array('all', 0, false, '', 'ASC', '', $appname == Api\Categories::GLOBAL_APPNAME);
 
 $content = "/* Category CSS for $appname */\n\n";
 
-foreach($categories as $cat)
+foreach ($categories as $cat)
 {
 	if (!isset($cat['data'])) continue;
 	if (!empty($cat['data']['color']))
@@ -45,7 +45,7 @@ 
 	}
 	if (!empty($cat['data']['icon']))
 	{
-		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('". admin_categories::icon_url($cat['data']['icon']) ."');} /*{$cat['name']}*/\n";
+		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('".admin_categories::icon_url($cat['data']['icon'])."');} /*{$cat['name']}*/\n";
 	}
 }
 
@@ -53,7 +53,7 @@ 
 $etag = '"'.md5($content).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for 1 day
+Api\Session::cache_control(86400); // cache for 1 day
 Header('Content-Type: text/css; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -65,7 +65,7 @@ 
 }
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

Braces +4 added lines, -1 removed lines

@@ -36,7 +36,10 @@
 
 foreach($categories as $cat)
 {
-	if (!isset($cat['data'])) continue;
+	if (!isset($cat['data']))
+	{
+		continue;
+	}
 	if (!empty($cat['data']['color']))
 	{
 		// Use slightly more specific selector that just class, to allow defaults

api/user.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 $etag = '"'.md5($preferences.$ab_preferences.$user).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for 1 day
+Api\Session::cache_control(86400); // cache for 1 day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -49,7 +49,7 @@ 
 $content .= 'egw.set_user('.$user.", egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

setup/schematoy.php

Spacing +101 added lines, -101 removed lines

@@ -23,7 +23,7 @@ 
 	include('./inc/functions.inc.php');
 
 	// Check header and authentication
-	if(!$GLOBALS['egw_setup']->auth('Config'))
+	if (!$GLOBALS['egw_setup']->auth('Config'))
 	{
 		Header('Location: index.php');
 		exit;
@@ -31,7 +31,7 @@ 
 	// Does not return unless user is authorized
 
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$GLOBALS['setup_tpl'] = CreateObject('phpgwapi.Template',$tpl_root);
+	$GLOBALS['setup_tpl'] = CreateObject('phpgwapi.Template', $tpl_root);
 	$GLOBALS['setup_tpl']->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
@@ -41,48 +41,48 @@ 
 		'T_setup_main' => 'schema.tpl'
 	));
 
-	$GLOBALS['setup_tpl']->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-	$GLOBALS['setup_tpl']->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','header','header');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','app_header','app_header');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','apps','apps');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','detail','detail');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','table','table');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','hook','hook');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','dep','dep');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','app_footer','app_footer');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','submit','submit');
-	$GLOBALS['setup_tpl']->set_block('T_setup_main','footer','footer');
-
-	$bgcolor = array('DDDDDD','EEEEEE');
-
-	function parsedep($depends,$main=True)
+	$GLOBALS['setup_tpl']->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+	$GLOBALS['setup_tpl']->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'header', 'header');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'app_header', 'app_header');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'apps', 'apps');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'detail', 'detail');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'table', 'table');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'hook', 'hook');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'dep', 'dep');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'app_footer', 'app_footer');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'submit', 'submit');
+	$GLOBALS['setup_tpl']->set_block('T_setup_main', 'footer', 'footer');
+
+	$bgcolor = array('DDDDDD', 'EEEEEE');
+
+	function parsedep($depends, $main = True)
 	{
 		$depstring = '(';
-		foreach($depends as $a => $b)
+		foreach ($depends as $a => $b)
 		{
-			foreach($b as $c => $d)
+			foreach ($b as $c => $d)
 			{
-				if(is_array($d))
+				if (is_array($d))
 				{
-					$depstring .= $c . ': ' .implode(',',$d) . '; ';
+					$depstring .= $c.': '.implode(',', $d).'; ';
 					$depver[] = $d;
 				}
 				else
 				{
-					$depstring .= $c . ': ' . $d . '; ';
+					$depstring .= $c.': '.$d.'; ';
 					$depapp[] = $d;
 				}
 			}
 		}
 		$depstring .= ')';
-		if($main)
+		if ($main)
 		{
 			return $depstring;
 		}
 		else
 		{
-			return array($depapp,$depver);
+			return array($depapp, $depver);
 		}
 	}
 
@@ -99,178 +99,178 @@ 
 	//var_dump($GLOBALS['setup_info']);exit;
 	@ksort($GLOBALS['setup_info']);
 
-	if($_POST['cancel'])
+	if ($_POST['cancel'])
 	{
 		Header('Location: index.php');
 		exit;
 	}
 
-	$GLOBALS['egw_setup']->html->show_header(lang("Developers' Table Schema Toy"),False,'config',$GLOBALS['egw_setup']->ConfigDomain);
+	$GLOBALS['egw_setup']->html->show_header(lang("Developers' Table Schema Toy"), False, 'config', $GLOBALS['egw_setup']->ConfigDomain);
 
-	if($_POST['submit'])
+	if ($_POST['submit'])
 	{
-		$GLOBALS['setup_tpl']->set_var('description',lang('App process') . ':');
-		$GLOBALS['setup_tpl']->pparse('out','header');
+		$GLOBALS['setup_tpl']->set_var('description', lang('App process').':');
+		$GLOBALS['setup_tpl']->pparse('out', 'header');
 
 		$appname = $_POST['appname'];
 		$install = $_POST['install'];
 		$version = $_POST['version'];
 
-		foreach($install as $appname => $key)
+		foreach ($install as $appname => $key)
 		{
 			$terror = array();
 			$terror[$appname]['name'] = $appname;
 			$terror[$appname]['version'] = $version[$appname];
 			$terror[$appname]['status'] = 'U';
 
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
 			// Drop newest tables
 			$terror[$appname]['tables'] = $GLOBALS['setup_info'][$appname]['tables'];
-			$GLOBALS['egw_setup']->process->droptables($terror,$GLOBALS['DEBUG']);
+			$GLOBALS['egw_setup']->process->droptables($terror, $GLOBALS['DEBUG']);
 			$terror[$appname]['tables'] = array();
 
 			// Reset tables field to baseline table names
-			if(file_exists($appdir.'tables_baseline.inc.php'))
+			if (file_exists($appdir.'tables_baseline.inc.php'))
 			{
 				include($appdir.'tables_baseline.inc.php');
-				foreach($phpgw_baseline as $table => $null)
+				foreach ($phpgw_baseline as $table => $null)
 				{
 					$terror[$appname]['tables'][] = $table;
-					echo '<br />Adding app table: ' . $table;
+					echo '<br />Adding app table: '.$table;
 				}
 			}
 
-			if($version[$appname])
+			if ($version[$appname])
 			{
-				echo '<br />Processing ' . $terror[$appname]['name'] . ' to ' . $version[$appname];
+				echo '<br />Processing '.$terror[$appname]['name'].' to '.$version[$appname];
 
-				$terror = $GLOBALS['egw_setup']->process->droptables($terror,$GLOBALS['DEBUG']);
+				$terror = $GLOBALS['egw_setup']->process->droptables($terror, $GLOBALS['DEBUG']);
 				$GLOBALS['egw_setup']->deregister_app($terror[$appname]['name']);
 
-				$terror = $GLOBALS['egw_setup']->process->baseline($terror,$GLOBALS['DEBUG']);
-				$terror = $GLOBALS['egw_setup']->process->test_data($terror,$GLOBALS['DEBUG']);
+				$terror = $GLOBALS['egw_setup']->process->baseline($terror, $GLOBALS['DEBUG']);
+				$terror = $GLOBALS['egw_setup']->process->test_data($terror, $GLOBALS['DEBUG']);
 
-				$terror = $GLOBALS['egw_setup']->process->upgrade($terror,$GLOBALS['DEBUG']);
+				$terror = $GLOBALS['egw_setup']->process->upgrade($terror, $GLOBALS['DEBUG']);
 				$terror[$appname]['version'] = $version[$appname];
 			}
 			else
 			{
-				echo '<br />Baseline-only completed for ' . $terror[$appname]['name'];
+				echo '<br />Baseline-only completed for '.$terror[$appname]['name'];
 			}
-			echo '<br />' . $GLOBALS['setup_info'][$appname]['title'] . ' '
-				. lang('tables installed, unless there are errors printed above') . '.';
+			echo '<br />'.$GLOBALS['setup_info'][$appname]['title'].' '
+				. lang('tables installed, unless there are errors printed above').'.';
 
 			$GLOBALS['setup_info'][$appname]['version'] = $terror[$appname]['version'];
 			$GLOBALS['egw_setup']->register_app($appname);
-			echo '<br />' . $terror[$appname]['title'] . ' ' . lang('registered') . '.';
+			echo '<br />'.$terror[$appname]['title'].' '.lang('registered').'.';
 		}
 
-		echo '<br /><a href="schematoy.php">' . lang('Go back') . '</a>';
-		$GLOBALS['setup_tpl']->pparse('out','footer');
+		echo '<br /><a href="schematoy.php">'.lang('Go back').'</a>';
+		$GLOBALS['setup_tpl']->pparse('out', 'footer');
 		exit;
 	}
 	$detail = $_REQUEST['detail'];
-	if($detail)
+	if ($detail)
 	{
 		@ksort($GLOBALS['setup_info'][$detail]);
 		@reset($GLOBALS['setup_info'][$detail]);
-		$GLOBALS['setup_tpl']->set_var('description',lang('App details') . ':');
-		$GLOBALS['setup_tpl']->pparse('out','header');
+		$GLOBALS['setup_tpl']->set_var('description', lang('App details').':');
+		$GLOBALS['setup_tpl']->pparse('out', 'header');
 
-		foreach($GLOBALS['setup_info'][$detail] as $key => $val)
+		foreach ($GLOBALS['setup_info'][$detail] as $key => $val)
 		{
 			$i = $i ? 0 : 1;
 
 			//if(!$val) { $val = 'none'; }
 
-			if($key == 'tables')
+			if ($key == 'tables')
 			{
-				if(is_array($val))
+				if (is_array($val))
 				{
-					$key = '<a href="sqltoarray.php?appname=' . $detail . '&submit=True">' . $key . '</a>' . "\n";
-					$val = implode(',',$val);
+					$key = '<a href="sqltoarray.php?appname='.$detail.'&submit=True">'.$key.'</a>'."\n";
+					$val = implode(',', $val);
 				}
 			}
-			if($key == 'hooks')
+			if ($key == 'hooks')
 			{
-				$val = implode(',',$val);
+				$val = implode(',', $val);
 			}
-			if($key == 'depends')
+			if ($key == 'depends')
 			{
 				$val = parsedep($val);
 			}
-			if(is_array($val))
+			if (is_array($val))
 			{
-				$val = implode(',',$val);
+				$val = implode(',', $val);
 			}
 
-			$GLOBALS['setup_tpl']->set_var('bg_color',$bgcolor[$i]);
-			$GLOBALS['setup_tpl']->set_var('name',$key);
-			$GLOBALS['setup_tpl']->set_var('details',$val);
-			$GLOBALS['setup_tpl']->pparse('out','detail');
+			$GLOBALS['setup_tpl']->set_var('bg_color', $bgcolor[$i]);
+			$GLOBALS['setup_tpl']->set_var('name', $key);
+			$GLOBALS['setup_tpl']->set_var('details', $val);
+			$GLOBALS['setup_tpl']->pparse('out', 'detail');
 		}
 
-		echo '<br /><a href="schematoy.php">' . lang('Go back') . '</a>';
-		$GLOBALS['setup_tpl']->pparse('out','footer');
+		echo '<br /><a href="schematoy.php">'.lang('Go back').'</a>';
+		$GLOBALS['setup_tpl']->pparse('out', 'footer');
 		exit;
 	}
 	else
 	{
-		$GLOBALS['setup_tpl']->set_var('description',lang("Select an app, enter a target version, then submit to process to that version.<br />If you do not enter a version, only the baseline tables will be installed for the app.<br /><blink>THIS WILL DROP ALL OF THE APPS' TABLES FIRST!</blink>"));
-		$GLOBALS['setup_tpl']->pparse('out','header');
-
-		$GLOBALS['setup_tpl']->set_var('appdata',lang('Application Data'));
-		$GLOBALS['setup_tpl']->set_var('actions',lang('Actions'));
-		$GLOBALS['setup_tpl']->set_var('action_url','schematoy.php');
-		$GLOBALS['setup_tpl']->set_var('app_info',lang('Application Name and Status'));
-		$GLOBALS['setup_tpl']->set_var('app_title',lang('Application Title'));
-		$GLOBALS['setup_tpl']->set_var('app_version',lang('Target Version'));
-		$GLOBALS['setup_tpl']->set_var('app_install',lang('Process'));
-		$GLOBALS['setup_tpl']->pparse('out','app_header');
-
-		foreach($GLOBALS['setup_info'] as $key => $value)
+		$GLOBALS['setup_tpl']->set_var('description', lang("Select an app, enter a target version, then submit to process to that version.<br />If you do not enter a version, only the baseline tables will be installed for the app.<br /><blink>THIS WILL DROP ALL OF THE APPS' TABLES FIRST!</blink>"));
+		$GLOBALS['setup_tpl']->pparse('out', 'header');
+
+		$GLOBALS['setup_tpl']->set_var('appdata', lang('Application Data'));
+		$GLOBALS['setup_tpl']->set_var('actions', lang('Actions'));
+		$GLOBALS['setup_tpl']->set_var('action_url', 'schematoy.php');
+		$GLOBALS['setup_tpl']->set_var('app_info', lang('Application Name and Status'));
+		$GLOBALS['setup_tpl']->set_var('app_title', lang('Application Title'));
+		$GLOBALS['setup_tpl']->set_var('app_version', lang('Target Version'));
+		$GLOBALS['setup_tpl']->set_var('app_install', lang('Process'));
+		$GLOBALS['setup_tpl']->pparse('out', 'app_header');
+
+		foreach ($GLOBALS['setup_info'] as $key => $value)
 		{
 			unset($test);
-			if(file_exists(EGW_SERVER_ROOT . '/' . $value['name'] . '/setup/tables_update.inc.php'))
+			if (file_exists(EGW_SERVER_ROOT.'/'.$value['name'].'/setup/tables_update.inc.php'))
 			{
-				include(EGW_SERVER_ROOT . '/' . $value['name'] . '/setup/tables_update.inc.php');
+				include(EGW_SERVER_ROOT.'/'.$value['name'].'/setup/tables_update.inc.php');
 
-				if(is_array($test))
+				if (is_array($test))
 				{
 					reset($test);
 				}
 
 				$s = '<option value="">&nbsp;</option>';
-				while(is_array($test) && list(,$versionnumber) = each($test))
+				while (is_array($test) && list(,$versionnumber) = each($test))
 				{
-					$s .= '<option value="' . $versionnumber . '">' . $versionnumber . '</option>';
+					$s .= '<option value="'.$versionnumber.'">'.$versionnumber.'</option>';
 				}
-				$GLOBALS['setup_tpl']->set_var('select_version',$s);
+				$GLOBALS['setup_tpl']->set_var('select_version', $s);
 
-				if($value['name'])
+				if ($value['name'])
 				{
 					$i = $i ? 0 : 1;
-					$GLOBALS['setup_tpl']->set_var('apptitle',$value['title']);
-					$GLOBALS['setup_tpl']->set_var('currentver',$value['currentver']);
-					$GLOBALS['setup_tpl']->set_var('bg_color',$bgcolor[$i]);
+					$GLOBALS['setup_tpl']->set_var('apptitle', $value['title']);
+					$GLOBALS['setup_tpl']->set_var('currentver', $value['currentver']);
+					$GLOBALS['setup_tpl']->set_var('bg_color', $bgcolor[$i]);
 
-					$GLOBALS['setup_tpl']->set_var('instimg','completed.png');
-					$GLOBALS['setup_tpl']->set_var('instalt',lang('Completed'));
-					$GLOBALS['setup_tpl']->set_var('install','<input type="checkbox" name="install[' . $value['name'] . ']" />');
-					$status = lang('OK') . ' - ' . $value['status'];
+					$GLOBALS['setup_tpl']->set_var('instimg', 'completed.png');
+					$GLOBALS['setup_tpl']->set_var('instalt', lang('Completed'));
+					$GLOBALS['setup_tpl']->set_var('install', '<input type="checkbox" name="install['.$value['name'].']" />');
+					$status = lang('OK').' - '.$value['status'];
 
-					$GLOBALS['setup_tpl']->set_var('appinfo',$value['name'] . '-' . $status);
-					$GLOBALS['setup_tpl']->set_var('appname',$value['name']);
+					$GLOBALS['setup_tpl']->set_var('appinfo', $value['name'].'-'.$status);
+					$GLOBALS['setup_tpl']->set_var('appname', $value['name']);
 
-					$GLOBALS['setup_tpl']->pparse('out','apps',True);
+					$GLOBALS['setup_tpl']->pparse('out', 'apps', True);
 				}
 			}
 		}
 	}
-	$GLOBALS['setup_tpl']->set_var('submit',lang('Save'));
-	$GLOBALS['setup_tpl']->set_var('cancel',lang('Cancel'));
-	$GLOBALS['setup_tpl']->pparse('out','app_footer');
-	$GLOBALS['setup_tpl']->pparse('out','footer');
+	$GLOBALS['setup_tpl']->set_var('submit', lang('Save'));
+	$GLOBALS['setup_tpl']->set_var('cancel', lang('Cancel'));
+	$GLOBALS['setup_tpl']->pparse('out', 'app_footer');
+	$GLOBALS['setup_tpl']->pparse('out', 'footer');
 	$GLOBALS['egw_setup']->html->show_footer();
 ?>

setup/sqltoarray.php

Spacing +72 added lines, -72 removed lines

@@ -21,7 +21,7 @@ 
 include('./inc/functions.inc.php');
 
 /* Check header and authentication */
-if(!$GLOBALS['egw_setup']->auth('Config'))
+if (!$GLOBALS['egw_setup']->auth('Config'))
 {
 	Header('Location: index.php');
 	exit;
@@ -29,10 +29,10 @@ 
 // Does not return unless user is authorized
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 
 $cancel   = $_REQUEST['cancel'];
-if($cancel)
+if ($cancel)
 {
 	Header('Location: applications.php');
 	exit;
@@ -42,15 +42,15 @@ 
 $submit   = $_REQUEST['submit'];
 $showall  = $_REQUEST['showall'];
 $appname  = $_REQUEST['appname'];
-if($download)
+if ($download)
 {
 	$setup_tpl->set_file(array(
 		'sqlarr'   => 'arraydl.tpl'
 	));
-	$setup_tpl->set_var('idstring',"/* \$Id" . ": tables_current.inc.php" . ",v 1.0" . " 2001/05/28 08:42:04 username " . "Exp \$ */");
-	$setup_tpl->set_block('sqlarr','sqlheader','sqlheader');
-	$setup_tpl->set_block('sqlarr','sqlbody','sqlbody');
-	$setup_tpl->set_block('sqlarr','sqlfooter','sqlfooter');
+	$setup_tpl->set_var('idstring', "/* \$Id".": tables_current.inc.php".",v 1.0"." 2001/05/28 08:42:04 username "."Exp \$ */");
+	$setup_tpl->set_block('sqlarr', 'sqlheader', 'sqlheader');
+	$setup_tpl->set_block('sqlarr', 'sqlbody', 'sqlbody');
+	$setup_tpl->set_block('sqlarr', 'sqlfooter', 'sqlfooter');
 }
 else
 {
@@ -66,44 +66,44 @@ 
 		'T_head'   => 'head.tpl',
 		'T_footer' => 'footer.tpl'
 	));
-	$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-	$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-	$setup_tpl->set_block('T_setup_main','header','header');
-	$setup_tpl->set_block('applist','appheader','appheader');
-	$setup_tpl->set_block('applist','appitem','appitem');
-	$setup_tpl->set_block('applist','appfooter','appfooter');
-	$setup_tpl->set_block('sqlarr','sqlheader','sqlheader');
-	$setup_tpl->set_block('sqlarr','sqlbody','sqlbody');
-	$setup_tpl->set_block('sqlarr','sqlfooter','sqlfooter');
+	$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+	$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
+	$setup_tpl->set_block('T_setup_main', 'header', 'header');
+	$setup_tpl->set_block('applist', 'appheader', 'appheader');
+	$setup_tpl->set_block('applist', 'appitem', 'appitem');
+	$setup_tpl->set_block('applist', 'appfooter', 'appfooter');
+	$setup_tpl->set_block('sqlarr', 'sqlheader', 'sqlheader');
+	$setup_tpl->set_block('sqlarr', 'sqlbody', 'sqlbody');
+	$setup_tpl->set_block('sqlarr', 'sqlfooter', 'sqlfooter');
 }
 
 $GLOBALS['egw_setup']->loaddb();
 
-function parse_vars($table,$term)
+function parse_vars($table, $term)
 {
 	$GLOBALS['setup_tpl']->set_var('table', $table);
-	$GLOBALS['setup_tpl']->set_var('term',$term);
+	$GLOBALS['setup_tpl']->set_var('term', $term);
 
-	list($arr,$pk,$fk,$ix,$uc) = $GLOBALS['egw_setup']->process->sql_to_array($table);
-	$GLOBALS['setup_tpl']->set_var('arr',$arr);
+	list($arr, $pk, $fk, $ix, $uc) = $GLOBALS['egw_setup']->process->sql_to_array($table);
+	$GLOBALS['setup_tpl']->set_var('arr', $arr);
 
-	foreach(array('pk','fk','ix','uc') as $kind)
+	foreach (array('pk', 'fk', 'ix', 'uc') as $kind)
 	{
-		$GLOBALS['setup_tpl']->set_var($kind.'s',_arr2str($$kind));
+		$GLOBALS['setup_tpl']->set_var($kind.'s', _arr2str($$kind));
 	}
-	unset($pk,$fk,$ix,$uc);
+	unset($pk, $fk, $ix, $uc);
 }
 
 function _arr2str($arr)
 {
-	if(!is_array($arr)) return $arr;
+	if (!is_array($arr)) return $arr;
 
 	$str = '';
-	foreach($arr as $key => $val)
+	foreach ($arr as $key => $val)
 	{
-		if($str) $str .= ',';
+		if ($str) $str .= ',';
 
-		if(!is_int($key))
+		if (!is_int($key))
 		{
 			$str .= "'$key' => ";
 		}
@@ -119,71 +119,71 @@ 
 	$showall  = $_REQUEST['showall'];
 	$apps     = $GLOBALS['apps'] ? $GLOBALS['apps'] : '';
 
-	if($download)
+	if ($download)
 	{
-		$GLOBALS['setup_tpl']->set_var('appname',$appname);
-		$GLOBALS['setup_tpl']->set_var('apps',$apps);
-		$string = $GLOBALS['setup_tpl']->parse('out',$template);
+		$GLOBALS['setup_tpl']->set_var('appname', $appname);
+		$GLOBALS['setup_tpl']->set_var('apps', $apps);
+		$string = $GLOBALS['setup_tpl']->parse('out', $template);
 	}
 	else
 	{
 //			$url = $GLOBALS['appname'] ? 'applications.php' : 'sqltoarray.php';
-		$GLOBALS['setup_tpl']->set_var('appname',$appname);
-		$GLOBALS['setup_tpl']->set_var('lang_download',lang('Download'));
-		$GLOBALS['setup_tpl']->set_var('lang_cancel',lang('Cancel'));
-		$GLOBALS['setup_tpl']->set_var('showall',$showall);
-		$GLOBALS['setup_tpl']->set_var('apps',$apps);
-		$GLOBALS['setup_tpl']->set_var('action_url','sqltoarray.php');
-		$GLOBALS['setup_tpl']->pfp('out',$template);
+		$GLOBALS['setup_tpl']->set_var('appname', $appname);
+		$GLOBALS['setup_tpl']->set_var('lang_download', lang('Download'));
+		$GLOBALS['setup_tpl']->set_var('lang_cancel', lang('Cancel'));
+		$GLOBALS['setup_tpl']->set_var('showall', $showall);
+		$GLOBALS['setup_tpl']->set_var('apps', $apps);
+		$GLOBALS['setup_tpl']->set_var('action_url', 'sqltoarray.php');
+		$GLOBALS['setup_tpl']->pfp('out', $template);
 	}
 	return $string;
 }
 
-function download_handler($dlstring,$fn='tables_current.inc.php')
+function download_handler($dlstring, $fn = 'tables_current.inc.php')
 {
 	Api\Header\Content::type($fn);
 	echo $dlstring;
 	exit;
 }
 
-if($submit || $showall)
+if ($submit || $showall)
 {
 	$dlstring = '';
 	$term = '';
 
-	if(!$download)
+	if (!$download)
 	{
 		$GLOBALS['egw_setup']->html->show_header();
 	}
 
-	if($showall)
+	if ($showall)
 	{
 		$table = $appname = '';
 	}
 
-	if(!$table && !$appname)
+	if (!$table && !$appname)
 	{
 		$term = ',';
 		$dlstring .= printout('sqlheader');
 
 		$GLOBALS['egw_setup']->db->connect();
-		foreach($GLOBALS['egw_setup']->db->Link_ID->MetaTables() as $table)
+		foreach ($GLOBALS['egw_setup']->db->Link_ID->MetaTables() as $table)
 		{
-			parse_vars($table,$term);
+			parse_vars($table, $term);
 			$dlstring .= printout('sqlbody');
 		}
 		$dlstring .= printout('sqlfooter');
 
 	}
-	elseif($appname)
+	elseif ($appname)
 	{
 		$dlstring .= printout('sqlheader');
 		$term = ',';
 
-		if(!$setup_info[$appname]['tables'])
+		if (!$setup_info[$appname]['tables'])
 		{
-			$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
-			if(file_exists($f))
+			$f = EGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php';
+			if (file_exists($f))
 			{
 				include($f);
 			}
@@ -193,28 +193,28 @@ 
 		$tables = $setup_info[$appname]['tables'];
 		$i = 0;
 		$tbls = count($tables);
-		while(list($key,$table) = @each($tables))
+		while (list($key, $table) = @each($tables))
 		{
 			$i++;
-			if($i == $tbls)
+			if ($i == $tbls)
 			{
 				$term = '';
 			}
-			parse_vars($table,$term);
+			parse_vars($table, $term);
 			$dlstring .= printout('sqlbody');
 			/* $i++; */
 		}
 		$dlstring .= printout('sqlfooter');
 	}
-	elseif($table)
+	elseif ($table)
 	{
 		$term = ';';
-		parse_vars($table,$term);
+		parse_vars($table, $term);
 		$dlstring .= printout('sqlheader');
 		$dlstring .= printout('sqlbody');
 		$dlstring .= printout('sqlfooter');
 	}
-	if($download)
+	if ($download)
 	{
 		download_handler($dlstring);
 	}
@@ -223,32 +223,32 @@ 
 {
 	$GLOBALS['egw_setup']->html->show_header();
 
-	$setup_tpl->set_var('action_url','sqltoarray.php');
-	$setup_tpl->set_var('lang_submit','Show selected');
-	$setup_tpl->set_var('lang_showall','Show all');
-	$setup_tpl->set_var('title','SQL to schema_proc array util');
-	$setup_tpl->set_var('lang_applist','Applications');
-	$setup_tpl->set_var('select_to_download_file',lang('Select to download file'));
-	$setup_tpl->pfp('out','appheader');
+	$setup_tpl->set_var('action_url', 'sqltoarray.php');
+	$setup_tpl->set_var('lang_submit', 'Show selected');
+	$setup_tpl->set_var('lang_showall', 'Show all');
+	$setup_tpl->set_var('title', 'SQL to schema_proc array util');
+	$setup_tpl->set_var('lang_applist', 'Applications');
+	$setup_tpl->set_var('select_to_download_file', lang('Select to download file'));
+	$setup_tpl->pfp('out', 'appheader');
 
 	$d = dir(EGW_SERVER_ROOT);
-	while($entry = $d->read())
+	while ($entry = $d->read())
 	{
-		$f = EGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
-		if(file_exists($f))
+		$f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php';
+		if (file_exists($f))
 		{
 			include($f);
 		}
 	}
 
-	while(list($key,$data) = @each($setup_info))
+	while (list($key, $data) = @each($setup_info))
 	{
-		if($data['tables'])
+		if ($data['tables'])
 		{
-			$setup_tpl->set_var('appname',$data['name']);
-			$setup_tpl->set_var('apptitle',$data['title']);
-			$setup_tpl->pfp('out','appitem');
+			$setup_tpl->set_var('appname', $data['name']);
+			$setup_tpl->set_var('apptitle', $data['title']);
+			$setup_tpl->pfp('out', 'appitem');
 		}
 	}
-	$setup_tpl->pfp('out','appfooter');
+	$setup_tpl->pfp('out', 'appfooter');
 }

Braces +8 added lines, -2 removed lines

@@ -96,12 +96,18 @@
 
 function _arr2str($arr)
 {
-	if(!is_array($arr)) return $arr;
+	if(!is_array($arr))
+	{
+		return $arr;
+	}
 
 	$str = '';
 	foreach($arr as $key => $val)
 	{
-		if($str) $str .= ',';
+		if($str)
+		{
+			$str .= ',';
+		}
 
 		if(!is_int($key))
 		{

setup/inc/class.setup_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

Braces +8 added lines, -2 removed lines

@@ -70,7 +70,10 @@ 
 		{
 			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
-		if ($check_only) return lang('Update necessary.');
+		if ($check_only)
+		{
+			return lang('Update necessary.');
+		}
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -119,7 +122,10 @@ 
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();
-		if ($messages && $this->verbose) echo strip_tags($messages)."\n";
+		if ($messages && $this->verbose)
+		{
+			echo strip_tags($messages)."\n";
+		}
 
 		$this->restore_db();
 

setup/inc/class.setup_cmd_admin.inc.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
 	 * @param array $config =array() extra config for the account object: account_repository, ldap_*
 	 * @param string $lang ='en'
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$admin_user=null,$admin_password=null,
-		$admin_firstname=null,$admin_lastname=null,$admin_email=null,array $config=array(),$lang='en')
+	function __construct($domain, $config_user = null, $config_passwd = null, $admin_user = null, $admin_password = null,
+		$admin_firstname = null, $admin_lastname = null, $admin_email = null, array $config = array(), $lang = 'en')
 	{
 		if (!is_array($domain))
 		{
@@ -68,21 +68,21 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only && $this->remote_id)
 		{
-			return true;	// can only check locally
+			return true; // can only check locally
 		}
-		$this->check_installed($this->domain,15);
+		$this->check_installed($this->domain, 15);
 
 		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
 		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
-		if (strpos($this->admin_email,'$') !== false)
+		if (strpos($this->admin_email, '$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(
-				array('$domain','$uid','$account_lid'),
-				array($this->domain,$this->admin_user,$this->admin_user),$this->admin_email);
+				array('$domain', '$uid', '$account_lid'),
+				array($this->domain, $this->admin_user, $this->admin_user), $this->admin_email);
 		}
 		$_POST['username'] = $this->admin_user;
 		$_POST['passwd2']  = $_POST['passwd'] = $this->admin_password;
@@ -99,9 +99,9 @@ 
 		switch ($error)
 		{
 			case 41:
-				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'),41);
+				throw new Api\Exception\WrongUserinput(lang('Error in admin-creation !!!'), 41);
 			case 42:
-				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'),42);
+				throw new Api\Exception\WrongUserinput(lang('Error in group-creation !!!'), 42);
 		}
 		$this->restore_db();
 
@@ -112,13 +112,13 @@ 
 		if (php_sapi_name() !== 'cli' || !file_exists(EGW_SERVER_ROOT.'/stylite') || file_exists(EGW_SERVER_ROOT.'/managementserver'))
 		{
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
+			exec($cmd, $output, $ret);
 		}
-		$output = implode("\n",$output);
+		$output = implode("\n", $output);
 		//echo "ret=$ret\n".$output;
 		if ($ret)
 		{
-			throw new Api\Exception ($output,$ret);
+			throw new Api\Exception($output, $ret);
 		}
 		return lang('Admin account successful created.');
 	}

Braces +8 added lines, -2 removed lines

@@ -76,8 +76,14 @@
 		}
 		$this->check_installed($this->domain,15);
 
-		if (!$this->admin_firstname) $this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
-		if (!$this->admin_lastname) $this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		if (!$this->admin_firstname)
+		{
+			$this->set_defaults['admin_firstname'] = $this->admin_firstname = lang('Admin');
+		}
+		if (!$this->admin_lastname)
+		{
+			$this->set_defaults['admin_lastname'] = $this->admin_lastname = lang('User');
+		}
 		if (strpos($this->admin_email,'$') !== false)
 		{
 			$this->set_defaults['email'] = $this->admin_email = str_replace(

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

@@ -68,91 +68,91 @@
 
 switch($action)
 {
-	case '--version':
-	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
-		break;
-
-	case '--create-header':
-	case '--edit-header':
-	case '--upgrade-header':
-	case '--update-header':
-		do_header($action == '--create-header',$arguments);
-		break;
-
-	case '--install':
-		do_install($arguments);
-		break;
-
-	case '--config':
-		do_config($arguments);
-		break;
-
-	case '--admin':
-		do_admin($arguments[0]);
-		break;
-
-	case '--update':
-		do_update($arguments[0]);
-		break;
-
-	case '--register-hooks':
-	case '--register-all-hooks':
-		do_hooks($arguments[0]);
-		break;
-
-	case '--backup':
-		do_backup($arguments[0]);
-		break;
-
-	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
-		break;
-
-	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
-		break;
-
-	case '--exit-codes':
-		list_exit_codes();
-		break;
-
-	case '--help':
-	case '--usage':
-		do_usage($arguments[0]);
-		break;
-
-	default:
-		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
-		{
-			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+		case '--version':
+		case '--check':
+			setup_cmd::check_installed($arguments[0],0,true);
+			break;
+
+		case '--create-header':
+		case '--edit-header':
+		case '--upgrade-header':
+		case '--update-header':
+			do_header($action == '--create-header',$arguments);
+			break;
+
+		case '--install':
+			do_install($arguments);
+			break;
+
+		case '--config':
+			do_config($arguments);
+			break;
+
+		case '--admin':
+			do_admin($arguments[0]);
+			break;
+
+		case '--update':
+			do_update($arguments[0]);
+			break;
+
+		case '--register-hooks':
+		case '--register-all-hooks':
+			do_hooks($arguments[0]);
+			break;
+
+		case '--backup':
+			do_backup($arguments[0]);
+			break;
+
+		case '--languages':
+			echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+			break;
+
+		case '--charsets':
+			echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+			break;
+
+		case '--exit-codes':
+			list_exit_codes();
+			break;
+
+		case '--help':
+		case '--usage':
+			do_usage($arguments[0]);
+			break;
+
+		default:
+			// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
+			if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
+				is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
-				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
-				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				$args = array();
+				list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
+				foreach($arguments as $arg)
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
-					$args[$name][$sub] = $value;
-				}
-				else
-				{
-					$args[$name] = $value;
+					list($name,$value) = explode('=',$arg,2);
+					if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+					{
+						throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					}
+					if (substr($name,-1) == ']')	// allow 1-dim. arrays
+					{
+						list($name,$sub) = explode('[',substr($name,0,-1),2);
+						$args[$name][$sub] = $value;
+					}
+					else
+					{
+						$args[$name] = $value;
+					}
 				}
+				$cmd = new $class($args);
+				$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
+				if (is_array($msg)) $msg = print_r($msg,true);
+				echo "$msg\n";
+				break;
 			}
-			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
-			echo "$msg\n";
-			break;
-		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+			throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
 }
 exit(0);
 

Braces +69 added lines, -17 removed lines

@@ -15,10 +15,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-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>setup-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 $dry_run = false;
@@ -33,7 +36,11 @@ 
 	}
 	$arguments = $_SERVER['argv'];
 	$action = array_shift($arguments);
-	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0]))
+	{
+		list($_POST['FormDomain']) = explode(',',$arguments[0]);
+	}
+	// header include needs that to detects the right domain
 }
 else
 {
@@ -51,7 +58,10 @@ 
 // check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log
 if (!ini_get('date.timezone'))
 {
-	if (!($tz = date_default_timezone_get())) $tz = 'UTC';
+	if (!($tz = date_default_timezone_get()))
+	{
+		$tz = 'UTC';
+	}
 	echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n";
 	ini_set('date.timezone',$tz);
 }
@@ -132,13 +142,19 @@ 
 			foreach($arguments as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -148,7 +164,10 @@ 
 			}
 			$cmd = new $class($args);
 			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
+			if (is_array($msg))
+			{
+				$msg = print_r($msg,true);
+			}
 			echo "$msg\n";
 			break;
 		}
@@ -164,14 +183,20 @@ 
 function do_config($args)
 {
 	$arg0 = explode(',',array_shift($args));
-	if (!($domain = @array_shift($arg0))) $domain = 'default';
+	if (!($domain = @array_shift($arg0)))
+	{
+		$domain = 'default';
+	}
 	$user = @array_shift($arg0);
 	$password = @array_shift($arg0);
 	_fetch_user_password($user,$password);
 
-	if ($arg0)	// direct assignments (name=value,...) left
+	if ($arg0)
+	{
+		// direct assignments (name=value,...) left
 	{
 		array_unshift($args,implode(',',$arg0));
+	}
 		array_unshift($args,'--config');
 	}
 
@@ -238,9 +263,15 @@ 
 	{
 		$options[0] = $domain;
 
-		if ($quite_check) ob_start();
+		if ($quite_check)
+		{
+			ob_start();
+		}
 		_check_auth_config(implode(',',$options),14);
-		if ($quite_check) ob_end_clean();
+		if ($quite_check)
+		{
+			ob_end_clean();
+		}
 
 		if ($backup == 'no')
 		{
@@ -316,7 +347,10 @@ 
 function _check_auth_config($arg,$stop,$set_lang=true)
 {
 	$options = explode(',',$arg);
-	if (!($domain = array_shift($options))) $domain = 'default';
+	if (!($domain = array_shift($options)))
+	{
+		$domain = 'default';
+	}
 	$user = array_shift($options);
 	$password = array_shift($options);
 	_fetch_user_password($user,$password);
@@ -324,7 +358,10 @@ 
 	setup_cmd::check_installed($domain,$stop,true);
 
 	// reset charset for the output to the charset used by the OS
-	if ($set_lang) $GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	if ($set_lang)
+	{
+		$GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
+	}
 
 	setup_cmd::check_setup_auth($user,$password,$domain);
 
@@ -360,7 +397,10 @@ 
 function _fetch_user_password(&$user,&$password)
 {
 	// read password from enviroment or query it from user, if not given
-	if (!$user) $user = 'admin';
+	if (!$user)
+	{
+		$user = 'admin';
+	}
 	if (!$password && !($password = $_SERVER['EGW_CLI_PASSWORD']))
 	{
 		echo lang('Admin password to header manager').' ';
@@ -406,9 +446,15 @@ 
 		list($code,$language) = explode("\t",$line);
 		$languages[$code] = $language;
 	}
-	if (isset($languages[$lang.'-'.$nation])) return $lang.'-'.$nation;
+	if (isset($languages[$lang.'-'.$nation]))
+	{
+		return $lang.'-'.$nation;
+	}
 
-	if (isset($languages[$lang])) return $lang;
+	if (isset($languages[$lang]))
+	{
+		return $lang;
+	}
 
 	return 'en';
 }
@@ -448,7 +494,10 @@ 
 	if (!$what || $what == 'config')
 	{
 		echo '--config '.lang('domain(default),[config user(admin)],password,[name=value,...] sets config values beside:')."\n";
-		if (!$what) echo '	--help config '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help config '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'config')
 	{
@@ -477,7 +526,10 @@ 
 		echo lang('Create or edit the EGroupware configuration file: header.inc.php:')."\n";
 		echo '--create-header '.lang('header-password[,header-user(admin)]')."\n";
 		echo '--edit-header '.lang('[header-password],[header-user],[new-password],[new-user]')."\n";
-		if (!$what) echo '	--help header '.lang('gives further options')."\n";
+		if (!$what)
+		{
+			echo '	--help header '.lang('gives further options')."\n";
+		}
 	}
 	if ($what == 'header')
 	{

Spacing +89 added lines, -89 removed lines

@@ -13,7 +13,7 @@ 
 
 use EGroupware\Api;
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
 {
@@ -33,7 +33,7 @@ 
 	}
 	$arguments = $_SERVER['argv'];
 	$action = array_shift($arguments);
-	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',',$arguments[0]);	// header include needs that to detects the right domain
+	if (isset($arguments[0])) list($_POST['FormDomain']) = explode(',', $arguments[0]); // header include needs that to detects the right domain
 }
 else
 {
@@ -42,42 +42,42 @@ 
 
 // setting the language from the enviroment
 $_POST['ConfigLang'] = get_lang($charset);
-create_http_enviroment();	// guessing the docroot etc.
+create_http_enviroment(); // guessing the docroot etc.
 
 if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 {
-	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+	ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 }
 // check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log
 if (!ini_get('date.timezone'))
 {
 	if (!($tz = date_default_timezone_get())) $tz = 'UTC';
 	echo "No default timezone (php.ini date.timezone) set, we temporary set '$tz'. You should fix that permanent!\n";
-	ini_set('date.timezone',$tz);
+	ini_set('date.timezone', $tz);
 }
 
 // setting up the $GLOBALS['egw_setup'] object AND including the header.inc.php if it exists
 include('inc/functions.inc.php');
-$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli';	// inc/functions.inc.php does NOT set it
+$GLOBALS['egw_info']['flags']['no_exception_handler'] = 'cli'; // inc/functions.inc.php does NOT set it
 $GLOBALS['egw_setup']->system_charset = $charset;
 
-if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 {
-	throw new Api\Exception\WrongUserinput(lang('You are using PHP version %1. EGroupware now requires %2 or later, recommended is PHP %3.',PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version),98);
+	throw new Api\Exception\WrongUserinput(lang('You are using PHP version %1. EGroupware now requires %2 or later, recommended is PHP %3.', PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, $GLOBALS['egw_setup']->recommended_php_version), 98);
 }
 
-switch($action)
+switch ($action)
 {
 	case '--version':
 	case '--check':
-		setup_cmd::check_installed($arguments[0],0,true);
+		setup_cmd::check_installed($arguments[0], 0, true);
 		break;
 
 	case '--create-header':
 	case '--edit-header':
 	case '--upgrade-header':
 	case '--update-header':
-		do_header($action == '--create-header',$arguments);
+		do_header($action == '--create-header', $arguments);
 		break;
 
 	case '--install':
@@ -106,11 +106,11 @@ 
 		break;
 
 	case '--languages':
-		echo html_entity_decode(file_get_contents('lang/languages'),ENT_COMPAT,'utf-8');
+		echo html_entity_decode(file_get_contents('lang/languages'), ENT_COMPAT, 'utf-8');
 		break;
 
 	case '--charsets':
-		echo html_entity_decode(implode("\n",$GLOBALS['egw_setup']->translation->get_charsets(false)),ENT_COMPAT,'utf-8')."\n";
+		echo html_entity_decode(implode("\n", $GLOBALS['egw_setup']->translation->get_charsets(false)), ENT_COMPAT, 'utf-8')."\n";
 		break;
 
 	case '--exit-codes':
@@ -124,21 +124,21 @@ 
 
 	default:
 		// we allow to call admin_cmd classes directly, if they define the constant SETUP_CLI_CALLABLE
-		if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
-			is_subclass_of($class,'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
+		if (substr($action, 0, 2) == '--' && class_exists($class = str_replace('-', '_', substr($action, 2))) &&
+			is_subclass_of($class, 'admin_cmd') && @constant($class.'::SETUP_CLI_CALLABLE'))
 		{
 			$args = array();
-			list($args['domain']) = explode(',', array_shift($arguments));	// domain must be first argument, to ensure right domain get's selected in header-include
-			foreach($arguments as $arg)
+			list($args['domain']) = explode(',', array_shift($arguments)); // domain must be first argument, to ensure right domain get's selected in header-include
+			foreach ($arguments as $arg)
 			{
-				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				list($name, $value) = explode('=', $arg, 2);
+				if (property_exists('admin_cmd', $name))		// dont allow to overwrite admin_cmd properties
 				{
-					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
+					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!", $arg), 90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				if (substr($name, -1) == ']')	// allow 1-dim. arrays
 				{
-					list($name,$sub) = explode('[',substr($name,0,-1),2);
+					list($name, $sub) = explode('[', substr($name, 0, -1), 2);
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -147,12 +147,12 @@ 
 				}
 			}
 			$cmd = new $class($args);
-			$msg = $cmd->run($time=null, $set_modifier=true, $skip_checks=false, $check_only=$dry_run);
-			if (is_array($msg)) $msg = print_r($msg,true);
+			$msg = $cmd->run($time = null, $set_modifier = true, $skip_checks = false, $check_only = $dry_run);
+			if (is_array($msg)) $msg = print_r($msg, true);
 			echo "$msg\n";
 			break;
 		}
-		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$action),90);
+		throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!", $action), 90);
 }
 exit(0);
 
@@ -163,19 +163,19 @@ 
  */
 function do_config($args)
 {
-	$arg0 = explode(',',array_shift($args));
+	$arg0 = explode(',', array_shift($args));
 	if (!($domain = @array_shift($arg0))) $domain = 'default';
 	$user = @array_shift($arg0);
 	$password = @array_shift($arg0);
-	_fetch_user_password($user,$password);
+	_fetch_user_password($user, $password);
 
 	if ($arg0)	// direct assignments (name=value,...) left
 	{
-		array_unshift($args,implode(',',$arg0));
-		array_unshift($args,'--config');
+		array_unshift($args, implode(',', $arg0));
+		array_unshift($args, '--config');
 	}
 
-	$cmd = new setup_cmd_config($domain,$user,$password,$args,true);
+	$cmd = new setup_cmd_config($domain, $user, $password, $args, true);
 	echo $cmd->run()."\n\n";
 
 	$cmd->get_config(true);
@@ -188,8 +188,8 @@ 
  */
 function do_hooks($arg)
 {
-	list($domain,$user,$password) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
@@ -197,9 +197,9 @@ 
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
 
-	foreach(array_keys($domains) as $domain)
+	foreach (array_keys($domains) as $domain)
 	{
-		$cmd = new setup_cmd_hooks($domain,$user,$password);
+		$cmd = new setup_cmd_hooks($domain, $user, $password);
 		echo "$domain: ".$cmd->run()."\n";
 	}
 	echo "\n";
@@ -212,10 +212,10 @@ 
  */
 function do_admin($arg)
 {
-	list($domain,$user,$password,$admin,$pw,$first,$last,$email,$lang) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $admin, $pw, $first, $last, $email, $lang) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
-	$cmd = new setup_cmd_admin($domain,$user,$password,$admin,$pw,$first,$last,$email,array(),$lang);
+	$cmd = new setup_cmd_admin($domain, $user, $password, $admin, $pw, $first, $last, $email, array(), $lang);
 	echo $cmd->run()."\n";
 }
 
@@ -225,21 +225,21 @@ 
  * @param string $arg domain(all),[config user(admin)],password,[backup-file, 'no' for no backup or empty for default name]
  * @param boolean $quite_check quiten the call to _check_auth_config
  */
-function do_backup($arg,$quite_check=false)
+function do_backup($arg, $quite_check = false)
 {
-	list($domain,,,$backup) = $options = explode(',',$arg);
+	list($domain,,, $backup) = $options = explode(',', $arg);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
 	{
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
-	foreach(array_keys($domains) as $domain)
+	foreach (array_keys($domains) as $domain)
 	{
 		$options[0] = $domain;
 
 		if ($quite_check) ob_start();
-		_check_auth_config(implode(',',$options),14);
+		_check_auth_config(implode(',', $options), 14);
 		if ($quite_check) ob_end_clean();
 
 		if ($backup == 'no')
@@ -257,7 +257,7 @@ 
 			}
 			else	// backup failed ==> dont start the upgrade
 			{
-				throw new Api\Exception\WrongUserinput(lang('Backup failed').': '.$f,50);
+				throw new Api\Exception\WrongUserinput(lang('Backup failed').': '.$f, 50);
 			}
 		}
 	}
@@ -270,31 +270,31 @@ 
  */
 function do_update($arg)
 {
-	list($domain,$user,$password,$backup,$app) = explode(',',$arg);
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $backup, $app) = explode(',', $arg);
+	_fetch_user_password($user, $password);
 
 	$domains = $GLOBALS['egw_domain'];
 	if ($domain && $domain != 'all')
 	{
 		$domains = array($domain => $GLOBALS['egw_domain'][$domain]);
 	}
-	foreach($domains as $domain => $data)
+	foreach ($domains as $domain => $data)
 	{
 		$arg = "$domain,$user,$password,$backup";
 
-		_check_auth_config($arg,14);
+		_check_auth_config($arg, 14);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$app || !in_array($app, setup_cmd::$apps_to_install) && !in_array($app, setup_cmd::$apps_to_upgrade)) &&
 			!setup_cmd::check_autoinstall())
 		{
-			echo lang('No update necessary, domain %1(%2) is up to date.',$domain,$data['db_type'])."\n";
+			echo lang('No update necessary, domain %1(%2) is up to date.', $domain, $data['db_type'])."\n";
 		}
 		else
 		{
-			do_backup($arg,true);
+			do_backup($arg, true);
 
-			$cmd = new setup_cmd_update($domain,$user,$password,$backup,false,$app);
+			$cmd = new setup_cmd_update($domain, $user, $password, $backup, false, $app);
 			echo $cmd->run()."\n";
 		}
 	}
@@ -313,20 +313,20 @@ 
  * @param boolean $set_lang =true set our charset, overwriting the charset of the EGw installation, default true
  * @return array with unprocessed arguments from $arg
  */
-function _check_auth_config($arg,$stop,$set_lang=true)
+function _check_auth_config($arg, $stop, $set_lang = true)
 {
-	$options = explode(',',$arg);
+	$options = explode(',', $arg);
 	if (!($domain = array_shift($options))) $domain = 'default';
 	$user = array_shift($options);
 	$password = array_shift($options);
-	_fetch_user_password($user,$password);
+	_fetch_user_password($user, $password);
 
-	setup_cmd::check_installed($domain,$stop,true);
+	setup_cmd::check_installed($domain, $stop, true);
 
 	// reset charset for the output to the charset used by the OS
 	if ($set_lang) $GLOBALS['egw_setup']->system_charset = $GLOBALS['charset'];
 
-	setup_cmd::check_setup_auth($user,$password,$domain);
+	setup_cmd::check_setup_auth($user, $password, $domain);
 
 	return $options;
 }
@@ -338,16 +338,16 @@ 
  */
 function do_install($args)
 {
-	list($domain,$user,$password,$backup,$charset,$lang) = explode(',',array_shift($args));
-	_fetch_user_password($user,$password);
+	list($domain, $user, $password, $backup, $charset, $lang) = explode(',', array_shift($args));
+	_fetch_user_password($user, $password);
 
 	$config = array();
-	foreach($args as $arg)
+	foreach ($args as $arg)
 	{
-		list($name,$value) = explode('=',$arg,2);
+		list($name, $value) = explode('=', $arg, 2);
 		$config[$name] = $value;
 	}
-	$cmd = new setup_cmd_install($domain,$user,$password,$backup,$charset,true,$config,$lang);
+	$cmd = new setup_cmd_install($domain, $user, $password, $backup, $charset, true, $config, $lang);
 	echo $cmd->run()."\n";
 }
 
@@ -357,14 +357,14 @@ 
  * @param string &$user
  * @param string &$password
  */
-function _fetch_user_password(&$user,&$password)
+function _fetch_user_password(&$user, &$password)
 {
 	// read password from enviroment or query it from user, if not given
 	if (!$user) $user = 'admin';
 	if (!$password && !($password = $_SERVER['EGW_CLI_PASSWORD']))
 	{
 		echo lang('Admin password to header manager').' ';
-		$password = trim(fgets($f = fopen('php://stdin','rb')));
+		$password = trim(fgets($f = fopen('php://stdin', 'rb')));
 		fclose($f);
 	}
 }
@@ -376,18 +376,18 @@ 
  * @param array $arguments
  * @return int
  */
-function do_header($create,&$arguments)
+function do_header($create, &$arguments)
 {
 	if (!$create)
 	{
 		// read password from enviroment or query it from user, if not given
-		$options = explode(',',@$arguments[0]);
-		_fetch_user_password($options[1],$options[0]);
-		$arguments[0] = implode(',',$options);
+		$options = explode(',', @$arguments[0]);
+		_fetch_user_password($options[1], $options[0]);
+		$arguments[0] = implode(',', $options);
 	}
-	array_unshift($arguments,$create ? '--create-header' : '--edit-header');
+	array_unshift($arguments, $create ? '--create-header' : '--edit-header');
 
-	$cmd = new setup_cmd_header($create?'create':'edit',$arguments);
+	$cmd = new setup_cmd_header($create ? 'create' : 'edit', $arguments);
 	echo $cmd->run()."\n";
 }
 
@@ -399,11 +399,11 @@ 
  */
 function get_lang(&$charset)
 {
-	@list($lang,$nation,$charset) = preg_split("/[_.]/",strtolower($_SERVER['LANG']));
+	@list($lang, $nation, $charset) = preg_split("/[_.]/", strtolower($_SERVER['LANG']));
 
-	foreach(file('lang/languages') as $line)
+	foreach (file('lang/languages') as $line)
 	{
-		list($code,$language) = explode("\t",$line);
+		list($code, $language) = explode("\t", $line);
 		$languages[$code] = $language;
 	}
 	if (isset($languages[$lang.'-'.$nation])) return $lang.'-'.$nation;
@@ -420,13 +420,13 @@ 
 {
 	$_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-	foreach(array('httpsdocs','httpdocs','htdocs','html','www') as $docroottop)
+	foreach (array('httpsdocs', 'httpdocs', 'htdocs', 'html', 'www') as $docroottop)
 	{
-		$parts = explode($docroottop,__FILE__);
+		$parts = explode($docroottop, __FILE__);
 		if (count($parts) == 2)
 		{
 			$_SERVER['DOCUMENT_ROOT'] = $parts[0].$docroottop;
-			$_SERVER['PHP_SELF'] = str_replace('\\','/',$parts[1]);
+			$_SERVER['PHP_SELF'] = str_replace('\\', '/', $parts[1]);
 			break;
 		}
 	}
@@ -436,9 +436,9 @@ 
 /**
  * Echos usage message
  */
-function do_usage($what='')
+function do_usage($what = '')
 {
-	echo lang('Usage: %1 command [additional options]',basename($_SERVER['argv'][0]))."\n\n";
+	echo lang('Usage: %1 command [additional options]', basename($_SERVER['argv'][0]))."\n\n";
 
 	if (!$what)
 	{
@@ -453,7 +453,7 @@ 
 	if ($what == 'config')
 	{
 		echo '	--files-dir, --backup-dir, --temp-dir '.lang('path to various directories: have to exist and be writeable by the webserver')."\n";
-		echo '	--webserver-url '.lang('eg. /egroupware or http://domain.com/egroupware, default: %1',str_replace('/setup/setup-cli.php','',$_SERVER['PHP_SELF']))."\n";
+		echo '	--webserver-url '.lang('eg. /egroupware or http://domain.com/egroupware, default: %1', str_replace('/setup/setup-cli.php', '', $_SERVER['PHP_SELF']))."\n";
 		echo '	--mailserver '.lang('host,port(143),[domain],[{standard(default)|vmailmgr = add domain for mailserver login}]').',[starttls|ssl|tls]'."\n";
 		echo '	--smtpserver '.lang('host,[smtp port],[smtp user],[smtp password],[auth session user/pw=yes|no],[starttls|ssl|tls],[account user editable=yes|no],[further identities=yes|no]')."\n";
 		echo '	--smtp '.lang('MTA (with LDAP): [yes(user edit forwarding)],emailadmin_smtp(|_sql|_ldap|_ads|_qmail|_mandriva|_dbmailuser|_suse)')."\n";
@@ -504,13 +504,13 @@ 
 		echo '--charsets '.lang('charsets used by the different languages')."\n";
 		echo '--exit-codes '.lang('all exit codes of the command line interface')."\n";
 	}
-	if (!$what || !in_array($what,array('config','header','list')))
+	if (!$what || !in_array($what, array('config', 'header', 'list')))
 	{
 		echo '--help [config|header|list] '.lang('gives further options')."\n";
 	}
 }
 
-function fail($exit_code,$message)
+function fail($exit_code, $message)
 {
 	echo $message."\n";
 	exit($exit_code);
@@ -526,40 +526,40 @@ 
  */
 function list_exit_codes()
 {
-	error_reporting(error_reporting() & ~E_NOTICE);
+	error_reporting(error_reporting()&~E_NOTICE);
 
 	$codes = array('Ok');
 	$setup_dir = EGW_SERVER_ROOT.'/setup/';
 	//$files = array('setup-cli.php');
-	foreach(scandir($setup_dir.'/inc') as $file)
+	foreach (scandir($setup_dir.'/inc') as $file)
 	{
-		if (substr($file,0,strlen('class.setup_cmd')) == 'class.setup_cmd')
+		if (substr($file, 0, strlen('class.setup_cmd')) == 'class.setup_cmd')
 		{
 			$files[] = 'inc/'.$file;
 		}
 	}
-	foreach($files as $file)
+	foreach ($files as $file)
 	{
 		$content = file_get_contents($setup_dir.'/'.$file);
 
 		$matches = null;
-		if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m',$content,$matches))
+		if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m', $content, $matches))
 		{
 			//echo $file.":\n"; print_r($matches);
-			foreach($matches[3] as $key => $code)
+			foreach ($matches[3] as $key => $code)
 			{
 				//if (isset($codes[$code])) echo "$file redifines #$code: {$codes[$code]}\n";
 
-				$src = preg_replace('/self::\$[a-z_>-]+/i', "''", $matches[2][$key]);	// gives fatal error otherwise
-				@eval($src='$codes['.$code.'] = '.$src.';');
+				$src = preg_replace('/self::\$[a-z_>-]+/i', "''", $matches[2][$key]); // gives fatal error otherwise
+				@eval($src = '$codes['.$code.'] = '.$src.';');
 				//echo "- codes[$code] => '{$codes[$code]}'\n";
 			}
 			//echo $file.":\n"; print_r($codes);
 		}
 	}
-	ksort($codes,SORT_NUMERIC);
-	foreach($codes as $num => $msg)
+	ksort($codes, SORT_NUMERIC);
+	foreach ($codes as $num => $msg)
 	{
-		echo $num."\t".str_replace("\n","\n\t",$msg)."\n";
+		echo $num."\t".str_replace("\n", "\n\t", $msg)."\n";
 	}
 }