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°6380 - Fix exception "Failed to parse time string" with check_backup.php script

Browse Source
This commit is contained in:
Molkobain
2023-06-22 13:50:35 +02:00
parent dcfefc1588
commit 3e73038709
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-backup/check-backup.php
View File

@@ -102,14 +102,19 @@ if (!function_exists('sys_get_temp_dir'))
} }
/**
* @param int $iRefTime Reference date time as a unix timestamp
*
* @return string Absolute path to the backup file, WITHOUT the file extension (`.tar.gz`)
* @throws \Exception
*/
function MakeArchiveFileName($iRefTime = null) function MakeArchiveFileName($iRefTime = null)
{ {
$sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d"; $sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d";
$sBackupFile = utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data'); $sBackupFile = utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
$oBackup = new DBBackup(); $oBackup = new DBBackup();
$oDateTime = $iRefTime !== null ? new DateTime($iRefTime) : new DateTime(); $oDateTime = $iRefTime !== null ? DateTime::createFromFormat('U', $iRefTime) : new DateTime();
$sBackupFile = $oBackup->MakeName($sBackupFile, $oDateTime); $sBackupFile = $oBackup->MakeName($sBackupFile, $oDateTime);
return $sBackupFile; return $sBackupFile;

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

@@ -146,13 +146,13 @@ class DBBackup
/** /**
* Create a normalized backup name, depending on the current date/time and Database * 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 following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php} * @param string $sNameSpec Name and path, eventually containing itop placeholders + time formatting following the strftime() format {@link https://www.php.net/manual/fr/function.strftime.php}
* @param \DateTime|null $oDateTime Date time to use for the name * @param \DateTime|null $oDateTime Date time to use for the name
* *
* @return string * @return string Name of the backup file WITHOUT the file extension (eg. `.tar.gz`)
* @since 3.1.0 N°5279 Add $oDtaeaTime parameter * @since 3.1.0 N°5279 Add $oDateTime parameter
*/ */
public function MakeName($sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null) public function MakeName(string $sNameSpec = "__DB__-%Y-%m-%d", DateTime $oDateTime = null)
{ {
if ($oDateTime === null) { if ($oDateTime === null) {
$oDateTime = new DateTime(); $oDateTime = new DateTime();