Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 20:24:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for backup paths

Browse Source
This commit is contained in:
David Bomba 2023-07-19 19:59:11 +10:00
parent 204e6bd852
commit 6139c7b0ee
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/ProtectedDownloadController.php
View File

@ -11,6 +11,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Utils\Ninja;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Jobs\Util\UnlinkFile; use App\Jobs\Util\UnlinkFile;
use App\Exceptions\SystemError; use App\Exceptions\SystemError;

18
app/Jobs/Company/CompanyExport.php
View File

@ -441,15 +441,15 @@ class CompanyExport implements ShouldQueue
$path = 'backups'; $path = 'backups';
Storage::makeDirectory(public_path('storage/backups/')); Storage::makeDirectory(storage_path('backups/'));
try { try {
mkdir(public_path('storage/backups/')); mkdir(storage_path('backups/'));
} catch(\Exception $e) { } catch(\Exception $e) {
nlog("could not create directory"); nlog("could not create directory");
} }
$zip_path = public_path('storage/backups/'.$file_name); $zip_path = storage_path('backups/'.$file_name);
$zip = new \ZipArchive(); $zip = new \ZipArchive();
if ($zip->open($zip_path, \ZipArchive::CREATE)!==true) { if ($zip->open($zip_path, \ZipArchive::CREATE)!==true) {
@ -459,14 +459,16 @@ class CompanyExport implements ShouldQueue
$zip->addFromString("backup.json", json_encode($this->export_data)); $zip->addFromString("backup.json", json_encode($this->export_data));
$zip->close(); $zip->close();
if (Ninja::isHosted()) { Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path));
Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path)); unlink($zip_path);
}
$storage_file_path = Storage::disk(config('filesystems.default'))->url('backups/'.$file_name); if(Ninja::isSelfHost())
$storage_path = Storage::disk(config('filesystems.default'))->path('backups/'.$file_name); $storage_path = 'backups/'.$file_name;
else
$storage_path = Storage::disk(config('filesystems.default'))->path('backups/'.$file_name);
$url = Cache::get($this->hash); $url = Cache::get($this->hash);
Cache::put($this->hash, $storage_path, now()->addHour()); Cache::put($this->hash, $storage_path, now()->addHour());
App::forgetInstance('translator'); App::forgetInstance('translator');