Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

[tt-rss.git] / classes / handler / public.php

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 1be322006ca1d0d58cf02f4739022aeae7aac7e4..0d6ef11c0896988525c99d3066e649b76ef0591b 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -348,7 +348,7 @@ class Handler_Public extends Handler {
        function rss() {
                $feed = $this->dbh->escape_string($_REQUEST["id"]);
                $key = $this->dbh->escape_string($_REQUEST["key"]);
-               $is_cat = $_REQUEST["is_cat"] != "false";
+               $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
                $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
                $offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
 
@@ -358,7 +358,7 @@ class Handler_Public extends Handler {
                $order = $this->dbh->escape_string($_REQUEST["order"]);
 
                $format = $this->dbh->escape_string($_REQUEST['format']);
-               $orig_guid = $_REQUEST["orig_guid"] != "false";
+               $orig_guid = !sql_bool_to_bool($_REQUEST["no_orig_guid"]);
 
                if (!$format) $format = 'atom';
 
@@ -550,6 +550,7 @@ class Handler_Public extends Handler {
                                }
                        } else {
                                $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                               user_error("Failed login attempt from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
                        }
 
                        if ($_REQUEST['return']) {