EGroupware / egroupware

setup/db_backup.php

Spacing +65 added lines, -66 removed lines

@@ -41,9 +41,9 @@ 
 if ($_POST['download'])
 {
 	list($file) = each($_POST['download']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to now allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to now allow to change the dir
 	while (@ob_end_clean()) {}      // end all active output buffering
-	ini_set('zlib.output_compression',0);   // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
+	ini_set('zlib.output_compression', 0); // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
 	Api\Header\Content::type(basename($file));
 	readfile($file);
 	exit;
@@ -61,23 +61,23 @@ 
 {
 	Api\Csrf::validate($_POST['csrf_token'], __FILE__);
 }
-$setup_tpl->set_block('T_db_backup','schedule_row','schedule_rows');
-$setup_tpl->set_block('T_db_backup','set_row','set_rows');
+$setup_tpl->set_block('T_db_backup', 'schedule_row', 'schedule_rows');
+$setup_tpl->set_block('T_db_backup', 'set_row', 'set_rows');
 
-$setup_tpl->set_var('stage_title',$stage_title = lang('DB backup and restore'));
-$setup_tpl->set_var('stage_desc',lang('This program lets you backup your database, schedule a backup or restore it.'));
-$setup_tpl->set_var('error_msg','');
+$setup_tpl->set_var('stage_title', $stage_title = lang('DB backup and restore'));
+$setup_tpl->set_var('stage_desc', lang('This program lets you backup your database, schedule a backup or restore it.'));
+$setup_tpl->set_var('error_msg', '');
 
-$bgcolor = array('#DDDDDD','#EEEEEE');
+$bgcolor = array('#DDDDDD', '#EEEEEE');
 
 if (is_object($GLOBALS['egw_setup']->html))
 {
-	$GLOBALS['egw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header($stage_title, False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 }
 else
 {
-	$setup_tpl->set_block('T_db_backup','setup_header');
-	$setup_tpl->set_var('setup_header','');
+	$setup_tpl->set_block('T_db_backup', 'setup_header');
+	$setup_tpl->set_var('setup_header', '');
 	$GLOBALS['egw_info']['flags']['app_header'] = $stage_title;
 	echo $GLOBALS['egw']->framework->header();
 	echo $GLOBALS['egw']->framework->navbar();
@@ -93,9 +93,9 @@ 
 	if (empty($minCount))
 	{
 		$minCount = 0;
-		$setup_tpl->set_var('error_msg',htmlspecialchars(lang("'%1' must be integer", lang("backup min count"))));
+		$setup_tpl->set_var('error_msg', htmlspecialchars(lang("'%1' must be integer", lang("backup min count"))));
 	}
-	$db_backup->saveConfig($minCount,$is_setup ? (boolean)$filesBackup : null);
+	$db_backup->saveConfig($minCount, $is_setup ? (boolean)$filesBackup : null);
 
 	if (is_int($minCount) && $minCount > 0)
 	{
@@ -112,22 +112,21 @@ 
 {
 	Vfs::$is_root = true;
 	echo '<div align="center">'.
-		(Vfs::mount('filesystem://default'.$db_backup->backup_dir.'?group=Admins&mode=070','/backup',false) ?
-			lang('Backup directory %1 mounted as %2',$db_backup->backup_dir,'/backup') :
-			lang('Failed to mount Backup directory!')).
+		(Vfs::mount('filesystem://default'.$db_backup->backup_dir.'?group=Admins&mode=070', '/backup', false) ?
+			lang('Backup directory %1 mounted as %2', $db_backup->backup_dir, '/backup') : lang('Failed to mount Backup directory!')).
 		"</div>\n";
 	Vfs::$is_root = false;
 }
 // create a backup now
-if($_POST['backup'])
+if ($_POST['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);
-		if(is_resource($f))
+		if (is_resource($f))
 			fclose($f);
-		$setup_tpl->set_var('error_msg',lang('backup finished'));
+		$setup_tpl->set_var('error_msg', lang('backup finished'));
 
 		/* Remove old backups. */
 		$cleaned_files = array();
@@ -139,38 +138,38 @@ 
 	}
 	else
 	{
-		$setup_tpl->set_var('error_msg',$f);
+		$setup_tpl->set_var('error_msg', $f);
 	}
 }
-$setup_tpl->set_var('backup_now_button','<input type="submit" name="backup" title="'.htmlspecialchars(lang("back's up your DB now, this might take a few minutes")).'" value="'.htmlspecialchars(lang('backup now')).'" />');
-$setup_tpl->set_var('upload','<input type="file" name="uploaded" /> &nbsp;'.
+$setup_tpl->set_var('backup_now_button', '<input type="submit" name="backup" title="'.htmlspecialchars(lang("back's up your DB now, this might take a few minutes")).'" value="'.htmlspecialchars(lang('backup now')).'" />');
+$setup_tpl->set_var('upload', '<input type="file" name="uploaded" /> &nbsp;'.
 	'<input type="submit" name="upload" value="'.htmlspecialchars(lang('upload backup')).'" title="'.htmlspecialchars(lang("uploads a backup to the backup-dir, from where you can restore it")).'" />');
-$setup_tpl->set_var('backup_mincount','<input type="text" name="backup_mincount" value="'.$db_backup->backup_mincount.'" size="3" maxlength="3"/>');
-$setup_tpl->set_var('backup_files','<input type="checkbox" name="backup_files" value="backup_files"'.
-	($db_backup->backup_files ? ' checked="true"':'').
+$setup_tpl->set_var('backup_mincount', '<input type="text" name="backup_mincount" value="'.$db_backup->backup_mincount.'" size="3" maxlength="3"/>');
+$setup_tpl->set_var('backup_files', '<input type="checkbox" name="backup_files" value="backup_files"'.
+	($db_backup->backup_files ? ' checked="true"' : '').
 // do NOT allow to change "backup files" outside of setup
 	($is_setup ? '' : ' disabled="true" title="'.htmlspecialchars(lang('Can only be change via Setup!')).'"').'/>');
-$setup_tpl->set_var('backup_save_settings','<input type="submit" name="save_backup_settings" value="'.htmlspecialchars(lang('save')).'" />');
-$setup_tpl->set_var('backup_mount','<input type="submit" name="mount" value="'.htmlspecialchars(lang('Mount backup directory to %1','/backup')).'" />');
+$setup_tpl->set_var('backup_save_settings', '<input type="submit" name="save_backup_settings" value="'.htmlspecialchars(lang('save')).'" />');
+$setup_tpl->set_var('backup_mount', '<input type="submit" name="mount" value="'.htmlspecialchars(lang('Mount backup directory to %1', '/backup')).'" />');
 
 if ($_POST['upload'] && is_array($_FILES['uploaded']) && !$_FILES['uploaded']['error'] &&
 	is_uploaded_file($_FILES['uploaded']['tmp_name']))
 {
-	move_uploaded_file($_FILES['uploaded']['tmp_name'],$db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
+	move_uploaded_file($_FILES['uploaded']['tmp_name'], $db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 
 	$md5 = ', md5='.md5_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 	$md5 .= ', sha1='.sha1_file($db_backup->backup_dir.'/'.$_FILES['uploaded']['name']);
 
-	$setup_tpl->set_var('error_msg',lang("succesfully uploaded file %1",$_FILES['uploaded']['name'].', '.
-		sprintf('%3.1lf MB (%d)',$_FILES['uploaded']['size']/(1024*1024),$_FILES['uploaded']['size']).$md5));
+	$setup_tpl->set_var('error_msg', lang("succesfully uploaded file %1", $_FILES['uploaded']['name'].', '.
+		sprintf('%3.1lf MB (%d)', $_FILES['uploaded']['size'] / (1024 * 1024), $_FILES['uploaded']['size']).$md5));
 }
 // delete a backup
 if ($_POST['delete'])
 {
 	list($file) = each($_POST['delete']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
 
-	if (unlink($file)) $setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
+	if (unlink($file)) $setup_tpl->set_var('error_msg', lang("backup '%1' deleted", $file));
 }
 // rename a backup
 if ($_POST['rename'])
@@ -181,44 +180,44 @@ 
 	{
 		list($ending) = array_reverse(explode('.', $file));
 		list($new_ending, $has_ending) = array_reverse(explode('.', $new_name));
-		if(!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
-		$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
-		$ext = preg_match('/(\.gz|\.bz2)+$/i',$file,$matches) ? $matches[1] : '';
-		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i','',basename($new_name)).$ext;
-		if (rename($file,$new_file)) $setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		if (!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
+		$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
+		$ext = preg_match('/(\.gz|\.bz2)+$/i', $file, $matches) ? $matches[1] : '';
+		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i', '', basename($new_name)).$ext;
+		if (rename($file, $new_file)) $setup_tpl->set_var('error_msg', lang("backup '%1' renamed to '%2'", basename($file), basename($new_file)));
 	}
 }
 // restore a backup
 if ($_POST['restore'])
 {
 	list($file) = each($_POST['restore']);
-	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
+	$file = $db_backup->backup_dir.'/'.basename($file); // basename to not allow to change the dir
 
-	if (is_resource($f = $db_backup->fopen_backup($file,true)))
+	if (is_resource($f = $db_backup->fopen_backup($file, true)))
 	{
-		echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
+		echo '<p align="center">'.lang('restore started, this might take a few minutes ...')."</p>\n".str_repeat(' ', 4096);
 		$start = time();
-		$db_backup->restore($f, true, $file);	// allways convert to current system charset on restore
-		$setup_tpl->set_var('error_msg',lang("backup '%1' restored",$file).' ('.(time()-$start).' s)');
+		$db_backup->restore($f, true, $file); // allways convert to current system charset on restore
+		$setup_tpl->set_var('error_msg', lang("backup '%1' restored", $file).' ('.(time() - $start).' s)');
 		if ($run_in_egw)
 		{
 			// updating the backup
 			$cmd = new setup_cmd_update($GLOBALS['egw']->session->account_domain,
-				$GLOBALS['egw_info']['server']['header_admin_user']='admin',
-				$GLOBALS['egw_info']['server']['header_admin_password']=uniqid('pw',true),false,true);
+				$GLOBALS['egw_info']['server']['header_admin_user'] = 'admin',
+				$GLOBALS['egw_info']['server']['header_admin_password'] = uniqid('pw', true), false, true);
 			echo $cmd->run()."\n";
-			echo '<h3>'.lang('You should %1log out%2 and in again, to update your current session!','<a href="'.Egw::link('/logout.php').'" target="_parent">','</a>')."</h3>\n";
+			echo '<h3>'.lang('You should %1log out%2 and in again, to update your current session!', '<a href="'.Egw::link('/logout.php').'" target="_parent">', '</a>')."</h3>\n";
 		}
 	}
 	else
 	{
-		$setup_tpl->set_var('error_msg',$f);
+		$setup_tpl->set_var('error_msg', $f);
 	}
 }
 // create a new scheduled backup
 if ($_POST['schedule'])
 {
-	$asyncservice->set_timer($_POST['times'],'db_backup-'.implode(':',$_POST['times']),'admin.admin_db_backup.do_backup','');
+	$asyncservice->set_timer($_POST['times'], 'db_backup-'.implode(':', $_POST['times']), 'admin.admin_db_backup.do_backup', '');
 }
 // cancel a scheduled backup
 if (is_array($_POST['cancel']))
@@ -229,29 +228,29 @@ 
 // list scheduled backups
 if (($jobs = $asyncservice->read('db_backup-%')))
 {
-	foreach($jobs as $job)
+	foreach ($jobs as $job)
 	{
 		$setup_tpl->set_var($job['times']);
-		$setup_tpl->set_var('next_run',date('Y-m-d H:i',$job['next']));
-		$setup_tpl->set_var('actions','<input type="submit" name="cancel['.$job['id'].']" value="'.htmlspecialchars(lang('delete')).'" />');
-		$setup_tpl->parse('schedule_rows','schedule_row',true);
+		$setup_tpl->set_var('next_run', date('Y-m-d H:i', $job['next']));
+		$setup_tpl->set_var('actions', '<input type="submit" name="cancel['.$job['id'].']" value="'.htmlspecialchars(lang('delete')).'" />');
+		$setup_tpl->parse('schedule_rows', 'schedule_row', true);
 	}
 }
 // input-fields to create a new scheduled backup
-foreach($times=array('year'=>'*','month'=>'*','day'=>'*','dow'=>'2-6','hour'=>3,'min'=>0) as $name => $default)
+foreach ($times = array('year'=>'*', 'month'=>'*', 'day'=>'*', 'dow'=>'2-6', 'hour'=>3, 'min'=>0) as $name => $default)
 {
-	$setup_tpl->set_var($name,'<input name="times['.$name.']" size="5" value="'.$default.'" />');
+	$setup_tpl->set_var($name, '<input name="times['.$name.']" size="5" value="'.$default.'" />');
 }
-$setup_tpl->set_var('next_run','&nbsp;');
-$setup_tpl->set_var('actions','<input type="submit" name="schedule" value="'.htmlspecialchars(lang('schedule')).'" />');
-$setup_tpl->parse('schedule_rows','schedule_row',true);
+$setup_tpl->set_var('next_run', '&nbsp;');
+$setup_tpl->set_var('actions', '<input type="submit" name="schedule" value="'.htmlspecialchars(lang('schedule')).'" />');
+$setup_tpl->parse('schedule_rows', 'schedule_row', true);
 
 // listing the availible backup sets
-$setup_tpl->set_var('backup_dir',$db_backup->backup_dir);
-$setup_tpl->set_var('set_rows','');
+$setup_tpl->set_var('backup_dir', $db_backup->backup_dir);
+$setup_tpl->set_var('set_rows', '');
 $handle = @opendir($db_backup->backup_dir);
 $files = array();
-while($handle && ($file = readdir($handle)))
+while ($handle && ($file = readdir($handle)))
 {
 	if ($file != '.' && $file != '..')
 	{
@@ -261,13 +260,13 @@ 
 if ($handle) closedir($handle);
 
 arsort($files);
-foreach($files as $file => $ctime)
+foreach ($files as $file => $ctime)
 {
 	$size = filesize($db_backup->backup_dir.'/'.$file);
 	$setup_tpl->set_var(array(
 		'filename'	=> $file,
-		'mod'		=> date('Y-m-d H:i',$ctime),
-		'size'		=> sprintf('%3.1lf MB (%d)',$size/(1024*1024),$size),
+		'mod'		=> date('Y-m-d H:i', $ctime),
+		'size'		=> sprintf('%3.1lf MB (%d)', $size / (1024 * 1024), $size),
 		'actions'	=> '<input type="submit" name="download['.$file.']" value="'.htmlspecialchars(lang('download')).'" />&nbsp;'."\n".
 			'<input type="submit" name="delete['.$file.']" value="'.htmlspecialchars(lang('delete')).'" onclick="return confirm(\''.
 				htmlspecialchars(lang('Confirm to delete this backup?')).'\');" />&nbsp;'."\n".
@@ -275,7 +274,7 @@ 
 			'<input type="submit" name="restore['.$file.']" value="'.htmlspecialchars(lang('restore')).'" onclick="return confirm(\''.
 				htmlspecialchars(lang('Restoring a backup will delete/replace all content in your database. Are you sure?')).'\');" />',
 	));
-	$setup_tpl->parse('set_rows','set_row',true);
+	$setup_tpl->parse('set_rows', 'set_row', true);
 }
 
 $setup_tpl->set_var(array(
@@ -299,8 +298,8 @@ 
 	'lang_size'				=> lang('size'),
 ));
 
-$setup_tpl->set_var('self',$self);
-$setup_tpl->pparse('out','T_db_backup');
+$setup_tpl->set_var('self', $self);
+$setup_tpl->pparse('out', 'T_db_backup');
 
 if ($run_in_egw)
 {

Braces +27 added lines, -8 removed lines

@@ -14,9 +14,12 @@ 
 use EGroupware\Api\Egw;
 use EGroupware\Api\Vfs;
 
-if (!is_object(@$GLOBALS['egw']))	// called from outside eGW ==> setup
+if (!is_object(@$GLOBALS['egw']))
+{
+	// called from outside eGW ==> setup
 {
 	include ('./inc/functions.inc.php');
+}
 
 	@set_time_limit(0);
 
@@ -42,7 +45,9 @@ 
 {
 	list($file) = each($_POST['download']);
 	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to now allow to change the dir
-	while (@ob_end_clean()) {}      // end all active output buffering
+	while (@ob_end_clean())
+	{
+}      // end all active output buffering
 	ini_set('zlib.output_compression',0);   // switch off zlib.output_compression, as this would limit downloads in size to memory_limit
 	Api\Header\Content::type(basename($file));
 	readfile($file);
@@ -126,7 +131,9 @@ 
 		echo '<p align="center">'.lang('backup started, this might take a few minutes ...')."</p>\n".str_repeat(' ',4096);
 		$db_backup->backup($f);
 		if(is_resource($f))
-			fclose($f);
+		{
+					fclose($f);
+		}
 		$setup_tpl->set_var('error_msg',lang('backup finished'));
 
 		/* Remove old backups. */
@@ -170,8 +177,11 @@ 
 	list($file) = each($_POST['delete']);
 	$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
 
-	if (unlink($file)) $setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
-}
+	if (unlink($file))
+	{
+		$setup_tpl->set_var('error_msg',lang("backup '%1' deleted",$file));
+	}
+	}
 // rename a backup
 if ($_POST['rename'])
 {
@@ -181,11 +191,17 @@ 
 	{
 		list($ending) = array_reverse(explode('.', $file));
 		list($new_ending, $has_ending) = array_reverse(explode('.', $new_name));
-		if(!$has_ending || $new_ending != $ending) $new_name .= '.'.$ending;
+		if(!$has_ending || $new_ending != $ending)
+		{
+			$new_name .= '.'.$ending;
+		}
 		$file = $db_backup->backup_dir.'/'.basename($file);	// basename to not allow to change the dir
 		$ext = preg_match('/(\.gz|\.bz2)+$/i',$file,$matches) ? $matches[1] : '';
 		$new_file = $db_backup->backup_dir.'/'.preg_replace('/(\.gz|\.bz2)+$/i','',basename($new_name)).$ext;
-		if (rename($file,$new_file)) $setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		if (rename($file,$new_file))
+		{
+			$setup_tpl->set_var('error_msg',lang("backup '%1' renamed to '%2'",basename($file),basename($new_file)));
+		}
 	}
 }
 // restore a backup
@@ -258,7 +274,10 @@ 
 		$files[$file] = filectime($db_backup->backup_dir.'/'.$file);
 	}
 }
-if ($handle) closedir($handle);
+if ($handle)
+{
+	closedir($handle);
+}
 
 arsort($files);
 foreach($files as $file => $ctime)

setup/admin_account.php

Spacing +48 added lines, -48 removed lines

@@ -13,13 +13,13 @@ 
 use EGroupware\Api;
 use EGroupware\Api\Framework;
 
-if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
+if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') !== false)
 {
 	include('./inc/functions.inc.php');
 
 	// Authorize the user to use setup app and load the database
 	// Does not return unless user is authorized
-	if(!$GLOBALS['egw_setup']->auth('Config') || $_POST['cancel'])
+	if (!$GLOBALS['egw_setup']->auth('Config') || $_POST['cancel'])
 	{
 		Header('Location: index.php');
 		exit;
@@ -43,16 +43,16 @@ 
 	$lname    = $_POST['lname'];
 	$email    = $_POST['email'];
 
-	if($passwd != $passwd2 || !$username)
+	if ($passwd != $passwd2 || !$username)
 	{
-		$error = '<p>'.lang('Passwords did not match, please re-enter') . ".</p>\n";
+		$error = '<p>'.lang('Passwords did not match, please re-enter').".</p>\n";
 	}
-	if(!$username)
+	if (!$username)
 	{
-		$error = '<p>'.lang('You must enter a username for the admin') . ".</p>\n";
+		$error = '<p>'.lang('You must enter a username for the admin').".</p>\n";
 	}
 }
-if(!$_POST['submit'] || $error)
+if (!$_POST['submit'] || $error)
 {
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
 	$setup_tpl = new Framework\Template($tpl_root);
@@ -64,8 +64,8 @@ 
 		'T_login_stage_header' => 'login_stage_header.tpl',
 		'T_admin_account' => 'admin_account.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');
 
 	$GLOBALS['egw_setup']->html->show_header(lang('Create admin account'));
 
@@ -76,27 +76,27 @@ 
 		'lname'    => $lname,
 		'email'    => $email,
 	));
-	$setup_tpl->set_var('action_url','admin_account.php');
-	$setup_tpl->set_var('description',lang('This will create a first user in eGroupWare or reset password and admin rights of an exiting user'));
-	$setup_tpl->set_var('lang_deleteall',lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?'));
-
-	$setup_tpl->set_var('detailadmin',lang('Details for Admin account'));
-	$setup_tpl->set_var('adminusername',lang('Admin username'));
-	$setup_tpl->set_var('adminfirstname',lang('Admin first name'));
-	$setup_tpl->set_var('adminlastname',lang('Admin last name'));
-	$setup_tpl->set_var('adminemail',lang('Admin email address'));
-	$setup_tpl->set_var('adminpassword',lang('Admin password'));
-	$setup_tpl->set_var('adminpassword2',lang('Re-enter password'));
-	$setup_tpl->set_var('admin_all_apps',lang('Give admin access to all installed apps'));
-	$setup_tpl->set_var('all_apps_desc',lang('Usually more annoying.<br />Admins can use Admin >> Manage accounts or groups to give access to further apps.'));
-	$setup_tpl->set_var('create_demo_accounts',lang('Create demo accounts'));
-	$setup_tpl->set_var('demo_desc',lang('The username/passwords are: demo/guest, demo2/guest and demo3/guest.'));
+	$setup_tpl->set_var('action_url', 'admin_account.php');
+	$setup_tpl->set_var('description', lang('This will create a first user in eGroupWare or reset password and admin rights of an exiting user'));
+	$setup_tpl->set_var('lang_deleteall', lang('Delete all existing SQL accounts, groups, ACLs and preferences (normally not necessary)?'));
+
+	$setup_tpl->set_var('detailadmin', lang('Details for Admin account'));
+	$setup_tpl->set_var('adminusername', lang('Admin username'));
+	$setup_tpl->set_var('adminfirstname', lang('Admin first name'));
+	$setup_tpl->set_var('adminlastname', lang('Admin last name'));
+	$setup_tpl->set_var('adminemail', lang('Admin email address'));
+	$setup_tpl->set_var('adminpassword', lang('Admin password'));
+	$setup_tpl->set_var('adminpassword2', lang('Re-enter password'));
+	$setup_tpl->set_var('admin_all_apps', lang('Give admin access to all installed apps'));
+	$setup_tpl->set_var('all_apps_desc', lang('Usually more annoying.<br />Admins can use Admin >> Manage accounts or groups to give access to further apps.'));
+	$setup_tpl->set_var('create_demo_accounts', lang('Create demo accounts'));
+	$setup_tpl->set_var('demo_desc', lang('The username/passwords are: demo/guest, demo2/guest and demo3/guest.'));
 
 	$setup_tpl->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__FILE__)));
 
-	$setup_tpl->set_var('lang_submit',lang('Save'));
-	$setup_tpl->set_var('lang_cancel',lang('Cancel'));
-	$setup_tpl->pparse('out','T_admin_account');
+	$setup_tpl->set_var('lang_submit', lang('Save'));
+	$setup_tpl->set_var('lang_cancel', lang('Cancel'));
+	$setup_tpl->pparse('out', 'T_admin_account');
 	$GLOBALS['egw_setup']->html->show_footer();
 }
 else
@@ -104,25 +104,25 @@ 
 	/* Begin transaction for acl, etc */
 	$GLOBALS['egw_setup']->db->transaction_begin();
 
-	if($_POST['delete_all'])
+	if ($_POST['delete_all'])
 	{
 		/* Now, clear out existing tables */
-		foreach(array($GLOBALS['egw_setup']->accounts_table,$GLOBALS['egw_setup']->acl_table,'egw_access_log') as $table)
+		foreach (array($GLOBALS['egw_setup']->accounts_table, $GLOBALS['egw_setup']->acl_table, 'egw_access_log') as $table)
 		{
-			$GLOBALS['egw_setup']->db->delete($table,'1=1',__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->delete($table, '1=1', __LINE__, __FILE__);
 		}
 		// keep default and forced prefs from installed apps
-		$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->prefs_table,'preference_owner NOT IN (-1,-2)',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->prefs_table, 'preference_owner NOT IN (-1,-2)', __LINE__, __FILE__);
 		// remove accounts from addressbook
-		$GLOBALS['egw_setup']->db->delete('egw_addressbook','account_id IS NOT NULL',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->delete('egw_addressbook', 'account_id IS NOT NULL', __LINE__, __FILE__);
 	}
 	// create our stock groups: Default (all users) and Admins (administrators)
-	$defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-	$admingroupid   = (int)$GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False);
+	$defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+	$admingroupid   = (int)$GLOBALS['egw_setup']->add_account('Admins', 'Admin', 'Group', False, False);
 
 	if (!$defaultgroupid || !$admingroupid)
 	{
-		if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
+		if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') === false)
 		{
 			return 42; //lang('Error in group-creation !!!');	// dont exit on setup-cli
 		}
@@ -133,11 +133,11 @@ 
 	}
 
 	// Group perms for the default group
-	$default_group_apps = array('addressbook','calendar','infolog','mail','filemanager','preferences','manual','groupdav','notifications','timesheet','importexport','activesync');
-	$GLOBALS['egw_setup']->add_acl($default_group_apps,'run',$defaultgroupid);
+	$default_group_apps = array('addressbook', 'calendar', 'infolog', 'mail', 'filemanager', 'preferences', 'manual', 'groupdav', 'notifications', 'timesheet', 'importexport', 'activesync');
+	$GLOBALS['egw_setup']->add_acl($default_group_apps, 'run', $defaultgroupid);
 
 	$apps = array();
-	foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, 'app_name', 'app_enabled < 3', __LINE__, __FILE__) as $row)
 	{
 		$apps[] = $row['app_name'];
 	}
@@ -148,24 +148,24 @@ 
 		$apps = array_intersect(
 			// also give Admins apps of all users group Defaults, in case one forgot to add admins to it
 			array_unique(array_merge($default_group_apps,
-				array('admin','bookmarks','emailadmin','news_admin','phpbrain','phpsysinfo','phpfreechat','projectmanager','resources','sitemgr','timesheet','tracker','wiki'))),$apps);
+				array('admin', 'bookmarks', 'emailadmin', 'news_admin', 'phpbrain', 'phpsysinfo', 'phpfreechat', 'projectmanager', 'resources', 'sitemgr', 'timesheet', 'tracker', 'wiki'))), $apps);
 	}
-	$GLOBALS['egw_setup']->add_acl($apps,'run',$admingroupid);
+	$GLOBALS['egw_setup']->add_acl($apps, 'run', $admingroupid);
 
 	/* Creation of the demo accounts is optional - the checkbox is on by default. */
-	if($_POST['create_demo'])
+	if ($_POST['create_demo'])
 	{
 		// Create 3 demo accounts
-		$GLOBALS['egw_setup']->add_account('demo','Demo','Account','guest');
-		$GLOBALS['egw_setup']->add_account('demo2','Demo2','Account','guest');
-		$GLOBALS['egw_setup']->add_account('demo3','Demo3','Account','guest');
+		$GLOBALS['egw_setup']->add_account('demo', 'Demo', 'Account', 'guest');
+		$GLOBALS['egw_setup']->add_account('demo2', 'Demo2', 'Account', 'guest');
+		$GLOBALS['egw_setup']->add_account('demo3', 'Demo3', 'Account', 'guest');
 	}
 
 	/* Create records for administrator account, with Admins as primary and Default as additional group */
-	$accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email);
+	$accountid = $GLOBALS['egw_setup']->add_account($username, $fname, $lname, $passwd, 'Admins', True, $email);
 	if (!$accountid)
 	{
-		if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
+		if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') === false)
 		{
 			return 41; //lang('Error in admin-creation !!!');	// dont exit on setup-cli
 		}
@@ -174,11 +174,11 @@ 
 		$GLOBALS['egw_setup']->db->transaction_abort();
 		exit;
 	}
-	$GLOBALS['egw_setup']->set_memberships(array($admingroupid,$defaultgroupid),$accountid);
+	$GLOBALS['egw_setup']->set_memberships(array($admingroupid, $defaultgroupid), $accountid);
 
 	$GLOBALS['egw_setup']->db->transaction_commit();
 
-	if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
+	if (strpos($_SERVER['PHP_SELF'], 'admin_account.php') !== false)
 	{
 		Header('Location: index.php');
 	}

setup/setup-cli.php

Switch Indentation +81 added lines, -81 removed lines

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

Spacing +90 added lines, -90 removed lines

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

Braces +69 added lines, -17 removed lines

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

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:

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[] = $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[] = $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();

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 />'),

setup/account_migration.php

Spacing +43 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
 // Does not return unless user is authorized
 
 $tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 $setup_tpl->set_file(array(
 	'migration' => 'account_migration.tpl',
 	'T_head' => 'head.tpl',
@@ -45,9 +45,9 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 }
 // Load configuration values account_repository and auth_type, as setup has not yet done so
-foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',
+foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value',
 	"config_name LIKE 'ldap%' OR config_name LIKE 'account_%' OR config_name LIKE '%encryption%' OR config_name='auth_type' OR config_name='mail_suffix'",
-	__LINE__,__FILE__) as $row)
+	__LINE__, __FILE__) as $row)
 {
 	$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 }
@@ -65,11 +65,11 @@ 
 }
 $direction = strtoupper($from).' --> '.strtoupper($to);
 
-$GLOBALS['egw_setup']->html->show_header($direction,False,'config',$GLOBALS['egw_setup']->ConfigDomain .
-	'(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+$GLOBALS['egw_setup']->html->show_header($direction, False, 'config', $GLOBALS['egw_setup']->ConfigDomain.
+	'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 
 // create base one level off ldap_context
-$base_parts = explode(',',$GLOBALS['egw_info']['server']['ldap_context']);
+$base_parts = explode(',', $GLOBALS['egw_info']['server']['ldap_context']);
 array_shift($base_parts);
 
 $cmd = new setup_cmd_ldap(array(
@@ -78,24 +78,24 @@ 
 	// allow to set ldap root DN (ldap_admin) to create instance specific admin DN and structure
 	'ldap_admin' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin'] : $GLOBALS['egw_info']['server']['ldap_root_dn'],
 	'ldap_admin_pw' => !empty($_POST['ldap_admin']) ? $_POST['ldap_admin_pw'] : $GLOBALS['egw_info']['server']['ldap_root_pw'],
-	'ldap_base' => implode(',',$base_parts),
+	'ldap_base' => implode(',', $base_parts),
 	'truncate_egw_accounts' => !empty($_POST['truncate_egw_accounts']),
-)+$GLOBALS['egw_info']['server']);
+) + $GLOBALS['egw_info']['server']);
 
 if (!$_POST['migrate'] && !$_POST['passwords2sql'])
 {
 	$accounts = $cmd->accounts($from);
 
 	// now outputting the account selection
-	$setup_tpl->set_block('migration','header','header');
-	$setup_tpl->set_block('migration','user_list','user_list');
-	$setup_tpl->set_block('migration','group_list','group_list');
-	$setup_tpl->set_block('migration','ldap_admin','ldap_admin');
-	$setup_tpl->set_block('migration','submit','submit');
-	$setup_tpl->set_block('migration','footer','footer');
-	$setup_tpl->set_block('migration','truncate_egw_accounts','truncate_egw_accounts');
-
-	foreach($accounts as $account_id => $account)
+	$setup_tpl->set_block('migration', 'header', 'header');
+	$setup_tpl->set_block('migration', 'user_list', 'user_list');
+	$setup_tpl->set_block('migration', 'group_list', 'group_list');
+	$setup_tpl->set_block('migration', 'ldap_admin', 'ldap_admin');
+	$setup_tpl->set_block('migration', 'submit', 'submit');
+	$setup_tpl->set_block('migration', 'footer', 'footer');
+	$setup_tpl->set_block('migration', 'truncate_egw_accounts', 'truncate_egw_accounts');
+
+	foreach ($accounts as $account_id => $account)
 	{
 		if ($account['account_type'] == 'g')
 		{
@@ -103,70 +103,69 @@ 
 			{
 				$identical_account_id_warning .= lang('Group %1 uses identical ID %2 as user %3!', $account['account_lid'], abs($account_id), $accounts[abs($account_id)]['account_lid']);
 			}
-			$group_list .= '<option value="' . $account_id . '" selected="1">'. $account['account_lid'] . "</option>\n";
+			$group_list .= '<option value="'.$account_id.'" selected="1">'.$account['account_lid']."</option>\n";
 		}
 		else
 		{
-			$user_list .= '<option value="' . $account_id . '" selected="1">'.
+			$user_list .= '<option value="'.$account_id.'" selected="1">'.
 				Api\Accounts::format_username($account['account_lid'],
-				$account['account_firstname'],$account['account_lastname'])	. "</option>\n";
+				$account['account_firstname'], $account['account_lastname'])."</option>\n";
 		}
 	}
-	$setup_tpl->set_var('action_url','account_migration.php');
-	$setup_tpl->set_var('users',$user_list);
-	$setup_tpl->set_var('groups',$group_list);
-
-	$setup_tpl->set_var('description',lang('Migration between EGroupware account repositories').': '.$direction);
-	$setup_tpl->set_var('select_users',lang('Select which user(s) will be exported'));
-	$setup_tpl->set_var('select_groups',lang('Select which group(s) will be exported'));
-	$setup_tpl->set_var('memberships',$identical_account_id_warning ?
-		'<p style="color: red">'.$identical_account_id_warning.'<br/>'.lang('Migration of group will fail, as SQL does NOT allow identical IDs.').'</p>' :
-		lang('Group memberships will be migrated too.'));
+	$setup_tpl->set_var('action_url', 'account_migration.php');
+	$setup_tpl->set_var('users', $user_list);
+	$setup_tpl->set_var('groups', $group_list);
+
+	$setup_tpl->set_var('description', lang('Migration between EGroupware account repositories').': '.$direction);
+	$setup_tpl->set_var('select_users', lang('Select which user(s) will be exported'));
+	$setup_tpl->set_var('select_groups', lang('Select which group(s) will be exported'));
+	$setup_tpl->set_var('memberships', $identical_account_id_warning ?
+		'<p style="color: red">'.$identical_account_id_warning.'<br/>'.lang('Migration of group will fail, as SQL does NOT allow identical IDs.').'</p>' : lang('Group memberships will be migrated too.'));
 	$setup_tpl->set_var('ldap_admin_message', lang('Give LDAP root DN and password, if you need to create an instance specific admin user, user- or group-context'));
 	$setup_tpl->set_var('ldap_admin_label', lang('Root DN'));
 	$setup_tpl->set_var('ldap_admin_pw_label', lang('Root DN password'));
-	$setup_tpl->set_var('migrate',$direction);
-	$setup_tpl->set_var('cancel',lang('Cancel'));
+	$setup_tpl->set_var('migrate', $direction);
+	$setup_tpl->set_var('cancel', lang('Cancel'));
 	if ($from == 'sql' && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap')
 	{
 		$setup_tpl->set_var('extra_button', Api\Html::submit_button('passwords2sql', lang('Passwords --> SQL')));
 	}
 
-	$setup_tpl->pfp('out','header');
-	if($user_list)
+	$setup_tpl->pfp('out', 'header');
+	if ($user_list)
 	{
-		$setup_tpl->pfp('out','user_list');
+		$setup_tpl->pfp('out', 'user_list');
 	}
-	if($group_list)
+	if ($group_list)
 	{
-		$setup_tpl->pfp('out','group_list');
+		$setup_tpl->pfp('out', 'group_list');
 	}
 	if ($to == 'ldap')
 	{
-		$setup_tpl->pfp('out','ldap_admin');
+		$setup_tpl->pfp('out', 'ldap_admin');
 	}
 	if ($to == 'sql')
 	{
 		$setup_tpl->set_var('truncate_egw_accounts_message', lang('Delete all existing accounts from SQL database'));
-		$setup_tpl->pfp('out','truncate_egw_accounts');
+		$setup_tpl->pfp('out', 'truncate_egw_accounts');
 	}
-	$setup_tpl->pfp('out','submit');
-	$setup_tpl->pfp('out','footer');
+	$setup_tpl->pfp('out', 'submit');
+	$setup_tpl->pfp('out', 'footer');
 }
 else	// do the migration
 {
 	$cmd->only = (array)$_POST['users'];
 	if (empty($_POST['passwords2sql'])) $cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
 	$cmd->verbose = true;
-	echo '<p align="center">'.str_replace("\n","</p>\n<p align='center'>",$cmd->run())."</p>\n";
+	echo '<p align="center">'.str_replace("\n", "</p>\n<p align='center'>", $cmd->run())."</p>\n";
 
 	// store new repostory (and auth_type), as we are migrated now
 	if ($_POST['migrate'])
 	{
-		Api\Config::save_value('account_repository', $GLOBALS['egw_info']['server']['account_repository']=$to, 'phpgwapi');
+		Api\Config::save_value('account_repository', $GLOBALS['egw_info']['server']['account_repository'] = $to, 'phpgwapi');
 		if (empty($GLOBALS['egw_info']['server']['auth_type']) || $GLOBALS['egw_info']['server']['auth_type'] == $from)
 		{
-			Api\Config::save_value('auth_type', $GLOBALS['egw_info']['server']['auth_type']=$to, 'phpgwapi');
+			Api\Config::save_value('auth_type', $GLOBALS['egw_info']['server']['auth_type'] = $to, 'phpgwapi');
 		}
 	}
 	echo '<p align="center">'.lang('Click <a href="index.php">here</a> to return to setup.')."</p>\n";

Braces +4 added lines, -1 removed lines

@@ -156,7 +156,10 @@
 else	// do the migration
 {
 	$cmd->only = (array)$_POST['users'];
-	if (empty($_POST['passwords2sql'])) $cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
+	if (empty($_POST['passwords2sql']))
+	{
+		$cmd->only = array_merge($cmd->only, (array)$_POST['groups']);
+	}
 	$cmd->verbose = true;
 	echo '<p align="center">'.str_replace("\n","</p>\n<p align='center'>",$cmd->run())."</p>\n";
 

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] . ': ';

Spacing +220 added lines, -220 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,12 +125,12 @@ 
 
 	$register_hooks = false;
 
-	if(!empty($remove) && is_array($remove))
+	if (!empty($remove) && is_array($remove))
 	{
 		$historylog = new Api\Storage\History();
 		$historylog->db = $GLOBALS['egw_setup']->db;
 
-		foreach($remove as $appname => $key)
+		foreach ($remove as $appname => $key)
 		{
 			$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
 			$terror = array();
@@ -138,30 +138,30 @@ 
 
 			if ($setup_info[$appname]['tables'])
 			{
-				$GLOBALS['egw_setup']->process->droptables($terror,$DEBUG);
-				echo '<br />' . $app_title . ' ' . lang('tables dropped') . '.';
+				$GLOBALS['egw_setup']->process->droptables($terror, $DEBUG);
+				echo '<br />'.$app_title.' '.lang('tables dropped').'.';
 			}
 
 			$GLOBALS['egw_setup']->deregister_app($setup_info[$appname]['name']);
-			echo '<br />' . $app_title . ' ' . lang('deregistered') . '.';
+			echo '<br />'.$app_title.' '.lang('deregistered').'.';
 
 			$register_hooks = true;
 
 			$historylog->appname = $appname;
 			if ($historylog->delete(null))
 			{
-				echo '<br />' . $app_title . ' ' . lang('Historylog removed') . '.';
+				echo '<br />'.$app_title.' '.lang('Historylog removed').'.';
 			}
 
 			// delete all application categories and ACL
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table,array('cat_appname' => $appname),__LINE__,__FILE__);
-			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table,array('acl_appname' => $appname),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->cats_table, array('cat_appname' => $appname), __LINE__, __FILE__);
+			$GLOBALS['egw_setup']->db->delete($GLOBALS['egw_setup']->acl_table, array('acl_appname' => $appname), __LINE__, __FILE__);
 		}
 	}
 
-	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();
@@ -171,13 +171,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']);
@@ -186,7 +186,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'])
 				{
@@ -196,23 +196,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;
 		}
@@ -221,61 +221,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']);
 				}
@@ -288,174 +288,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', in_array($key, array('api', 'phpgwapi')) ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
-					$setup_tpl->set_var('upgrade','&nbsp;');
+					$setup_tpl->set_var('remove', in_array($key, array('api', 'phpgwapi')) ? '&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
 						{
@@ -463,123 +463,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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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 == 'phpgwapi' ? '&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();
 }

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]);

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/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 	'name'  => 'eGroupware core team',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info['importexport']['autoinstall'] = true;	// install automatically on update
+$setup_info['importexport']['autoinstall'] = true; // install automatically on update
 
-$setup_info['importexport']['license']  = 'GPL';
+$setup_info['importexport']['license'] = 'GPL';
 $setup_info['importexport']['description'] =
 '';
 $setup_info['importexport']['note'] =

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

@@ -38,7 +38,7 @@
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );
 
 

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')
 		),