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

get_article_filters: silence preg_match() warnings on incorrect user input

This commit is contained in:
Andrew Dolgov 2010-11-11 14:06:08 +03:00
parent 7a707deb84
commit a9d63d29a1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
functions.php
View File

@ -1520,8 +1520,8 @@
foreach ($filters["title"] as $filter) { foreach ($filters["title"] as $filter) {
$reg_exp = $filter["reg_exp"]; $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ((!$inverse && preg_match("/$reg_exp/i", $title)) || if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
($inverse && !preg_match("/$reg_exp/i", $title))) { ($inverse && !@preg_match("/$reg_exp/i", $title))) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
@ -1533,8 +1533,8 @@
$reg_exp = $filter["reg_exp"]; $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ((!$inverse && preg_match("/$reg_exp/i", $content)) || if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
($inverse && !preg_match("/$reg_exp/i", $content))) { ($inverse && !@preg_match("/$reg_exp/i", $content))) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
@ -1547,11 +1547,11 @@
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ($inverse) { if ($inverse) {
if (!preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) { if (!@preg_match("/$reg_exp/i", $title) && !preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
} else { } else {
if (preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) { if (@preg_match("/$reg_exp/i", $title) || preg_match("/$reg_exp/i", $content)) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
} }
@ -1564,8 +1564,8 @@
$reg_exp = $filter["reg_exp"]; $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ((!$inverse && preg_match("/$reg_exp/i", $link)) || if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
($inverse && !preg_match("/$reg_exp/i", $link))) { ($inverse && !@preg_match("/$reg_exp/i", $link))) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
@ -1602,8 +1602,8 @@
foreach ($filters["author"] as $filter) { foreach ($filters["author"] as $filter) {
$reg_exp = $filter["reg_exp"]; $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ((!$inverse && preg_match("/$reg_exp/i", $author)) || if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
($inverse && !preg_match("/$reg_exp/i", $author))) { ($inverse && !@preg_match("/$reg_exp/i", $author))) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }
@ -1618,8 +1618,8 @@
$reg_exp = $filter["reg_exp"]; $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"]; $inverse = $filter["inverse"];
if ((!$inverse && preg_match("/$reg_exp/i", $tag_string)) || if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
($inverse && !preg_match("/$reg_exp/i", $tag_string))) { ($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
array_push($matches, array($filter["action"], $filter["action_param"])); array_push($matches, array($filter["action"], $filter["action_param"]));
} }