EGroupware / egroupware

setup/index.php

Indentation +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
 					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+										 "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:

Braces +15 added lines, -4 removed lines

@@ -49,10 +49,13 @@ 
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
 if ($GLOBALS['egw_info']['setup']['stage']['header'] != '10')
 {
-	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)	// header needs update, go there direct
+	if ($GLOBALS['egw_info']['setup']['stage']['header'] == 4)
+	{
+		// header needs update, go there direct
 	{
 		Header('Location: manageheader.php');
 	}
+	}
 	else	// run check-install first
 	{
 		Header('Location: check_install.php?intro=1');
@@ -97,7 +100,9 @@ 
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG'])
+{
+echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
@@ -501,8 +506,14 @@ 
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade)
+			{
+				$msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
+			}
+			if ($to_install)
+			{
+				$msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			}
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),

Switch Indentation +93 added lines, -93 removed lines

@@ -184,17 +184,17 @@ 
 
 switch($GLOBALS['egw_info']['setup']['stage']['db'])
 {
-	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
-		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
-		switch ($info['db_type'])
-		{
+		case 1:
+			$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+			$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
+			$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+			$setup_tpl->set_var('create_database',lang('Create database'));
+			$setup_tpl->set_var('instr','');
+			$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
+			switch ($info['db_type'])
+			{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
@@ -227,77 +227,77 @@ 
 				//break;
 			default:
 				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
-		}
+			}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of EGroupware.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
-			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
-			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 4:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of EGroupware',
-			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		case 2:
+			$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of EGroupware.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 3:
+			$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+			$setup_tpl->set_var('install',lang('Install'));
+			$setup_tpl->set_var('proceed',lang('We can proceed'));
+			$setup_tpl->set_var('coreapps',lang('all applications'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
+			$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+				'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
+			$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+			$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+				lang('Convert backup to charset selected above').'</label>');
+			$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 4:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of EGroupware',
+				isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
+			$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
+			$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+			$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
+			$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
+			$setup_tpl->set_var('upgrade',lang('Upgrade'));
+			$setup_tpl->set_var('goto',lang('Go to'));
+			$setup_tpl->set_var('configuration',lang('configuration'));
+			$setup_tpl->set_var('admin_account',lang('Create admin account'));
+			$setup_tpl->set_var('applications',lang('Manage Applications'));
+			$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
+			$setup_tpl->set_var('language_management',lang('Manage Languages'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 5:
-		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+			$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 5:
+			$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
+			$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
+			$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('cancel',lang('cancel'));
+			$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		case 6:
+			$setup_tpl->set_var('status',lang('Status'));
+			$setup_tpl->set_var('notcomplete',lang('not complete'));
+			$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
+			$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
+			$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
 
-		try {	// catch DB errors to report them
-			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
-			{
+			try {	// catch DB errors to report them
+				switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
+				{
 				case 'dbcreate':
 					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
@@ -376,7 +376,7 @@ 
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
-			}
+				}
 		}
 		catch (Api\Db\Exception $e)
 		{
@@ -388,21 +388,21 @@ 
 		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
 		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
 		break;
-	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your EGroupware API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
-	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
-		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
-		break;
+		case 10:
+			$setup_tpl->set_var('tablescurrent',lang('Your EGroupware API is current'));
+			$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
+			$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+			$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
+			$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
+		default:
+			$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
+			$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+			$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
+			$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+			break;
 }
 
 // Config Section

Spacing +180 added lines, -182 removed lines

@@ -20,8 +20,7 @@ 
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
 $setup_tpl = new Framework\Template($tpl_root);
-$setup_tpl->set_file(array
-(
+$setup_tpl->set_file(array(
 	'T_head'       => 'head.tpl',
 	'T_footer'     => 'footer.tpl',
 	'T_alert_msg'  => 'msg_alert_msg.tpl',
@@ -31,19 +30,19 @@ 
 	'T_setup_db_blocks'    => 'setup_db_blocks.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_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_db_blocks','B_db_stage_1','V_db_stage_1');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_1a','V_db_stage_1a');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_2','V_db_stage_2');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_3','V_db_stage_3');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_4','V_db_stage_4');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_5','V_db_stage_5');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_pre','V_db_stage_6_pre');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_6_post','V_db_stage_6_post');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_10','V_db_stage_10');
-$setup_tpl->set_block('T_setup_db_blocks','B_db_stage_default','V_db_stage_default');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1', 'V_db_stage_1');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_1a', 'V_db_stage_1a');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_2', 'V_db_stage_2');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_3', 'V_db_stage_3');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_4', 'V_db_stage_4');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_5', 'V_db_stage_5');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_pre', 'V_db_stage_6_pre');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_6_post', 'V_db_stage_6_post');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_10', 'V_db_stage_10');
+$setup_tpl->set_block('T_setup_db_blocks', 'B_db_stage_default', 'V_db_stage_default');
 
 // Check header and authentication
 $GLOBALS['egw_info']['setup']['stage']['header'] = $GLOBALS['egw_setup']->detection->check_header();
@@ -59,9 +58,9 @@ 
 	}
 	exit;
 }
-elseif(!$GLOBALS['egw_setup']->auth('Config'))
+elseif (!$GLOBALS['egw_setup']->auth('Config'))
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Please login'),True);
+	$GLOBALS['egw_setup']->html->show_header(lang('Please login'), True);
 	$GLOBALS['egw_setup']->html->login_form();
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
@@ -73,11 +72,11 @@ 
 	$GLOBALS['egw_info']['setup']['header_msg'],
 	False,
 	'config',
-	$GLOBALS['egw_setup']->ConfigDomain . ' (' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
+	$GLOBALS['egw_setup']->ConfigDomain.' ('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_user'].'@'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_host'].':'.
 		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_port'].'/'.
-		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'] . ')'
+		$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'].')'
 );
 /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */
 /* $GLOBALS['egw_setup']->clear_session_cache(); */
@@ -91,23 +90,23 @@ 
 		$GLOBALS['egw_setup']->detection->get_versions());
 
 	$GLOBALS['egw_info']['setup']['stage']['db'] = $GLOBALS['egw_setup']->detection->check_db($setup_info);
-	if($GLOBALS['DEBUG'])
+	if ($GLOBALS['DEBUG'])
 	{
 		_debug_array($setup_info);
 	}
 }
 
-if ($GLOBALS['DEBUG']) { echo 'Stage: ' . $GLOBALS['egw_info']['setup']['stage']['db']; }
+if ($GLOBALS['DEBUG']) { echo 'Stage: '.$GLOBALS['egw_info']['setup']['stage']['db']; }
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['db'] = 0;
 //$action = 'Upgrade';
 // end DEBUG code
 
-switch($_POST['action'])
+switch ($_POST['action'])
 {
 	case 'Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('Are you sure you want to delete your existing tables and data?') . '.';
+		$submsg = lang('Are you sure you want to delete your existing tables and data?').'.';
 		$subaction = lang('uninstall');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'predrop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 5;
@@ -121,7 +120,7 @@ 
 		break;
 	case 'REALLY Uninstall all applications':
 		$subtitle = lang('Deleting Tables');
-		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data') . '.';
+		$submsg = lang('At your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data').'.';
 		$subaction = lang('uninstalled');
 		$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'drop';
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
@@ -152,17 +151,17 @@ 
 		$GLOBALS['egw_info']['setup']['stage']['db'] = 6;
 		break;
 }
-$setup_tpl->set_var('subtitle',@$subtitle);
-$setup_tpl->set_var('submsg',@$submsg);
-$setup_tpl->set_var('subaction',@$subaction);
+$setup_tpl->set_var('subtitle', @$subtitle);
+$setup_tpl->set_var('submsg', @$submsg);
+$setup_tpl->set_var('subaction', @$subaction);
 
 // Old PHP
-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;
 }
@@ -171,135 +170,134 @@ 
 
 //$GLOBALS['egw_setup']->app_status();
 $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images';
-$incomplete = $GLOBALS['egw_info']['server']['app_images'] . '/incomplete.png';
-$completed  = $GLOBALS['egw_info']['server']['app_images'] . '/completed.png';
+$incomplete = $GLOBALS['egw_info']['server']['app_images'].'/incomplete.png';
+$completed  = $GLOBALS['egw_info']['server']['app_images'].'/completed.png';
 
-$setup_tpl->set_var('img_incomplete',$incomplete);
-$setup_tpl->set_var('img_completed',$completed);
+$setup_tpl->set_var('img_incomplete', $incomplete);
+$setup_tpl->set_var('img_completed', $completed);
 
-$setup_tpl->set_var('db_step_text',lang('Step %1 - Simple Application Management', ++$num));
-$setup_tpl->set_var('lang_system_charset',lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
-$setup_tpl->set_var('system_charset',str_replace('&amp;','&',
-	$GLOBALS['egw_setup']->translation->get_charsets('system_charset',$GLOBALS['egw_setup']->system_charset)));
+$setup_tpl->set_var('db_step_text', lang('Step %1 - Simple Application Management', ++$num));
+$setup_tpl->set_var('lang_system_charset', lang('<b>charset to use</b> (use utf-8 if you plan to use languages with different charsets):'));
+$setup_tpl->set_var('system_charset', str_replace('&amp;', '&',
+	$GLOBALS['egw_setup']->translation->get_charsets('system_charset', $GLOBALS['egw_setup']->system_charset)));
 
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 1:
-		$setup_tpl->set_var('dbnotexist','<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
-		$setup_tpl->set_var('makesure',lang('Make sure that your database is created and the account permissions are set'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('oncesetup',lang('Once the database is setup correctly'));
-		$setup_tpl->set_var('createdb','<b>'.lang('Or we can attempt to create the database for you:').'</b>');
-		$setup_tpl->set_var('create_database',lang('Create database'));
-		$setup_tpl->set_var('instr','');
+		$setup_tpl->set_var('dbnotexist', '<b>'.lang('Your Database is not working!').'</b>: '.$GLOBALS['egw_setup']->db->Error);
+		$setup_tpl->set_var('makesure', lang('Make sure that your database is created and the account permissions are set'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('oncesetup', lang('Once the database is setup correctly'));
+		$setup_tpl->set_var('createdb', '<b>'.lang('Or we can attempt to create the database for you:').'</b>');
+		$setup_tpl->set_var('create_database', lang('Create database'));
+		$setup_tpl->set_var('instr', '');
 		$info = $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain];
 		switch ($info['db_type'])
 		{
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlt':
-				$set_charset = (float) $GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
+				$set_charset = (float)$GLOBALS['egw_setup']->db->ServerInfo['version'] >= 4.1 ? ' DEFAULT CHARACTER SET utf8' : '';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang("Instructions for creating the database in %1:",'MySql').'</b>'
+					'<b>'.lang("Instructions for creating the database in %1:", 'MySql').'</b>'
 					. '<br />'.lang('Login to mysql -')
 					. '<br /><i>[user@server user]# <b>mysql -u root -p</b></i><br />'
 					. lang('Create the empty database and grant user permissions -')
 					. "<br /><i>mysql> <b>CREATE DATABASE $info[db_name]$set_charset;</b></i>"
-					. "<br /><i>mysql> <b>GRANT ALL ON " . $info['db_name']
-					. ".* TO " . $info['db_user'] . "@localhost IDENTIFIED BY '" . $info['db_pass'] . "';</b></i>");
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
+					. "<br /><i>mysql> <b>GRANT ALL ON ".$info['db_name']
+					. ".* TO ".$info['db_user']."@localhost IDENTIFIED BY '".$info['db_pass']."';</b></i>");
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1');
 				break;
 			case 'pgsql':
 				$ip = $info['db_host'] == 'localhost' ? '127.0.0.1' : '&lt;ip-address webserver&gt;';
 				$setup_tpl->set_var('instr',
-					'<b>'.lang('Instructions for creating the database in %1:','PostgreSQL').'</b>'
+					'<b>'.lang('Instructions for creating the database in %1:', 'PostgreSQL').'</b>'
 					. '<br />'.lang('Login as user postgres, eg. by using su as root')
 					. "<br /><i>[root@server /root]# <b>su - postgres</b></i><br />"
 					. lang('Create the empty database and grant user permissions -')
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P " . $info['db_user'] . "</b></i>"
-					. "<br /><i>Enter password for new user: <b>" . $info['db_pass'] . "</b></i>"
-					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner " .  $info['db_user'] . ' ' . $info['db_name'] . "</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createuser --no-adduser --no-createdb -P ".$info['db_user']."</b></i>"
+					. "<br /><i>Enter password for new user: <b>".$info['db_pass']."</b></i>"
+					. "<br /><i>[postgres@server /var/lib/pgsql]\$ <b>createdb --encoding=utf-8 --owner ".$info['db_user'].' '.$info['db_name']."</b></i>"
 					. '<br />'.lang('to allow password authentification add the following line to your pg_hba.conf (above all others) AND restart postgres:')
 					. '<br /><i># TYPE DATABASE USER CIDR-ADDRESS METHOD</i>'
-					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" :
-					                     "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
+					.($info['db_host'] ? "<br /><i><b>host $info[db_name] $info[db_user] $ip/32 password</b></i>" : "<br /><i><b>local $info[db_name] $info[db_user] password</b></i>"));
 				//$setup_tpl->parse('V_db_stage_1','B_db_stage_1');
 				//break;
 			default:
-				$setup_tpl->parse('V_db_stage_1','B_db_stage_1a');
+				$setup_tpl->parse('V_db_stage_1', 'B_db_stage_1a');
 		}
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_1');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 2:
-		$setup_tpl->set_var('prebeta',lang('You appear to be running a pre-beta version of EGroupware.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->parse('V_db_stage_2','B_db_stage_2');
+		$setup_tpl->set_var('prebeta', lang('You appear to be running a pre-beta version of EGroupware.<br />These versions are no longer supported, and there is no upgrade path for them in setup.<br /> You may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->parse('V_db_stage_2', 'B_db_stage_2');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_2');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 3:
-		$setup_tpl->set_var('dbexists','<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
-		$setup_tpl->set_var('install',lang('Install'));
-		$setup_tpl->set_var('proceed',lang('We can proceed'));
-		$setup_tpl->set_var('coreapps',lang('all applications'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('lang_restore',lang('Or you can install a previous backup.'));
-		$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+		$setup_tpl->set_var('dbexists', '<b>'.lang('Your database is working, but you dont have any applications installed').'</b>');
+		$setup_tpl->set_var('install', lang('Install'));
+		$setup_tpl->set_var('proceed', lang('We can proceed'));
+		$setup_tpl->set_var('coreapps', lang('all applications'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('lang_restore', lang('Or you can install a previous backup.'));
+		$setup_tpl->set_var('upload', '<input type="file" name="uploaded" /> &nbsp;'.
 			'<input type="submit" name="upload" value="'.htmlspecialchars(lang('install backup')).'" title="'.htmlspecialchars(lang("uploads a backup and installs it on your DB")).'" />');
-		$setup_tpl->set_var('convert_checkbox','<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
-		$setup_tpl->set_var('lang_convert_charset','<label for="convert_checkbox">'.
+		$setup_tpl->set_var('convert_checkbox', '<input type="checkbox" name="convert_charset" id="convert_checkbox" value="1"/>');
+		$setup_tpl->set_var('lang_convert_charset', '<label for="convert_checkbox">'.
 			lang('Convert backup to charset selected above').'</label>');
-		$setup_tpl->parse('V_db_stage_3','B_db_stage_3');
+		$setup_tpl->parse('V_db_stage_3', 'B_db_stage_3');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_3');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 4:
 		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('oldver',lang('You appear to be running version %1 of EGroupware',
+		$setup_tpl->set_var('oldver', lang('You appear to be running version %1 of EGroupware',
 			isset($setup_info['api']['currentver']) ? $setup_info['api']['currentver'] : $setup_info['phpgwapi']['currentver']));
-		$setup_tpl->set_var('automatic',lang('We will automatically update your tables/records to %1',$setup_info['api']['version']));
-		$setup_tpl->set_var('backupwarn',lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
-		$setup_tpl->set_var('lang_backup',lang('create a backup before upgrading the DB'));
-		$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-		$setup_tpl->set_var('upgrade',lang('Upgrade'));
-		$setup_tpl->set_var('goto',lang('Go to'));
-		$setup_tpl->set_var('configuration',lang('configuration'));
-		$setup_tpl->set_var('admin_account',lang('Create admin account'));
-		$setup_tpl->set_var('applications',lang('Manage Applications'));
-		$setup_tpl->set_var('db_backup',lang('DB backup and restore'));
-		$setup_tpl->set_var('language_management',lang('Manage Languages'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dont_touch_my_data',lang('Dont touch my data'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('automatic', lang('We will automatically update your tables/records to %1', $setup_info['api']['version']));
+		$setup_tpl->set_var('backupwarn', lang('but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>These automated scripts can easily destroy your data.</strong>'));
+		$setup_tpl->set_var('lang_backup', lang('create a backup before upgrading the DB'));
+		$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+		$setup_tpl->set_var('upgrade', lang('Upgrade'));
+		$setup_tpl->set_var('goto', lang('Go to'));
+		$setup_tpl->set_var('configuration', lang('configuration'));
+		$setup_tpl->set_var('admin_account', lang('Create admin account'));
+		$setup_tpl->set_var('applications', lang('Manage Applications'));
+		$setup_tpl->set_var('db_backup', lang('DB backup and restore'));
+		$setup_tpl->set_var('language_management', lang('Manage Languages'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dont_touch_my_data', lang('Dont touch my data'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
 
-		$setup_tpl->parse('V_db_stage_4','B_db_stage_4');
+		$setup_tpl->parse('V_db_stage_4', 'B_db_stage_4');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_4');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 5:
 		$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
-		$setup_tpl->set_var('are_you_sure',lang('ARE YOU SURE?'));
-		$setup_tpl->set_var('really_uninstall_all_applications',lang('REALLY Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('cancel',lang('cancel'));
-		$setup_tpl->parse('V_db_stage_5','B_db_stage_5');
+		$setup_tpl->set_var('are_you_sure', lang('ARE YOU SURE?'));
+		$setup_tpl->set_var('really_uninstall_all_applications', lang('REALLY Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('cancel', lang('cancel'));
+		$setup_tpl->parse('V_db_stage_5', 'B_db_stage_5');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_5');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 6:
-		$setup_tpl->set_var('status',lang('Status'));
-		$setup_tpl->set_var('notcomplete',lang('not complete'));
-		$setup_tpl->set_var('tblchange',lang('Table Change Messages'));
-		$setup_tpl->parse('V_db_stage_6_pre','B_db_stage_6_pre');
+		$setup_tpl->set_var('status', lang('Status'));
+		$setup_tpl->set_var('notcomplete', lang('not complete'));
+		$setup_tpl->set_var('tblchange', lang('Table Change Messages'));
+		$setup_tpl->parse('V_db_stage_6_pre', 'B_db_stage_6_pre');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_6_pre');
-		$setup_tpl->set_var('tableshave',lang('If you did not receive any errors, your applications have been'));
+		$setup_tpl->set_var('tableshave', lang('If you did not receive any errors, your applications have been'));
 
 		try {	// catch DB errors to report them
 			switch ($GLOBALS['egw_info']['setup']['currentver']['phpgwapi'])
 			{
 				case 'dbcreate':
-					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8',	// create all new db's with utf8
+					$GLOBALS['egw_setup']->db->create_database($_POST['db_root'], $_POST['db_pass'], 'utf8', // create all new db's with utf8
 						!preg_match('/^[0-9.a-z_]+$/i', $_POST['db_grant_host']) ? 'localhost' : $_POST['db_grant_host']);
 					break;
 				case 'drop':
@@ -315,25 +313,25 @@ 
 						if (is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 							is_uploaded_file($_FILES['uploaded']['tmp_name']))
 						{
-							if (preg_match('/\.(bz2|gz)$/i',$_FILES['uploaded']['name'],$matches))
+							if (preg_match('/\.(bz2|gz)$/i', $_FILES['uploaded']['name'], $matches))
 							{
 								$ext = '.'.$matches[1];
-								move_uploaded_file($_FILES['uploaded']['tmp_name'],$_FILES['uploaded']['tmp_name'].$ext);
+								move_uploaded_file($_FILES['uploaded']['tmp_name'], $_FILES['uploaded']['tmp_name'].$ext);
 								$_FILES['uploaded']['tmp_name'] .= $ext;
 							}
-							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'],true)))
+							if (is_resource($f = $db_backup->fopen_backup($_FILES['uploaded']['tmp_name'], true)))
 							{
-								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
-								$db_backup->restore($f,$_POST['convert_charset'],$_FILES['uploaded']['tmp_name'],false);
+								echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
+								$db_backup->restore($f, $_POST['convert_charset'], $_FILES['uploaded']['tmp_name'], false);
 								fclose($f);
 								echo '<p align="center">'.lang('restore finished')."</p>\n";
 								unlink($_FILES['uploaded']['tmp_name']);
 							}
 							else	// backup failed ==> dont start the upgrade
 							{
-								$setup_tpl->set_var('submsg',lang('Restore failed'));
-								$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-								$setup_tpl->set_var('subaction','');
+								$setup_tpl->set_var('submsg', lang('Restore failed'));
+								$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+								$setup_tpl->set_var('subaction', '');
 							}
 						}
 					}
@@ -346,7 +344,7 @@ 
 							$GLOBALS['egw_setup']->system_charset = $_REQUEST['system_charset'];
 							$GLOBALS['egw_setup']->db->Link_ID->SetCharSet($_REQUEST['system_charset']);
 						}
-						$setup_info = $GLOBALS['egw_setup']->process->pass($s_info,'new',$_REQUEST['debug'],True);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($s_info, 'new', $_REQUEST['debug'], True);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -358,21 +356,21 @@ 
 						$db_backup = new Api\Db\Backup();
 						if (is_resource($f = $db_backup->fopen_backup()))
 						{
-							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
+							echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
 							$db_backup->backup($f);
 							fclose($f);
 							echo '<p align="center">'.lang('backup finished')."</p>\n";
 						}
 						else	// backup failed ==> dont start the upgrade
 						{
-							$setup_tpl->set_var('submsg',lang('Backup failed'));
-							$setup_tpl->set_var('tableshave','<b>'.$f.'</b>');
-							$setup_tpl->set_var('subaction','');
+							$setup_tpl->set_var('submsg', lang('Backup failed'));
+							$setup_tpl->set_var('tableshave', '<b>'.$f.'</b>');
+							$setup_tpl->set_var('subaction', '');
 						}
 					}
 					if (!@$_POST['backup'] || !is_string($f))
 					{
-						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info,'upgrade',$_REQUEST['debug']);
+						$setup_info = $GLOBALS['egw_setup']->process->pass($setup_info, 'upgrade', $_REQUEST['debug']);
 						$GLOBALS['egw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
 					}
 					break;
@@ -382,159 +380,159 @@ 
 		{
 			echo "<pre>".$e->getMessage()."</pre>\n";
 		}
-		$setup_tpl->set_var('re-check_my_installation',lang('Re-Check My Installation'));
-		$setup_tpl->set_var('system_charset',$GLOBALS['egw']->system_charset);
-		$setup_tpl->parse('V_db_stage_6_post','B_db_stage_6_post');
-		$db_filled_block = $db_filled_block . $setup_tpl->get_var('V_db_stage_6_post');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('re-check_my_installation', lang('Re-Check My Installation'));
+		$setup_tpl->set_var('system_charset', $GLOBALS['egw']->system_charset);
+		$setup_tpl->parse('V_db_stage_6_post', 'B_db_stage_6_post');
+		$db_filled_block = $db_filled_block.$setup_tpl->get_var('V_db_stage_6_post');
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	case 10:
-		$setup_tpl->set_var('tablescurrent',lang('Your EGroupware API is current'));
-		$setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications'));
-		$setup_tpl->set_var('dropwarn',lang('Your tables will be dropped and you will lose data'));
-		$setup_tpl->set_var('deletetables',lang('Uninstall all applications'));
-		$setup_tpl->parse('V_db_stage_10','B_db_stage_10');
+		$setup_tpl->set_var('tablescurrent', lang('Your EGroupware API is current'));
+		$setup_tpl->set_var('uninstall_all_applications', lang('Uninstall all applications'));
+		$setup_tpl->set_var('dropwarn', lang('Your tables will be dropped and you will lose data'));
+		$setup_tpl->set_var('deletetables', lang('Uninstall all applications'));
+		$setup_tpl->parse('V_db_stage_10', 'B_db_stage_10');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_10');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 	default:
-		$setup_tpl->set_var('dbnotexist',lang('Your database does not exist'));
-		$setup_tpl->parse('V_db_stage_default','B_db_stage_default');
+		$setup_tpl->set_var('dbnotexist', lang('Your database does not exist'));
+		$setup_tpl->parse('V_db_stage_default', 'B_db_stage_default');
 		$db_filled_block = $setup_tpl->get_var('V_db_stage_default');
-		$setup_tpl->set_var('V_db_filled_block',$db_filled_block);
+		$setup_tpl->set_var('V_db_filled_block', $db_filled_block);
 		break;
 }
 
 // Config Section
-$setup_tpl->set_var('config_step_text',lang('Step %1 - Configuration', ++$num));
+$setup_tpl->set_var('config_step_text', lang('Step %1 - Configuration', ++$num));
 $GLOBALS['egw_info']['setup']['stage']['config'] = $GLOBALS['egw_setup']->detection->check_config();
 
 // begin DEBUG code
 //$GLOBALS['egw_info']['setup']['stage']['config'] = 10;
 // end DEBUG code
 
-$setup_tpl->set_var('config_status_img',$incomplete);
-$setup_tpl->set_var('config_status_alt',lang('not completed'));
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+$setup_tpl->set_var('config_status_img', $incomplete);
+$setup_tpl->set_var('config_status_alt', lang('not completed'));
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 1:	// AFAIK this dont happen any more, as we have setup_process::save_minimal_config() now -- RalfBecker
 		$btn_config_now = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			lang('Please configure EGroupware for your environment'),
-			'post','config.php',
-			'submit',lang('Configure Now'),
+			'post', 'config.php',
+			'submit', lang('Configure Now'),
 			'');
-		$setup_tpl->set_var('config_table_data',$btn_config_now);
+		$setup_tpl->set_var('config_table_data', $btn_config_now);
 		break;
 	case 10:
-		$setup_tpl->set_var('config_status_img',$completed);
-		$setup_tpl->set_var('config_status_alt',lang('completed'));
+		$setup_tpl->set_var('config_status_img', $completed);
+		$setup_tpl->set_var('config_status_alt', lang('completed'));
 		$config_msg = lang('Configuration completed');
 	case 2:
 		if ($GLOBALS['egw_info']['setup']['config_errors'])
 		{
-			$config_msg = implode('<br />',$GLOBALS['egw_info']['setup']['config_errors']);
+			$config_msg = implode('<br />', $GLOBALS['egw_info']['setup']['config_errors']);
 		}
 		$btn_edit_config = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$config_msg,
-			'post','config.php',
-			'submit',lang('Edit Current Configuration'),
+			'post', 'config.php',
+			'submit', lang('Edit Current Configuration'),
 			''
 		);
-		$setup_tpl->set_var('config_table_data',$btn_edit_config);
+		$setup_tpl->set_var('config_table_data', $btn_edit_config);
 		break;
 	default:
-		$setup_tpl->set_var('config_status_img',$incomplete);
-		$setup_tpl->set_var('config_status_alt',lang('not completed'));
-		$setup_tpl->set_var('config_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('config_status_img', $incomplete);
+		$setup_tpl->set_var('config_status_alt', lang('not completed'));
+		$setup_tpl->set_var('config_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Admin Account Section
-$setup_tpl->set_var('admin_step_text',lang('Step %1 - Admin Account', ++$num));
+$setup_tpl->set_var('admin_step_text', lang('Step %1 - Admin Account', ++$num));
 
-switch($GLOBALS['egw_info']['setup']['stage']['config'])
+switch ($GLOBALS['egw_info']['setup']['stage']['config'])
 {
 	case 10:
 		// check if there is already a user account (not the anonymous account of sitemgr or a group)
 		$no_accounts = !$GLOBALS['egw_setup']->accounts_exist();
-		$setup_tpl->set_var('admin_status_img',$no_accounts ? $incomplete : $completed);
-		$setup_tpl->set_var('admin_status_alt',$no_accounts ? lang('not completed') : lang('completed'));
-		$setup_tpl->set_var('admin_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+		$setup_tpl->set_var('admin_status_img', $no_accounts ? $incomplete : $completed);
+		$setup_tpl->set_var('admin_status_alt', $no_accounts ? lang('not completed') : lang('completed'));
+		$setup_tpl->set_var('admin_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$no_accounts ? lang('No accounts existing') : lang('Accounts existing'),
-			'post','admin_account.php',
-			'submit',lang('Create admin account'),
+			'post', 'admin_account.php',
+			'submit', lang('Create admin account'),
 			''
 		));
 		break;
 	default:
-		$setup_tpl->set_var('admin_status_img',$incomplete);
-		$setup_tpl->set_var('admin_status_alt',lang('not completed'));
-		$setup_tpl->set_var('admin_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('admin_status_img', $incomplete);
+		$setup_tpl->set_var('admin_status_alt', lang('not completed'));
+		$setup_tpl->set_var('admin_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 
-$setup_tpl->set_var('apps_step_text',lang('Step %1 - Advanced Application Management', ++$num));
+$setup_tpl->set_var('apps_step_text', lang('Step %1 - Advanced Application Management', ++$num));
 //	$GLOBALS['egw_info']['setup']['stage']['apps'] = $GLOBALS['egw_setup']->check_apps();
-switch($GLOBALS['egw_info']['setup']['stage']['db'])
+switch ($GLOBALS['egw_info']['setup']['stage']['db'])
 {
 	case 10:
-		$setup_tpl->set_var('apps_status_img',$completed);
-		$setup_tpl->set_var('apps_status_alt',lang('completed'));
+		$setup_tpl->set_var('apps_status_img', $completed);
+		$setup_tpl->set_var('apps_status_alt', lang('completed'));
 		// check if we have apps to upgrade or essential apps not installed
 		$to_upgrade = $to_install = array();
-		foreach($setup_info as $app => $data)
+		foreach ($setup_info as $app => $data)
 		{
 			if ($data['currentver'] && $data['version'] && $data['version'] != $data['currentver'])
 			{
 				$to_upgrade[] = lang(!empty($data['title']) ? $data['title'] : $app);
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		// warn if essential apps are not installed
-		foreach(array('api','admin','preferences') as $app)
+		foreach (array('api', 'admin', 'preferences') as $app)
 		{
 			if (!isset($setup_info[$app]) || empty($setup_info[$app]['currentver']))
 			{
 				$to_install[] = lang($app);
-				$setup_tpl->set_var('apps_status_img',$incomplete);
+				$setup_tpl->set_var('apps_status_img', $incomplete);
 			}
 		}
 		$msg = '';
 		if ($to_upgrade || $to_install)
 		{
-			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ',$to_upgrade);
-			if ($to_install) $msg .= ($msg?'<br />':'').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ',$to_install);
+			if ($to_upgrade) $msg = '<b>'.lang('The following applications need to be upgraded:').'</b> '.implode(', ', $to_upgrade);
+			if ($to_install) $msg .= ($msg ? '<br />' : '').'<b>'.lang('The following applications are required, but NOT installed:').'</b> '.implode(', ', $to_install);
 		}
 		$btn_manage_apps = $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 			$msg ? $msg : lang('This stage is completed<br />'),
-			'post','applications.php',
-			'submit',lang('Manage Applications'),
+			'post', 'applications.php',
+			'submit', lang('Manage Applications'),
 			'');
-		$setup_tpl->set_var('apps_table_data',$btn_manage_apps);
+		$setup_tpl->set_var('apps_table_data', $btn_manage_apps);
 		break;
 	default:
-		$setup_tpl->set_var('apps_status_img',$incomplete);
-		$setup_tpl->set_var('apps_status_alt',lang('not completed'));
-		$setup_tpl->set_var('apps_table_data',lang('Not ready for this stage yet'));
+		$setup_tpl->set_var('apps_status_img', $incomplete);
+		$setup_tpl->set_var('apps_status_alt', lang('not completed'));
+		$setup_tpl->set_var('apps_table_data', lang('Not ready for this stage yet'));
 		break;
 }
 // Backup and restore section
-$setup_tpl->set_var('backup_step_text',lang('Step %1 - DB backup and restore', ++$num));
+$setup_tpl->set_var('backup_step_text', lang('Step %1 - DB backup and restore', ++$num));
 if ($GLOBALS['egw_info']['setup']['stage']['db'] == 10 && !$no_backup_dir)
 {
-	$setup_tpl->set_var('backup_status_img',$completed);
-	$setup_tpl->set_var('backup_status_alt',lang('completed'));
-	$setup_tpl->set_var('backup_table_data',$GLOBALS['egw_setup']->html->make_frm_btn_simple(
+	$setup_tpl->set_var('backup_status_img', $completed);
+	$setup_tpl->set_var('backup_status_alt', lang('completed'));
+	$setup_tpl->set_var('backup_table_data', $GLOBALS['egw_setup']->html->make_frm_btn_simple(
 		''/*lang('This stage is completed<br />')*/,
-		'post','db_backup.php',
-		'submit',lang('backup and restore'),
+		'post', 'db_backup.php',
+		'submit', lang('backup and restore'),
 		''));
 }
 else
 {
-	$setup_tpl->set_var('backup_status_img',$incomplete);
-	$setup_tpl->set_var('backup_status_alt',lang('not completed'));
-	$setup_tpl->set_var('backup_table_data',$no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
+	$setup_tpl->set_var('backup_status_img', $incomplete);
+	$setup_tpl->set_var('backup_status_alt', lang('not completed'));
+	$setup_tpl->set_var('backup_table_data', $no_backup_dir ? $no_backup_dir : lang('Not ready for this stage yet'));
 }
 
-$setup_tpl->pparse('out','T_setup_main');
+$setup_tpl->pparse('out', 'T_setup_main');
 $GLOBALS['egw_setup']->html->show_footer();

setup/applications.php

Indentation +1 added lines, -1 removed lines

@@ -350,7 +350,7 @@
 			{
 				echo lang('because it depends upon') . ':<br />' . "\n";
 				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
-                            $depapp_count = count($depapp);
+							$depapp_count = count($depapp);
 				for ($i=0; $i<$depapp_count; $i++)
 				{
 					echo '<br />' . $depapp[$i] . ': ';

Braces +4 added lines, -1 removed lines

@@ -285,7 +285,10 @@
 				$val = array2string($val);
 				break;
 			default:
-				if (is_array($val)) $val = implode(', ', $val);
+				if (is_array($val))
+				{
+					$val = implode(', ', $val);
+				}
 				break;
 		}
 		$setup_tpl->set_var('bg_color', $bgcolor[++$i & 1]);

Spacing +213 added lines, -213 removed lines

@@ -51,36 +51,36 @@ 
 	Api\Csrf::validate($_POST['csrf_token'], __FILE__);
 }
 
-$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('T_setup_main','app_header','app_header');
-$setup_tpl->set_block('T_setup_main','apps','apps');
-$setup_tpl->set_block('T_setup_main','detail','detail');
-$setup_tpl->set_block('T_setup_main','table','table');
-$setup_tpl->set_block('T_setup_main','hook','hook');
-$setup_tpl->set_block('T_setup_main','dep','dep');
-$setup_tpl->set_block('T_setup_main','app_footer','app_footer');
-$setup_tpl->set_block('T_setup_main','submit','submit');
-$setup_tpl->set_block('T_setup_main','footer','footer');
-
-$bgcolor = array('#DDDDDD','#EEEEEE');
-
-function parsedep($depends,$main=True)
+$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('T_setup_main', 'app_header', 'app_header');
+$setup_tpl->set_block('T_setup_main', 'apps', 'apps');
+$setup_tpl->set_block('T_setup_main', 'detail', 'detail');
+$setup_tpl->set_block('T_setup_main', 'table', 'table');
+$setup_tpl->set_block('T_setup_main', 'hook', 'hook');
+$setup_tpl->set_block('T_setup_main', 'dep', 'dep');
+$setup_tpl->set_block('T_setup_main', 'app_footer', 'app_footer');
+$setup_tpl->set_block('T_setup_main', 'submit', 'submit');
+$setup_tpl->set_block('T_setup_main', 'footer', 'footer');
+
+$bgcolor = array('#DDDDDD', '#EEEEEE');
+
+function parsedep($depends, $main = True)
 {
 	$depstring = '(';
-	foreach($depends as $b)
+	foreach ($depends as $b)
 	{
-		foreach($b as $c => $d)
+		foreach ($b as $c => $d)
 		{
 			if (is_array($d))
 			{
-				$depstring .= $c . ': ' .implode(',',$d) . '; ';
+				$depstring .= $c.': '.implode(',', $d).'; ';
 				$depver[] = $d;
 			}
 			else
 			{
-				$depstring .= $c . ': ' . $d . '; ';
+				$depstring .= $c.': '.$d.'; ';
 				$depapp[] = $d;
 			}
 		}
@@ -92,7 +92,7 @@ 
 	}
 	else
 	{
-		return array($depapp,$depver);
+		return array($depapp, $depver);
 	}
 }
 
@@ -106,17 +106,17 @@ 
 
 @ksort($setup_info);
 
-if(@$_POST['cancel'])
+if (@$_POST['cancel'])
 {
 	Header("Location: index.php");
 	exit;
 }
 
-if(@$_POST['submit'])
+if (@$_POST['submit'])
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
-	$setup_tpl->set_var('description',lang('App install/remove/upgrade') . ':');
-	$setup_tpl->pparse('out','header');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
+	$setup_tpl->set_var('description', lang('App install/remove/upgrade').':');
+	$setup_tpl->pparse('out', 'header');
 
 	$appname = $_POST['appname'];
 	$remove  = $_POST['remove'];
@@ -125,14 +125,14 @@ 
 
 	$register_hooks = false;
 
-	if(!empty($remove) && is_array($remove))
+	if (!empty($remove) && is_array($remove))
 	{
 		$register_hooks = $GLOBALS['egw_setup']->process->remove(array_keys($remove), $setup_info, $DEBUG) > 0;
 	}
 
-	if(!empty($install) && is_array($install))
+	if (!empty($install) && is_array($install))
 	{
-		foreach($install as $appname => $key)
+		foreach ($install as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -142,13 +142,13 @@ 
 			{
 				$terror_c = $GLOBALS['egw_setup']->process->current($terror, $DEBUG);
 				$terror = $GLOBALS['egw_setup']->process->default_records($terror_c, $DEBUG);
-				echo '<br />' . $app_title . ' '
-					. lang('tables installed, unless there are errors printed above') . '.';
+				echo '<br />'.$app_title.' '
+					. lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
 				// check default_records for apps without tables, they might need some initial work too
-				$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
+				$terror = $GLOBALS['egw_setup']->process->default_records($terror, $DEBUG);
 				if ($GLOBALS['egw_setup']->app_registered($setup_info[$appname]['name']))
 				{
 					$GLOBALS['egw_setup']->update_app($setup_info[$appname]['name']);
@@ -157,7 +157,7 @@ 
 				{
 					$GLOBALS['egw_setup']->register_app($setup_info[$appname]['name']);
 				}
-				echo '<br />' . $app_title . ' ' . lang('registered') . '.';
+				echo '<br />'.$app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$appname]['hooks'])
 				{
@@ -167,23 +167,23 @@ 
 		}
 	}
 
-	if(!empty($upgrade) && is_array($upgrade))
+	if (!empty($upgrade) && is_array($upgrade))
 	{
-		foreach($upgrade as $appname => $key)
+		foreach ($upgrade as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
 			$terror[$appname] = $setup_info[$appname];
 
-			$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
+			$GLOBALS['egw_setup']->process->upgrade($terror, $DEBUG);
 			if ($setup_info[$appname]['tables'])
 			{
-				echo '<br />' . $app_title . ' ' . lang('tables upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('tables upgraded').'.';
 				// The process_upgrade() function also handles registration
 			}
 			else
 			{
-				echo '<br />' . $app_title . ' ' . lang('upgraded') . '.';
+				echo '<br />'.$app_title.' '.lang('upgraded').'.';
 			}
 			$register_hooks = true;
 		}
@@ -192,61 +192,61 @@ 
 	if ($register_hooks)
 	{
 		Api\Hooks::read(true);
-		echo '<br />' . $app_title . ' ' . lang('hooks registered') . '.';
+		echo '<br />'.$app_title.' '.lang('hooks registered').'.';
 	}
 
 	//$setup_tpl->set_var('goback',
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
 	//$setup_tpl->pparse('out','submit');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header(lang('Application Management'), False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 }
 
-if(@$_GET['hooks'])
+if (@$_GET['hooks'])
 {
 	Api\Cache::flush(Api\Cache::INSTANCE);
 
-	echo lang('Cached cleared') . '<br />';
+	echo lang('Cached cleared').'<br />';
 }
 $detail = $_GET['detail'];
 $resolve = $_GET['resolve'];
-if(@$detail)
+if (@$detail)
 {
 	@ksort($setup_info[$detail]);
-	$setup_tpl->set_var('description',lang('App details') . ':');
-	$setup_tpl->pparse('out','header');
+	$setup_tpl->set_var('description', lang('App details').':');
+	$setup_tpl->pparse('out', 'header');
 
-	$setup_tpl->set_var('name','application');
+	$setup_tpl->set_var('name', 'application');
 	$setup_tpl->set_var('details', lang($setup_info[$detail]['title']));
-	$setup_tpl->pparse('out','detail');
+	$setup_tpl->pparse('out', 'detail');
 
-	foreach($setup_info[$detail] as $key => $val)
+	foreach ($setup_info[$detail] as $key => $val)
 	{
-		switch($key)
+		switch ($key)
 		{
 			case 'title':
 				continue 2;
 			case 'tables':
 				$tblcnt = count($setup_info[$detail][$key]);
-				if(is_array($val))
+				if (is_array($val))
 				{
-					$key = '<a href="sqltoarray.php?appname=' . $detail . '&submit=True&apps=True">' . $key . '(' . $tblcnt . ')</a>' . "\n";
-					$val = implode(',' . "\n",$val);
+					$key = '<a href="sqltoarray.php?appname='.$detail.'&submit=True&apps=True">'.$key.'('.$tblcnt.')</a>'."\n";
+					$val = implode(','."\n", $val);
 				}
 				break;
 			case 'hooks':
-				foreach($val as &$hooks)
+				foreach ($val as &$hooks)
 				{
 					$hooks = (array)$hooks;
 				}
 				$val = str_replace('EGroupware\\', '', implode(', ', call_user_func_array('array_merge', $val)));
 				break;
 			case 'depends':
-				foreach($val as &$dep)
+				foreach ($val as &$dep)
 				{
 					$dep = $dep['appname'].': '.implode(', ', $dep['versions']);
 				}
@@ -259,174 +259,174 @@ 
 				if (is_array($val)) $val = implode(', ', $val);
 				break;
 		}
-		$setup_tpl->set_var('bg_color', $bgcolor[++$i & 1]);
-		$setup_tpl->set_var('name',$key);
-		$setup_tpl->set_var('details',$val);
-		$setup_tpl->pparse('out','detail');
+		$setup_tpl->set_var('bg_color', $bgcolor[++$i&1]);
+		$setup_tpl->set_var('name', $key);
+		$setup_tpl->set_var('details', $val);
+		$setup_tpl->pparse('out', 'detail');
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 elseif (@$resolve)
 {
 	$version  = $_GET['version'];
 	$notables = $_GET['notables'];
-	$setup_tpl->set_var('description',lang('Problem resolution'). ':');
-	$setup_tpl->pparse('out','header');
+	$setup_tpl->set_var('description', lang('Problem resolution').':');
+	$setup_tpl->pparse('out', 'header');
 	$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name'];
 
-	if($_GET['post'])
+	if ($_GET['post'])
 	{
-		echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
+		echo '"'.$app_title.'" '.lang('may be broken').' ';
 		echo lang('because an application it depends upon was upgraded');
 		echo '<br />';
-		echo lang('to a version it does not know about') . '.';
+		echo lang('to a version it does not know about').'.';
 		echo '<br />';
-		echo lang('However, the application may still work') . '.';
+		echo lang('However, the application may still work').'.';
 	}
-	elseif($_GET['badinstall'])
+	elseif ($_GET['badinstall'])
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because of a failed upgrade or install') . '.';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because of a failed upgrade or install').'.';
 		echo '<br />';
-		echo lang('Some or all of its tables are missing') . '.';
+		echo lang('Some or all of its tables are missing').'.';
 		echo '<br />';
-		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
+		echo lang('You should either uninstall and then reinstall it, or attempt manual repairs').'.';
 	}
-	elseif($_GET['deleted'])
+	elseif ($_GET['deleted'])
 	{
-		echo '"' . $app_title . '" ' . lang('is broken') . ' ';
-		echo lang('because its sources are missing') . '!';
+		echo '"'.$app_title.'" '.lang('is broken').' ';
+		echo lang('because its sources are missing').'!';
 		echo '<br />';
-		echo lang('However the tables are still in the database') . '.';
+		echo lang('However the tables are still in the database').'.';
 		echo '<br />';
-		echo lang('You should either install the sources or uninstall it, to get rid of the tables') . '.';
+		echo lang('You should either install the sources or uninstall it, to get rid of the tables').'.';
 	}
 	elseif (!$version)
 	{
-		if($setup_info[$resolve]['enabled'])
+		if ($setup_info[$resolve]['enabled'])
 		{
-			echo '"' . $app_title . '" ' . lang('is broken') . ' ';
+			echo '"'.$app_title.'" '.lang('is broken').' ';
 		}
 		else
 		{
-			echo '"' . $app_title . '" ' . lang('is disabled') . ' ';
+			echo '"'.$app_title.'" '.lang('is disabled').' ';
 		}
 
 		if (!$notables)
 		{
-			if($setup_info[$resolve]['status'] == 'D')
+			if ($setup_info[$resolve]['status'] == 'D')
 			{
-				echo lang('because it depends upon') . ':<br />' . "\n";
-				list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
+				echo lang('because it depends upon').':<br />'."\n";
+				list($depapp, $depver) = parsedep($setup_info[$resolve]['depends'], False);
                             $depapp_count = count($depapp);
-				for ($i=0; $i<$depapp_count; $i++)
+				for ($i = 0; $i < $depapp_count; $i++)
 				{
-					echo '<br />' . $depapp[$i] . ': ';
+					echo '<br />'.$depapp[$i].': ';
 					$list = '';
-					foreach($depver[$i] as $x => $y)
+					foreach ($depver[$i] as $x => $y)
 					{
-						$list .= $y . ', ';
+						$list .= $y.', ';
 					}
-					echo substr($list,0,-2)."\n";
+					echo substr($list, 0, -2)."\n";
 				}
-				echo '<br /><br />' . lang('The table definition was correct, and the tables were installed') . '.';
+				echo '<br /><br />'.lang('The table definition was correct, and the tables were installed').'.';
 			}
 			else
 			{
-				echo lang('because it was manually disabled') . '.';
+				echo lang('because it was manually disabled').'.';
 			}
 		}
-		elseif($setup_info[$resolve]['enable'] == 2)
+		elseif ($setup_info[$resolve]['enable'] == 2)
 		{
-			echo lang('because it is not a user application, or access is controlled via acl') . '.';
+			echo lang('because it is not a user application, or access is controlled via acl').'.';
 		}
-		elseif($setup_info[$resolve]['enable'] == 0)
+		elseif ($setup_info[$resolve]['enable'] == 0)
 		{
-			echo lang('because the enable flag for this app is set to 0, or is undefined') . '.';
+			echo lang('because the enable flag for this app is set to 0, or is undefined').'.';
 		}
 		else
 		{
-			echo lang('because it requires manual table installation, <br />or the table definition was incorrect') . ".\n"
-				. lang("Please check for sql scripts within the application's directory") . '.';
+			echo lang('because it requires manual table installation, <br />or the table definition was incorrect').".\n"
+				. lang("Please check for sql scripts within the application's directory").'.';
 		}
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 	else
 	{
-		echo $app_title . ' ' . lang('has a version mismatch') . ' ';
-		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.';
+		echo $app_title.' '.lang('has a version mismatch').' ';
+		echo lang('because of a failed upgrade, or the database is newer than the installed version of this app').'.';
 		echo '<br />';
-		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.';
-		echo '<br />' . lang('However, the application is otherwise installed') . '.';
+		echo lang('If the application has no defined tables, selecting upgrade should remedy the problem').'.';
+		echo '<br />'.lang('However, the application is otherwise installed').'.';
 	}
 
-	echo '<br /><a href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>';
-	$setup_tpl->pparse('out','footer');
+	echo '<br /><a href="applications.php?debug='.$DEBUG.'">'.lang('Go back').'</a>';
+	$setup_tpl->pparse('out', 'footer');
 	exit;
 }
 else
 {
-	$setup_tpl->set_var('description',lang('Select the desired action(s) from the available choices'));
-	$setup_tpl->set_var('action_url','applications.php');
-	$setup_tpl->pparse('out','header');
-
-	$setup_tpl->set_var('appdata',lang('Application Data'));
-	$setup_tpl->set_var('actions',lang('Actions'));
-	$setup_tpl->set_var('app_info',lang('Application Name and Status Information'));
-	$setup_tpl->set_var('app_title',lang('Application Title'));
-	$setup_tpl->set_var('app_currentver',lang('Current Version'));
-	$setup_tpl->set_var('app_version',lang('Available Version'));
-	$setup_tpl->set_var('app_install',lang('Install'));
-	$setup_tpl->set_var('app_remove',lang('Remove'));
-	$setup_tpl->set_var('app_upgrade',lang('Upgrade'));
-	$setup_tpl->set_var('app_resolve',lang('Resolve'));
-	$setup_tpl->set_var('check','check.png');
-	$setup_tpl->set_var('install_all',lang('Install All'));
-	$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
-	$setup_tpl->set_var('remove_all',lang('Remove All'));
-	$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
-	$setup_tpl->set_var('debug','<input type="checkbox" name="debug" value="True"' .($DEBUG ? ' checked="checked"' : '') . ' />');
-	$setup_tpl->set_var('bg_color',$bgcolor[0]);
-
-	$setup_tpl->pparse('out','app_header');
+	$setup_tpl->set_var('description', lang('Select the desired action(s) from the available choices'));
+	$setup_tpl->set_var('action_url', 'applications.php');
+	$setup_tpl->pparse('out', 'header');
+
+	$setup_tpl->set_var('appdata', lang('Application Data'));
+	$setup_tpl->set_var('actions', lang('Actions'));
+	$setup_tpl->set_var('app_info', lang('Application Name and Status Information'));
+	$setup_tpl->set_var('app_title', lang('Application Title'));
+	$setup_tpl->set_var('app_currentver', lang('Current Version'));
+	$setup_tpl->set_var('app_version', lang('Available Version'));
+	$setup_tpl->set_var('app_install', lang('Install'));
+	$setup_tpl->set_var('app_remove', lang('Remove'));
+	$setup_tpl->set_var('app_upgrade', lang('Upgrade'));
+	$setup_tpl->set_var('app_resolve', lang('Resolve'));
+	$setup_tpl->set_var('check', 'check.png');
+	$setup_tpl->set_var('install_all', lang('Install All'));
+	$setup_tpl->set_var('upgrade_all', lang('Upgrade All'));
+	$setup_tpl->set_var('remove_all', lang('Remove All'));
+	$setup_tpl->set_var('lang_debug', lang('enable for extra debug-messages'));
+	$setup_tpl->set_var('debug', '<input type="checkbox" name="debug" value="True"'.($DEBUG ? ' checked="checked"' : '').' />');
+	$setup_tpl->set_var('bg_color', $bgcolor[0]);
+
+	$setup_tpl->pparse('out', 'app_header');
 
 	$i = 0;
-	foreach($setup_info as $key => $value)
+	foreach ($setup_info as $key => $value)
 	{
-		if(@$value['name'])
+		if (@$value['name'])
 		{
 			$i = ($i ? 0 : 1);
-			$setup_tpl->set_var('apptitle',$value['title']?$value['title']:lang($value['name']));
-			$setup_tpl->set_var('currentver',@$value['currentver']);
-			$setup_tpl->set_var('version',$value['version']);
-			$setup_tpl->set_var('bg_color',$bgcolor[$i]);
+			$setup_tpl->set_var('apptitle', $value['title'] ? $value['title'] : lang($value['name']));
+			$setup_tpl->set_var('currentver', @$value['currentver']);
+			$setup_tpl->set_var('version', $value['version']);
+			$setup_tpl->set_var('bg_color', $bgcolor[$i]);
 
-			switch($value['status'])
+			switch ($value['status'])
 			{
 				case 'C':
-					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-					$setup_tpl->set_var('upgrade','&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
 					if (!$GLOBALS['egw_setup']->detection->check_app_tables($value['name']))
 					{
 						// App installed and enabled, but some tables are missing
-						$setup_tpl->set_var('instimg','table.png');
-						$setup_tpl->set_var('bg_color','FFCCAA');
-						$setup_tpl->set_var('instalt',lang('Not Completed'));
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-						$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'table.png');
+						$setup_tpl->set_var('bg_color', 'FFCCAA');
+						$setup_tpl->set_var('instalt', lang('Not Completed'));
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+						$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('instimg','completed.png');
-						$setup_tpl->set_var('instalt',lang('Completed'));
-						$setup_tpl->set_var('install','&nbsp;');
-						if($value['enabled'])
+						$setup_tpl->set_var('instimg', 'completed.png');
+						$setup_tpl->set_var('instalt', lang('Completed'));
+						$setup_tpl->set_var('install', '&nbsp;');
+						if ($value['enabled'])
 						{
-							$setup_tpl->set_var('resolution','');
-							$status = lang('OK') . ' - ' . $value['status'];
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('OK').' - '.$value['status'];
 						}
 						else
 						{
@@ -434,123 +434,123 @@ 
 							{
 								$notables = '&notables=True';
 							}
-							$setup_tpl->set_var('bg_color','CCCCFF');
+							$setup_tpl->set_var('bg_color', 'CCCCFF');
 							$setup_tpl->set_var('resolution',
-								'<a href="applications.php?resolve=' . $value['name'] .  $notables . '">' . lang('Possible Reasons') . '</a>'
+								'<a href="applications.php?resolve='.$value['name'].$notables.'">'.lang('Possible Reasons').'</a>'
 							);
-							$status = lang('Disabled') . ' - ' . $value['status'];
+							$status = lang('Disabled').' - '.$value['status'];
 						}
 					}
 					break;
 				case 'U':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
 					if (!@$value['currentver'])
 					{
-						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'],True))
+						if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'], True))
 						{
 							// Some tables missing
-							$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-							$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
-							$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+							$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&badinstall=True">'.lang('Potential Problem').'</a>');
+							$status = lang('Requires reinstall or manual repair').' - '.$value['status'];
 						}
 						else
 						{
-							$setup_tpl->set_var('remove','&nbsp;');
-							$setup_tpl->set_var('resolution','');
-							$status = lang('Requires upgrade') . ' - ' . $value['status'];
+							$setup_tpl->set_var('remove', '&nbsp;');
+							$setup_tpl->set_var('resolution', '');
+							$status = lang('Requires upgrade').' - '.$value['status'];
 						}
 						// show not installed apps without icon
-						$setup_tpl->set_var('instimg','spacer.png');
-						$setup_tpl->set_var('instalt','');
-						$setup_tpl->set_var('bg_color','CCFFCC');
-						$setup_tpl->set_var('install','<input type="checkbox" name="install[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$status = lang('Please install') . ' - ' . $value['status'];
+						$setup_tpl->set_var('instimg', 'spacer.png');
+						$setup_tpl->set_var('instalt', '');
+						$setup_tpl->set_var('bg_color', 'CCFFCC');
+						$setup_tpl->set_var('install', '<input type="checkbox" name="install['.$value['name'].']" />');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$status = lang('Please install').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('bg_color','CCCCFF');
-						$setup_tpl->set_var('install','&nbsp;');
+						$setup_tpl->set_var('bg_color', 'CCCCFF');
+						$setup_tpl->set_var('install', '&nbsp;');
 						// TODO display some info about breakage if you mess with this app
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','');
-						$status = lang('Requires upgrade') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '');
+						$status = lang('Requires upgrade').' - '.$value['status'];
 					}
 					break;
 				case 'V':
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
 					if ($value['version'] == 'deleted')
 					{
-						$setup_tpl->set_var('bg_color','CCAAAA');
-						$setup_tpl->set_var('upgrade','&nbsp;');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&deleted=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Sources deleted/missing') . ' - ' . $value['status'];
+						$setup_tpl->set_var('bg_color', 'CCAAAA');
+						$setup_tpl->set_var('upgrade', '&nbsp;');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&deleted=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Sources deleted/missing').' - '.$value['status'];
 					}
 					else
 					{
-						$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&version=True">' . lang('Possible Solutions') . '</a>');
-						$status = lang('Version Mismatch') . ' - ' . $value['status'];
+						$setup_tpl->set_var('upgrade', '<input type="checkbox" name="upgrade['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&version=True">'.lang('Possible Solutions').'</a>');
+						$status = lang('Version Mismatch').' - '.$value['status'];
 					}
 					break;
 				case 'D':
-					$setup_tpl->set_var('bg_color','FFCCCC');
+					$setup_tpl->set_var('bg_color', 'FFCCCC');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
 					if ($values['currentver'])
 					{
-						$setup_tpl->set_var('remove',$key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-						$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '">' . lang('Possible Solutions') . '</a>');
+						$setup_tpl->set_var('remove', $key == 'api' ? '&nbsp;' : '<input type="checkbox" name="remove['.$value['name'].']" />');
+						$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'">'.lang('Possible Solutions').'</a>');
 					}
 					else
 					{
-						$setup_tpl->set_var('remove','&nbsp;');
-						$setup_tpl->set_var('resolution','&nbsp;');
+						$setup_tpl->set_var('remove', '&nbsp;');
+						$setup_tpl->set_var('resolution', '&nbsp;');
 					}
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$status = lang('Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$status = lang('Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				case 'P':
-					$setup_tpl->set_var('bg_color','FFCCFF');
+					$setup_tpl->set_var('bg_color', 'FFCCFF');
 					$depstring = parsedep($value['depends']);
 					$depstring .= ')';
-					$setup_tpl->set_var('instimg','dep.png');
-					$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&post=True">' . lang('Possible Solutions') . '</a>');
-					$status = lang('Post-install Dependency Failure') . ':' . $depstring . $value['status'];
+					$setup_tpl->set_var('instimg', 'dep.png');
+					$setup_tpl->set_var('instalt', lang('Post-install Dependency Failure'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '<a href="applications.php?resolve='.$value['name'].'&post=True">'.lang('Possible Solutions').'</a>');
+					$status = lang('Post-install Dependency Failure').':'.$depstring.$value['status'];
 					break;
 				default:
-					$setup_tpl->set_var('instimg','incomplete.png');
-					$setup_tpl->set_var('instalt',lang('Not Completed'));
-					$setup_tpl->set_var('install','&nbsp;');
-					$setup_tpl->set_var('remove','&nbsp;');
-					$setup_tpl->set_var('upgrade','&nbsp;');
-					$setup_tpl->set_var('resolution','');
+					$setup_tpl->set_var('instimg', 'incomplete.png');
+					$setup_tpl->set_var('instalt', lang('Not Completed'));
+					$setup_tpl->set_var('install', '&nbsp;');
+					$setup_tpl->set_var('remove', '&nbsp;');
+					$setup_tpl->set_var('upgrade', '&nbsp;');
+					$setup_tpl->set_var('resolution', '');
 					$status = '';
 					break;
 			}
 			//$setup_tpl->set_var('appname',$value['name'] . '-' . $status . ',' . $value['filename']);
-			$setup_tpl->set_var('appinfo',$value['name'] . '-' . $status);
-			$setup_tpl->set_var('appname',$value['name']);
+			$setup_tpl->set_var('appinfo', $value['name'].'-'.$status);
+			$setup_tpl->set_var('appname', $value['name']);
 
-			$setup_tpl->pparse('out','apps',True);
+			$setup_tpl->pparse('out', 'apps', True);
 		}
 	}
 
-	$setup_tpl->set_var('submit',lang('Save'));
-	$setup_tpl->set_var('cancel',lang('Cancel'));
-	$setup_tpl->pparse('out','app_footer');
-	$setup_tpl->pparse('out','footer');
+	$setup_tpl->set_var('submit', lang('Save'));
+	$setup_tpl->set_var('cancel', lang('Cancel'));
+	$setup_tpl->pparse('out', 'app_footer');
+	$setup_tpl->pparse('out', 'footer');
 	$GLOBALS['egw_setup']->html->show_footer();
 }

setup/doc/chown.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-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 as web-page
 {
@@ -39,7 +39,7 @@ 
 }
 $ids = explode(',', $_SERVER['argv'][0]);
 $change = array();
-while($ids)
+while ($ids)
 {
 	$from = (int)array_shift($ids);
 	$to = (int)array_shift($ids);
@@ -66,24 +66,24 @@ 
 
 chown_grp($path, null, $recursive);
 
-function chown_grp($path, array $stat=null, $recursive=false)
+function chown_grp($path, array $stat = null, $recursive = false)
 {
 	global $change;
 
 	if (is_null($stat) && !($stat = stat($path))) return false;
 
-	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
+	if (isset($change[$stat['uid']]) && !chown($path, $uid = $change[$stat['uid']]))
 	{
 		echo "Faild to set new owner #$uid for $path\n";
 	}
-	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid=-$change[-$stat['gid']]))
+	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid = -$change[-$stat['gid']]))
 	{
 		echo "Faild to set new group #$gid for $path\n";
 	}
 
 	if ($recursive && is_dir($path))
 	{
-		foreach(new DirectoryIterator($path) as $child)
+		foreach (new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
 				chown_grp($child->getPathname(), array(

Braces +11 added lines, -3 removed lines

@@ -13,10 +13,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>setup/doc/chown.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 $recursive = false;
 
@@ -70,7 +73,10 @@ 
 {
 	global $change;
 
-	if (is_null($stat) && !($stat = stat($path))) return false;
+	if (is_null($stat) && !($stat = stat($path)))
+	{
+		return false;
+	}
 
 	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
 	{
@@ -86,10 +92,12 @@ 
 		foreach(new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
-				chown_grp($child->getPathname(), array(
+			{
+							chown_grp($child->getPathname(), array(
 					'uid' => $child->getOwner(),
 					'gid' => $child->getGroup(),
 				), $recursive);
+			}
 		}
 	}
 }

importexport/setup/tables_current.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_importexport_definitions' => array(
 		'fd' => array(
-			'definition_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '255'),
-			'application' => array('type' => 'varchar','precision' => '50'),
-			'plugin' => array('type' => 'varchar','precision' => '100'),
-			'type' => array('type' => 'varchar','precision' => '20'),
-			'allowed_users' => array('type' => 'varchar','meta' => 'account-commasep','precision' => '255'),
+			'definition_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '255'),
+			'application' => array('type' => 'varchar', 'precision' => '50'),
+			'plugin' => array('type' => 'varchar', 'precision' => '100'),
+			'type' => array('type' => 'varchar', 'precision' => '20'),
+			'allowed_users' => array('type' => 'varchar', 'meta' => 'account-commasep', 'precision' => '255'),
 			'plugin_options' => array('type' => 'longtext'),
-			'owner' => array('type' => 'int','meta' => 'account','precision' => '4'),
-			'description' => array('type' => 'varchar','precision' => '255'),
+			'owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4'),
+			'description' => array('type' => 'varchar', 'precision' => '255'),
 			'modified' => array('type' => 'timestamp'),
 			'filter' => array('type' => 'longtext')
 		),

importexport/setup/tables_update.inc.php

Spacing +15 added lines, -15 removed lines

@@ -13,7 +13,7 @@ 
 
 function importexport_upgrade0_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','description',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'description', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -44,11 +44,11 @@ 
 
 function importexport_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions','definition_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions', 'definition_id', array(
 		'type' => 'auto',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'modified', array(
 		'type' => 'timestamp'
 	));
 
@@ -63,7 +63,7 @@ 
 
 function importexport_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 
@@ -74,7 +74,7 @@ 
 	// import i/e defintions
 	if (extension_loaded('dom'))
 	{
-		require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+		require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 		// This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 		$GLOBALS['egw_setup']->setup_account_object();
@@ -82,18 +82,18 @@ 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
 		while (false !== ($appdir = $egwdir->read())) {
-			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+			if (!is_dir($defdir)) continue;
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
 			while (false !== ($entry = $d->read())) {
 				try
 				{
-					$file = $defdir. '/'. $entry;
-					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
-					importexport_definitions_bo::import( $file );
+					$file = $defdir.'/'.$entry;
+					list($filename, $extension) = explode('.', $entry);
+					if ($extension != 'xml') continue;
+					importexport_definitions_bo::import($file);
 				}
 				catch (Exception $e)
 				{
@@ -104,10 +104,10 @@ 
 		}
 	}
 	// give Default and Admins group rights for ImportExport
-	foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+	foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 	{
-		$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-		$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+		$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+		$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 	}
 
 	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.9.004';
@@ -115,7 +115,7 @@ 
 
 function importexport_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 

Braces +12 added lines, -4 removed lines

@@ -81,18 +81,26 @@
 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
-		while (false !== ($appdir = $egwdir->read())) {
+		while (false !== ($appdir = $egwdir->read()))
+		{
 			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			if ( !is_dir( $defdir ) )
+			{
+				continue;
+			}
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
-			while (false !== ($entry = $d->read())) {
+			while (false !== ($entry = $d->read()))
+			{
 				try
 				{
 					$file = $defdir. '/'. $entry;
 					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
+					if ( $extension != 'xml' )
+					{
+						continue;
+					}
 					importexport_definitions_bo::import( $file );
 				}
 				catch (Exception $e)

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

@@ -12,9 +12,9 @@ 
 if (!extension_loaded('dom'))
 {
 	echo "<p>Required PHP DOM extension missing, installation of ImportExport definitions aborted.</p>\n";
-	return;	// otherwise we mess up the whole eGroupware install process
+	return; // otherwise we mess up the whole eGroupware install process
 }
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
@@ -22,22 +22,22 @@ 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {
-	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+	if (!is_dir($defdir)) continue;
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
 	while (false !== ($entry = $d->read())) {
-		$file = $defdir. '/'. $entry;
-		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
-		importexport_definitions_bo::import( $file );
+		$file = $defdir.'/'.$entry;
+		list($filename, $extension) = explode('.', $entry);
+		if ($extension != 'xml') continue;
+		importexport_definitions_bo::import($file);
 	}
 }
 
 // give Default and Admins group rights for ImportExport
-foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 {
-	$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+	$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 }

Braces +12 added lines, -4 removed lines

@@ -21,16 +21,24 @@
 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
-while (false !== ($appdir = $egwdir->read())) {
+while (false !== ($appdir = $egwdir->read()))
+{
 	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	if ( !is_dir( $defdir ) )
+	{
+		continue;
+	}
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
-	while (false !== ($entry = $d->read())) {
+	while (false !== ($entry = $d->read()))
+	{
 		$file = $defdir. '/'. $entry;
 		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
+		if ( $extension != 'xml' )
+		{
+			continue;
+		}
 		importexport_definitions_bo::import( $file );
 	}
 }

importexport/inc/class.importexport_iface_import_plugin.inc.php

Indentation +21 added lines, -21 removed lines

@@ -88,33 +88,33 @@
 	public function get_selectors_etpl();
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*	record_# => error message
-	*	)
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => error message
+	 *	)
+	 */
 	public function get_errors();
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*	record_# => warning message
-	*	)
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *	record_# => warning message
+	 *	)
+	 */
 	public function get_warnings();
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*	action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *	action => record count
+	 * )
+	 */
 	public function get_results();
 
 } // end of iface_export_plugin

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
  * So this interface just garanties the interaction with userinterfaces. It
  * has nothing to do with datatypes.
  */
-interface importexport_iface_import_plugin {
+interface importexport_iface_import_plugin
+{
 	
 	/**
 	 * imports entries according to given definition object.

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param definition $_definition
 	 * @return int number of successful imports
 	 */
-	public function import( $_stream, importexport_definition $_definition );
+	public function import($_stream, importexport_definition $_definition);
 
 	/**
 	 * Reads entries, and presents them back as they will be understood
@@ -79,7 +79,7 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null);
+	public function get_options_etpl(importexport_definition &$definition = null);
 
 	/**
 	 * returns etemplate name for slectors of this plugin

importexport/inc/class.importexport_iface_export_record.inc.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 	
 	/**
 	 * exports a record into resource of handle
@@ -41,7 +41,7 @@ 
 	 * @param object of interface egw_record _record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record );
+	public function export_record(importexport_iface_egw_record $_record);
 
 	/**
 	 * Retruns total number of exported records.

importexport/inc/class.importexport_iface_import_record.inc.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 
 	/**
 	 * cleanup
@@ -42,7 +42,7 @@ 
 	 * @param string _position may be: {first|last|next|previous|somenumber}
 	 * @return bool
 	 */
-	public function get_record( $_position = 'next' );
+	public function get_record($_position = 'next');
 
 	/**
 	 * Retruns total number of records for the open resource.