extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

"need to use verbose parameter for restore too"

Browse Source
This commit is contained in:
Ralf Becker 2008-11-23 13:09:16 +00:00
parent 6f442ea296
commit d379065824
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
setup/inc/class.setup_cmd_install.inc.php
View File

@ -7,13 +7,13 @@
* @package setup * @package setup
* @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
/** /**
* setup command: install the tables * setup command: install the tables
*/ */
class setup_cmd_install extends setup_cmd class setup_cmd_install extends setup_cmd
{ {
/** /**
* Constructor * Constructor
@ -50,7 +50,7 @@ class setup_cmd_install extends setup_cmd
/** /**
* run the command: install the tables * run the command: install the tables
* *
* @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
* @return string serialized $GLOBALS defined in the header.inc.php * @return string serialized $GLOBALS defined in the header.inc.php
* @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2); * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
@ -62,22 +62,33 @@ class setup_cmd_install extends setup_cmd
// instanciate setup object and check authorisation // instanciate setup object and check authorisation
$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain); $this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
$this->check_installed($this->domain,array(13,14,20),$this->verbose); $this->check_installed($this->domain,array(13,14,20),$this->verbose);
// use uploaded backup, instead installing from scratch // use uploaded backup, instead installing from scratch
if ($this->backup) if ($this->backup)
{ {
$db_backup =& new db_backup(); $db_backup =& new db_backup();
if (!is_resource($f = $db_backup->fopen_backup($this->backup,true))) if (!is_resource($f = $db_backup->fopen_backup($this->backup,true)))
{ {
throw new egw_exception_wrong_userinput(lang('Restore failed'),31); throw new egw_exception_wrong_userinput(lang('Restore failed').' ('.$f.')',31);
}
if ($this->verbose)
{
echo lang('Restore started, this might take a few minutes ...')."\n";
}
else
{
ob_start(); // restore echos the table structure
} }
//echo lang('Restore started, this might take a few minutes ...')."\n";
$db_backup->restore($f,$this->charset); $db_backup->restore($f,$this->charset);
fclose($f); fclose($f);
if (!$this->verbose)
{
ob_end_clean();
}
return lang('Restore finished'); return lang('Restore finished');
} }
// regular (new) install // regular (new) install
@ -93,9 +104,9 @@ class setup_cmd_install extends setup_cmd
if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n"; if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
$setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config); $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
$this->restore_db(); $this->restore_db();
return lang('Installation finished'); return lang('Installation finished');
} }
} }