code cleanup, test for db_escape() crazyness in DB sanity check

[tt-rss.git] / xml-rpc.php

diff --git a/xml-rpc.php b/xml-rpc.php
index 20f7c7da3cab659c2644ec2201ed65fff75b2b68..2a23f57f677bcc175e4bc9cbf47c402c6407ccba 100644 (file)
--- a/xml-rpc.php
+++ b/xml-rpc.php
@@ -1,4 +1,4 @@
-<?
+<?php
        require "xmlrpc/lib/xmlrpc.inc";
        require "xmlrpc/lib/xmlrpcs.inc";
 
@@ -19,9 +19,7 @@
                return;
        }
 
-       if (DB_TYPE == "pgsql") {
-               pg_query("set client_encoding = 'utf-8'");
-       }
+       init_connection($link);
 
        function getVirtualFeeds($msg) {
                global $link;
@@ -169,7 +167,7 @@
                if (authenticate_user($link, $login, $pass)) {
 
                        $result = db_query($link, "SELECT 
-                               id, feed_url, cat_id, title, SUBSTRING(last_updated,1,19) AS last_updated
+                               id, feed_url, cat_id, title, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
                                        FROM ttrss_feeds WHERE owner_uid = " . 
                                $_SESSION["uid"]);
 
@@ -276,11 +274,15 @@
 
                        while ($line = db_fetch_assoc($result)) {
 
+                               $is_updated = ($line["last_read"] == "" && ($line["unread"] != "t" && $line["unread"] != "1"));
+
                                $headline_items =       array(
                                                "id" => new xmlrpcval($line["id"], "int"),
                                                "unread" => new xmlrpcval(sql_bool_to_bool($line["unread"]), "boolean"),
                                                "marked" => new xmlrpcval(sql_bool_to_bool($line["marked"]), "boolean"),
                                                "updated" => new xmlrpcval(strtotime($line["updated"]), "int"),
+                                               "is_updated" => new xmlrpcval($is_updated, "boolean"),
+
                                                "title" => new xmlrpcval($line["title"])
                                        );
 
@@ -331,7 +333,7 @@
 
                        $query = "SELECT title,link,content,feed_id,comments,int_id,
                                marked,unread,
-                               SUBSTRING(updated,1,16) as updated,
+                               ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
                                author
                                FROM ttrss_entries,ttrss_user_entries
                                WHERE   id = '$article_id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"] ;