EGroupware / egroupware

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

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	'flags' => array(
 		'currentapp' => 'api',
 		'noheader' => true,
-		'load_translations' => false,	// do not automatically load translations
+		'load_translations' => false, // do not automatically load translations
 		'nocachecontrol' => true,
 	)
 );
@@ -39,10 +39,10 @@ 
 }
 
 // use an etag with app, lang and a hash over the creation-times of all lang-files
-$etag = '"'.$_GET['app'].'-'.$_GET['lang'].'-'.  Api\Translation::etag($_GET['app'], $_GET['lang']).'"';
+$etag = '"'.$_GET['app'].'-'.$_GET['lang'].'-'.Api\Translation::etag($_GET['app'], $_GET['lang']).'"';
 
 // headers to allow caching, we specify etag on url to force reload, even with Expires header
-Api\Session::cache_control(864000);	// cache for 10 days
+Api\Session::cache_control(864000); // cache for 10 days
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -64,7 +64,7 @@ 
 $content = 'egw.set_lang_arr("'.$_GET['app'].'", '.str_replace('\\\\n', '\\n', json_encode(Api\Translation::$lang_arr)).', egw && egw.window !== window);';
 
 // 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 +8 added lines, -2 removed lines

@@ -14,8 +14,14 @@
 use EGroupware\Api;
 
 // just to be sure, noone tries something nasty ...
-if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app'])) die('No valid application-name given!');
-if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang'])) die('No valid lang-name given!');
+if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app']))
+{
+	die('No valid application-name given!');
+}
+if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang']))
+{
+	die('No valid lang-name given!');
+}
 
 // switch evtl. set output-compression off, as we cant calculate a Content-Length header with transparent compression
 ini_set('zlib.output_compression', 0);

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

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 // if we are NOT called as part of an update script, behave like a regular setup script
 if (!isset($GLOBALS['egw_setup']) || !is_object($GLOBALS['egw_setup']))
 {
-	$diagnostics = 1;	// can be set to 0=non, 1=some (default for now), 2=all
+	$diagnostics = 1; // can be set to 0=non, 1=some (default for now), 2=all
 
 	include('./inc/functions.inc.php');
 	// Authorize the user to use setup app and load the database
@@ -25,50 +25,50 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+	$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 	$setup_tpl->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$GLOBALS['egw_setup']->html->show_header('',False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header('', False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 	echo '<h3>'.'Fix mysql DB to match the eGroupWare system_charset'."</h3>\n";
 	$running_standalone = true;
 }
-$db =& $GLOBALS['egw_setup']->db;
-$charset2mysql =& $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
+$db = & $GLOBALS['egw_setup']->db;
+$charset2mysql = & $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
 $mysql2charset = array_flip($charset2mysql);
 
 $ServerInfo = $db->Link_ID->ServerInfo();
-$db_version = (float) $ServerInfo['version'];
+$db_version = (float)$ServerInfo['version'];
 
 if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
 
-if (substr($db->Type,0,5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
+if (substr($db->Type, 0, 5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
 	$GLOBALS['egw_setup']->system_charset != $GLOBALS['egw_setup']->db_charset_was)
 {
 	$tables_modified = 'no';
 
 	$tables = array();
-	$db->query("SHOW TABLE STATUS",__LINE__,__FILE__);
+	$db->query("SHOW TABLE STATUS", __LINE__, __FILE__);
 	while (($row = $db->row(true)))
 	{
 		$tables[$row['Name']] = $row['Collation'];
 	}
-	foreach($tables as $table => $collation)
+	foreach ($tables as $table => $collation)
 	{
 		$columns = array();
-		$db->query("SHOW FULL FIELDS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW FULL FIELDS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			$columns[] = $row;
 		}
 		//echo $table; _debug_array($columns);
 		$fulltext = $fulltext_back = array();
-		$db->query("SHOW KEYS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW KEYS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			if ($row['Index_type'] == 'FULLTEXT')
 			{
@@ -77,12 +77,12 @@ 
 		}
 
 		$alter_table = $alter_table_back = array();
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i',$column['Type'],$matches))
+			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i', $column['Type'], $matches))
 			{
-				list(,$type,$size) = $matches;
-				list($charset) = explode('_',$column['Collation']);
+				list(,$type, $size) = $matches;
+				list($charset) = explode('_', $column['Collation']);
 
 				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 
@@ -97,7 +97,7 @@ 
 					}
 					else
 					{
-						$bintype = str_replace('text','blob',$type);
+						$bintype = str_replace('text', 'blob', $type);
 					}
 					//echo "<p>$table.$col $type CHARACTER SET $charset $default $null</p>\n";
 
@@ -108,7 +108,7 @@ 
 					{
 						$idx_name = $fulltext[$col];
 						$idx_cols = array();
-						foreach($fulltext as $c => $i)
+						foreach ($fulltext as $c => $i)
 						{
 							if ($i == $idx_name)
 							{
@@ -124,7 +124,7 @@ 
 				}
 			}
 		}
-		list($charset) = explode('_',$collation);
+		list($charset) = explode('_', $collation);
 		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
@@ -132,26 +132,26 @@ 
 		}
 		if (count($alter_table))
 		{
-			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
+			$alter_table = "ALTER TABLE $table\n".implode(",\n", $alter_table);
 
 			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
-			if (!$db->query($alter_table,__LINE__,__FILE__))
+			if (!$db->query($alter_table, __LINE__, __FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
 				echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
 				echo "<p>continuing ...</p>\n";
 				continue;
 			}
-			foreach($fulltext_back as $idx_name => $idx_cols)
+			foreach ($fulltext_back as $idx_name => $idx_cols)
 			{
-				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`',$idx_cols)."`)";
+				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`', $idx_cols)."`)";
 			}
 			if (count($alter_table_back))
 			{
-				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
+				$alter_table_back = "ALTER TABLE $table\n".implode(",\n", $alter_table_back);
 
 				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
-				if (!$db->query($alter_table_back,__LINE__,__FILE__))
+				if (!$db->query($alter_table_back, __LINE__, __FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
 					echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
@@ -163,13 +163,13 @@ 
 		}
 	}
 	// change the default charset of the DB
-	$db->query("SHOW CREATE DATABASE `$db->Database`",__LINE__,__FILE__);
+	$db->query("SHOW CREATE DATABASE `$db->Database`", __LINE__, __FILE__);
 	$create_db = $db->next_record() ? $db->f(1) : '';
-	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
+	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i', $create_db, $matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
 		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
-		$db->query($alter_db,__LINE__,__FILE__);
+		$db->query($alter_db, __LINE__, __FILE__);
 	}
 }
 if ($running_standalone || $_REQUEST['debug'])

Braces +33 added lines, -9 removed lines

@@ -41,7 +41,10 @@ 
 $ServerInfo = $db->Link_ID->ServerInfo();
 $db_version = (float) $ServerInfo['version'];
 
-if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
+if ($running_standalone || $_REQUEST['debug'])
+{
+	echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
+}
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
@@ -84,15 +87,21 @@ 
 				list(,$type,$size) = $matches;
 				list($charset) = explode('_',$column['Collation']);
 
-				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
+				if (isset($mysql2charset[$charset]))
+				{
+					$charset = $mysql2charset[$charset];
+				}
 
 				if ($charset != $GLOBALS['egw_setup']->system_charset)
 				{
 					$col = $column['Field'];
 
-					if ($type == 'varchar' || $type == 'char')	// old schema_proc (pre 1.0.1) used also char
+					if ($type == 'varchar' || $type == 'char')
+					{
+						// old schema_proc (pre 1.0.1) used also char
 					{
 						$type = 'varchar('.$size.')';
+					}
 						$bintype = 'varbinary('.$size.')';
 					}
 					else
@@ -125,7 +134,10 @@ 
 			}
 		}
 		list($charset) = explode('_',$collation);
-		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
+		if (isset($mysql2charset[$charset]))
+		{
+			$charset = $mysql2charset[$charset];
+		}
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
 			$alter_table[] = " DEFAULT CHARACTER SET $mysql_system_charset";
@@ -134,7 +146,10 @@ 
 		{
 			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
 
-			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
+			if ($running_standalone || $_REQUEST['debug'])
+			{
+				echo '<p>'.nl2br($alter_table)."</p>\n";
+			}
 			if (!$db->query($alter_table,__LINE__,__FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
@@ -150,7 +165,10 @@ 
 			{
 				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
 
-				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
+				if ($running_standalone || $_REQUEST['debug'])
+				{
+					echo '<p>'.nl2br($alter_table_back)."</p>\n";
+				}
 				if (!$db->query($alter_table_back,__LINE__,__FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
@@ -168,7 +186,10 @@ 
 	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
-		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
+		if ($running_standalone || $_REQUEST['debug'])
+		{
+			echo '<p>'.$alter_db."</p>\n";
+		}
 		$db->query($alter_db,__LINE__,__FILE__);
 	}
 }
@@ -176,5 +197,8 @@ 
 {
 	echo "<p>$tables_modified tables changed to our system_charset {$GLOBALS['egw_setup']->system_charset}($mysql_system_charset)</p>\n";
 
-	if ($running_standalone) $GLOBALS['egw_setup']->html->show_footer();
-}
+	if ($running_standalone)
+	{
+		$GLOBALS['egw_setup']->html->show_footer();
+	}
+	}

setup/manageheader.php

Spacing +54 added lines, -54 removed lines

@@ -18,7 +18,7 @@ 
 require_once('./inc/class.setup_header.inc.php');
 $GLOBALS['egw_setup']->header = new setup_header();
 
-$setup_tpl = new Framework\Template('./templates/default', 'keep');	// 'keep' to keep our {hash} prefix of passwords
+$setup_tpl = new Framework\Template('./templates/default', 'keep'); // 'keep' to keep our {hash} prefix of passwords
 $setup_tpl->set_file(array(
 	'T_head' => 'head.tpl',
 	'T_footer' => 'footer.tpl',
@@ -27,10 +27,10 @@ 
 	'T_login_stage_header' => 'login_stage_header.tpl',
 	'T_setup_manage' => 'manageheader.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_manage','manageheader','manageheader');
-$setup_tpl->set_block('T_setup_manage','domain','domain');
+$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_manage', 'manageheader', 'manageheader');
+$setup_tpl->set_block('T_setup_manage', 'domain', 'domain');
 
 $setup_tpl->set_var(array(
 	'lang_select' => '',
@@ -44,13 +44,13 @@ 
 
 if ($GLOBALS['egw_info']['setup']['stage']['header'] > 2 && !$GLOBALS['egw_setup']->auth('Header'))
 {
-	$GLOBALS['egw_setup']->html->show_header('Please login',True);
+	$GLOBALS['egw_setup']->html->show_header('Please login', True);
 	$GLOBALS['egw_setup']->html->login_form();
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
 }
 // Detect current mode
-switch($GLOBALS['egw_info']['setup']['stage']['header'])
+switch ($GLOBALS['egw_info']['setup']['stage']['header'])
 {
 	case '1':
 		$GLOBALS['egw_info']['setup']['HeaderFormMSG'] = lang('Create your header.inc.php');
@@ -86,7 +86,7 @@ 
 }
 if (isset($_POST['setting']))	// Post of the header-form
 {
-	$validation_errors = check_header_form();	// validate the submitted form
+	$validation_errors = check_header_form(); // validate the submitted form
 }
 if (!isset($_POST['action']) || $validation_errors)	// generate form to edit the header
 {
@@ -94,25 +94,25 @@ 
 }
 else
 {
-	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'],$GLOBALS['egw_domain']);
+	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'], $GLOBALS['egw_domain']);
 
 	list($action) = @each($_POST['action']);
-	switch($action)
+	switch ($action)
 	{
 		case 'download':
-			Api\Header\Content::type('header.inc.php','application/octet-stream');
+			Api\Header\Content::type('header.inc.php', 'application/octet-stream');
 			echo $newheader;
 			break;
 
 		case 'view':
 			$GLOBALS['egw_setup']->html->show_header('Generated header.inc.php', False, 'header');
 			echo '<table width="90%"><tr><td>';
-			echo '<br />' . lang('Save this text as contents of your header.inc.php') . '<br /><hr />';
+			echo '<br />'.lang('Save this text as contents of your header.inc.php').'<br /><hr />';
 			echo "<pre>\n";
 			echo htmlentities($newheader);
 			echo "\n</pre><hr />\n";
 			echo '<form action="index.php" method="post">';
-			echo '<br />' . lang('After retrieving the file, put it into place as the header.inc.php.  Then, click "continue".') . '<br />';
+			echo '<br />'.lang('After retrieving the file, put it into place as the header.inc.php.  Then, click "continue".').'<br />';
 			echo '<input type="hidden" name="FormLogout" value="header" />';
 			echo '<input type="submit" name="junk" value="'.lang('Continue').'" />';
 			echo '</form>';
@@ -122,13 +122,13 @@ 
 
 		case 'write':
 			if ((is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../')) &&
-				($f = fopen('../header.inc.php','wb')))
+				($f = fopen('../header.inc.php', 'wb')))
 			{
-				fwrite($f,$newheader);
+				fwrite($f, $newheader);
 				fclose($f);
 				$GLOBALS['egw_setup']->html->show_header('Saved header.inc.php', False, 'header');
 				echo '<form action="index.php" method="post">';
-					echo '<br />' . lang('Created header.inc.php!');
+					echo '<br />'.lang('Created header.inc.php!');
 				echo '<input type="hidden" name="FormLogout" value="header" />';
 				echo '<input type="submit" name="junk" value="'.lang('Continue').'" />';
 				echo '</form>';
@@ -138,8 +138,8 @@ 
 			else
 			{
 				$GLOBALS['egw_setup']->html->show_header('Error generating header.inc.php', False, 'header');
-				echo lang('Could not open header.inc.php for writing!') . '<br />' . "\n";
-				echo lang('Please check read/write permissions on directories, or back up and use another option.') . '<br />';
+				echo lang('Could not open header.inc.php for writing!').'<br />'."\n";
+				echo lang('Please check read/write permissions on directories, or back up and use another option.').'<br />';
 				$GLOBALS['egw_setup']->html->show_footer();
 			}
 			break;
@@ -154,11 +154,11 @@ 
 function check_header_form()
 {
 	// setting the non-domain settings from the posted content
-	foreach($_POST['setting'] as $name => $value)
+	foreach ($_POST['setting'] as $name => $value)
 	{
 		if (get_magic_quotes_gpc()) $value = stripslashes($value);
 
-		switch($name)
+		switch ($name)
 		{
 			case 'show_domain_selectbox':
 			case 'mcrypt_enabled':
@@ -175,7 +175,7 @@ 
 	}
 
 	// setting the domain settings from the posted content
-	foreach($_POST['domains'] as $key => $domain)
+	foreach ($_POST['domains'] as $key => $domain)
 	{
 		if ($_POST['deletedomain'][$key])
 		{
@@ -184,7 +184,7 @@ 
 			continue;
 		}
 
-		foreach($_POST['setting_'.$key] as $name => $value)
+		foreach ($_POST['setting_'.$key] as $name => $value)
 		{
 			if (get_magic_quotes_gpc()) $value = stripslashes($value);
 
@@ -218,20 +218,20 @@ 
 
 	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['HeaderFormMSG'], False, 'header');
 
-	if(empty($_REQUEST['ConfigLang']))
+	if (empty($_REQUEST['ConfigLang']))
 	{
-		$setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True,'en')."</form></td></tr>");
+		$setup_tpl->set_var('lang_select', '<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True, 'en')."</form></td></tr>");
 	}
 
-	$setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']);
+	$setup_tpl->set_var('pagemsg', $GLOBALS['egw_info']['setup']['PageMSG']);
 
 	// checking required PHP version
-	if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+	if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 	{
-		$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
+		$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'], True);
 		$GLOBALS['egw_setup']->html->show_alert_msg('Error',
 			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));
+			PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, $GLOBALS['egw_setup']->recommended_php_version));
 		$GLOBALS['egw_setup']->html->show_footer();
 		exit;
 	}
@@ -249,33 +249,33 @@ 
 		exit;
 	}
 	$js_default_db_ports = 'var default_db_ports = new Array();'."\n";
-	foreach($GLOBALS['egw_setup']->header->default_db_ports as $db => $port)
+	foreach ($GLOBALS['egw_setup']->header->default_db_ports as $db => $port)
 	{
 		$js_default_db_ports .= '  default_db_ports["'.$db.'"]="'.$port.'";'."\n";
 	}
-	$setup_tpl->set_var('js_default_db_ports',$js_default_db_ports);
+	$setup_tpl->set_var('js_default_db_ports', $js_default_db_ports);
 
-	if ($validation_errors) $setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	if ($validation_errors) $setup_tpl->set_var('detected', '<ul><li>'.implode("</li>\n<li>", $validation_errors)."</li>\n</ul>\n");
 
 	if ($_POST['adddomain'])
 	{
 		$GLOBALS['egw_domain'][lang('new')] = $GLOBALS['egw_setup']->header->domain_defaults(
 			$GLOBALS['egw_info']['server']['header_admin_user'],
-			$GLOBALS['egw_info']['server']['header_admin_password'],$supported_db);
+			$GLOBALS['egw_info']['server']['header_admin_password'], $supported_db);
 	}
 	// show the non-domain settings
 	//echo "<pre>".print_r($GLOBALS['egw_info']['server'],true)."</pre>\n";
-	foreach($GLOBALS['egw_info']['server'] as $name => $value)
+	foreach ($GLOBALS['egw_info']['server'] as $name => $value)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'db_persistent':
 			case 'show_domain_selectbox':
 			case 'mcrypt_enabled':
-				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'),' selected="selected"');
+				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'), ' selected="selected"');
 				break;
 			default:
-				if (!is_array($value)) $setup_tpl->set_var($name,htmlspecialchars($value));
+				if (!is_array($value)) $setup_tpl->set_var($name, htmlspecialchars($value));
 				break;
 		}
 	}
@@ -284,48 +284,48 @@ 
 	);
 	if ($GLOBALS['egw_info']['server']['session_handler'] && !isset($supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']]))
 	{
-		$supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']] = lang("Custom handler: %1",$GLOBALS['egw_info']['server']['session_handler']);
+		$supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']] = lang("Custom handler: %1", $GLOBALS['egw_info']['server']['session_handler']);
 	}
 	$options = array();
-	foreach($supported_session_handler as $type => $label)
+	foreach ($supported_session_handler as $type => $label)
 	{
-		$options[] = '<option ' . ($type == $GLOBALS['egw_info']['server']['session_handler'] ?
-			'selected="selected" ' : '') . 'value="' . $type . '">' . $label . '</option>';
+		$options[] = '<option '.($type == $GLOBALS['egw_info']['server']['session_handler'] ?
+			'selected="selected" ' : '').'value="'.$type.'">'.$label.'</option>';
 	}
-	$setup_tpl->set_var('session_options',implode("\n",$options));
+	$setup_tpl->set_var('session_options', implode("\n", $options));
 
 	// showing the settings of all domains
-	foreach($GLOBALS['egw_domain'] as $domain => $data)
+	foreach ($GLOBALS['egw_domain'] as $domain => $data)
 	{
-		$setup_tpl->set_var('db_domain',htmlspecialchars($domain));
-		foreach($data as $name => $value)
+		$setup_tpl->set_var('db_domain', htmlspecialchars($domain));
+		foreach ($data as $name => $value)
 		{
 			if ($name == 'db_port' && !$value)	// Set default here if the admin didn't set a port yet
 			{
 				$value = $GLOBALS['egw_setup']->header->default_db_ports[$data['db_type']];
 			}
-			$setup_tpl->set_var($name,htmlspecialchars($value));
+			$setup_tpl->set_var($name, htmlspecialchars($value));
 		}
 		$dbtype_options = '';
-		foreach($supported_db as $db)
+		foreach ($supported_db as $db)
 		{
-			$dbtype_options .= '<option ' . ($db == $data['db_type'] ? 'selected="selected" ' : '').
-				'value="' . $db . '">' . $GLOBALS['egw_setup']->header->db_fullnames[$db] . "</option>\n";
+			$dbtype_options .= '<option '.($db == $data['db_type'] ? 'selected="selected" ' : '').
+				'value="'.$db.'">'.$GLOBALS['egw_setup']->header->db_fullnames[$db]."</option>\n";
 		}
-		$setup_tpl->set_var('dbtype_options',$dbtype_options);
+		$setup_tpl->set_var('dbtype_options', $dbtype_options);
 
-		$setup_tpl->parse('domains','domain',True);
+		$setup_tpl->parse('domains', 'domain', True);
 	}
-	if(is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../'))
+	if (is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../'))
 	{
-		$setup_tpl->set_var('actions',lang('%1, %2 or %3 the configuration file.',
+		$setup_tpl->set_var('actions', lang('%1, %2 or %3 the configuration file.',
 			'<input type="submit" name="action[write]" value="'.htmlspecialchars(lang('Write')).'" />',
 			'<input type="submit" name="action[download]" value="'.htmlspecialchars(lang('Download')).'" />',
 			'<input type="submit" name="action[view]" value="'.htmlspecialchars(lang('View')).'" />'));
 	}
 	else
 	{
-		$setup_tpl->set_var('actions',lang('Cannot create the header.inc.php due to file permission restrictions.<br /> Instead you can %1 or %2 the file.',
+		$setup_tpl->set_var('actions', lang('Cannot create the header.inc.php due to file permission restrictions.<br /> Instead you can %1 or %2 the file.',
 			'<input type="submit" name="action[download]" value="'.htmlspecialchars(lang('Download')).'" />',
 			'<input type="submit" name="action[view]" value="'.htmlspecialchars(lang('View')).'" />'));
 	}
@@ -387,7 +387,7 @@ 
 		'lang_Yes'             => lang('Yes'),
 		'lang_No'              => lang('No')
 	));
-	$setup_tpl->pfp('out','manageheader');
+	$setup_tpl->pfp('out', 'manageheader');
 
 	$GLOBALS['egw_setup']->html->show_footer();
 }

Braces +38 added lines, -10 removed lines

@@ -84,14 +84,21 @@ 
 {
 	$GLOBALS['egw_info']['server']['server_root'] = EGW_SERVER_ROOT;
 }
-if (isset($_POST['setting']))	// Post of the header-form
+if (isset($_POST['setting']))
 {
-	$validation_errors = check_header_form();	// validate the submitted form
+	// Post of the header-form
+{
+	$validation_errors = check_header_form();
+}
+// validate the submitted form
 }
-if (!isset($_POST['action']) || $validation_errors)	// generate form to edit the header
+if (!isset($_POST['action']) || $validation_errors)
+{
+	// generate form to edit the header
 {
 	show_header_form($validation_errors);
 }
+}
 else
 {
 	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'],$GLOBALS['egw_domain']);
@@ -156,7 +163,10 @@ 
 	// setting the non-domain settings from the posted content
 	foreach($_POST['setting'] as $name => $value)
 	{
-		if (get_magic_quotes_gpc()) $value = stripslashes($value);
+		if (get_magic_quotes_gpc())
+		{
+			$value = stripslashes($value);
+		}
 
 		switch($name)
 		{
@@ -166,7 +176,10 @@ 
 				$GLOBALS['egw_info']['server'][$name] = $value == 'True';
 				break;
 			case 'new_admin_password':
-				if ($value) $GLOBALS['egw_info']['server']['header_admin_password'] = $value;
+				if ($value)
+				{
+					$GLOBALS['egw_info']['server']['header_admin_password'] = $value;
+				}
 				break;
 			default:
 				$GLOBALS['egw_info']['server'][$name] = $value;
@@ -186,11 +199,17 @@ 
 
 		foreach($_POST['setting_'.$key] as $name => $value)
 		{
-			if (get_magic_quotes_gpc()) $value = stripslashes($value);
+			if (get_magic_quotes_gpc())
+			{
+				$value = stripslashes($value);
+			}
 
 			if ($name == 'new_config_passwd')
 			{
-				if ($value) $GLOBALS['egw_domain'][$domain]['config_passwd'] = $value;
+				if ($value)
+				{
+					$GLOBALS['egw_domain'][$domain]['config_passwd'] = $value;
+				}
 				continue;
 			}
 			$GLOBALS['egw_domain'][$domain][$name] = $value;
@@ -255,7 +274,10 @@ 
 	}
 	$setup_tpl->set_var('js_default_db_ports',$js_default_db_ports);
 
-	if ($validation_errors) $setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	if ($validation_errors)
+	{
+		$setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	}
 
 	if ($_POST['adddomain'])
 	{
@@ -275,7 +297,10 @@ 
 				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'),' selected="selected"');
 				break;
 			default:
-				if (!is_array($value)) $setup_tpl->set_var($name,htmlspecialchars($value));
+				if (!is_array($value))
+				{
+					$setup_tpl->set_var($name,htmlspecialchars($value));
+				}
 				break;
 		}
 	}
@@ -300,10 +325,13 @@ 
 		$setup_tpl->set_var('db_domain',htmlspecialchars($domain));
 		foreach($data as $name => $value)
 		{
-			if ($name == 'db_port' && !$value)	// Set default here if the admin didn't set a port yet
+			if ($name == 'db_port' && !$value)
+			{
+				// Set default here if the admin didn't set a port yet
 			{
 				$value = $GLOBALS['egw_setup']->header->default_db_ports[$data['db_type']];
 			}
+			}
 			$setup_tpl->set_var($name,htmlspecialchars($value));
 		}
 		$dbtype_options = '';

setup/config.php

Spacing +44 added lines, -44 removed lines

@@ -19,7 +19,7 @@ 
 Authorize the user to use setup app and load the database
 Does not return unless user is authorized
 */
-if(!$GLOBALS['egw_setup']->auth('Config') || @$_POST['cancel'])
+if (!$GLOBALS['egw_setup']->auth('Config') || @$_POST['cancel'])
 {
 	Header('Location: index.php');
 	exit;
@@ -55,35 +55,35 @@ 
 
 $newsettings = $_POST['newsettings'];
 
-if(@$_POST['submit'] && @$newsettings)
+if (@$_POST['submit'] && @$newsettings)
 {
 	/* Load hook file with functions to validate each config (one/none/all) */
-	$GLOBALS['egw_setup']->hook('config_validate','setup');
+	$GLOBALS['egw_setup']->hook('config_validate', 'setup');
 
-	$newsettings['tz_offset'] = date('Z')/3600;
+	$newsettings['tz_offset'] = date('Z') / 3600;
 
 	$GLOBALS['egw_setup']->db->transaction_begin();
-	foreach($newsettings as $setting => $value)
+	foreach ($newsettings as $setting => $value)
 	{
-		if(in_array($setting, (array)$GLOBALS['egw_info']['server']['found_validation_hook']) && function_exists($setting))
+		if (in_array($setting, (array)$GLOBALS['egw_info']['server']['found_validation_hook']) && function_exists($setting))
 		{
 			$setting($newsettings);
-			if($GLOBALS['config_error'])
+			if ($GLOBALS['config_error'])
 			{
-				$GLOBALS['error'] .= '<b>'.$GLOBALS['config_error'] ."</b><br />\n";
+				$GLOBALS['error'] .= '<b>'.$GLOBALS['config_error']."</b><br />\n";
 				$GLOBALS['config_error'] = '';
 				/* Bail out, stop writing config data */
 				break;
 			}
-			$value = $newsettings[$setting];	// it might be changed by the validation hook
+			$value = $newsettings[$setting]; // it might be changed by the validation hook
 		}
 		/* Don't erase passwords, since we also do not print them below */
-		if(!empty($value) || !(stristr($setting,'passwd') || stristr($setting,'password') || stristr($setting,'root_pw')))
+		if (!empty($value) || !(stristr($setting, 'passwd') || stristr($setting, 'password') || stristr($setting, 'root_pw')))
 		{
 			Api\Config::save_value($setting, $value, 'phpgwapi');
 		}
 	}
-	if(!$GLOBALS['error'])
+	if (!$GLOBALS['error'])
 	{
 		$GLOBALS['egw_setup']->db->transaction_commit();
 		// unset cached config, as this is the primary source for configuration now
@@ -94,21 +94,21 @@ 
 	}
 }
 
-$GLOBALS['egw_setup']->html->show_header(lang('Configuration'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+$GLOBALS['egw_setup']->html->show_header(lang('Configuration'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 
 // if we have an validation error, use the new settings made by the user and not the stored config
-if($GLOBALS['error'] && is_array($newsettings))
+if ($GLOBALS['error'] && is_array($newsettings))
 {
 	$GLOBALS['current_config'] = $newsettings;
 }
 else
 {
-	foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'*',false,__LINES__,__FILES__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, '*', false, __LINES__, __FILES__) as $row)
 	{
 		$GLOBALS['current_config'][$row['config_name']] = $row['config_value'];
 	}
 }
-$setup_tpl->pparse('out','T_config_pre_script');
+$setup_tpl->pparse('out', 'T_config_pre_script');
 
 /* Now parse each of the templates we want to show here */
 class phpgw
@@ -118,90 +118,90 @@ 
 	var $db;
 }
 $GLOBALS['egw'] = new phpgw;
-$GLOBALS['egw']->db     =& $GLOBALS['egw_setup']->db;
+$GLOBALS['egw']->db = & $GLOBALS['egw_setup']->db;
 
 $t = new Framework\Template(Framework\Template::get_dir('setup'));
 
 $t->set_unknowns('keep');
 $t->set_file(array('config' => 'config.tpl'));
-$t->set_block('config','body','body');
+$t->set_block('config', 'body', 'body');
 
 $vars = $t->get_undefined('body');
-$GLOBALS['egw_setup']->hook('config','setup');
+$GLOBALS['egw_setup']->hook('config', 'setup');
 
-foreach($vars as $value)
+foreach ($vars as $value)
 {
-	$valarray = explode('_',$value);
+	$valarray = explode('_', $value);
 	$type = $valarray[0];
 	$new = $newval = '';
 
-	while($chunk = next($valarray))
+	while ($chunk = next($valarray))
 	{
 		$new[] = $chunk;
 	}
-	$newval = implode(' ',$new);
+	$newval = implode(' ', $new);
 
 	switch ($type)
 	{
 		case 'lang':
-			$t->set_var($value,lang($newval));
+			$t->set_var($value, lang($newval));
 			break;
 		case 'value':
-			$newval = str_replace(' ','_',$newval);
+			$newval = str_replace(' ', '_', $newval);
 			/* Don't show passwords in the form */
-			if(strpos($value,'passwd') !== false || strpos($value,'password') !== false || strpos($value,'root_pw') !== false)
+			if (strpos($value, 'passwd') !== false || strpos($value, 'password') !== false || strpos($value, 'root_pw') !== false)
 			{
-				$t->set_var($value,'');
+				$t->set_var($value, '');
 			}
 			else
 			{
-				$t->set_var($value,@$current_config[$newval]);
+				$t->set_var($value, @$current_config[$newval]);
 			}
 			break;
 		case 'selected':
-			$newvals = explode(' ',$newval);
+			$newvals = explode(' ', $newval);
 			$setting = array_pop($newvals);
-			$config = implode('_',$newvals);
+			$config = implode('_', $newvals);
 			/* echo $config . '=' . $current_config[$config]; */
-			if(@$current_config[$config] == $setting)
+			if (@$current_config[$config] == $setting)
 			{
-				$t->set_var($value,' selected');
+				$t->set_var($value, ' selected');
 			}
 			else
 			{
-				$t->set_var($value,'');
+				$t->set_var($value, '');
 			}
 			break;
 		case 'hook':
-			$newval = str_replace(' ','_',$newval);
-			$t->set_var($value,$newval($current_config));
+			$newval = str_replace(' ', '_', $newval);
+			$t->set_var($value, $newval($current_config));
 			break;
 		default:
-			$t->set_var($value,'');
+			$t->set_var($value, '');
 			break;
 	}
 }
 
-if($GLOBALS['error'])
+if ($GLOBALS['error'])
 {
-	if($GLOBALS['error'] == 'badldapconnection')
+	if ($GLOBALS['error'] == 'badldapconnection')
 	{
 		/* Please check the number and dial again :) */
 		$GLOBALS['egw_setup']->html->show_alert_msg('Error',
 			lang('There was a problem trying to connect to your LDAP server. <br />'
-				.'please check your LDAP server configuration') . '.');
+				.'please check your LDAP server configuration').'.');
 	}
 
-	$GLOBALS['egw_setup']->html->show_alert_msg('Error',$GLOBALS['error'].'<p>');
+	$GLOBALS['egw_setup']->html->show_alert_msg('Error', $GLOBALS['error'].'<p>');
 }
 
-$t->pfp('out','body');
+$t->pfp('out', 'body');
 unset($t);
 
-$setup_tpl->set_var('more_configs',lang('Please login to egroupware and run the admin application for additional site configuration') . '.');
+$setup_tpl->set_var('more_configs', lang('Please login to egroupware and run the admin application for additional site configuration').'.');
 
-$setup_tpl->set_var('lang_submit',lang('Save'));
-$setup_tpl->set_var('lang_cancel',lang('Cancel'));
-$setup_tpl->pparse('out','T_config_post_script');
+$setup_tpl->set_var('lang_submit', lang('Save'));
+$setup_tpl->set_var('lang_cancel', lang('Cancel'));
+$setup_tpl->pparse('out', 'T_config_post_script');
 
 $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/hook_config.inc.php

Spacing +35 added lines, -35 removed lines

@@ -20,14 +20,14 @@ 
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default = array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
 	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == json_encode($default_db=array(
+	elseif ($config['vfs_fstab'] == json_encode($default_db = array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
 	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
@@ -39,10 +39,10 @@ 
 		$config['vfs_storage_mode'] = 'custom';
 	}
 	//_debug_array(array_intersect_key($config,array('vfs_fstab'=>1,'vfs_storage_mode'=>1)));
-	foreach(array(
+	foreach (array(
 		'fs' => lang('Filesystem (default)'),
 		'db' => lang('Database').' (problems with files > 1MB)',
-		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
+		'custom' => lang('Custom set via %1', 'filemanager/cli.php mount'),
 	) as $name => $label)
 	{
 		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
@@ -57,24 +57,24 @@ 
 
 function encryptalgo($config)
 {
-	if(@function_exists('mcrypt_list_algorithms'))
+	if (@function_exists('mcrypt_list_algorithms'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_algo']))
+		if (!isset($config['mcrypt_algo']))
 		{
-			$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			$config['mcrypt_algo'] = 'tripledes'; /* MCRYPT_TRIPLEDES */
 		}
 		$algos = @mcrypt_list_algorithms();
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($algos))
+		while (list($key, $value) = each($algos))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_algo'] == $value)
+				if ($config['mcrypt_algo'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -84,29 +84,29 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
+			$out = '<option value="">'.lang('no algorithms available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
+		$out = '<option value="tripledes">TRIPLEDES</option>'."\n";
 	}
 	return $out;
 }
 
 function encryptmode($config)
 {
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_mode']))
+		if (!isset($config['mcrypt_mode']))
 		{
 			$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
 		}
@@ -114,13 +114,13 @@ 
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($modes))
+		while (list($key, $value) = each($modes))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_mode'] == $value)
+				if ($config['mcrypt_mode'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -130,34 +130,34 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="" selected="selected">' . lang('no modes available') . '</option>' . "\n";
+			$out = '<option value="" selected="selected">'.lang('no modes available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="cbc" selected="selected">CBC</option>' . "\n";
+		$out = '<option value="cbc" selected="selected">CBC</option>'."\n";
 	}
 	return $out;
 }
 
-function passwdhashes($config,$return_hashes=false)
+function passwdhashes($config, $return_hashes = false)
 {
-	$hashes = sql_passwdhashes($config,true);
+	$hashes = sql_passwdhashes($config, true);
 	if (isset($hashes['crypt']))
 	{
-		$hashes['des'] = 'des (=crypt)';	// old LDAP name for crypt
+		$hashes['des'] = 'des (=crypt)'; // old LDAP name for crypt
 	}
 	return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
 }
 
-function sql_passwdhashes($config, $return_hashes=false, &$securest=null)
+function sql_passwdhashes($config, $return_hashes = false, &$securest = null)
 {
 	$hashes = Api\Auth::passwdhashes($securest);
 
@@ -172,19 +172,19 @@ 
  */
 function auth_types($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type']);
 }
 function auth_type_syncml($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_syncml']);
 }
 function auth_type_groupdav($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_groupdav']);
 }
 function auth_type_activesync($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_activesync']);
 }
 
 /**
@@ -205,12 +205,12 @@ 
  * @param string $selected value of selected optino
  * @return string
  */
-function _options_from(array $options,$selected)
+function _options_from(array $options, $selected)
 {
-	foreach($options as $value => $label)
+	foreach ($options as $value => $label)
 	{
-		$out .= '<option value="' . htmlspecialchars($value) . '"' .
-			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="'.htmlspecialchars($value).'"'.
+			($selected == $value ? ' selected="selected"' : '').'>'.$label.'</option>'."\n";
 	}
 	return $out;
 }

Braces +12 added lines, -3 removed lines

@@ -23,17 +23,23 @@ 
 	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
+	}
 	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default_db))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
+	}
 	else
 	{
 		$config['vfs_storage_mode'] = 'custom';
@@ -45,11 +51,14 @@ 
 		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
 	) as $name => $label)
 	{
-		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
+		if ($name != 'custom' || $name === $config['vfs_storage_mode'])
+		{
+			// dont show custom, if not custom
 		{
 			$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
 				'">'.htmlspecialchars($label)."</options>\n";
 		}
+		}
 	}
 	//echo "<pre>".htmlspecialchars($options)."</pre>\n";
 	return $options;