summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-02-17 16:22:36 +0300
committerAndrew Dolgov <[email protected]>2010-02-17 16:22:36 +0300
commit1f7b77d1681626cb2071e29692be68d2dbd18b81 (patch)
tree2115f95cf2631f743b02a377e1d9aa963ad69e52
parent01701654eb01257ef96882ed5840a29355a353be (diff)
backend: if fresh=1 parameter to getUnread is present, append output of fresh feed
-rw-r--r--backend.php8
-rw-r--r--utils/notifier/manifest.json5
2 files changed, 10 insertions, 3 deletions
diff --git a/backend.php b/backend.php
index 37c79412e..8ccc503af 100644
--- a/backend.php
+++ b/backend.php
@@ -490,6 +490,7 @@
case "getUnread":
$login = db_escape_string($_REQUEST["login"]);
+ $fresh = $_REQUEST["fresh"] == "1";
header("Content-Type: text/plain; charset=utf-8");
@@ -497,7 +498,14 @@
if (db_num_rows($result) == 1) {
$uid = db_fetch_result($result, 0, "id");
+
print getGlobalUnread($link, $uid);
+
+ if ($fresh) {
+ print ";";
+ print getFeedArticles($link, -3, false, true, $uid);
+ }
+
} else {
print "-1;User not found";
}
diff --git a/utils/notifier/manifest.json b/utils/notifier/manifest.json
index f0f00953a..206dffd49 100644
--- a/utils/notifier/manifest.json
+++ b/utils/notifier/manifest.json
@@ -1,14 +1,13 @@
{
"name": "Tiny Tiny RSS Notifier",
"background_page": "background.html",
- "version": "0.2",
+ "version": "0.2.1",
"description": "This extension displays the number of unread articles in your Tiny Tiny RSS installation",
"options_page": "options.html",
"icons": { "48": "images/icon.png", "128": "images/icon.png" },
"browser_action": {
"default_icon": "images/normal.png",
- "default_title": "You have no unread articles.",
- "popup.disabled": "popup.html"
+ "default_title": "You have no unread articles."
},
"permissions": [
"tabs", "http://*/*", "https://*/*"