EGroupware / egroupware

setup/db_backup.php

Spacing +64 added lines, -65 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,23 +112,22 @@ 
 {
 	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";
 		$starttime = microtime(true);
 		$db_backup->backup($f);
-		if(is_resource($f))
+		if (is_resource($f))
 			fclose($f);
-		$setup_tpl->set_var('error_msg', lang('backup finished').': '. number_format(microtime(true)-$starttime, 1).'s');
+		$setup_tpl->set_var('error_msg', lang('backup finished').': '.number_format(microtime(true) - $starttime, 1).'s');
 
 		/* Remove old backups. */
 		$cleaned_files = array();
@@ -140,38 +139,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'])
@@ -182,44 +181,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']))
@@ -230,29 +229,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 != '..')
 	{
@@ -262,13 +261,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".
@@ -276,7 +275,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(
@@ -300,8 +299,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);
@@ -127,7 +132,9 @@ 
 		$starttime = microtime(true);
 		$db_backup->backup($f);
 		if(is_resource($f))
-			fclose($f);
+		{
+					fclose($f);
+		}
 		$setup_tpl->set_var('error_msg', lang('backup finished').': '. number_format(microtime(true)-$starttime, 1).'s');
 
 		/* Remove old backups. */
@@ -171,8 +178,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'])
 {
@@ -182,11 +192,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
@@ -259,7 +275,10 @@ 
 		$files[$file] = filectime($db_backup->backup_dir.'/'.$file);
 	}
 }
-if ($handle) closedir($handle);
+if ($handle)
+{
+	closedir($handle);
+}
 
 arsort($files);
 foreach($files as $file => $ctime)