valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wip-phpstan-level6' of git.tt-rss.org:fox/tt-rss into wip-phpstan-level6

This commit is contained in:
Andrew Dolgov 2021-11-14 21:01:25 +03:00
parent 91c9a73532 9326ed605f
commit 67a89e861d
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/mailer.php
View File

@ -32,8 +32,6 @@ class Mailer {
// 4. set error message if needed via passed Mailer instance function set_error() // 4. set error message if needed via passed Mailer instance function set_error()
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
// Implemented via plugin, so ignore the undefined method 'hook_send_mail'.
// @phpstan-ignore-next-line
$rc = $p->hook_send_mail($this, $params); $rc = $p->hook_send_mail($this, $params);
if ($rc == 1) if ($rc == 1)

44
classes/pref/filters.php
View File

@ -56,7 +56,9 @@ class Pref_Filters extends Handler_Protected {
$res = $this->pdo->query("SELECT id,name FROM ttrss_filter_types"); $res = $this->pdo->query("SELECT id,name FROM ttrss_filter_types");
$filter_types = array(); /** @var array<int, string> */
$filter_types = [];
while ($line = $res->fetch()) { while ($line = $res->fetch()) {
$filter_types[$line["id"]] = $line["name"]; $filter_types[$line["id"]] = $line["name"];
} }
@ -64,7 +66,10 @@ class Pref_Filters extends Handler_Protected {
$scope_qparts = array(); $scope_qparts = array();
$rctr = 0; $rctr = 0;
/** @var string $r */
foreach (clean($_REQUEST["rule"]) AS $r) { foreach (clean($_REQUEST["rule"]) AS $r) {
/** @var array{'reg_exp': string, 'filter_type': int, 'feed_id': array<int, int|string>, 'name': string}|null */
$rule = json_decode($r, true); $rule = json_decode($r, true);
if ($rule && $rctr < 5) { if ($rule && $rctr < 5) {
@ -72,19 +77,21 @@ class Pref_Filters extends Handler_Protected {
unset($rule["filter_type"]); unset($rule["filter_type"]);
$scope_inner_qparts = []; $scope_inner_qparts = [];
/** @var int|string $feed_id may be a category string (e.g. 'CAT:7') or feed ID int */
foreach ($rule["feed_id"] as $feed_id) { foreach ($rule["feed_id"] as $feed_id) {
if (strpos($feed_id, "CAT:") === 0) { if (strpos("$feed_id", "CAT:") === 0) {
$cat_id = (int) substr($feed_id, 4); $cat_id = (int) substr("$feed_id", 4);
array_push($scope_inner_qparts, "cat_id = " . $this->pdo->quote($cat_id)); array_push($scope_inner_qparts, "cat_id = " . $cat_id);
} else if ($feed_id > 0) { } else if (is_numeric($feed_id) && $feed_id > 0) {
array_push($scope_inner_qparts, "feed_id = " . $this->pdo->quote($feed_id)); array_push($scope_inner_qparts, "feed_id = " . (int)$feed_id);
} }
} }
if (count($scope_inner_qparts) > 0) { if (count($scope_inner_qparts) > 0) {
array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")"); array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")");
} }
array_push($filter["rules"], $rule); array_push($filter["rules"], $rule);
@ -495,7 +502,7 @@ class Pref_Filters extends Handler_Protected {
} }
function editSave(): void { function editSave(): void {
$filter_id = clean($_REQUEST["id"]); $filter_id = (int) clean($_REQUEST["id"]);
$enabled = checkbox_to_sql_bool(clean($_REQUEST["enabled"] ?? false)); $enabled = checkbox_to_sql_bool(clean($_REQUEST["enabled"] ?? false));
$match_any_rule = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false)); $match_any_rule = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false));
$inverse = checkbox_to_sql_bool(clean($_REQUEST["inverse"] ?? false)); $inverse = checkbox_to_sql_bool(clean($_REQUEST["inverse"] ?? false));
@ -526,7 +533,7 @@ class Pref_Filters extends Handler_Protected {
$sth->execute(array_merge($ids, [$_SESSION['uid']])); $sth->execute(array_merge($ids, [$_SESSION['uid']]));
} }
private function _save_rules_and_actions($filter_id): void { private function _save_rules_and_actions(int $filter_id): void {
$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?"); $sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?");
$sth->execute([$filter_id]); $sth->execute([$filter_id]);
@ -698,7 +705,8 @@ class Pref_Filters extends Handler_Protected {
} }
function editrule(): void { function editrule(): void {
$feed_ids = array_map("intval", explode(",", clean($_REQUEST["ids"]))); /** @var array<int, int|string> */
$feed_ids = explode(",", clean($_REQUEST["ids"]));
print json_encode([ print json_encode([
"multiselect" => $this->_feed_multi_select("feed_id", $feed_ids, 'required="1" style="width : 100%; height : 300px" dojoType="fox.form.ValidationMultiSelect"') "multiselect" => $this->_feed_multi_select("feed_id", $feed_ids, 'required="1" style="width : 100%; height : 300px" dojoType="fox.form.ValidationMultiSelect"')
@ -840,9 +848,11 @@ class Pref_Filters extends Handler_Protected {
$this->pdo->commit(); $this->pdo->commit();
} }
private function _feed_multi_select(string $id, $default_ids = [], /**
$attributes = "", $include_all_feeds = true, * @param array<int, int|string> $default_ids
$root_id = null, $nest_level = 0): string { */
private function _feed_multi_select(string $id, array $default_ids = [], string $attributes = "",
bool $include_all_feeds = true, ?int $root_id = null, int $nest_level = 0): string {
$pdo = Db::pdo(); $pdo = Db::pdo();