mailto plugin: only mail unique articles

[tt-rss.git] / classes / api.php

diff --git a/classes/api.php b/classes/api.php
index e3fcc8d3d3e73aad4b7f27bbaca71d6b87046005..6bcb92152236d62ed535862751cb4f7d6f71d8cc 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -77,6 +77,7 @@ class API extends Handler {
                                $this->wrap(self::STATUS_OK,    array("session_id" => session_id(),
                                        "api_level" => self::API_LEVEL));
                        } else {                                                         // else we are not logged in
+                               user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
                                $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
                        }
                } else {
@@ -313,7 +314,7 @@ class API extends Handler {
                if ($article_id) {
 
                        $query = "SELECT id,title,link,content,feed_id,comments,int_id,
-                               marked,unread,published,score,note,
+                               marked,unread,published,score,note,lang,
                                ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
                                author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
                                FROM ttrss_entries,ttrss_user_entries
@@ -346,7 +347,8 @@ class API extends Handler {
                                                "attachments" => $attachments,
                                                "score" => (int)$line["score"],
                                                "feed_title" => $line["feed_title"],
-                                               "note" => $line["note"]
+                                               "note" => $line["note"],
+                                               "lang" => $line["lang"]
                                        );
 
                                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
@@ -515,7 +517,7 @@ class API extends Handler {
                                        if ($unread || !$unread_only) {
 
                                                $row = array(
-                                                               "id" => $cv["id"],
+                                                               "id" => (int) $cv["id"],
                                                                "title" => $cv["description"],
                                                                "unread" => $cv["counter"],
                                                                "cat_id" => -2,
@@ -561,7 +563,7 @@ class API extends Handler {
 
                                        if ($unread || !$unread_only) {
                                                $row = array(
-                                                               "id" => $line["id"],
+                                                               "id" => (int) $line["id"],
                                                                "title" => $line["title"],
                                                                "unread" => $unread,
                                                                "is_cat" => true,
@@ -642,7 +644,7 @@ class API extends Handler {
                        $headlines = array();
 
                        while ($line = db_fetch_assoc($result)) {
-                               $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100);
+                               $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100);
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 100, true);
                                }
@@ -705,6 +707,7 @@ class API extends Handler {
 
                                $headline_row["score"] = (int)$line["score"];
                                $headline_row["note"] = $line["note"];
+                               $headline_row["lang"] = $line["lang"];
 
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
                                        $headline_row = $p->hook_render_article_api(array("headline" => $headline_row));