Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions Controller/Backup.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@

namespace FacturaScripts\Plugins\Backup\Controller;

use Coderatio\SimpleBackup\SimpleBackup;
use DatabaseBackupManager\MySQLBackup;
use FacturaScripts\Core\Base\Controller;
use FacturaScripts\Core\Base\ControllerPermissions;
use FacturaScripts\Core\Cache;
use FacturaScripts\Core\Response;
use FacturaScripts\Core\Tools;
use FacturaScripts\Core\UploadedFile;
use FacturaScripts\Dinamic\Model\User;
use PDO;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use ZipArchive;
Expand Down Expand Up @@ -243,12 +244,16 @@ protected function createSqlAction(): void
}

$file_name = date('Y-m-d_H-i-s') . '.sql';
SimpleBackup::setDatabase([
Tools::config('db_name'),
Tools::config('db_user'),
Tools::config('db_pass'),
Tools::config('db_host')
])->storeAfterExportTo($folder, $file_name);

//definimos la configurcion de la base de datos y el directorio de backup
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
$backupDir = Tools::folder('MyFiles', 'Backups');

$backup = new MySQLBackup($db, $backupDir);

//exportamos la base de datos a un archivo y le cambiamos el nombre para que tenga el formato correcto
$file = $backup->backup();
rename($file, Tools::folder('MyFiles', 'Backups', $file_name));

$file_path = Tools::folder('MyFiles', 'Backups', $file_name);
if (false === file_exists($file_path)) {
Expand Down Expand Up @@ -610,13 +615,11 @@ private function restoreBackupAction(): void
$this->dataBase->close();

// importamos el backup
$backup = SimpleBackup::setDatabase([
Tools::config('db_name'),
Tools::config('db_user'),
Tools::config('db_pass'),
Tools::config('db_host')
])->importFrom($sqlFile);
if (false === $backup->getResponse()->status) {
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
$backup = new MySQLBackup($db);

$restore = $backup->restore($sqlFile);
if (true !== $restore) {
Tools::log()->error('record-save-error');
$this->dataBase->connect();
Cache::clear();
Expand Down
19 changes: 12 additions & 7 deletions Cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@

namespace FacturaScripts\Plugins\Backup;

use Coderatio\SimpleBackup\SimpleBackup;
use DatabaseBackupManager\MySQLBackup;
use FacturaScripts\Core\Plugins;
use FacturaScripts\Core\Template\CronClass;
use FacturaScripts\Core\Tools;
use PDO;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use ZipArchive;
Expand Down Expand Up @@ -129,12 +130,16 @@ protected function createSqlFile(): bool
}

$file_name = date('Y-m-d_H-i-s') . '.sql';
SimpleBackup::setDatabase([
Tools::config('db_name'),
Tools::config('db_user'),
Tools::config('db_pass'),
Tools::config('db_host')
])->storeAfterExportTo($folder, $file_name);

//definimos la configurcion de la base de datos y el directorio de backup
$db = new PDO('mysql:host=' . Tools::config('db_host') . ';port=' . Tools::config('db_port') . ';dbname=' . Tools::config('db_name'), Tools::config('db_user'), Tools::config('db_pass'));
$backupDir = Tools::folder('MyFiles', 'Backups');

$backup = new MySQLBackup($db, $backupDir);

//exportamos la base de datos a un archivo y le cambiamos el nombre para que tenga el formato correcto
$file = $backup->backup();
rename($file, Tools::folder('MyFiles', 'Backups', $file_name));

$file_path = Tools::folder('MyFiles', 'Backups', $file_name);
if (false === file_exists($file_path)) {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"require": {
"coderatio/simple-backup": "1.0.*",
"ext-zip": "*"
"ext-zip": "*",
"julio101290/mysql-backup": "^1.0"
}
}