composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°4227 - enhance cli restore feedback when backup file not accessible

Browse Source
This commit is contained in:
odain
2021-09-22 11:42:27 +02:00
parent 7c7386afc7
commit ae0c43a099
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-backup/restore.php
View File

@@ -97,7 +97,7 @@ function GetOperationName() {
function ExecuteMainOperation($oP){
if (utils::IsModeCLI())
{
$oP->p(date('Y-m-d H:i:s')." - running backup utility");
$oP->p(date('Y-m-d H:i:s')." - running restore utility");
$sAuthUser = ReadMandatoryParam($oP, 'auth_user');
$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd');
$sBackupFile = ReadMandatoryParam($oP, 'backup_file');
@@ -110,7 +110,7 @@ function ExecuteMainOperation($oP){
ExitError($oP, "Access restricted or wrong credentials ('$sAuthUser')");
}
if (!is_file($sBackupFile) && is_readable($sBackupFile)){
if (!is_file($sBackupFile) || !is_readable($sBackupFile)){
ExitError($oP, "Cannot access backup file ('$sBackupFile')");
}
}
@@ -136,7 +136,6 @@ function ExecuteMainOperation($oP){
$oRestore = new MyCliRestore($oP);
$oRestore->SetMySQLBinDir(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
$res = false;
if (MetaModel::GetConfig()->Get('demo_mode'))
{
$oP->p("Sorry, iTop is in demonstration mode: the feature is disabled");