diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controllers/importExportController.php | 7 | ||||
| -rw-r--r-- | app/Models/View.php | 1 | ||||
| -rw-r--r-- | app/views/importExport/sqlite.phtml | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 294f4de2c..7dc825b9e 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -751,7 +751,14 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { Minz_Error::error(404); return; } + $this->view->sqlitePath = $path; + $this->view->sqliteName = basename($path); + if ($this->view->sqliteName === 'db.sqlite') { + $username = Minz_User::name() ?? '_'; + $date = date('Y-m-d_H-i-s', filemtime($path) ?: time()); + $this->view->sqliteName = 'freshrss_' . $username . '_' . $date . '_db.sqlite'; + } $this->view->_layout(null); } } diff --git a/app/Models/View.php b/app/Models/View.php index b251e95ed..b7970b57e 100644 --- a/app/Models/View.php +++ b/app/Models/View.php @@ -92,6 +92,7 @@ class FreshRSS_View extends Minz_View { /** @var null|array<array{name:string,size:int,mtime:int}> */ public ?array $sqliteArchives = null; public string $sqlitePath; + public string $sqliteName; // Form login public int $cookie_days; diff --git a/app/views/importExport/sqlite.phtml b/app/views/importExport/sqlite.phtml index f1d181a61..7b0a244a3 100644 --- a/app/views/importExport/sqlite.phtml +++ b/app/views/importExport/sqlite.phtml @@ -3,7 +3,7 @@ declare(strict_types=1); /** @var FreshRSS_View $this */ @ob_end_clean(); // Ensure no buffer header('Content-Type: application/vnd.sqlite3'); -header('Content-Disposition: attachment; filename="' . basename($this->sqlitePath) . '"'); +header('Content-Disposition: attachment; filename="' . $this->sqliteName . '"'); header('Cache-Control: private, no-store, max-age=0'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s \\G\\M\\T', @filemtime($this->sqlitePath) ?: 0)); header('Content-Length: ' . (@filesize($this->sqlitePath) ?: 0)); |