From 29a963c14f4acfdb530e10384550b728e6d47b69 Mon Sep 17 00:00:00 2001 From: shibuya246 Date: Mon, 1 Jul 2013 19:51:32 +0900 Subject: add to feed rss output --- templates/generated_feed.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/generated_feed.txt b/templates/generated_feed.txt index 6bfa50b1b..6a673e866 100644 --- a/templates/generated_feed.txt +++ b/templates/generated_feed.txt @@ -20,6 +20,7 @@ <content type="html"><![CDATA[${ARTICLE_CONTENT}]]></content> <updated>${ARTICLE_UPDATED_ATOM}</updated> <author><name>${ARTICLE_AUTHOR}</name></author> + <source><title>${ARTICLE_SOURCE_TITLE} -- cgit v1.2.3 From ab10707facb7e338b2f6ed6a98865b9c754c5f32 Mon Sep 17 00:00:00 2001 From: shibuya246 Date: Mon, 1 Jul 2013 19:53:27 +0900 Subject: add to feed rss output --- classes/handler/public.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/handler/public.php b/classes/handler/public.php index f05beafd2..205853eae 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -110,6 +110,8 @@ class Handler_Public extends Handler { date(DATE_RFC822, strtotime($line["updated"])), true); $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true); + + $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true); $tags = get_article_tags($line["id"], $owner_uid); -- cgit v1.2.3 From af26179d15a42451ea67a171bdb71d800e210194 Mon Sep 17 00:00:00 2001 From: Konstantin Ufimtsev <kestl1st@gmail.com> Date: Mon, 1 Jul 2013 22:52:14 +1000 Subject: getting last_marked value from starred.json --- plugins/googlereaderimport/init.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php index 2e22161b9..dcb335a0d 100644 --- a/plugins/googlereaderimport/init.php +++ b/plugins/googlereaderimport/init.php @@ -114,6 +114,7 @@ class GoogleReaderImport extends Plugin { $guid = db_escape_string(mb_substr($item['id'], 0, 250)); $title = db_escape_string($item['title']); $updated = date('Y-m-d h:i:s', $item['updated']); + $last_marked = date('Y-m-d h:i:s', mb_substr($item['crawlTimeMsec'], 0, 10)); $link = ''; $content = ''; $author = db_escape_string($item['author']); @@ -165,7 +166,7 @@ class GoogleReaderImport extends Plugin { $imported += (int) $this->create_article($owner_uid, $guid, $title, $link, $updated, $content, $author, $sql_set_marked, $tags, - $orig_feed_data); + $orig_feed_data, $last_marked); if ($file && $processed % 25 == 0) { _debug("processed $processed articles..."); @@ -196,7 +197,7 @@ class GoogleReaderImport extends Plugin { } // expects ESCAPED data - private function create_article($owner_uid, $guid, $title, $link, $updated, $content, $author, $marked, $tags, $orig_feed_data) { + private function create_article($owner_uid, $guid, $title, $link, $updated, $content, $author, $marked, $tags, $orig_feed_data, $last_marked) { if (!$guid) $guid = sha1($link); @@ -299,7 +300,7 @@ class GoogleReaderImport extends Plugin { (ref_id, uuid, feed_id, orig_feed_id, owner_uid, marked, tag_cache, label_cache, last_read, note, unread, last_marked) VALUES - ('$ref_id', '', NULL, $orig_feed_id, $owner_uid, $marked, '', '', NOW(), '', false, NOW())"); + ('$ref_id', '', NULL, $orig_feed_id, $owner_uid, $marked, '', '', '$last_marked', '', false, '$last_marked')"); $result = db_query("SELECT int_id FROM ttrss_user_entries, ttrss_entries WHERE owner_uid = $owner_uid AND ref_id = id AND ref_id = $ref_id"); -- cgit v1.2.3 From d999bc3eb2e0000aad7f92f73ed26938c7a83519 Mon Sep 17 00:00:00 2001 From: Andrew Herron <thespyder@programmer.net> Date: Tue, 2 Jul 2013 22:29:19 +1000 Subject: prevent accidental ctrl_key global --- js/tt-rss.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/tt-rss.js b/js/tt-rss.js index a1d7d6411..c14c65f27 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -847,6 +847,7 @@ function hotkey_handler(e) { var keycode = false; var shift_key = false; + var ctrl_key = false; var cmdline = $('cmdline'); -- cgit v1.2.3 From c65bd1027ab46848493973da0515640a93815d27 Mon Sep 17 00:00:00 2001 From: Andrew Herron <thespyder@programmer.net> Date: Tue, 2 Jul 2013 22:36:29 +1000 Subject: Added alt and meta key handling to hotkeys --- js/tt-rss.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/tt-rss.js b/js/tt-rss.js index c14c65f27..46e282351 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -848,11 +848,15 @@ function hotkey_handler(e) { var keycode = false; var shift_key = false; var ctrl_key = false; + var alt_key = false; + var meta_key = false; var cmdline = $('cmdline'); shift_key = e.shiftKey; ctrl_key = e.ctrlKey; + alt_key = e.altKey; + meta_key = e.metaKey; if (window.event) { keycode = window.event.keyCode; @@ -894,6 +898,8 @@ function hotkey_handler(e) { // ensure ^*char notation if (shift_key) hotkey = "*" + hotkey; if (ctrl_key) hotkey = "^" + hotkey; + if (alt_key) hotkey = "+" + hotkey; + if (meta_key) hotkey = "%" + hotkey; hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey; hotkey_prefix = false; -- cgit v1.2.3 From 4cb2c55025c2ca56034117629af4d26856b9c7e8 Mon Sep 17 00:00:00 2001 From: Joakim <joakim@my domain name here.com> Date: Fri, 5 Jul 2013 20:34:38 +0200 Subject: Filter test from web interface now replicates behaviour from pull #167 --- include/functions.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/functions.php b/include/functions.php index 355eec2cd..0eceed623 100644 --- a/include/functions.php +++ b/include/functions.php @@ -3958,6 +3958,7 @@ $reg_qpart = "REGEXP"; foreach ($filter["rules"] AS $rule) { + $rule['reg_exp'] = str_replace('/', '\/', $rule["reg_exp"]); $regexp_valid = preg_match('/' . $rule['reg_exp'] . '/', $rule['reg_exp']) !== FALSE; -- cgit v1.2.3