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

📌 Identify & remove Combodo code from ArchiveTar lib

Browse Source
This commit is contained in:
Pierre Goiffon
2019-02-21 10:23:36 +01:00
parent 4857569813
commit a35690d13c
4 changed files with 170 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
require_once('tar.php');
require_once(APPROOT.'core/tar-itop.class.inc.php');
interface BackupArchive
{
@@ -308,7 +308,7 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
{
$this->LogInfo("Creating backup: '$sTargetFile.tar.gz'");
$oArchive = new ArchiveTar($sTargetFile.'.tar.gz');
$oArchive = new ITopArchiveTar($sTargetFile.'.tar.gz');
$sTmpFolder = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
$aFiles = $this->PrepareFilesToBackup($sSourceConfigFile, $sTmpFolder);
@@ -710,18 +710,14 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
class TarGzArchive implements BackupArchive
{
/*
* @var ArchiveTar
*/
/** @var \ITopArchiveTar $oArchive */
protected $oArchive;
/*
* string[]
*/
/** @var string[] $aFiles */
protected $aFiles = null;
public function __construct($sFile)
{
$this->oArchive = new ArchiveTar($sFile);
$this->oArchive = new ITopArchiveTar($sFile);
}
/**