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

replace several preg_match() feed id tests with is_numeric()

This commit is contained in:
Andrew Dolgov 2012-09-02 14:11:28 +04:00
parent 5a49ed95a8
commit 75c648cf5c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -154,7 +154,7 @@ class Feeds extends Handler_Protected {
}
}
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
if (is_numeric($feed) && $feed > 0) {
$result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds
WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
@ -806,7 +806,7 @@ class Feeds extends Handler_Protected {
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);
if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
if (!$cat_view && is_numeric($feed) && $feed > 0) {
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
}

4
include/functions.php
View File

@ -2336,7 +2336,7 @@
$query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
/* tags */
} else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) {
} else if (!is_numeric($feed)) {
$query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
id = feed_id) as feed_title,";
@ -2496,7 +2496,7 @@
$content_query_part = "content as content_preview,";
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
if (is_numeric($feed)) {
if ($feed >= 0) {
$feed_kind = "Feeds";