]> git.wh0rd.org Git - tt-rss.git/commitdiff
api: remove obsolete getArticles/getNewArticles previously added for tt-rss reader
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 13 Apr 2011 11:52:31 +0000 (15:52 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Wed, 13 Apr 2011 11:52:31 +0000 (15:52 +0400)
api/index.php

index 6b47d81224c9fce18e497898c7aff2c99a5faff2..ea267ca8eee03130af910221eb0b84f7456c3dfe 100644 (file)
                                array("value" => get_pref($link, $pref_name)));
                        break;
 
-               /* Method added for ttrss-reader for Android */
-               case "getArticles":
-                       $isCategory = (int)db_escape_string($_REQUEST["is_cat"]);
-                       $id = (int)db_escape_string($_REQUEST["id"]);
-                       $displayUnread = (int)db_escape_string($_REQUEST["unread"]);
-                       $limit = (int)db_escape_string($_REQUEST["limit"]);
-                       $feeds = array();
-
-                       if ($isCategory > 0) {
-                               // Get Feeds of the category
-
-                               if ($id == 0) {
-                                       $category_part = "cat_id is NULL";
-                               } else {
-                                       $category_part = "cat_id = '$id'";
-                               }
-
-                               $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE ".
-                                                       $category_part." AND owner_uid = '".$_SESSION["uid"]."'");
-
-                               while ($line = db_fetch_assoc($result)) {
-                                       array_push($feeds, $line["id"]);
-                               }
-
-                               // Virtual feeds
-                               $match_part = "";
-                               if ($id == -1) {
-                                       $match_part = "marked = true";
-                                       array_push($feeds, -1);
-                               } else if ($id == -2) {
-                                       $match_part = "published = true";
-                                       array_push($feeds, -2);
-                               } else if ($id == -3) {
-                                       $match_part = "unread = true";
-                                       array_push($feeds, -3);
-
-                                       $intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
-
-                                       if (DB_TYPE == "pgsql") {
-                                               $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
-                                       } else {
-                                               $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
-                                       }
-                               } else if ($id == -4) {
-                                       $match_part = "true";
-                                       array_push($feeds, -4);
-                               }
-                       } else {
-                               // Only add one feed
-                               array_push($feeds, $id);
-                       }
-
-                       $ret = array();
-
-                       if (DB_TYPE == "mysql") {
-                               $limit_part = " LIMIT 0,".$limit;
-                       } else if (DB_TYPE == "pgsql") {
-                               $limit_part = " LIMIT ".$limit;
-                       } else {
-                               $limit_part = "";
-                       }
-
-                       // Fetch articles for the feeds
-                       foreach ($feeds as $feed) {
-
-                               if ($match_part) {
-                                       $from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries";
-                                       $feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
-
-                                       $query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id,
-                                               marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
-                                               FROM $from_qpart WHERE
-                                               ttrss_user_entries.ref_id = ttrss_entries.id AND
-                                               $feeds_qpart ($match_part) AND ttrss_user_entries.owner_uid = ".$_SESSION["uid"]." ORDER BY updated DESC".$limit_part;
-
-                                       $result = db_query($link, $query);
-                               } else {
-                                       $query = "SELECT ttrss_entries.id,ttrss_entries.title,link,content,feed_id,comments,int_id,
-                                               marked,unread,published,".SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
-                                               FROM ttrss_entries,ttrss_user_entries
-                                               WHERE feed_id = '".$feed."' AND ref_id = id AND owner_uid = ".
-                                                       $_SESSION["uid"]." AND unread >= '".$displayUnread."' ORDER BY updated DESC".$limit_part;
-
-                                       $result = db_query($link, $query);
-                               }
-
-                               $articles = array();
-                               $i=0;
-                               while ($i < mysql_numrows($result)) {
-
-                                       $article_id = db_fetch_result($result, $i, "id");
-
-                                       $attachments = get_article_enclosures($link, $article_id);
-
-                                       $article = array(
-                                               "id" => db_fetch_result($result, $i, "ttrss_entries.id"),
-                                               "title" => db_fetch_result($result, $i, "ttrss_entries.title"),
-                                               "link" => db_fetch_result($result, $i, "link"),
-                                               "labels" => get_article_labels($link, $article_id),
-                                               "unread" => sql_bool_to_bool(db_fetch_result($result, $i, "unread")),
-                                               "marked" => sql_bool_to_bool(db_fetch_result($result, $i, "marked")),
-                                               "published" => sql_bool_to_bool(db_fetch_result($result, $i, "published")),
-                                               "comments" => db_fetch_result($result, $i, "comments"),
-                                               "author" => db_fetch_result($result, $i, "author"),
-                                               "updated" => strtotime(db_fetch_result($result, $i, "updated")),
-                                               "content" => db_fetch_result($result, $i, "content"),
-                                               "feed_id" => db_fetch_result($result, $i, "feed_id"),
-                                               "attachments" => $attachments
-                                       );
-
-                                       array_push($ret, $article);
-
-                                       $i++;
-                               }
-                       }
-
-                       print api_wrap_reply(API_STATUS_OK, $seq, $ret);
-                       break;
-
-               /* Method added for ttrss-reader for Android */
-               case "getNewArticles":
-                       $time = (int) db_escape_string($_REQUEST["time"]);
-                       // unread=1 zeigt alle an, unread=0 nur ungelesene
-                       $displayUnread = (int) db_escape_string($_REQUEST["unread"]);
-
-                       if (DB_TYPE == "mysql") {
-                               $db_time_function = " AND last_updated > FROM_UNIXTIME(".$time.")";
-                       } else if (DB_TYPE == "pgsql") {
-                               $db_time_function = " AND last_updated > to_timestamp(".$time.")";
-                       } else {
-                               $db_time_function = "";
-                       }
-
-                       if (DB_TYPE == "mysql") {
-                               $db_time_function2 = " AND updated > FROM_UNIXTIME(".$time.")";
-                       } else if (DB_TYPE == "pgsql") {
-                               $db_time_function2 = " AND updated > to_timestamp(".$time.")";
-                       } else {
-                               $db_time_function2 = "";
-                       }
-
-                       $cats = array();
-
-
-                       // Add uncategorized feeds
-                       $unread = getFeedUnread($link, 0, true);
-                       if ($unread || $displayUnread > 0) {
-                               $feeds = array();
-                               $result_0 = db_query($link, "SELECT id, feed_url, cat_id, title, ".
-                                               SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ".
-                                               "FROM ttrss_feeds WHERE cat_id IS null AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function);
-
-                               while ($line_feeds = db_fetch_assoc($result_0)) {
-                                       $unread_feed = getFeedUnread($link, $line_feeds["id"], false);
-                                       if ($unread || $displayUnread > 0) {
-
-                                               $result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
-                                                       marked,unread,published,".
-                                                       SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
-                                                       FROM ttrss_entries,ttrss_user_entries
-                                                       WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " .
-                                                               $_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2);
-
-                                               $articles = array();
-                                               while ($line_articles = db_fetch_assoc($result_1)) {
-                                                       $article_id = db_fetch_result($result, $i, "id");
-                                                       $attachments = get_article_enclosures($link, $article_id);
-                                                       array_push($articles, $article = array(
-                                                               "id" => $line_articles["id"],
-                                                               "title" => $line_articles["title"],
-                                                               "link" => $line_articles["link"],
-                                                               "labels" => $article_id,
-                                                               "unread" => $line_articles["unread"],
-                                                               "marked" => $line_articles["marked"],
-                                                               "published" => $line_articles["published"],
-                                                               "comments" => $line_articles["comments"],
-                                                               "author" => $line_articles["author"],
-                                                               "updated" => strtotime($line_articles["updated"]),
-                                                               "content" => $line_articles["content"],
-                                                               "feed_id" => $line_articles["feed_id"],
-                                                               "attachments" => $attachments));
-                                               }
-
-                                               array_push($feeds, array(
-                                                       "feed_url" => $line_feeds["feed_url"],
-                                                       "title" => $line_feeds["title"],
-                                                       "id" => (int)$line_feeds["id"],
-                                                       "unread" => (int)$unread_feed,
-                                                       "has_icon" => $has_icon,
-                                                       "cat_id" => (int)$line_feeds["cat_id"],
-                                                       "last_updated" => strtotime($line_feeds["last_updated"]),
-                                                       "articles" => $articles
-                                               ));
-                                       }
-                               }
-
-                               array_push($cats,
-                                       array(
-                                               "id" => 0,
-                                               "title" => "Uncategorized Feeds",
-                                               "unread" => $unread,
-                                               "feeds" => $feeds));
-                       }
-
-
-                       $result = db_query($link, "SELECT id, title FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"]);
-                       while ($line = db_fetch_assoc($result)) {
-                               $unread = getFeedUnread($link, $line["id"], true);
-
-                               if ($unread || $displayUnread > 0) {
-                                       $feeds = array();
-                                       $result_0 = db_query($link, "SELECT id, feed_url, cat_id, title, ".
-                                               SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ".
-                                               "FROM ttrss_feeds WHERE cat_id = '".
-                                               $line["id"]."' AND owner_uid = '".$_SESSION["uid"]."'" . $db_time_function);
-
-                                       while ($line_feeds = db_fetch_assoc($result_0)) {
-                                               $unread_feed = getFeedUnread($link, $line_feeds["id"], false);
-                                               if ($unread_feed || $displayUnread > 0) {
-
-                                                       $result_1 = db_query($link, "SELECT id,title,link,content,feed_id,comments,int_id,
-                                                               marked,unread,published,".
-                                                               SUBSTRING_FOR_DATE."(updated,1,16) as updated,author
-                                                               FROM ttrss_entries,ttrss_user_entries
-                                                               WHERE feed_id = '".$line_feeds["id"]."' AND ref_id = id AND owner_uid = " .
-                                                                       $_SESSION["uid"]." AND unread >= '".$displayUnread."'" . $db_time_function2);
-
-                                                       $articles = array();
-                                                       while ($line_articles = db_fetch_assoc($result_1)) {
-                                                               $article_id = db_fetch_result($result, $i, "id");
-                                                               $attachments = get_article_enclosures($link, $article_id);
-                                                               array_push($articles, $article = array(
-                                                                       "id" => $line_articles["id"],
-                                                                       "title" => $line_articles["title"],
-                                                                       "link" => $line_articles["link"],
-                                                                       "labels" => $article_id,
-                                                                       "unread" => $line_articles["unread"],
-                                                                       "marked" => $line_articles["marked"],
-                                                                       "published" => $line_articles["published"],
-                                                                       "comments" => $line_articles["comments"],
-                                                                       "author" => $line_articles["author"],
-                                                                       "updated" => strtotime($line_articles["updated"]),
-                                                                       "content" => $line_articles["content"],
-                                                                       "feed_id" => $line_articles["feed_id"],
-                                                                       "attachments" => $attachments));
-                                                       }
-
-                                                       array_push($feeds, array(
-                                                               "feed_url" => $line_feeds["feed_url"],
-                                                               "title" => $line_feeds["title"],
-                                                               "id" => (int)$line_feeds["id"],
-                                                               "unread" => (int)$unread_feed,
-                                                               "cat_id" => (int)$line_feeds["cat_id"],
-                                                               "last_updated" => strtotime($line_feeds["last_updated"]),
-                                                               "articles" => $articles
-                                                       ));
-
-                                               }
-                                       }
-
-                                       array_push($cats,
-                                               array(
-                                                       "id" => $line["id"],
-                                                       "title" => $line["title"],
-                                                       "unread" => $unread,
-                                                       "feeds" => $feeds));
-                               }
-                       }
-                       print api_wrap_reply(API_STATUS_OK, $seq, $cats);
-                       break;
-
                default:
                        print api_wrap_reply(API_STATUS_ERR, $seq,
                                array("error" => 'UNKNOWN_METHOD'));