aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/importExportController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-11-18 11:32:13 +0100
committerGravatar GitHub <noreply@github.com> 2018-11-18 11:32:13 +0100
commit55d7115926df2df45e8bde6e8e6f6e2b9c367024 (patch)
treeec01fb1593a61a432eb1e5a569239429e3f0a1f3 /app/Controllers/importExportController.php
parent6122a45d9a60fb52cbb83cb649dbf928c6446149 (diff)
Add username in configuration menu and exports (#2133)
* Add username in configuration menu https://github.com/FreshRSS/FreshRSS/pull/2099#issuecomment-435944803 * Add username to exported files
Diffstat (limited to 'app/Controllers/importExportController.php')
-rw-r--r--app/Controllers/importExportController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index c7b384540..9e485dd28 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -699,7 +699,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
// Only one file? Guess its type and export it.
$filename = key($export_files);
$type = self::guessFileType($filename);
- $this->sendFile('freshrss_' . $filename, $export_files[$filename], $type);
+ $this->sendFile('freshrss_' . Minz_Session::param('currentUser', '_') . '_' . $filename, $export_files[$filename], $type);
}
return $nb_files;
}
@@ -810,7 +810,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
header('Content-Type: application/zip');
header('Content-Length: ' . filesize($zip_file));
$day = date('Y-m-d');
- header('Content-Disposition: attachment; filename="freshrss_' . $day . '_export.zip"');
+ header('Content-Disposition: attachment; filename="freshrss_' . Minz_Session::param('currentUser', '_') . '_' . $day . '_export.zip"');
readfile($zip_file);
unlink($zip_file);
}