composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°1595 - Setup : Blocking error on backup failure

Browse Source 
SVN:trunk[6010]
This commit is contained in:
Eric Espié
2018-08-22 10:16:35 +00:00
parent 07056613e5
commit ea9b7eddde
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -6,7 +6,9 @@
"ext-mcrypt": "*",
"ext-cli": "*",
"ext-soap": "*",
"ext-json": "*"
"ext-json": "*",
"ext-zip": "*",
"ext-mysqli": "*"
},
"config": {
"platform": {

16
setup/backup.class.inc.php
View File

@@ -235,18 +235,20 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
/**
* Create a normalized backup name, depending on the current date/time and Database
*
* @param sNameSpec string Name and path, eventually containing itop placeholders + time formatting specs
* @param string sMySQLBinDir Name and path, eventually containing itop placeholders + time formatting specs
*/
public function SetMySQLBinDir($sMySQLBinDir)
{
$this->sMySQLBinDir = $sMySQLBinDir;
}
/**
* Create a normalized backup name, depending on the current date/time and Database
*
* @param string sNameSpec Name and path, eventually containing itop placeholders + time formatting specs
*/
/**
* Create a normalized backup name, depending on the current date/time and Database
*
* @param string sNameSpec Name and path, eventually containing itop placeholders + time formatting specs
*
* @return string
*/
public function MakeName($sNameSpec = "__DB__-%Y-%m-%d")
{
$sFileName = $sNameSpec;
@@ -646,7 +648,7 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
{
if (empty($sData))
{
return;
return '';
}
return ' --'.$sCliArgName.'='.self::EscapeShellArg($sData);

4
setup/tar.php
View File

@@ -680,7 +680,7 @@ class ArchiveTar
*/
public function _error($p_message)
{
$this->error_object = $this->raiseError($p_message);
IssueLog::Error($p_message);
}
/**
@@ -688,7 +688,7 @@ class ArchiveTar
*/
public function _warning($p_message)
{
$this->error_object = $this->raiseError($p_message);
IssueLog::Warning($p_message);
}
/**