Commit graph

1291 commits

Author SHA1 Message Date
Andrew Dolgov
0086a89740 move some label stuff to labels.php
move getfeedcategory() to Feeds
2017-05-04 15:36:36 +03:00
Andrew Dolgov
904aff7667 abs_to_rel_path: removed 2017-05-04 15:28:21 +03:00
Andrew Dolgov
4a0da0e5bf move get_article_labels to Article 2017-05-04 15:26:21 +03:00
Andrew Dolgov
2ed0d6c433 move counter cache to a separate class
fix references to get_article_tags
2017-05-04 15:22:57 +03:00
Andrew Dolgov
aeb1abedb2 move a bunch of functions into Feeds/Article namespaces
+       static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+       static function getLastArticleId() {
+       static function queryFeedHeadlines($params) {
+       static function getParentCategories($cat, $owner_uid) {
+       static function getChildCategories($cat, $owner_uid) {

move the rest of functions2.php back to functions.php as it is of more manageable size, remove the former
2017-05-04 15:13:02 +03:00
Andrew Dolgov
a230bf88a9 move to Article:
+       static function purge_orphans($do_output = false) {

move to Feeds

+       static function getGlobalUnread($user_id = false) {
+       static function getCategoryTitle($cat_id) {
+       static function getLabelUnread($label_id, $owner_uid = false) {
2017-05-04 15:00:21 +03:00
Andrew Dolgov
86a8351ca2 move the following to Feeds:
+       static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+       static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
+       static function subscribe_to_feed($url, $cat_id = 0,
+       static function getFeedIcon($id) {
+       static function getFeedTitle($id, $cat = false) {
+       static function getCategoryUnread($cat, $owner_uid = false) {
+       static function getCategoryChildrenUnread($cat, $owner_uid = false) {
2017-05-04 14:50:56 +03:00
Andrew Dolgov
7e5f8d9fb3 move the following to Article:
+       static function format_article_enclosures($id, $always_display_enclosures,
+       static function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+       static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+       static function format_tags_string($tags) {
+       static function format_article_labels($labels) {
+       static function format_article_note($id, $note, $allow_edit = true) {
+       static function get_article_enclosures($id) {
2017-05-04 14:38:45 +03:00
Andrew Dolgov
4122da0290 move getArticleFeed to Article
move print_label_select to controls
2017-05-04 14:26:44 +03:00
Andrew Dolgov
e60d5b0a84 move opml-specific get_feed_category to opml.php 2017-05-04 14:24:30 +03:00
Andrew Dolgov
9549e33c2c move some common control-generating functions to controls.php 2017-05-04 14:22:23 +03:00
Andrew Dolgov
07d3431e28 update_rss_feed: minor code cleanup 2017-04-27 13:08:43 +03:00
Andrew Dolgov
ea79a0e033 remove some redundant php closing tags 2017-04-26 20:24:18 +03:00
Andrew Dolgov
7b55001eee fix various issues reported by static analysis
update gitlab-ci config
2017-04-26 15:29:22 +03:00
Andrew Dolgov
467bc4fe03 bump version_static to 17.4 2017-04-23 00:48:51 +03:00
Andrew Dolgov
337535416f filter by search results while marking feed as read 2017-03-31 11:21:35 +03:00
Andrew Dolgov
86e534290e enclosures: rewrite relative urls on import, duh 2017-03-27 19:20:46 +03:00
Andrew Dolgov
9594ea6875 add cosmetic suffixes back for cached url links 2017-03-23 18:26:43 +03:00
Andrew Dolgov
dc2c4b13d4 when choosing enclosures to embed or rewrite (af_zz_imgproxy) only use content type instead of "filename"-based hacks 2017-03-23 15:22:00 +03:00
Andrew Dolgov
388d4dfa88 enable caching of media in article enclosures 2017-03-23 15:19:25 +03:00
Andrew Dolgov
48eefd8c5c allow caching of audio files 2017-03-23 15:03:22 +03:00
Andrew Dolgov
41bead9baa remove local file extensions and generalize some method names for cached media
file extensions may still be present in urls, but are ignored by the backend

MIGRATION (if you have any cached data worth keeping, not required):
in cache/images run "rename 's/\..*$//' *" i.e. strip file extensions
2017-03-23 14:55:40 +03:00
Andrew Dolgov
8519c68d93 rewrite relative urls for html5 audio source elements 2017-03-06 09:20:58 +03:00
Andrew Dolgov
1bfe1d7b31 simplify error handling
* less convoluted exception dialogs
* use window.onerror for the majority of exception catching/reporting
* remove most of now useless try/catch blocks
* report stacktrace instead of manually specified error locations
2017-03-04 14:34:44 +03:00
Luc Didry
453787526a Improve update_feedbrowser_cache SQL query 2017-02-16 12:05:32 +01:00
Andrew Dolgov
4a23031fcd rewrite_relative_url: cleanup resulting url path while rewriting 2017-02-13 15:25:21 +03:00
Andrew Dolgov
454292b295 format_article_enclosures: allow embedding .jpeg files 2017-02-12 20:24:29 +03:00
Andrew Dolgov
676c7303ca add HOOK_ENCLOSURE_ENTRY for af_zz_imgproxy (2) 2017-02-12 17:02:07 +03:00
Andrew Dolgov
58210301e0 add HOOK_ENCLOSURE_ENTRY for af_zz_imgproxy 2017-02-12 16:01:28 +03:00
Jérémy DECOOL
ba2853caac Prevent target='_blank' vulnerability on dynamic link 2017-02-12 11:01:36 +01:00
Andrew Dolgov
fafd32e2dc use get_self_url_prefix() when rewriting cached images 2017-02-10 15:14:47 +03:00
Andrew Dolgov
dc8bd8a640 add some print_checkbox/print_button calls; rename some plugin preference pane titles 2017-02-10 14:57:25 +03:00
Andrew Dolgov
8cf37284e7 af_zz_imgproxy: add optional setting to proxy all remote images
functions: add some form helper methods
2017-02-10 14:17:18 +03:00
Andrew Dolgov
7818bfde0b sanitize: properly handle cached content in archived articles 2017-02-10 12:11:09 +03:00
Andrew Dolgov
70c0a8c2e0 pass several image files used in notify messages to frontend as base64 to prevent broken error messages in case network connection is down. also, update some close buttons to show correct cursor. 2017-02-09 23:19:26 +03:00
Andrew Dolgov
829d478f1b add some protection against opener attacks if external site is opened via window.open() 2017-02-08 15:07:05 +03:00
Andrew Dolgov
5edd605ae1 image cache: do not try to cache data: schema urls; add caching of html5 video content (similar to cache_starred_images plugin) 2017-02-04 11:50:01 +03:00
Andrew Dolgov
0442cbb6c1 image cache: send files as content-disposition: attachment; add .png suffix to image urls 2017-02-04 11:32:24 +03:00
Andrew Dolgov
24c7e4132d subscribe dialog: do not report errors via alert()
fetch_file_contents: reset all globals on start, return error message body when not using curl
subscribe_to_feed: report if cloudflare is in the error message
2017-01-28 12:45:49 +03:00
Andrew Dolgov
181c8285dd add compact theme with smaller font 2017-01-26 22:41:18 +03:00
Andrew Dolgov
e432b8fbe2 implement cache-busting for default theme.css
night theme: small fixes
2017-01-25 12:17:41 +03:00
Andrew Dolgov
553ec3c351 pass article guid to hook_render_article 2017-01-25 08:50:42 +03:00
Shane Synan
311cdb27f4 sanitize: allow dfn tag
Add <dfn> tag to allowed tags list.  <dfn> represents the defining
instance of a term in HTML.
2017-01-24 18:39:17 -06:00
Andrew Dolgov
3b001e4330 support rel=noopener for links 2017-01-24 18:45:25 +03:00
Andrew Dolgov
e934d63e0c fetch_file_contents: rework the way shim works to prevent intermittent warnings 2017-01-24 15:11:13 +03:00
Andrew Dolgov
67268b0017 sanitize: allow acronym tag 2017-01-24 11:36:43 +03:00
Andrew Dolgov
cb3f877303 reference pubsubhubbub classes using their namespace 2017-01-23 08:20:46 +03:00
Andrew Dolgov
70c5b2bfcc feed tree: only run animation for appearing unread counters to prevent clashes with aux counter updating and animations ending up in wrong state 2017-01-22 20:20:35 +03:00
Andrew Dolgov
a86255572a bump VERSION_STATIC due to Dojo changes 2017-01-22 13:55:36 +03:00
Andrew Dolgov
fa287f6b11 Merge branch 'af-comics-gocomics-feed' into 'master'
Update af_comics plugin to support GoComics.

Updates the af_comics plugin to support new GoComics site, which dropped native RSS feeds.

See merge request !42
2017-01-22 11:03:45 +03:00
Andrew Dolgov
967f0619c7 force ngettext() count argument type to string 2017-01-22 10:18:43 +03:00
JustAMacUser
fabfb9fc2a Added support to fetch_file_contents() to explicitly set CURLOPT_FOLLOWLOCATION. 2017-01-22 02:12:09 -05:00
Anders Kaseorg
becd215a75 lib: Upgrade php-subscriber from ??? to 1213f89 (2016-11-15)
https://github.com/pubsubhubbub/php-subscriber

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2017-01-21 15:01:14 -05:00
Anders Kaseorg
5ddc3e274d lib: Upgrade php-publisher from ??? to a5d6a0e (2016-11-15)
https://github.com/pubsubhubbub/php-publisher

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2017-01-21 15:01:14 -05:00
Andrew Dolgov
c606bd5741 tweak the enclosure dropdown display a little bit for less-readable urls 2017-01-17 14:04:00 +03:00
Andrew Dolgov
f6bcb5c606 Merge branch 'subscribe-idn-feed' into 'master'
Subscribe to feed with Internationalized Domain Name

Currently you cannot subscribe to feeds on hosts with internationalized domain names (IDNA) within tt-rss. You need to manually convert them to punycode to subscribe to them.

This patch adds code to detect IDNA and convert them to punycode in fix_url() if possible on the system. This requires PHP IDN functions (e.g. on Debian Jessie this needs php5-intl to be installed), so a notice is added to the installer sanity check.

See merge request !37
2017-01-16 11:36:00 +03:00
Andrew Dolgov
17a8e61d2a deprecate encrypted feed passwords because mcrypt is getting removed from php 7.1
1. transparent decryption for existing installs stays for the time being
2. new passwords are not going to be encrypted even if FEED_CRYPT_KEY is defined
3. added update.php --decrypt-feeds to bulk decrypt existing encrypted passwords
4. updated install to not auto-generate crypt key
5. added warning to config.php-dist
2017-01-07 14:25:46 +03:00
Bernhard Thaler
62958fe9dc convert to punycode for feed on idn hostname 2017-01-02 22:50:26 +01:00
Andrew Dolgov
3d5d289077 set_basic_feed_info: fix typo 2016-11-30 14:09:57 +03:00
Andrew Dolgov
bfe1eb4e52 rssfuncs: fix warning when trying to update nonexisting feed 2016-11-30 14:03:21 +03:00
Andrew Dolgov
12ff230bc2 maybe we shouldn't escape entry_author twice 2016-11-25 14:04:41 +03:00
Andrew Dolgov
3bba9c396f fetch_file_contents: set timeout when not using CURL 2016-10-24 16:12:18 +03:00
Andrew Dolgov
e3dceca66b get_article_filters: add unicode modifier to preg_match() 2016-10-19 21:40:58 +03:00
Andrew Dolgov
6687cb9927 shared posts: remove link to feed in externally shared articles to prevent leaking potentially private feed urls 2016-09-21 09:39:31 +03:00
John Brayton
401eb0f694 Specify feed_id as an int rather than a string. 2016-08-28 20:08:37 -04:00
John Brayton
f1b3b3f330 Add feed_id to subscribeToFeed response when the code is 1 or 0.
Set the API_LEVEL to 14.
2016-08-27 10:29:25 -04:00
Andrew Dolgov
557d86fe42 better debugging for matched filter rules 2016-08-26 14:45:34 +03:00
Andrew Dolgov
e54eb40a8c remove support for legacy mysql driver 2016-08-21 14:03:35 +03:00
Andrew Dolgov
1a322ff3df import_export: better error message if upload failed 2016-08-19 18:14:22 +03:00
Andrew Dolgov
5cbd1fe8e4 perform housekeeping tasks for plugins loaded in user-context only 2016-08-11 15:01:01 +03:00
Andrew Dolgov
25a533c432 bump static version to 16.8 2016-08-10 09:15:52 +03:00
Andrew Dolgov
6ff51c1997 Merge branch 'more-info-article-filter' into 'master'
Pass the value of cache_images to plugins in HOOK_ARTICLE_FILTER.

Adds the `$cache_images` value to the `$article['feed']` array before calling HOOK_ARTICLE_FILTER. Allows plugins to know whether images will be cached in case they want to manage them in one way or another.

See merge request !32
2016-08-07 22:22:09 +03:00
JustAMacUser
babfadbfd2 Pass the value of cache_images to plugins in HOOK_ARTICLE_FILTER. 2016-08-06 14:16:39 -04:00
JustAMacUser
d8b0f06705 Remove href attribute if it executes JavaScript. 2016-08-06 14:07:30 -04:00
JustAMacUser
dae16f72c9 Only strings need 4-byte filtering. 2016-07-26 03:51:22 -04:00
Andrew Dolgov
64c24ecb59 add hotkey for toggling VFEED_GROUP_BY_FEED preference 2016-07-26 15:55:00 +03:00
Andrew Dolgov
e6905f7f87 test if mb_internal_encoding() is available in functions.php head 2016-07-07 10:02:55 +03:00
Andrew Dolgov
638fdf732a update_rss_feed: log warning when attempting to update unknown feed 2016-04-29 22:10:00 +03:00
Andrew Dolgov
42f78188d0 sanitize: force strip unnecessary data outside of <body>...</body> tags generated by DOMDocument::saveHTML() 2016-04-29 21:59:34 +03:00
Andrew Dolgov
977cea1438 actually check for failures properly in the dbupdater 2016-04-26 20:04:24 +03:00
Andrew Dolgov
9e84bab449 daemon common: use proper update condition checking for secondary-selected feeds 2016-04-01 18:54:53 +03:00
Andrew Dolgov
c71add385d fetch_file_contents: fix shim when invoked with 1 argument only 2016-03-31 09:48:05 +03:00
Andrew Dolgov
465fb16d33 remove fetch_file_contents2, use a compat shim instead 2016-03-30 13:46:32 +03:00
Andrew Dolgov
633fb7ffe2 amend previous 2016-03-30 13:34:26 +03:00
Andrew Dolgov
79c891a8b7 set smallish timeout on update check, exclude update checking on initial load 2016-03-30 13:32:49 +03:00
Andrew Dolgov
e3bc4591af add a hash-based fetch_file_contents2() 2016-03-30 13:25:32 +03:00
Andrew Dolgov
583d5b9a98 get_version: add missing substr 2016-03-28 13:26:09 +03:00
Andrew Dolgov
ae397f3a91 bump version_static to 16.3 2016-03-23 22:58:33 +03:00
Andrew Dolgov
7843453c00 version: do not hardcode master branch 2016-03-23 19:08:38 +03:00
Andrew Dolgov
7c0d68f207 remove dismiss* functions 2016-03-22 10:28:34 +03:00
Andrew Dolgov
94d425fe4a rewrite_relative_url: only skip urls like magnet: instead of everything with : 2016-02-20 12:06:47 +03:00
Andrew Dolgov
7bbe94bc93 Revert "rewrite_relative_url: do not skip urls containing :"
This reverts commit a547fef6ab.
2016-02-20 12:02:34 +03:00
Andrew Dolgov
a547fef6ab rewrite_relative_url: do not skip urls containing : 2016-02-20 11:57:37 +03:00
Andrew Dolgov
d43b6563ef Merge branch 'master' of git.tt-rss.org:fox/tt-rss 2016-02-19 09:39:29 +03:00
JustAMacUser
a01bfd78c2 Remove srcset and sizes attributes from img tag if locally caching images. 2016-02-19 01:35:11 -05:00
Andrew Dolgov
cc43e19b44 error handler: do not log last query, truncate error message to a smaller length 2016-02-17 16:42:13 +03:00
Andrew Dolgov
50bda3fefb sanitize: allow <xml:namespace> (thanks, livejournal) 2016-02-05 11:31:13 +03:00
Andrew Dolgov
0edf1d0dc0 update_rss_feed: disable support for http 304 for the time being 2016-02-02 14:51:02 +03:00
Andrew Dolgov
71b75bb7fa fix multiple issues with archived feeds 2016-01-26 19:03:05 +03:00
Andrew Dolgov
0bc503ff9a update_rss_feed: escape dumped content while debugging 2016-01-23 02:17:24 +03:00
Andrew Dolgov
3b44aae0f3 sanitize: allow <description> 2016-01-23 02:17:00 +03:00
Andrew Dolgov
c352248651 get_article_tags: while getting tags from cache check if article entry actually exists 2016-01-14 12:12:35 +03:00
Andrew Dolgov
312742db6e updates: auto-disable CURL if open_basedir is enabled, notify possible issues w/ plugins 2016-01-13 18:12:31 +03:00
Andrew Dolgov
393fc7d6b5 update static version 2016-01-12 16:44:14 +03:00
Andrew Dolgov
5bdcb8fd78 remove option ALLOW_DUPLICATE_POSTS as confusing/useless 2016-01-07 22:01:35 +03:00
Andrew Dolgov
4f186b1f10 fix broken article processing if ALLOW_DUPLICATE_POSTS is enabled 2016-01-07 21:49:31 +03:00
Andrew Dolgov
9b736a20b3 do not automatically call cleanup_tags() in housekeeping tasks 2016-01-04 10:42:24 +03:00
Thomas Kramer
98070db009 Update new feeds first in postgres 2015-12-31 12:54:52 +01:00
Andrew Dolgov
85d067e837 tag_is_valid: check numeric tags properly 2015-12-30 15:15:18 +03:00
Andrew Dolgov
a536f94c8d sanitize: clear out @srcset/@sizes on images leading to http sites when running over https 2015-12-17 09:59:53 +03:00
Andrew Dolgov
6eed9a7463 Merge branch 'master' of git.tt-rss.org:fox/tt-rss 2015-12-07 20:07:37 +03:00
Andrew Dolgov
a956648502 catchup_feed: proper fix for mysql 5.7 2015-12-07 20:07:13 +03:00
Andrew Dolgov
33d131d699 ttrss_gc: return true 2015-12-07 15:25:31 +03:00
Andrew Dolgov
040aa5408a fix previous, owner_uid not passed in daemon context 2015-12-07 15:06:32 +03:00
Andrew Dolgov
a8ac766132 do not discard custom set article tags when updating from source 2015-12-07 11:54:24 +03:00
Andrew Dolgov
24e6ff5d1c calculate_article_hash: strip tags before hashing fields 2015-12-05 03:10:57 +03:00
Andrew Dolgov
bfd902bbcc sanity_check: enforce minimum php version (5.4) 2015-12-04 19:03:57 +03:00
Andrew Dolgov
b8619f8db0 store formatted backtrace to sql log 2015-12-04 15:58:20 +03:00
Andrew Dolgov
9bd422c2e7 set_basic_feed_info: fix missing column 2015-12-03 19:21:17 +03:00
Andrew Dolgov
eed5467759 Revert "set_basic_feed_info: bail out if feed doesn't exist"
This reverts commit d77bd1a5d2.
2015-12-03 19:18:50 +03:00
Andrew Dolgov
d77bd1a5d2 set_basic_feed_info: bail out if feed doesn't exist 2015-12-03 16:16:42 +03:00
Andrew Dolgov
475d762872 logger: record last query before logged error 2015-12-03 16:15:28 +03:00
Andrew Dolgov
fd3e5e8da4 get_article_filters: check if action.type is set 2015-12-03 15:33:47 +03:00
Andrew Dolgov
15c0bca0e5 catchup maybe add workaround for mysql 5.7 derived_merge 2015-12-03 15:33:36 +03:00
Andrew Dolgov
01bf7f8887 update sanity_config 2015-12-01 10:11:40 +03:00
Heiko Adams
b9af06802b Revert "Fix missing SESSION_CHECK_ADDRESS in config"
This reverts commit 635ecdb9fa.
2015-11-30 10:42:11 +01:00
Andrew Dolgov
19e47ad60b queryFeedHeadlines: don't check first_id when sorting by oldest first 2015-11-21 22:20:00 +03:00
Andrew Dolgov
4c46702672 drop support for (obsolete, removed from recent php versions) php safe_mode setting
remove ugly hacks for curl + open_basedir combination breaking support for http redirects
2015-11-19 20:05:17 +03:00
Andrew Dolgov
6497fb65b4 fix ttrss_feeds.last_update defaulting to 0 on mysql, set to null instead
bump schema
2015-11-18 14:33:47 +03:00
Andrew Dolgov
7475580b37 getLabelCounters: stricter ownership check 2015-11-02 14:22:37 +03:00
Andrew Dolgov
389ae94a40 iframe_whitelisted: allow player.vimeo.com 2015-10-26 20:50:44 +03:00
Andrew Dolgov
9cc29abd41 queryFeedHeadlines: int_id was not included when browsing by tag which broke several button plugins 2015-10-08 10:08:51 +03:00
Andrew Dolgov
94b8ce6cec queryfeedheadlines: remove disable_offsets hack 2015-09-15 12:33:58 +03:00
Andrew Dolgov
6b860bd9d2 recently read: limit query by last_read 2015-09-13 15:59:21 +03:00
JustAMacUser
08e79cb6b9 Fixed height/width image attributes for enclosures. 2015-08-23 13:08:48 -04:00
Andrew Dolgov
c7ce438e7b hurr-durr (2) 2015-08-21 19:35:10 +03:00
Andrew Dolgov
48b23e500e Merge branch 'master' of git.fakecake.org:tt-rss 2015-08-21 19:32:07 +03:00
Andrew Dolgov
b95c1e3ced hurr-durr 2015-08-21 19:31:40 +03:00
Andrew Dolgov
f5e66c439e remove SESSION_CHECK_ADDRESS 2015-08-21 09:02:16 +03:00
Andrew Dolgov
978989bb7b shorten previous a bit 2015-08-18 12:04:19 +03:00
Skibbi
e22e0d686c Prevent concatenating words for full text search index 2015-08-18 12:01:00 +03:00
Andrew Dolgov
961cae85a4 Merge branch 'master' of git.fakecake.org:tt-rss 2015-08-17 07:55:44 +03:00
Andrew Dolgov
d5eaaa0508 curl: let's verify ssl peers 2015-08-17 07:53:50 +03:00
JustAMacUser
4a27966e78 Keep local cached images fresh if file exists.
Updates the cache_images() function to `touch` images if the file exists already. Some sites (e.g. news) re-use stock images and this change updates the local file's modified time every time the image is referenced in new articles. This should prevent the local file from being expired/deleted only to be re-cached later on.
2015-08-16 00:33:33 -04:00
JustAMacUser
8493163576 Unset $retval after HOOK_FORMAT_ENCLOSURES.
Fixes an edge case where changing the array of enclosures with HOOK_FORMAT_ENCLOSURES might break the dropdown rendering if HOOK_RENDER_ENCLOSURE has no registered hooks.
2015-08-14 19:42:30 -04:00
Andrew Dolgov
28539f6aaf search_to_sql: trim() input 2015-08-14 10:31:29 +03:00
Andrew Dolgov
dcbe36b2a2 fix some remaining old-style viewfeed() calls 2015-08-13 09:51:39 +03:00
Andrew Dolgov
45913edda0 fetch_file_contents: use http/1.1 when not using curl 2015-08-12 21:51:02 +03:00
Andrew Dolgov
0acc1ed76e dijit style updates 2015-08-12 16:58:06 +03:00
Andrew Dolgov
6b0a17ad8b viewfeed: switch to hash-based arguments
viewfeed: remove (obsolete) method parameter
add shortcut to debug viewfeed() query
2015-08-12 14:09:46 +03:00