aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/authController.php2
-rw-r--r--app/Controllers/categoryController.php2
-rw-r--r--app/Controllers/entryController.php50
-rw-r--r--app/Controllers/errorController.php68
-rw-r--r--app/Controllers/extensionController.php4
-rw-r--r--app/Controllers/importExportController.php30
-rw-r--r--app/Controllers/indexController.php4
7 files changed, 83 insertions, 77 deletions
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 3fc7036fa..b53747921 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -36,7 +36,6 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
$anon_refresh !== FreshRSS_Context::systemConf()->allow_anonymous_refresh ||
$unsafe_autologin !== FreshRSS_Context::systemConf()->unsafe_autologin_enabled ||
$api_enabled !== FreshRSS_Context::systemConf()->api_enabled) {
-
if (in_array($auth_type, ['form', 'http_auth', 'none'], true)) {
FreshRSS_Context::systemConf()->auth_type = $auth_type;
} else {
@@ -89,6 +88,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
case 'none':
// It should not happen!
Minz_Error::error(404);
+ break;
default:
// TODO load plugin instead
Minz_Error::error(404);
diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 410147b4e..4d5c77596 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -28,7 +28,7 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
* Request parameter is:
* - new-category
*/
- public function createAction() :void {
+ public function createAction(): void {
$catDAO = FreshRSS_Factory::createCategoryDao();
$tagDAO = FreshRSS_Factory::createTagDao();
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 8cea74752..e604ca6b2 100644
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -79,31 +79,31 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
} else {
$type_get = $get[0];
$get = (int)substr($get, 2);
- switch($type_get) {
- case 'c':
- $entryDAO->markReadCat($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 'f':
- $entryDAO->markReadFeed($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 's':
- $entryDAO->markReadEntries($id_max, true, null, FreshRSS_Feed::PRIORITY_IMPORTANT,
- FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 'a':
- $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_MAIN_STREAM, FreshRSS_Feed::PRIORITY_IMPORTANT,
- FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 'i':
- $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_IMPORTANT, null,
- FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 't':
- $entryDAO->markReadTag($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
- case 'T':
- $entryDAO->markReadTag(0, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
- break;
+ switch ($type_get) {
+ case 'c':
+ $entryDAO->markReadCat($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 'f':
+ $entryDAO->markReadFeed($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 's':
+ $entryDAO->markReadEntries($id_max, true, null, FreshRSS_Feed::PRIORITY_IMPORTANT,
+ FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 'a':
+ $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_MAIN_STREAM, FreshRSS_Feed::PRIORITY_IMPORTANT,
+ FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 'i':
+ $entryDAO->markReadEntries($id_max, false, FreshRSS_Feed::PRIORITY_IMPORTANT, null,
+ FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 't':
+ $entryDAO->markReadTag($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
+ case 'T':
+ $entryDAO->markReadTag(0, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
+ break;
}
if ($next_get !== 'a') {
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index c3e832cf8..59e910bac 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -24,40 +24,40 @@ class FreshRSS_error_Controller extends FreshRSS_ActionController {
]);
switch ($code_int) {
- case 200 :
- header('HTTP/1.1 200 OK');
- break;
- case 400:
- header('HTTP/1.1 400 Bad Request');
- $this->view->code = 'Error 400 - Bad Request';
- $this->view->errorMessage = '';
- break;
- case 403:
- header('HTTP/1.1 403 Forbidden');
- $this->view->code = 'Error 403 - Forbidden';
- $this->view->errorMessage = _t('feedback.access.denied');
- break;
- case 404:
- header('HTTP/1.1 404 Not Found');
- $this->view->code = 'Error 404 - Not found';
- $this->view->errorMessage = _t('feedback.access.not_found');
- break;
- case 405:
- header('HTTP/1.1 405 Method Not Allowed');
- $this->view->code = 'Error 405 - Method Not Allowed';
- $this->view->errorMessage = '';
- break;
- case 503:
- header('HTTP/1.1 503 Service Unavailable');
- $this->view->code = 'Error 503 - Service Unavailable';
- $this->view->errorMessage = 'Error 503 - Service Unavailable';
- break;
- case 500:
- default:
- header('HTTP/1.1 500 Internal Server Error');
- $this->view->code = 'Error 500 - Internal Server Error';
- $this->view->errorMessage = 'Error 500 - Internal Server Error';
- break;
+ case 200:
+ header('HTTP/1.1 200 OK');
+ break;
+ case 400:
+ header('HTTP/1.1 400 Bad Request');
+ $this->view->code = 'Error 400 - Bad Request';
+ $this->view->errorMessage = '';
+ break;
+ case 403:
+ header('HTTP/1.1 403 Forbidden');
+ $this->view->code = 'Error 403 - Forbidden';
+ $this->view->errorMessage = _t('feedback.access.denied');
+ break;
+ case 404:
+ header('HTTP/1.1 404 Not Found');
+ $this->view->code = 'Error 404 - Not found';
+ $this->view->errorMessage = _t('feedback.access.not_found');
+ break;
+ case 405:
+ header('HTTP/1.1 405 Method Not Allowed');
+ $this->view->code = 'Error 405 - Method Not Allowed';
+ $this->view->errorMessage = '';
+ break;
+ case 503:
+ header('HTTP/1.1 503 Service Unavailable');
+ $this->view->code = 'Error 503 - Service Unavailable';
+ $this->view->errorMessage = 'Error 503 - Service Unavailable';
+ break;
+ case 500:
+ default:
+ header('HTTP/1.1 500 Internal Server Error');
+ $this->view->code = 'Error 500 - Internal Server Error';
+ $this->view->errorMessage = 'Error 500 - Internal Server Error';
+ break;
}
$error_message = trim(implode($error_logs));
diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 0029d5e52..6a4d97bea 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -158,7 +158,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
if ($conf !== null && $res === true) {
$ext_list = $conf->extensions_enabled;
- $ext_list = array_filter($ext_list, static function(string $key) use($type) {
+ $ext_list = array_filter($ext_list, static function (string $key) use ($type) {
// Remove from list the extensions that have disappeared or changed type
$extension = Minz_ExtensionManager::findExtension($key);
return $extension !== null && $extension->getType() === $type;
@@ -220,7 +220,7 @@ class FreshRSS_extension_Controller extends FreshRSS_ActionController {
if ($conf !== null && $res === true) {
$ext_list = $conf->extensions_enabled;
- $ext_list = array_filter($ext_list, static function(string $key) use($type) {
+ $ext_list = array_filter($ext_list, static function (string $key) use ($type) {
// Remove from list the extensions that have disappeared or changed type
$extension = Minz_ExtensionManager::findExtension($key);
return $extension !== null && $extension->getType() === $type;
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 52c70ffe0..2dc25fa2f 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -38,9 +38,15 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
*/
private static function megabytes(string $size_str) {
switch (substr($size_str, -1)) {
- case 'M': case 'm': return (int)$size_str;
- case 'K': case 'k': return (int)$size_str / 1024;
- case 'G': case 'g': return (int)$size_str * 1024;
+ case 'M':
+ case 'm':
+ return (int)$size_str;
+ case 'K':
+ case 'k':
+ return (int)$size_str / 1024;
+ case 'G':
+ case 'g':
+ return (int)$size_str * 1024;
}
return $size_str;
}
@@ -689,15 +695,15 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
private static function filenameToContentType(string $filename): string {
$filetype = self::guessFileType($filename);
switch ($filetype) {
- case 'zip':
- return 'application/zip';
- case 'opml':
- return 'application/xml; charset=utf-8';
- case 'json_starred':
- case 'json_feed':
- return 'application/json; charset=utf-8';
- default:
- return 'application/octet-stream';
+ case 'zip':
+ return 'application/zip';
+ case 'opml':
+ return 'application/xml; charset=utf-8';
+ case 'json_starred':
+ case 'json_feed':
+ return 'application/json; charset=utf-8';
+ default:
+ return 'application/octet-stream';
}
}
}
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2588320b5..2ee72b7b7 100644
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -268,8 +268,8 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
foreach ($entryDAO->listWhere(
$type, $id, FreshRSS_Context::$state, FreshRSS_Context::$order,
$postsPerPage ?? FreshRSS_Context::$number, FreshRSS_Context::$offset, FreshRSS_Context::$first_id,
- FreshRSS_Context::$search, $date_min)
- as $entry) {
+ FreshRSS_Context::$search, $date_min
+ ) as $entry) {
yield $entry;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 21:05:54 +0000