jan/miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add option to disable mark as read for original link

Browse Source 
fixes #196
This commit is contained in:
Mathias Kresin 2015-01-29 23:28:18 +01:00
parent 5b9c330f69
commit a2686ae21d
22 changed files with 70 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/js/all.min.js vendored
View File

@ -1,19 +1,19 @@
var k=function(){var e=[];return{j:function(d,a){var b=d.querySelector("span.items-count");if(b){var c=d.getAttribute("data-feed-id"),e=d.querySelector("h2:first-of-type");e.className="loading-icon";var l=new XMLHttpRequest;l.onload=function(){e.className="";d.removeAttribute("data-feed-error");var c=d.querySelector(".feed-last-checked");c&&(c.innerHTML=c.getAttribute("data-after-update"));c=JSON.parse(this.responseText);c.result?b.innerHTML=c.items_count.items_unread+"/"+c.items_count.items_total:
d.setAttribute("data-feed-error","1");a?a(c):g.a()};l.open("POST","?action=refresh-feed&feed_id="+c,!0);l.send()}},k:function(){var d=Array.prototype.slice.call(document.querySelectorAll("article:not([data-feed-disabled])")),a=setInterval(function(){for(;0<d.length&&5>e.length;){var b=d.shift();e.push(parseInt(b.getAttribute("data-feed-id"),10));k.j(b,function(b){b=e.indexOf(b.feed_id);0<=b&&e.splice(b,1);0===d.length&&0===e.length&&(clearInterval(a),g.a())})}},100)}}}(),g=function(){function e(a){return item_id=
a.getAttribute("data-item-id")}function d(a){if(a&&a.hasAttribute("data-reverse-label")){var b=a.innerHTML;a.innerHTML=a.getAttribute("data-reverse-label");a.setAttribute("data-reverse-label",b)}}function a(a){"mouse"!==m.c&&t.d();a.parentNode.removeChild(a);r--}function b(){-1<window.location.href.indexOf("nothing_to_read=1")&&0<n?window.location.href="?action=unread":0===r&&window.location.reload();var a=document.getElementById("page-counter");a&&(a.textContent=r||"");document.getElementById("nav-counter").textContent=
n||"";var b=document.querySelector("div.page-header h2:first-of-type");if(b)pageHeading=b.firstChild.nodeValue;else if(b=document.querySelector("article.item h1:first-of-type")){document.title=b.textContent;return}switch(document.querySelector("section.page").getAttribute("data-item-page")){case "unread":document.title="Miniflux ("+n+")";break;case "feed-items":document.title="("+r+") "+pageHeading;break;default:document.title=a?pageHeading+" ("+r+")":pageHeading}}function c(f){var h=e(f),c=new XMLHttpRequest;
c.onload=function(){if(t.b()){if(f.getAttribute("data-hide"))a(f);else{f.setAttribute("data-item-status","read");var c=f.querySelector("a.mark");d(c);(c=f.querySelector("a.mark"))&&c.setAttribute("data-action","mark-unread")}n--;b()}};c.open("POST","?action=mark-item-read&id="+h,!0);c.send()}function v(f){var c=e(f),p=new XMLHttpRequest;p.onload=function(){if(t.b()){if(f.getAttribute("data-hide"))a(f);else{f.setAttribute("data-item-status","unread");var c=f.querySelector("a.mark");d(c);(c=f.querySelector("a.mark"))&&
c.setAttribute("data-action","mark-read")}n++;b()}};p.open("POST","?action=mark-item-unread&id="+c,!0);p.send()}var l=[],q=!1,n=function(){var a=document.getElementById("nav-counter");if(a)return counter=parseInt(a.textContent,10)||0}(),r=function(){var a=document.getElementById("page-counter");if(a)return counter=parseInt(a.textContent,10)||0}();return{p:c,r:v,q:function(f){var c=e(f),d=new XMLHttpRequest;d.onload=function(){t.b()&&(a(f),"unread"===f.getAttribute("data-item-status")&&n--,b())};d.open("POST",
"?action=mark-item-removed&id="+c,!0);d.send()},i:function(c){var h=e(c),p="1"===c.getAttribute("data-item-bookmark")?"0":"1",u=new XMLHttpRequest;u.onload=function(){var h=document.querySelector("section.page");if(t.b()&&"bookmarks"===h.getAttribute("data-item-page"))a(c),b();else if(c.setAttribute("data-item-bookmark",p),t.b())h=c.querySelector("a.bookmark"),d(h);else if((h=c.querySelector("a.bookmark-icon"))&&h.hasAttribute("data-reverse-title")){var e=h.getAttribute("title");h.setAttribute("title",
h.getAttribute("data-reverse-title"));h.setAttribute("data-reverse-title",e)}};u.open("POST","?action=bookmark&id="+h+"&value="+p,!0);u.send()},A:function(a){var b=a.getAttribute("data-item-status");"read"===b?v(a):"unread"===b&&c(a)},v:function(a){(a=a.querySelector("a.show"))&&a.click()},g:function(a){var b=a.querySelector("a.original");b&&("unread"===a.getAttribute("data-item-status")&&c(a),b.removeAttribute("data-action"),"mouse"!==m.c&&b.click())},e:function(a){var b=document.getElementById("download-item");
if(b){b.innerHTML=" "+b.getAttribute("data-before-message");b.className="loading-icon";var c=new XMLHttpRequest;c.onload=function(){var a=JSON.parse(c.responseText);b.className="";if(a.result){var d=document.getElementById("item-content");d&&(d.innerHTML=a.content);b.innerHTML=b.getAttribute("data-after-message")}else b.innerHTML=b.getAttribute("data-failure-message")};a=e(a);c.open("POST","?action=download-item&id="+a,!0);c.send()}},f:function(a){for(var b=document.getElementsByTagName("article"),
c=[],d=0,l=b.length;d<l;d++)c.push(e(b[d]));b=new XMLHttpRequest;b.onload=function(){window.location.href=a};b.open("POST","?action=mark-items-as-read",!0);b.send(JSON.stringify(c))},B:function(){for(var a=["#current-item h1","#item-content","#listing #current-item h2","#listing #current-item .preview"],b=0;b<a.length;b++){var c=document.querySelector(a[b]);c&&(c.dir=""==c.dir?"rtl":"")}},C:function(){return q},a:function(){if(!document.hidden||!q){var a=new XMLHttpRequest;a.onload=function(){var a=
0===l.length,c=!1,d=JSON.parse(this.responseText),e;for(e in d.feeds){var f=d.feeds[e];if(!l.hasOwnProperty(e)||f.time>l[e])l[e]=f.time,"unread"===f.status&&(c=!0)}document.hidden||d.nbUnread===n&&!q?document.hidden&&!a&&c&&(q=!0,document.title="\u21bb "+document.title):(q=!1,n=d.nbUnread,b())};a.open("POST","?action=latest-feeds-items",!0);a.send()}}}}(),m=function(){function e(a){if(63!==a.keyCode&&63!==a.which&&(a.ctrlKey||a.shiftKey||a.altKey||a.metaKey))return!0;a=a.target||a.srcElement;return"INPUT"===
a.tagName||"TEXTAREA"===a.tagName?!0:!1}var d=[];return{c:"",n:function(){document.onclick=function(a){var b=a.target.getAttribute("data-action");b&&"original-link"!==b&&a.preventDefault()};document.onmouseup=function(a){if(2!==a.button)if("INPUT"===a.target.nodeName&&"auto-select"===a.target.className)a.target.select();else{var b=a.target.getAttribute("data-action");if(b){m.c="mouse";var c;a:{for(element=a.target;element&&element.parentNode;)if(element=element.parentNode,element.tagName&&"article"===
element.tagName.toLowerCase()){c=element;break a}c=void 0}switch(b){case "refresh-all":k.k();break;case "refresh-feed":c&&k.j(c);break;case "mark-read":c&&g.p(c);break;case "mark-unread":c&&g.r(c);break;case "mark-removed":c&&g.q(c);break;case "bookmark":c&&g.i(c);break;case "download-item":c&&g.e(c);break;case "original-link":c&&g.g(c);break;case "mark-all-read":g.f("?action=unread");break;case "mark-feed-read":g.f("?action=feed-items&feed_id="+a.target.getAttribute("data-feed-id"))}}}}},m:function(){document.onkeypress=
function(a){if(!e(a))if(m.c="keyboard",d.push(a.keyCode||a.which),103===d[0])switch(d[1]){case void 0:break;case 117:window.location.href="?action=unread";d=[];break;case 98:window.location.href="?action=bookmarks";d=[];break;case 104:window.location.href="?action=history";d=[];break;case 115:window.location.href="?action=feeds";d=[];break;case 112:window.location.href="?action=config";d=[];break;default:d=[]}else{d=[];var b=document.getElementById("current-item");switch(a.keyCode||a.which){case 100:b&&
g.e(b);break;case 112:case 107:t.h();break;case 110:case 106:t.d();break;case 118:b&&g.g(b);break;case 111:b&&g.v(b);break;case 109:b&&g.A(b);break;case 102:b&&g.i(b);break;case 104:t.t();break;case 108:t.s();break;case 114:k.k();break;case 63:t.w();break;case 122:g.B()}}};document.onkeydown=function(a){if(!e(a))switch(m.c="keyboard",a.keyCode||a.which){case 37:t.h();break;case 39:t.d()}}},o:function(){document.addEventListener("visibilitychange",function(){!document.hidden&&g.C()&&g.a()})}}}(),t=
function(){function e(a){var b=pageYOffset+document.documentElement.clientHeight;(0>b-(a.offsetTop+a.offsetHeight)||b-a.offsetTop>document.documentElement.clientHeight)&&window.scrollTo(0,a.offsetTop-10)}function d(){return document.getElementById("listing")?!0:!1}return{s:function(){var a=document.getElementById("next-page");a&&a.click()},t:function(){var a=document.getElementById("previous-page");a&&a.click()},d:function(){var a=document.getElementById("next-item");if(a)a.click();else if(d())if(a=
document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,c=a.length;b<c;b++){if("current-item"===a[b].id){b+1<c&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b+1].id="current-item",e(a[b+1]));break}}else a[0].id="current-item",e(a[0])},h:function(){var a=document.getElementById("previous-item");if(a)a.click();else if(d())if(a=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=a.length-1;0<=b;b--){if("current-item"===
a[b].id){0<=b-1&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b-1].id="current-item",e(a[b-1]));break}}else a[a.length-1].id="current-item",e(a[a.length-1])},w:function(){open("?action=show-help","Help","width=320,height=450,location=no,scrollbars=no,status=no,toolbar=no")},b:d}}();
({D:function(){},u:function(){m.m();m.n();m.o();this.l()},l:function(){var e=new XMLHttpRequest;e.onload=function(){var d=JSON.parse(this.responseText);0<d.frontend_updatecheck_interval&&(g.a(),setInterval(function(){g.a()},6E4*d.frontend_updatecheck_interval))};e.open("POST","?action=get-config",!0);e.send(JSON.stringify(["frontend_updatecheck_interval"]))}}).u();
var k=function(){var d=[];return{i:function(c,a){var b=c.querySelector("span.items-count");if(b){var e=c.getAttribute("data-feed-id"),d=c.querySelector("h2:first-of-type");d.className="loading-icon";var p=new XMLHttpRequest;p.onload=function(){d.className="";c.removeAttribute("data-feed-error");var e=c.querySelector(".feed-last-checked");e&&(e.innerHTML=e.getAttribute("data-after-update"));e=JSON.parse(this.responseText);e.result?b.innerHTML=e.items_count.items_unread+"/"+e.items_count.items_total:
c.setAttribute("data-feed-error","1");a?a(e):g.a()};p.open("POST","?action=refresh-feed&feed_id="+e,!0);p.send()}},j:function(){var c=Array.prototype.slice.call(document.querySelectorAll("article:not([data-feed-disabled])")),a=setInterval(function(){for(;0<c.length&&5>d.length;){var b=c.shift();d.push(parseInt(b.getAttribute("data-feed-id"),10));k.i(b,function(b){b=d.indexOf(b.feed_id);0<=b&&d.splice(b,1);0===c.length&&0===d.length&&(clearInterval(a),g.a())})}},100)}}}(),g=function(){function d(a){var b=
document.createEvent("MouseEvents");b.initEvent("mousedown",!0,!0);a.dispatchEvent(b);b=document.createEvent("MouseEvents");b.initEvent("mouseup",!0,!0);a.dispatchEvent(b);a.click()}function c(a){return item_id=a.getAttribute("data-item-id")}function a(a){if(a&&a.hasAttribute("data-reverse-label")){var b=a.innerHTML;a.innerHTML=a.getAttribute("data-reverse-label");a.setAttribute("data-reverse-label",b)}}function b(a){"mouse"!==n.c&&u.d();a.parentNode.removeChild(a);q--}function e(){-1<window.location.href.indexOf("nothing_to_read=1")&&
0<l?window.location.href="?action=unread":0===q&&window.location.reload();var a=document.getElementById("page-counter");a&&(a.textContent=q||"");document.getElementById("nav-counter").textContent=l||"";var b=document.querySelector("div.page-header h2:first-of-type");if(b)pageHeading=b.firstChild.nodeValue;else if(b=document.querySelector("article.item h1:first-of-type")){document.title=b.textContent;return}switch(document.querySelector("section.page").getAttribute("data-item-page")){case "unread":document.title=
"Miniflux ("+l+")";break;case "feed-items":document.title="("+q+") "+pageHeading;break;default:document.title=a?pageHeading+" ("+q+")":pageHeading}}function v(f){var m=c(f),h=new XMLHttpRequest;h.onload=function(){if(u.b()){if(f.getAttribute("data-hide"))b(f);else{f.setAttribute("data-item-status","read");var c=f.querySelector("a.mark");a(c);(c=f.querySelector("a.mark"))&&c.setAttribute("data-action","mark-unread")}l--;e()}};h.open("POST","?action=mark-item-read&id="+m,!0);h.send()}function p(f){var m=
c(f),h=new XMLHttpRequest;h.onload=function(){if(u.b()){if(f.getAttribute("data-hide"))b(f);else{f.setAttribute("data-item-status","unread");var c=f.querySelector("a.mark");a(c);(c=f.querySelector("a.mark"))&&c.setAttribute("data-action","mark-read")}l++;e()}};h.open("POST","?action=mark-item-unread&id="+m,!0);h.send()}var t=[],r=!1,l=function(){var a=document.getElementById("nav-counter");if(a)return counter=parseInt(a.textContent,10)||0}(),q=function(){var a=document.getElementById("page-counter");
if(a)return counter=parseInt(a.textContent,10)||0}();return{o:function(a){"read"!==a.getAttribute("data-item-status")&&v(a)},q:p,p:function(a){var m=c(a),h=new XMLHttpRequest;h.onload=function(){u.b()&&(b(a),"unread"===a.getAttribute("data-item-status")&&l--,e())};h.open("POST","?action=mark-item-removed&id="+m,!0);h.send()},h:function(f){var m=c(f),h="1"===f.getAttribute("data-item-bookmark")?"0":"1",d=new XMLHttpRequest;d.onload=function(){var c=document.querySelector("section.page");if(u.b()&&
"bookmarks"===c.getAttribute("data-item-page"))b(f),e();else if(f.setAttribute("data-item-bookmark",h),u.b())c=f.querySelector("a.bookmark"),a(c);else if((c=f.querySelector("a.bookmark-icon"))&&c.hasAttribute("data-reverse-title")){var m=c.getAttribute("title");c.setAttribute("title",c.getAttribute("data-reverse-title"));c.setAttribute("data-reverse-title",m)}};d.open("POST","?action=bookmark&id="+m+"&value="+h,!0);d.send()},A:function(a){var b=a.getAttribute("data-item-status");"read"===b?p(a):"unread"===
b&&v(a)},v:function(a){(a=a.querySelector("a.show"))&&d(a)},s:function(a){(a=a.querySelector("a.original"))&&d(a)},e:function(a){var b=document.getElementById("download-item");if(b){b.innerHTML=" "+b.getAttribute("data-before-message");b.className="loading-icon";var e=new XMLHttpRequest;e.onload=function(){var a=JSON.parse(e.responseText);b.className="";if(a.result){var c=document.getElementById("item-content");c&&(c.innerHTML=a.content);b.innerHTML=b.getAttribute("data-after-message")}else b.innerHTML=
b.getAttribute("data-failure-message")};a=c(a);e.open("POST","?action=download-item&id="+a,!0);e.send()}},f:function(a){for(var b=document.getElementsByTagName("article"),e=[],d=0,l=b.length;d<l;d++)e.push(c(b[d]));b=new XMLHttpRequest;b.onload=function(){window.location.href=a};b.open("POST","?action=mark-items-as-read",!0);b.send(JSON.stringify(e))},B:function(){for(var a=["#current-item h1","#item-content","#listing #current-item h2","#listing #current-item .preview"],b=0;b<a.length;b++){var c=
document.querySelector(a[b]);c&&(c.dir=""==c.dir?"rtl":"")}},C:function(){return r},a:function(){if(!document.hidden||!r){var a=new XMLHttpRequest;a.onload=function(){var a=0===t.length,b=!1,c=JSON.parse(this.responseText),d;for(d in c.feeds){var f=c.feeds[d];if(!t.hasOwnProperty(d)||f.time>t[d])t[d]=f.time,"unread"===f.status&&(b=!0)}document.hidden||c.nbUnread===l&&!r?document.hidden&&!a&&b&&(r=!0,document.title="\u21bb "+document.title):(r=!1,l=c.nbUnread,e())};a.open("POST","?action=latest-feeds-items",
!0);a.send()}}}}(),n=function(){function d(a){if(63!==a.keyCode&&63!==a.which&&(a.ctrlKey||a.shiftKey||a.altKey||a.metaKey))return!0;a=a.target||a.srcElement;return"INPUT"===a.tagName||"TEXTAREA"===a.tagName?!0:!1}var c=[];return{c:"",m:function(){document.onclick=function(a){a.target.hasAttribute("data-action")&&"original"!==a.target.className&&a.preventDefault()};document.onmouseup=function(a){if(2!==a.button)if("INPUT"===a.target.nodeName&&"auto-select"===a.target.className)a.target.select();else{var b=
a.target.getAttribute("data-action");if(b){n.c="mouse";var c;a:{for(element=a.target;element&&element.parentNode;)if(element=element.parentNode,element.tagName&&"article"===element.tagName.toLowerCase()){c=element;break a}c=void 0}switch(b){case "refresh-all":k.j();break;case "refresh-feed":c&&k.i(c);break;case "mark-read":c&&g.o(c);break;case "mark-unread":c&&g.q(c);break;case "mark-removed":c&&g.p(c);break;case "bookmark":c&&g.h(c);break;case "download-item":c&&g.e(c);break;case "mark-all-read":g.f("?action=unread");
break;case "mark-feed-read":g.f("?action=feed-items&feed_id="+a.target.getAttribute("data-feed-id"))}}}}},l:function(){document.onkeypress=function(a){if(!d(a))if(n.c="keyboard",c.push(a.keyCode||a.which),103===c[0])switch(c[1]){case void 0:break;case 117:window.location.href="?action=unread";c=[];break;case 98:window.location.href="?action=bookmarks";c=[];break;case 104:window.location.href="?action=history";c=[];break;case 115:window.location.href="?action=feeds";c=[];break;case 112:window.location.href=
"?action=config";c=[];break;default:c=[]}else{c=[];var b=document.getElementById("current-item");switch(a.keyCode||a.which){case 100:b&&g.e(b);break;case 112:case 107:u.g();break;case 110:case 106:u.d();break;case 118:b&&g.s(b);break;case 111:b&&g.v(b);break;case 109:b&&g.A(b);break;case 102:b&&g.h(b);break;case 104:u.t();break;case 108:u.r();break;case 114:k.j();break;case 63:u.w();break;case 122:g.B()}}};document.onkeydown=function(a){if(!d(a))switch(n.c="keyboard",a.keyCode||a.which){case 37:u.g();
break;case 39:u.d()}}},n:function(){document.addEventListener("visibilitychange",function(){!document.hidden&&g.C()&&g.a()})}}}(),u=function(){function d(a){var b=pageYOffset+document.documentElement.clientHeight;(0>b-(a.offsetTop+a.offsetHeight)||b-a.offsetTop>document.documentElement.clientHeight)&&window.scrollTo(0,a.offsetTop-10)}function c(){return document.getElementById("listing")?!0:!1}return{r:function(){var a=document.getElementById("next-page");a&&a.click()},t:function(){var a=document.getElementById("previous-page");
a&&a.click()},d:function(){var a=document.getElementById("next-item");if(a)a.click();else if(c())if(a=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,e=a.length;b<e;b++){if("current-item"===a[b].id){b+1<e&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b+1].id="current-item",d(a[b+1]));break}}else a[0].id="current-item",d(a[0])},g:function(){var a=document.getElementById("previous-item");if(a)a.click();else if(c())if(a=document.getElementsByTagName("article"),
document.getElementById("current-item"))for(var b=a.length-1;0<=b;b--){if("current-item"===a[b].id){0<=b-1&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b-1].id="current-item",d(a[b-1]));break}}else a[a.length-1].id="current-item",d(a[a.length-1])},w:function(){open("?action=show-help","Help","width=320,height=450,location=no,scrollbars=no,status=no,toolbar=no")},b:c}}();
({D:function(){},u:function(){n.l();n.m();n.n();this.k()},k:function(){var d=new XMLHttpRequest;d.onload=function(){var c=JSON.parse(this.responseText);0<c.frontend_updatecheck_interval&&(g.a(),setInterval(function(){g.a()},6E4*c.frontend_updatecheck_interval))};d.open("POST","?action=get-config",!0);d.send(JSON.stringify(["frontend_updatecheck_interval"]))}}).u();

7
assets/js/event.js
View File

@ -22,9 +22,7 @@ Miniflux.Event = (function() {
ListenMouseEvents: function() {
document.onclick = function(e) {
var action = e.target.getAttribute("data-action");
if (action && action !== 'original-link') {
if (e.target.hasAttribute("data-action") && e.target.className !== 'original') {
e.preventDefault();
}
};
@ -86,9 +84,6 @@ Miniflux.Event = (function() {
case 'download-item':
currentItem && Miniflux.Item.DownloadContent(currentItem);
break;
case 'original-link':
currentItem && Miniflux.Item.OpenOriginal(currentItem);
break;
case 'mark-all-read':
Miniflux.Item.MarkListingAsRead("?action=unread");
break;

30
assets/js/item.js
View File

@ -24,6 +24,19 @@ Miniflux.Item = (function() {
}
}();
function simulateMouseClick(element)
{
var event = document.createEvent("MouseEvents");
event.initEvent("mousedown", true, true);
element.dispatchEvent(event);
var event = document.createEvent("MouseEvents");
event.initEvent("mouseup", true, true);
element.dispatchEvent(event);
element.click();
}
function getItemID(item)
{
item_id = item.getAttribute("data-item-id");
@ -191,7 +204,10 @@ Miniflux.Item = (function() {
}
return {
MarkAsRead: markAsRead,
MarkAsRead: function(item) {
var status = item.getAttribute("data-item-status");
if (status !== "read") markAsRead(item);
},
MarkAsUnread: markAsUnread,
MarkAsRemoved: markAsRemoved,
SwitchBookmark: function(item) {
@ -239,19 +255,11 @@ Miniflux.Item = (function() {
},
Show: function(item) {
var link = item.querySelector("a.show");
if (link) link.click();
if (link) simulateMouseClick(link);
},
OpenOriginal: function(item) {
var link = item.querySelector("a.original");
if (link) {
if (item.getAttribute("data-item-status") === "unread") markAsRead(item);
link.removeAttribute("data-action");
if (Miniflux.Event.lastEventType !== "mouse") {
link.click();
}
}
if (link) simulateMouseClick(link)
},
DownloadContent: function(item) {
var container = document.getElementById("download-item");

1
controllers/bookmark.php
View File

@ -47,6 +47,7 @@ Router\get_action('bookmarks', function() {
Response\html(Template\layout('bookmarks', array(
'favicons' => Model\Feed\get_item_favicons($items),
'original_marks_read' => Model\Config\get('original_marks_read'),
'order' => '',
'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'),

6
controllers/config.php
View File

@ -138,7 +138,7 @@ Router\get_action('config', function() {
// Update preferences
Router\post_action('config', function() {
$values = Request\values() + array('nocontent' => 0, 'image_proxy' => 0, 'favicons' => 0, 'debug_mode' => 0);
$values = Request\values() + array('nocontent' => 0, 'image_proxy' => 0, 'favicons' => 0, 'debug_mode' => 0, 'original_marks_read' => 0);
Model\Config\check_csrf_values($values);
list($valid, $errors) = Model\Config\validate_modification($values);
@ -175,7 +175,7 @@ Router\post_action('config', function() {
Router\post_action('get-config', function() {
$return = array();
$options = Request\values();
if (empty($options)) {
$return = Model\Config\get_all();
}
@ -184,7 +184,7 @@ Router\post_action('get-config', function() {
$return[$name] = Model\Config\get($name);
}
}
Response\json($return);
});

1
controllers/history.php
View File

@ -21,6 +21,7 @@ Router\get_action('history', function() {
Response\html(Template\layout('history', array(
'favicons' => Model\Feed\get_item_favicons($items),
'original_marks_read' => Model\Config\get('original_marks_read'),
'items' => $items,
'order' => '',
'direction' => '',

6
controllers/item.php
View File

@ -26,6 +26,7 @@ Router\get_action('unread', function() {
Response\html(Template\layout('unread_items', array(
'favicons' => Model\Feed\get_item_favicons($items),
'original_marks_read' => Model\Config\get('original_marks_read'),
'order' => $order,
'direction' => $direction,
'display_mode' => Model\Config\get('items_display_mode'),
@ -89,6 +90,7 @@ Router\get_action('feed-items', function() {
Response\html(Template\layout('feed_items', array(
'favicons' => Model\Feed\get_favicons(array($feed['id'])),
'original_marks_read' => Model\Config\get('original_marks_read'),
'order' => $order,
'direction' => $direction,
'display_mode' => Model\Config\get('items_display_mode'),
@ -204,7 +206,7 @@ Router\get_action('mark-item-removed', function() {
Router\post_action('latest-feeds-items', function() {
$items = Model\Item\get_latest_feeds_items();
$nb_unread_items = Model\Item\count_by_status('unread');
$feeds = array_reduce($items, function ($result, $item) {
$result[$item['id']] = array(
'time' => $item['updated'] ?: 0,
@ -212,7 +214,7 @@ Router\post_action('latest-feeds-items', function() {
);
return $result;
}, array());
Response\json(array(
'feeds' => $feeds,
'nbUnread' => $nb_unread_items

1
locales/cs_CZ/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

1
locales/de_DE/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

1
locales/es_ES/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

1
locales/fr_FR/translations.php
View File

@ -234,4 +234,5 @@ return array(
'Refresh interval in minutes for unread counter' => 'Fréquence d\'actualisation en minute du compteur de non lus',
'Nothing to show. Enable the debug mode to see log messages.' => 'Rien à montrer. Activez le mode debug pour voir les messages de log.',
'Enable debug mode' => 'Activer le mode debug',
'Original link marks article as read' => 'Original link marks article as read',
);

1
locales/it_IT/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

1
locales/pt_BR/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

1
locales/zh_CN/translations.php
View File

@ -234,4 +234,5 @@ return array(
// 'Refresh interval in minutes for unread counter' => '',
// 'Nothing to show. Enable the debug mode to see log messages.' => '',
// 'Enable debug mode' => '',
// 'Original link marks article as read' => '',
);

3
models/config.php
View File

@ -288,6 +288,9 @@ function validate_modification(array $values)
new Validators\Required('theme', t('Value required')),
new Validators\Integer('frontend_updatecheck_interval', t('Must be an integer')),
new Validators\Integer('debug_mode', t('Must be an integer')),
new Validators\Integer('nocontent', t('Must be an integer')),
new Validators\Integer('favicons', t('Must be an integer')),
new Validators\Integer('original_marks_read', t('Must be an integer')),
);
if (ENABLE_AUTO_UPDATE) {

7
models/schema.php
View File

@ -5,7 +5,12 @@ namespace Schema;
use PDO;
use Model\Config;
const VERSION = 37;
const VERSION = 38;
function version_38($pdo)
{
$pdo->exec('INSERT INTO settings ("key", "value") VALUES ("original_marks_read", 1)');
}
function version_37($pdo)
{

1
templates/bookmarks.php
View File

@ -19,6 +19,7 @@
'hide' => false,
'display_mode' => $display_mode,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>
<?php endforeach ?>

1
templates/config.php
View File

@ -72,6 +72,7 @@
<?= Helper\form_label(t('Refresh interval in minutes for unread counter'), 'frontend_updatecheck_interval') ?>
<?= Helper\form_number('frontend_updatecheck_interval', $values, $errors, array('min="0"')) ?><br/>
<?= Helper\form_checkbox('original_marks_read', t('Original link marks article as read'), 1, isset($values['original_marks_read']) && $values['original_marks_read'] == 1) ?><br/>
<?= Helper\form_checkbox('nocontent', t('Do not fetch the content of articles'), 1, isset($values['nocontent']) && $values['nocontent'] == 1) ?><br/>
<?= Helper\form_checkbox('favicons', t('Download favicons'), 1, isset($values['favicons']) && $values['favicons'] == 1) ?><br/>
</div>

1
templates/feed_items.php
View File

@ -35,6 +35,7 @@
'hide' => false,
'display_mode' => $display_mode,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>
<?php endforeach ?>

1
templates/history.php
View File

@ -22,6 +22,7 @@
'hide' => true,
'display_mode' => $display_mode,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>
<?php endforeach ?>

2
templates/item.php
View File

@ -36,7 +36,7 @@
<span title="<?= dt('%e %B %Y %k:%M', $item['updated']) ?>"><?= Helper\relative_time($item['updated']) ?></span>
</li>
<li class="hide-mobile">
<a href="<?= $item['url'] ?>" class="original" rel="noreferrer" target="_blank" data-action="original-link"><?= t('original link') ?></a>
<a href="<?= $item['url'] ?>" class="original" rel="noreferrer" target="_blank" <?= ($original_marks_read) ? 'data-action="mark-read"' : '' ?>><?= t('original link') ?></a>
</li>
<?php if ($item['enclosure']): ?>
<li>

1
templates/unread_items.php
View File

@ -23,6 +23,7 @@
'hide' => true,
'display_mode' => $display_mode,
'favicons' => $favicons,
'original_marks_read' => $original_marks_read,
)) ?>
<?php endforeach ?>