tweak filter preview layout a bit; allow previewing matched articles in a popup

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

diff --git a/classes/article.php b/classes/article.php
index e9f86f2984d6a709fe5cf8aeb0c4caebd0018eec..01f6b512660cc41b173b81522fc5e81f8dba1d6d 100644 (file)
--- a/classes/article.php
+++ b/classes/article.php
@@ -30,7 +30,6 @@ class Article extends Handler_Protected {
                $id = $this->dbh->escape_string($_REQUEST["id"]);
                $cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"]));
                $mode = $this->dbh->escape_string($_REQUEST["mode"]);
-               $omode = $this->dbh->escape_string($_REQUEST["omode"]);
 
                // in prefetch mode we only output requested cids, main article
                // just gets marked as read (it already exists in client cache)
@@ -42,12 +41,12 @@ class Article extends Handler_Protected {
                } else if ($mode == "zoom") {
                        array_push($articles, format_article($id, true, true));
                } else if ($mode == "raw") {
-                       if ($_REQUEST['html']) {
+                       if (isset($_REQUEST['html'])) {
                                header("Content-Type: text/html");
-                               print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
+                               print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
                        }
 
-                       $article = format_article($id, false);
+                       $article = format_article($id, false, isset($_REQUEST["zoom"]));
                        print $article['content'];
                        return;
                }
@@ -108,7 +107,7 @@ class Article extends Handler_Protected {
 
                // only check for our user data here, others might have shared this with different content etc
                $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
-                       link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
+                       guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
                if (db_num_rows($result) != 0) {
                        $ref_id = db_fetch_result($result, 0, "id");
@@ -191,7 +190,7 @@ class Article extends Handler_Protected {
                print "<table width='100%'><tr><td>";
 
                print "<textarea dojoType=\"dijit.form.SimpleTextarea\" rows='4'
-                       style='font-size : 12px; width : 100%' id=\"tags_str\"
+                       style='font-size : 12px; width : 98%' id=\"tags_str\"
                        name='tags_str'>$tags_str</textarea>
                <div class=\"autocomplete\" id=\"tags_choices\"
                                style=\"display:none\"></div>";
@@ -216,6 +215,18 @@ class Article extends Handler_Protected {
                        score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
                print json_encode(array("id" => $ids,
+                       "score" => (int)$score,
+                       "score_pic" => get_score_pic($score)));
+       }
+
+       function getScore() {
+               $id = $this->dbh->escape_string($_REQUEST['id']);
+
+               $result = $this->dbh->query("SELECT score FROM ttrss_user_entries WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
+               $score = $this->dbh->fetch_result($result, 0, "score");
+
+               print json_encode(array("id" => $id,
+                       "score" => (int)$score,
                        "score_pic" => get_score_pic($score)));
        }