From 6c01e4e7d6c177ac345c826059e585bffdd1d517 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 7 Apr 2023 00:13:49 +0200 Subject: Use typed access to request parameters (#5267) * Use typed access to request parameters This was a big source of mixed datatypes in many places * Fix notifications * Fix bookmarkAction --- app/Controllers/importExportController.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'app/Controllers/importExportController.php') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 14adc793d..2df185398 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -580,19 +580,18 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { */ public function exportAction() { if (!Minz_Request::isPost()) { - return Minz_Request::forward( - array('c' => 'importExport', 'a' => 'index'), - true - ); + Minz_Request::forward(['c' => 'importExport', 'a' => 'index'], true); + return; } $username = Minz_User::name(); $export_service = new FreshRSS_Export_Service($username); - $export_opml = Minz_Request::param('export_opml', false); - $export_starred = Minz_Request::param('export_starred', false); - $export_labelled = Minz_Request::param('export_labelled', false); - $export_feeds = Minz_Request::param('export_feeds', array()); + $export_opml = Minz_Request::paramBoolean('export_opml'); + $export_starred = Minz_Request::paramBoolean('export_starred'); + $export_labelled = Minz_Request::paramBoolean('export_labelled'); + /** @var array */ + $export_feeds = Minz_Request::paramArray('export_feeds'); $max_number_entries = 50; $exported_files = []; @@ -616,7 +615,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } foreach ($export_feeds as $feed_id) { - $result = $export_service->generateFeedEntries($feed_id, $max_number_entries); + $result = $export_service->generateFeedEntries((int)$feed_id, $max_number_entries); if (!$result) { // It means the actual feed_id doesn’t correspond to any existing feed continue; @@ -629,10 +628,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { $nb_files = count($exported_files); if ($nb_files <= 0) { // There’s nothing to do, there’re no files to export - return Minz_Request::forward( - array('c' => 'importExport', 'a' => 'index'), - true - ); + Minz_Request::forward(['c' => 'importExport', 'a' => 'index'], true); + return; } if ($nb_files === 1) { @@ -643,10 +640,11 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { // More files? Let’s compress them in a Zip archive if (!extension_loaded('zip')) { // Oops, there is no ZIP extension! - return Minz_Request::bad( + Minz_Request::bad( _t('feedback.import_export.export_no_zip_extension'), - array('c' => 'importExport', 'a' => 'index') + ['c' => 'importExport', 'a' => 'index'] ); + return; } [$filename, $content] = $export_service->zip($exported_files); -- cgit v1.2.3