rename digest_checkbox

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

diff --git a/classes/feeds.php b/classes/feeds.php
index dfb3a4b266fe4ebbbb4f7fe416be5476de3aab26..b533bf0437cad0493153ea613bd6a914d089a631 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -141,6 +141,9 @@ class Feeds extends Handler_Protected {
                                        $next_unread_feed, $offset, $vgr_last_feed = false,\r
                                        $override_order = false, $include_children = false) {\r
 \r
+               if (isset($_REQUEST["DevForceUpdate"]))\r
+                       header("Content-Type: text/plain");\r
+\r
                $disable_cache = false;\r
 \r
                $reply = array();\r
@@ -320,23 +323,6 @@ class Feeds extends Handler_Protected {
                                        array_push($topmost_article_ids, $id);\r
                                }\r
 \r
-                               if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {\r
-\r
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
-                                               theme_image($this->link, 'images/updated.png')."\"\r
-                                               alt=\"Updated\">";\r
-                               } else {\r
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"\r
-                                               alt=\"Updated\">";\r
-                               }\r
-\r
-                               if (sql_bool_to_bool($line["unread"]) &&\r
-                                       time() - strtotime($line["updated_noms"]) < $fresh_intl) {\r
-\r
-                                       $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
-                                               theme_image($this->link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";\r
-                               }\r
-\r
                                if ($line["unread"] == "t" || $line["unread"] == "1") {\r
                                        $class .= " Unread";\r
                                        ++$num_unread;\r
@@ -446,11 +432,10 @@ class Feeds extends Handler_Protected {
 \r
                                        $reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";\r
 \r
-                                       $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";\r
-\r
                                        $reply['content'] .= "<div class='hlLeft'>";\r
 \r
-                                       $reply['content'] .= "<input type=\"checkbox\" onclick=\"tSR(this)\"\r
+                                       $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+                                                       type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
                                                        id=\"RCHK-$id\">";\r
 \r
                                        $reply['content'] .= "$marked_pic";\r
@@ -542,8 +527,9 @@ class Feeds extends Handler_Protected {
 \r
                                        $reply['content'] .= "<div>";\r
 \r
-                                       $reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,\r
-                                                       'RROW-$id')\" id=\"RCHK-$id\"/>";\r
+                                       $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+                                                       type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
+                                                       id=\"RCHK-$id\">";\r
 \r
                                        $reply['content'] .= "$marked_pic";\r
                                        $reply['content'] .= "$published_pic";\r
@@ -594,7 +580,6 @@ class Feeds extends Handler_Protected {
                                                        title=\"".htmlspecialchars($line["feed_title"])."\"\r
                                                        onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";\r
                                        }\r
-                                       $reply['content'] .= "<div class=\"updPic\">$update_pic</div>";\r
                                        $reply['content'] .= "</div>";\r
 \r
                                        $reply['content'] .= "</div>";\r
@@ -712,7 +697,7 @@ class Feeds extends Handler_Protected {
                                                $reply['content'] .= $p->hook_article_button($line);\r
                                        }\r
 \r
-                                       $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
+                                       $reply['content'] .= "<img src=\"images/close_article.png\"\r
                                                style=\"cursor : pointer\" style=\"cursor : pointer\"\r
                                                onclick=\"dismissArticle($id)\"\r
                                                title='".__('Close article')."'>";\r
@@ -822,7 +807,7 @@ class Feeds extends Handler_Protected {
                 * when there's nothing to load - e.g. no stuff in fresh feed */\r
 \r
                if ($feed == -5) {\r
-                       print json_encode(generate_dashboard_feed($this->link));\r
+                       print json_encode($this->generate_dashboard_feed($this->link));\r
                        return;\r
                }\r
 \r
@@ -841,7 +826,7 @@ class Feeds extends Handler_Protected {
                }\r
 \r
                if ($result && db_num_rows($result) == 0) {\r
-                       print json_encode(generate_error_feed($this->link, __("Feed not found.")));\r
+                       print json_encode($this->generate_error_feed($this->link, __("Feed not found.")));\r
                        return;\r
                }\r
 \r
@@ -944,5 +929,63 @@ class Feeds extends Handler_Protected {
                print json_encode($reply);\r
 \r
        }\r
+\r
+       private function generate_dashboard_feed($link) {\r
+               $reply = array();\r
+\r
+               $reply['headlines']['id'] = -5;\r
+               $reply['headlines']['is_cat'] = false;\r
+\r
+               $reply['headlines']['toolbar'] = '';\r
+               $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');\r
+\r
+               $reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";\r
+\r
+               $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds\r
+                       WHERE owner_uid = " . $_SESSION['uid']);\r
+\r
+               $last_updated = db_fetch_result($result, 0, "last_updated");\r
+               $last_updated = make_local_datetime($link, $last_updated, false);\r
+\r
+               $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);\r
+\r
+               $result = db_query($link, "SELECT COUNT(id) AS num_errors\r
+                       FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);\r
+\r
+               $num_errors = db_fetch_result($result, 0, "num_errors");\r
+\r
+               if ($num_errors > 0) {\r
+                       $reply['headlines']['content'] .= "<br/>";\r
+                       $reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".\r
+                               __('Some feeds have update errors (click for details)')."</a>";\r
+               }\r
+               $reply['headlines']['content'] .= "</span></p>";\r
+\r
+               $reply['headlines-info'] = array("count" => 0,\r
+                       "vgroup_last_feed" => '',\r
+                       "unread" => 0,\r
+                       "disable_cache" => true);\r
+\r
+               return $reply;\r
+       }\r
+\r
+       private function generate_error_feed($link, $error) {\r
+               $reply = array();\r
+\r
+               $reply['headlines']['id'] = -6;\r
+               $reply['headlines']['is_cat'] = false;\r
+\r
+               $reply['headlines']['toolbar'] = '';\r
+               $reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";\r
+\r
+               $reply['headlines-info'] = array("count" => 0,\r
+                       "vgroup_last_feed" => '',\r
+                       "unread" => 0,\r
+                       "disable_cache" => true);\r
+\r
+               return $reply;\r
+       }\r
+\r
+\r
 }\r
 ?>\r