Andrew Dolgov
f3c04fc5d8
sync modified scores via mutation observer
2018-12-11 10:30:32 +03:00
Andrew Dolgov
25ca144bb7
score: get correct classes for rows/score icons on the client
2018-12-11 10:00:54 +03:00
Andrew Dolgov
93dfdb2fcd
exp: tweak headline label styles
2018-12-10 21:39:12 +03:00
Andrew Dolgov
96fccefa62
update hotkey help dialog a bit
2018-12-10 08:37:24 +03:00
Andrew Dolgov
d0d05e4079
zoom mode: hide .attachments
2018-12-10 07:20:13 +03:00
Andrew Dolgov
a5813bb766
mysql: use date_format() for yyiw part in queryFeedHeadlines()
2018-12-09 20:38:02 +03:00
Michael Kuhn
3484ad2aaf
Use IYYY in combination with IW
...
Otherwise, we could end up with a wrong date, see:
https://community.oracle.com/thread/997899
2018-12-09 18:28:15 +01:00
Andrew Dolgov
6a6af964df
feed template, ARTICLE_OG_IMAGE: set as optional
2018-12-09 17:18:29 +03:00
Andrew Dolgov
851f62dc4a
syndicated feeds:
...
1. properly reset enclosure template variables if there's no enclosures
2. add ARTICLE_OG_IMAGE which sets flavor image for article using common code with article render etc
2018-12-09 17:07:17 +03:00
Andrew Dolgov
607ede512f
center previously centered text on single line dialog panels
2018-12-09 16:27:29 +03:00
Andrew Dolgov
fa538a6c86
implement year-week sorting window if headlines buffer is grouped by feed titles
2018-12-09 13:35:37 +03:00
Andrew Dolgov
703351c79e
remove theme supports-version etc checking
2018-12-09 11:37:26 +03:00
Andrew Dolgov
b2c079893b
move Article::format_article() to Handler_Public
2018-12-09 11:13:02 +03:00
Andrew Dolgov
966fe6d612
#sharepopup: update css
2018-12-09 10:56:39 +03:00
fox
9545fc6c84
Merge branch 'fix-ambiguous-id' of chtitux/tt-rss into master
2018-12-09 01:29:08 +00:00
Andrew Dolgov
8f5b5ae09e
if not enabled, set content_preview to "" instead of null
2018-12-09 04:24:48 +03:00
Théophile Helleboid - chtitux
c70dc852a1
Be explicit when id column is ambiguous
2018-12-08 22:36:03 +01:00
Andrew Dolgov
f3737c0b24
update_rss_feed: add log message if article is filtered out
...
combine filters: fix crash on missing global function
2018-12-08 17:01:30 +03:00
Andrew Dolgov
bd66a9ef28
render article on the client using headlines data
2018-12-08 09:32:14 +03:00
Andrew Dolgov
41e967136f
format headlines list: normalize booleans for pdo mysql
2018-12-08 08:23:18 +03:00
Andrew Dolgov
4e06b94f76
format_article_enclosures: i don't think we need so many <hr>s
2018-12-07 23:22:30 +03:00
Andrew Dolgov
811e1514a3
remove uuid from headlines JSON output
2018-12-07 22:14:32 +03:00
Andrew Dolgov
3b7a9219f6
viewfeed: cleanup unneeded stuff from server JSON output
2018-12-07 21:52:41 +03:00
Andrew Dolgov
76885fc5ad
viewfeed: general code cleanup
2018-12-07 21:22:51 +03:00
Andrew Dolgov
8f75b06835
implement feed grouping display, remove unneeded server vgrlf passing
2018-12-07 21:11:50 +03:00
Andrew Dolgov
0b84d1d0dc
viewfeed: add orig_feed object
2018-12-07 18:38:27 +03:00
Andrew Dolgov
95f63e121a
note that HOOK_FORMAT_ARTICLE_CDM is dead for now
2018-12-07 18:35:50 +03:00
Andrew Dolgov
e075e6141b
json-viewfeed updates
2018-12-07 18:24:56 +03:00
Andrew Dolgov
249c93a228
initial for js templates
2018-12-07 16:00:11 +03:00
Andrew Dolgov
a68b150601
remove separate classes for various panels, unify under .panel
...
remove a few other unnecessary css classes/ids
2018-12-07 14:03:33 +03:00
Andrew Dolgov
4fdcc923f0
prefs: reload on user theme change
2018-12-07 10:35:46 +03:00
Andrew Dolgov
1e3a53c037
do not try to update filter triggers if nothing was triggered (properly this time)
2018-12-06 23:12:20 +03:00
Andrew Dolgov
5780a5d501
do not try to update filter triggers if nothing was triggered
2018-12-06 23:05:02 +03:00
Andrew Dolgov
4cbc62d2a5
article note format updates
2018-12-06 20:55:51 +03:00
Andrew Dolgov
3e4326e34d
add ttrss_filters2.last_triggered (bump schema version)
2018-12-06 19:37:20 +03:00
Andrew Dolgov
a01c33d654
add HOOK_FILTER_TRIGGERED (for filter debugging)
2018-12-06 19:15:00 +03:00
Andrew Dolgov
e9cf8e8e35
normalize archived articles output in headlines
2018-12-06 19:00:11 +03:00
Andrew Dolgov
369bac525b
simplify zoom mode display
2018-12-06 16:42:21 +03:00
Andrew Dolgov
26c074ed7e
rework article header to use flexbox
2018-12-06 16:35:57 +03:00
Andrew Dolgov
b4c2b26822
remove collapse.png
2018-12-06 15:28:11 +03:00
Andrew Dolgov
0b8cbc9156
remove some bitmaps and rework stuff using it to use iconfont instead
2018-12-06 15:22:52 +03:00
Andrew Dolgov
15d05e8a26
night.css: do not import default less theme statically
...
remove themes/default.php (not needed)
compact.css: fixes
2018-12-06 14:49:33 +03:00
Andrew Dolgov
d2d2cb7e7d
rework scoring display, JS processing and icons
2018-12-06 14:23:45 +03:00
Andrew Dolgov
8b2286305e
and again
2018-12-06 13:18:14 +03:00
Andrew Dolgov
1de1426114
Revert "change fresh feed icon"
...
This reverts commit 69da55b945
.
2018-12-06 13:16:53 +03:00
Andrew Dolgov
69da55b945
change fresh feed icon
2018-12-06 13:13:25 +03:00
Andrew Dolgov
4aa11fe78d
set some alt-info buttons; fix missing default submit for create filter dialog
2018-12-06 13:04:39 +03:00
Andrew Dolgov
814e49f8f7
add icons to accordion panels in preferences
...
fix typo in pref-prefs closing panel tag
2018-12-06 08:56:28 +03:00
Andrew Dolgov
fd10614f5d
labels: unfortunately we can't rely on caption to selectively clear label_cache (because of json unicode encoding) so clean it completely if label is updated
2018-12-06 08:29:32 +03:00
Andrew Dolgov
0a41c1a6e1
update label rendering (and editor)
2018-12-06 08:26:52 +03:00
Andrew Dolgov
19e24b4fe2
force cast profile id to integer when assigning to session variable
2018-12-06 07:08:54 +03:00
Andrew Dolgov
c700345c96
trgm: use vector icon, replace recently read icon
2018-12-05 22:48:14 +03:00
Andrew Dolgov
a0b1664620
prefs: change user icon
2018-12-05 21:40:46 +03:00
Andrew Dolgov
cad6d1d7fd
various icon updates; use new icons in feed tree
2018-12-05 20:26:27 +03:00
Andrew Dolgov
8c5c762a85
some more icon styling updates + user control panel
2018-12-05 16:58:00 +03:00
Andrew Dolgov
f3e6e12d46
various minor updates re: icons
2018-12-05 16:48:29 +03:00
Andrew Dolgov
b16c57d29c
replace plugin.png with scalable icon
2018-12-05 16:37:09 +03:00
Andrew Dolgov
a0778577ac
remove pub_{set,unset}.png usage in main code
2018-12-05 14:18:03 +03:00
Andrew Dolgov
cbd7328cb4
minor fixes to pub/mark icons etc
2018-12-05 14:11:40 +03:00
Andrew Dolgov
b65d8384c2
update headlines to use vector icons
2018-12-05 13:58:18 +03:00
Andrew Dolgov
89b213b4bb
initial for material-icons
2018-12-05 10:50:50 +03:00
Andrew Dolgov
edd348b16c
rework not-cdm headline rows to use flex-box
2018-12-05 09:08:02 +03:00
Andrew Dolgov
88c2da72d5
combined mode: use flex-box for header/footer layout
2018-12-05 08:31:13 +03:00
Andrew Dolgov
2621180b54
in three panel mode, attach context menu to the title, instead of entire headlines row
2018-12-05 07:34:16 +03:00
Andrew Dolgov
29c890b495
login form: use dojo, remove profile hacks
2018-12-04 23:17:35 +03:00
Andrew Dolgov
2ab097b2e5
initial work for flat modern theme
2018-12-04 22:24:31 +03:00
Andrew Dolgov
6befff30d7
updates for flat theme (mostly disable old dijit overrides)
2018-12-04 19:03:42 +03:00
Andrew Dolgov
f81df37c36
wrap plugin list into border container, like prefs (2)
2018-12-04 15:33:20 +03:00
Andrew Dolgov
0880100f6a
wrap plugin list into border container, like prefs
2018-12-04 15:31:21 +03:00
Andrew Dolgov
31e79317b3
normalize various font sizes and families between prefs & main UI
...
change some dialogs layout a bit to maybe become more readable
2018-12-04 15:22:22 +03:00
Andrew Dolgov
0b8fef8262
combined unexpanded: respect 'SHOW_CONTENT_PREVIEW' preference
2018-12-04 10:47:50 +03:00
Andrew Dolgov
197e80add6
fix several issues related to profile being set to a non-numeric value
2018-12-04 10:47:01 +03:00
Andrew Dolgov
27b93988e7
add placeholder loading indicator to CDM entries
...
restore missing "originally from" for archived articles
2018-12-03 20:05:11 +03:00
Andrew Dolgov
e76d1fb995
plugins: mail, mailto: remove code from global context
2018-12-03 14:21:50 +03:00
Andrew Dolgov
4d4034091a
prefs: Prefs global -> Helpers
2018-12-03 12:46:00 +03:00
Andrew Dolgov
b3bc638a9f
refactor OPML export/import code to be less horrible
2018-12-03 12:26:49 +03:00
Andrew Dolgov
78cc470193
remove some plugin JS code out of global context
2018-12-03 10:51:14 +03:00
wn_
6f9307aa9a
Also fix the 'Create label' `onclick`
2018-12-02 16:15:31 -06:00
wn_
6100392bd5
Fix an `onclick` (`Article.editArticleTags` --> `Article.editTags`)
2018-12-02 16:02:03 -06:00
Andrew Dolgov
5ead558e43
move Utils to AppBase where it belongs
2018-12-02 22:08:18 +03:00
Andrew Dolgov
eeb49d375c
uploadIconHandler -> CommonDialogs
2018-12-02 20:57:51 +03:00
Andrew Dolgov
526389b2d3
update notify_* calls to use Notify
2018-12-02 20:56:30 +03:00
Andrew Dolgov
d9c5c93cef
move some more stuff out of common.js
...
rework client-side cookie functions a bit
limit dojo cachebust based on server scripts modification time
remove param_escape()
2018-12-02 20:07:57 +03:00
Andrew Dolgov
ad1b6f0a86
bring back excerpts in unexpanded mode
2018-12-02 19:04:53 +03:00
Andrew Dolgov
3a6dae9203
prefs: more of the same, really
2018-12-02 16:29:00 +03:00
Andrew Dolgov
b9869dbc01
prefs: remove some more stuff from global context (user management, etc)
2018-12-02 16:17:36 +03:00
Andrew Dolgov
58e54282d3
prefs: move more global functions into matching classes
2018-12-02 15:30:07 +03:00
Andrew Dolgov
f26d404890
prefs: move other tree-related functions to respective trees
2018-12-02 12:03:28 +03:00
Andrew Dolgov
60cd467694
embed some pref-feed helper functions into the tree
2018-12-02 11:50:53 +03:00
Andrew Dolgov
2e985d1733
move some label helper functions to prefLabelTree
2018-12-02 11:34:57 +03:00
Andrew Dolgov
e23b6e397d
prefs: store active tab for reload, remove most old table row functions
2018-12-02 11:25:32 +03:00
Andrew Dolgov
874560db54
remove obsolete row selection functions
...
move getUrlParam() to Utils
2018-12-02 10:33:58 +03:00
Andrew Dolgov
2f85b50e36
remove toggleSelectListRow2()
2018-12-02 10:16:25 +03:00
Andrew Dolgov
0a18d0b1ed
Feeds: shorten some method names
...
finally rename "view as rss"
2018-12-02 08:57:22 +03:00
Andrew Dolgov
6e625555c9
Headlines: shorten selectArticles
2018-12-02 08:34:08 +03:00
Andrew Dolgov
3678315bea
Article, Headlines: shorten several method names
2018-12-02 08:32:13 +03:00
Andrew Dolgov
1e2d4410d3
move some more shared stuff to CommonDialogs, Filters, and Utils
2018-12-01 22:39:29 +03:00
Andrew Dolgov
cc26be0793
migrate tt-rss.js contents to App
2018-12-01 21:51:00 +03:00
Andrew Dolgov
ab0fadf60d
fix vfeed group title CSS in not combined mode
2018-12-01 21:08:15 +03:00
Andrew Dolgov
642c37ea61
further effocts to wrap JS stuff into objects
2018-12-01 21:01:53 +03:00
Andrew Dolgov
4bed9be57d
js-ification: start on some common dialogs
2018-12-01 18:25:32 +03:00
Andrew Dolgov
97df81d8d9
even more objectification of JS
2018-12-01 17:54:16 +03:00
Andrew Dolgov
d86ddbc635
further objectification of JS code
2018-12-01 17:21:26 +03:00
Andrew Dolgov
049a37aa0e
WIP reshuffling of JS global context into separate logical objects
2018-12-01 17:05:35 +03:00
Andrew Dolgov
195180b64d
minor refactoring: normalize some function names; cleanup; etc
2018-12-01 11:18:35 +03:00
Andrew Dolgov
8d190d539b
CLI tools: fix --quiet not working if --log is unset
2018-12-01 10:05:26 +03:00
Andrew Dolgov
a2ef54cd92
toggleMark, togglePub: refactor implementation
...
shorten marked/published img CSS classes
2018-12-01 08:20:09 +03:00
Andrew Dolgov
5aa9c60494
bring back (debloated) version of unexpanded combined mode
2018-12-01 01:03:01 +03:00
Andrew Dolgov
2e01a1d41d
css updates; night theme fixes for changed CSS classes
2018-11-30 17:42:38 +03:00
Andrew Dolgov
07fd4f8d9d
minor css fixes (mostly for zoom mode)
2018-11-30 17:22:30 +03:00
Andrew Dolgov
add558e7e5
rework some styles related to three panel mode
2018-11-30 15:54:38 +03:00
Andrew Dolgov
8359ca6dad
combined mode (and more) css class name updates
2018-11-30 15:48:17 +03:00
Andrew Dolgov
5f211e37a4
remove FTITLE- id
2018-11-30 14:53:58 +03:00
Andrew Dolgov
67cdf4cf12
remove some unnecessary element IDs
...
rework plugins/note to use xhrJson()
2018-11-30 14:39:06 +03:00
Andrew Dolgov
b9585004e6
packed headlines: no point in using JSON here
2018-11-30 13:56:33 +03:00
Andrew Dolgov
7673331850
headlines: remove collapseBtn
2018-11-30 13:53:58 +03:00
Andrew Dolgov
9563e3bcd6
remove expandable CDM headlines
2018-11-30 13:51:54 +03:00
Andrew Dolgov
c8c9a26f30
move to simpler CDM handling of encoded content (instead of CENCW... etc)
2018-11-30 13:26:41 +03:00
Andrew Dolgov
ef129fed2a
some more xhrPost refactoring (batchEditSave WIP)
2018-11-30 10:48:50 +03:00
Andrew Dolgov
fc0a3050eb
use xhrPost is even more places!
2018-11-30 09:23:51 +03:00
Andrew Dolgov
3ad9944d5e
fix missing sprintf() argument
2018-11-30 09:19:00 +03:00
Andrew Dolgov
c10a43069e
debug logging system rework:
...
* support various logging levels per-message
* remove hacks like debug_suppress, DAEMON_EXTENDED_DEBUG, etc
* _debug() is kept as a compatibility shim for plugins
2018-11-30 08:34:29 +03:00
Andrew Dolgov
ed1262d55a
oops, remove useless db_escape_string() in article class (and nsfw plugin)
2018-11-29 23:04:12 +03:00
Andrew Dolgov
4508e3103d
some more eslint-related stuff
2018-11-29 21:03:55 +03:00
Andrew Dolgov
79c5035920
reset password: use updated mailer parameters properly
2018-11-26 12:44:36 +03:00
Andrew Dolgov
2d54eb1a87
remove cache/simplepie
2018-11-23 12:31:47 +03:00
Andrew Dolgov
e08990f753
mailer: fix indents
2018-11-22 16:55:37 +03:00
Andrew Dolgov
ac5e55c2bd
mailer: return 0 if plugin requested to stop (-1)
2018-11-22 16:39:10 +03:00
Andrew Dolgov
55bf4bc1d3
mailer: split to/from name/addresses
2018-11-22 16:36:10 +03:00
Andrew Dolgov
57932e1837
remove PHPMailer and related directives from config.php-dist; add pluggable Mailer class
2018-11-22 14:45:14 +03:00
Andrew Dolgov
253dbd4856
generate_syndicated_feed: add support for virtual feeds provided by plugins
2018-11-07 14:21:39 +03:00
Andrew Dolgov
22366ccc5b
db_prefs: fix cache never being used on read(); remove unnecessary
...
sprintf()s to integer
2018-11-03 21:52:38 +03:00
Andrew Dolgov
3a0292303e
php: remove trailing whitespaces
2018-11-03 15:08:43 +03:00
Andrew Dolgov
2c940c4861
better handle PDOExceptions during open transaction in feed update
2018-11-03 15:00:58 +03:00
Andrew Dolgov
5f66f872b6
fix session write handler always assuming that database entry exists and failing silently if it doesn't; remove session cookie-related hacks
2018-10-16 14:07:42 +03:00
Andrew Dolgov
f8fc1ac543
login: check for stale session in login handler, instead of authenticate_user()
2018-10-16 11:39:12 +03:00
Andrew Dolgov
f730d7bb0a
another attempt to enforce session ID regeneration on login
2018-10-16 09:11:32 +03:00
Andrew Dolgov
65e98f4086
force regenerate session id on successful login, remove previous blank SID check
2018-10-15 15:47:50 +03:00
Andrew Dolgov
bb84330234
Logger_SQL: use separate PDO connection
2018-09-10 21:49:31 +03:00
Andrew Dolgov
80fd79ca30
Logger->log() allow passing context (defaults to '')
2018-09-10 21:32:10 +03:00
Andrew Dolgov
4f17c3f977
Logger: add implementation for logger->log(message)
2018-09-10 21:26:28 +03:00
Andrew Dolgov
665495b94b
cache_media: only touch() local file if it's writable
2018-09-10 16:17:12 +03:00
Andrew Dolgov
d4fef36237
rewrite per-feed/global strip images to strip media
2018-09-07 10:24:46 +03:00
Andrew Dolgov
62d0060aa1
update_daemon_common: do not abort entire batch if PDOException happens when processing individual feeds
2018-09-03 13:03:35 +03:00
Andrew Dolgov
01d22e255f
PDO: switch error reporting to exceptions
2018-09-03 12:30:26 +03:00
Andrew Dolgov
2ab49fec9a
API: getHeadlines: return feed_id for Archived entries as 0 instead of null to be consistent with requested feed_id
2018-08-29 15:13:07 +03:00
Andrew Dolgov
a291a0c00f
API: oops, forgot that headlines could be requested for a tag
2018-08-29 12:55:03 +03:00
Andrew Dolgov
70e180e887
API: getHeadlines: check for feed_id correctly
2018-08-29 12:53:33 +03:00
Andrew Dolgov
54727f9534
parser: move media:element handling to feeditem_common; use media:content @media attribute to generate placeholder content-type if not specified
2018-08-21 07:01:26 +03:00
fox
8ab77d19ef
Merge branch 'pullreq-enclosure-content-type' of tkappe/tt-rss into master
2018-08-21 03:47:39 +00:00
Andrew Dolgov
2aef804f4b
split transparent rewriting of locally cached media URLs to execute after both sanitize() and HOOK_RENDER_ARTICLE to allow plugins work on original source URLs consistently
2018-08-20 12:12:32 +03:00
Tobias Kappé
ac8a0e7dc6
Differentiate enclosures based on content type.
...
Some RSS feeds contain multiple enclosures with the same URL. When the first of
these is not recognized as an image, later entries are not added to the
database as rows in ttrss_enclosures. This change differentiates enclosures
based on their content type, so an entry can have multiple enclosure types with
the same URL (but possibly a different content type).
2018-08-18 17:17:30 +01:00
Andrew Dolgov
04ad631a08
Merge branch 'master' of git.fakecake.org:tt-rss
2018-08-17 10:11:53 +03:00
Andrew Dolgov
88adf3da1b
send_local_file: add application/octet-stream hack
...
cached_url: return original requested filename to save as
2018-08-16 12:16:51 +03:00
Andrew Dolgov
163b50b15f
cache_media: only show downloading debug message when actually downloading
2018-08-16 11:56:51 +03:00
Andrew Dolgov
611aeb7197
add debug stdout logger
2018-08-15 15:08:31 +03:00
Andrew Dolgov
069aea5989
remove FEED_CRYPT_KEY and everything related to it
...
always assume auth_pass_encrypted is false
2018-08-13 15:59:24 +03:00
Andrew Dolgov
eb43d9f4a8
fix previous to not crash if document first child is not a DOMElement or whatever
2018-08-12 19:27:04 +03:00
Tobias Kappé
a377d5c981
Determine language for atom entry without a loop.
2018-08-12 16:17:13 +01:00
Tobias Kappé
3bbaf902ab
Sanitize language obtained for an entry.
2018-08-12 16:12:34 +01:00
Tobias Kappé
22a866edb5
Store language of entries as indicated by the feed.
2018-08-12 15:27:26 +01:00
Andrew Dolgov
32c0c07cc1
pluginhost: implement basic autoloader for classes bundled with plugins (uses vendor/ layout)
2018-08-07 14:36:45 +03:00
BtbN
2b8afd4942
Only strip utf8mb4 if mysql_charset != utf8mb4
...
If a user has fixed their database properly utf8mb4 works just fine allowing emoji and other 4 byte unicode characters to work.
2018-08-04 13:07:32 +00:00
Andrew Dolgov
6e6c3a878d
update_rss_feed: limit maximum length of tsvector data because of pgsql limitations
2018-07-10 14:08:55 +03:00
Andrew Dolgov
310c18e6bb
move OTPHP to vendor/; additionally move Base32 class to OTPHP namespace
2018-06-20 18:27:34 +03:00
Andrew Dolgov
f5302247c6
share: add support for og:image, etc. metadata for shared articles
2018-05-29 22:04:02 +03:00
MatthieuS
5d95676ecc
Call the subscription hook from the plugins even if fetch_file_contents returned no data
...
This allows a plug-in to override the fetch when the core fetch method fails for some feeds (eg. Tumblr feeds when requested from an EU IP).
2018-05-23 09:00:04 +00:00
Andrew Dolgov
66fe33e769
bump date_updated when updated article data is saved to exclude it from purging (because it is still present in the originating feed)
2018-05-20 10:41:08 +03:00
Andrew Dolgov
963c22646b
pass tsvector data as a named parameter on article update, remove escaping hacks
2018-04-03 13:57:27 +03:00
Andrew Dolgov
4fa64e8446
filter dialog: remove placeholder
2018-03-21 14:02:06 +03:00
Andrew Dolgov
e794e434da
filter dialog: add tooltip re: filter syntax
2018-03-21 13:38:36 +03:00
tsia
551f3c2c85
fixed "reset to defaults" in preferences
2018-03-15 16:26:50 +00:00
Andrew Dolgov
0a8cdd4b9c
remove firefox feed subscribe integration code (obsolete)
2018-03-14 18:15:21 +03:00
Andrew Dolgov
c9a5e5aa28
feed editor: expose site_url for editing
2018-03-01 15:43:40 +03:00
Andrew Dolgov
f1415df47c
prefs: expand feed tree if displaying search results
2018-02-26 11:58:53 +03:00
Andrew Dolgov
5edf4b73a4
add a workaround to support numeric tags
2018-02-11 10:24:24 +03:00
Andrew Dolgov
f6269d1bc4
add special class for feeds with disabled updates
2018-02-08 13:54:06 +03:00
Andrew Dolgov
a340b29ba9
pref-feeds: disable tree autoexpand
2018-02-04 09:36:56 +03:00
Andrew Dolgov
67bf38afda
savefeedorder, savefilterorder: do not use clean() on json payload
2018-02-04 09:33:28 +03:00
Andrew Dolgov
7f4a404566
include: convert some spaces to tabs
2018-01-30 10:44:31 +03:00
Andrew Dolgov
102a01354b
strip utf8mb4 characters in enclosures on mysql
2018-01-29 23:24:11 +03:00
jsoares
26ad257de5
Fixed time stamping of new unmarked/unpublished articles
2018-01-22 22:41:24 +00:00
Colin Vidal
c217de557f
rpc: addfeed: gets login and pass only if need_auth is checked.
...
Because of browser form auto-completion, the hidden field login and
password can be automatically filled when adding a feed. It would
enable feed authentication even if the user doesn't click on need_auth
button.
2018-01-14 20:55:39 +01:00
Andrew Dolgov
c30f5e1811
subscribe_to_feed: force-cast login and password to string
2018-01-05 06:50:37 +03:00
immanuelfodor
09be7cdd73
binding statement named param instead of positional replacement
2018-01-02 06:30:22 +00:00
Andrew Dolgov
8dedacf497
remove synchronous feed refreshing on ForceUpdate
2017-12-31 07:37:49 +03:00
Tianon Gravi
bbc4d4bf34
treat OPML-imported feeds without a title the same as a batch import
2017-12-29 15:33:01 -08:00
Francesco Turco
1a7277570b
fix two-factor authenticaton
2017-12-22 12:29:25 +01:00
Andrew Dolgov
d4c05d0be2
update_rss_feed: don't try to use quoted NOW() in query
2017-12-18 18:27:23 +03:00
Andrew Dolgov
6fb5f17be6
pluginhost: always return an array in get_all()
2017-12-17 19:06:18 +03:00
Andrew Dolgov
bed2d6e054
force-cast some variables used in queries to integer
...
do not display SQL query in headlines debug mode
2017-12-17 16:24:13 +03:00
Andrew Dolgov
d0cce0c7a4
isdefaultpassword: use method_exists() to check for check_password
2017-12-15 12:15:15 +03:00
Andrew Dolgov
0f05147531
properly highlight search keywords containing forward slash
2017-12-15 08:33:59 +03:00
simonp
5f19596651
Fix typo from previous pull request
2017-12-14 18:43:42 +01:00
Benjamin Collet
44c6a04b61
Check if the auth module supports check_password() method before using it
2017-12-14 18:02:37 +01:00
Andrew Dolgov
9390ddeae2
fix single user mode login failing because of isdefaultpassword()
2017-12-14 19:27:55 +03:00
Andrew Dolgov
1bf468ba1a
pref-prefs: set button classes
2017-12-11 18:50:00 +03:00
Andrew Dolgov
121ac0481f
filter rule/action dialogs: set default action
2017-12-11 18:46:27 +03:00
Andrew Dolgov
ef1feb3610
subscribe dialog: add primary action
2017-12-11 18:43:53 +03:00
Andrew Dolgov
05e81655c3
user editor: add primary action
2017-12-11 18:41:32 +03:00
Andrew Dolgov
6fb5ce5e35
add some primary dialog actions; update css
2017-12-11 18:36:36 +03:00
Andrew Dolgov
5f7be9957f
filter,label dlg: use default action
2017-12-11 18:23:30 +03:00
Andrew Dolgov
320a3ba529
search form: set default action
2017-12-11 18:14:45 +03:00
Andrew Dolgov
f70d456a5b
Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
2017-12-11 12:54:30 +03:00
fox
c463a95dca
Merge branch 'master' of dim0x69/tt-rss into master
2017-12-11 09:47:04 +00:00
dim0x69
e58a14de72
Check return value from Plugins
2017-12-11 09:41:45 +00:00
fox
9306918767
Merge branch 'pda-rss-now' of richm/tt-rss into pdo-experimental
2017-12-11 04:01:28 +00:00
Richard Mortimer
aa16334f1f
Include NOW() in prepared SQL for rssutils.php
2017-12-10 23:05:52 +00:00
Andrew Dolgov
1c1fc17120
synchronous feed update: catch PDO exceptions as to not break headlines output
2017-12-10 21:10:19 +03:00
Andrew Dolgov
83a052f1fa
pdo_connect: catch exception on create
2017-12-10 09:27:07 +03:00
Andrew Dolgov
f8db5bb4db
installer: use PDO, improve wording for some notices
...
PDO wrapper: allow working with blank DB_HOST
2017-12-10 09:20:52 +03:00
Andrew Dolgov
8e1450aa15
update previous to only affect mysql
2017-12-05 22:46:18 +03:00
Andrew Dolgov
f76f773a16
purge_orphans: limit maximum number of deleted articles
2017-12-05 22:37:50 +03:00
Andrew Dolgov
99b23daee6
opml_import_filter: remove debugging
2017-12-05 10:18:54 +03:00
Andrew Dolgov
8f92a67e6f
some (very minor) code cleanup in feeds class
2017-12-04 10:39:50 +03:00
Andrew Dolgov
003a7447c3
format_headlines_list: prevent warning on first_id changed check
2017-12-04 10:26:22 +03:00
Andrew Dolgov
92175a8371
setpref: remove nl2br()
2017-12-04 08:27:25 +03:00
Andrew Dolgov
e6532439d6
force strip_tags() on all user input unless explicitly allowed
2017-12-03 23:35:38 +03:00
Andrew Dolgov
7c6f7bb0aa
fix some minor issues found by code analyzer
2017-12-03 23:08:04 +03:00
Andrew Dolgov
fa3bcfa379
queryfeedheadlines: there's no need to quote order_by/override_order
...
else: feedicon cache busting etc
2017-12-03 22:49:57 +03:00
Andrew Dolgov
5f5b0de423
style feed icon and opml file upload controls
2017-12-03 22:35:12 +03:00
Andrew Dolgov
229c139c6a
ccache: properly recalculate counters for uncategorized
2017-12-03 21:34:57 +03:00
Andrew Dolgov
342e8a9eeb
move feeds cache directory to cache/feeds
2017-12-03 21:01:35 +03:00
Andrew Dolgov
7c0eb1b621
add defaultPasswordWarning nag dialog
2017-12-03 20:46:27 +03:00
Andrew Dolgov
31e2811a63
ttrss_zoom: fix CSS
2017-12-03 19:55:19 +03:00
Andrew Dolgov
2f0623c9a5
db: return adapter on get(), remove IDB wrapper
2017-12-03 14:54:15 +03:00
Andrew Dolgov
df5d2a0665
pluginhost: do not connect via legacy DB api until requested
...
log all initiated legacy database connections
2017-12-03 14:49:18 +03:00
Andrew Dolgov
2cf93c046c
pref-users: fix sorting the table
2017-12-03 13:54:31 +03:00
Andrew Dolgov
28040002f3
pdo connection string: properly check for DB_PORT
2017-12-03 13:37:43 +03:00
Andrew Dolgov
1f16f9b8ae
feed debugger: only allow debugging users own feeds
2017-12-03 13:35:18 +03:00
Andrew Dolgov
93e70e36c2
force article content/etc to string when updating to avoid failing null constraint check
2017-12-03 13:32:24 +03:00
Andrew Dolgov
b51d44a5e6
further stylesheet simplification related fixes (2)
2017-12-03 13:26:26 +03:00
Andrew Dolgov
09bc54c690
further stylesheet simplification related fixes
2017-12-03 13:25:34 +03:00
Andrew Dolgov
5e68e24679
css/less updates
2017-12-03 12:50:07 +03:00
Andrew Dolgov
4dc3f7e779
api: do not use sql_bool_to_bool()
2017-12-03 11:06:49 +03:00
Andrew Dolgov
69563c96b4
plugin base: add type hint to init(host)
2017-12-03 10:11:32 +03:00
Andrew Dolgov
49a888ecce
rssutils: forbid question marks in tsvector data, PDO gets confused sometimes even by quoted ?s
2017-12-03 10:10:01 +03:00
Andrew Dolgov
64312bfd71
feeds: remove sql_bool_to_bool()
2017-12-03 09:44:08 +03:00
Andrew Dolgov
b6f3562d1e
plugin base class: init pdo object
...
plugins/share: use PDO
2017-12-03 09:43:18 +03:00
Andrew Dolgov
187abfe732
main classes: remove sql_bool_to_bool() kludge
2017-12-03 09:35:59 +03:00
Andrew Dolgov
8ff3cbb32e
filters: remove sql_bool_to_bool()
...
checkbox_to_sql_bool: return ints (???)
2017-12-03 09:26:11 +03:00
Andrew Dolgov
e4291ba12f
otpenable: use pdo prepare()
2017-12-03 09:10:14 +03:00
Andrew Dolgov
731ecac530
completeLabels: use prepare() not query()
2017-12-03 09:06:43 +03:00
Andrew Dolgov
7d960ce7e9
auth_internal: use PDO + other fixes
2017-12-03 00:18:08 +03:00
fox
ab1960cf13
Merge branch 'upstream/pdo-experimental' of JustAMacUser/tt-rss into pdo-experimental
2017-12-02 19:50:00 +00:00
Andrew Dolgov
bfccff11c4
filter rule saving fix
2017-12-02 22:47:47 +03:00
JustAMacUser
1a05210933
Fixed PDO query to prepared statement in API::updateArticles.
2017-12-02 14:08:55 -05:00
Andrew Dolgov
bf6db17b8f
feeds: use PDO
2017-12-02 16:07:03 +03:00
Andrew Dolgov
2e52e4fd7a
feeds: more PDo stuff
2017-12-02 15:53:32 +03:00
Andrew Dolgov
e4befe6bf4
fix label cache being double escaped on save
...
remove some old-style escaping
2017-12-02 15:47:53 +03:00
Andrew Dolgov
7a1872c1e0
feeds: more PDO stuff
2017-12-02 15:36:32 +03:00
Andrew Dolgov
b5bf9a0ff3
remove long forgotten stuff related to feed debugging actionbar
2017-12-02 15:12:39 +03:00
Andrew Dolgov
91d679667e
feeds: PDO progress
2017-12-02 15:04:11 +03:00
Andrew Dolgov
da9ea57d1c
checkbox to sql bool related changes, some more boolean fixes
2017-12-02 14:07:48 +03:00
Andrew Dolgov
7ccb4e91ff
boolean handling changes which probably won't break everything
2017-12-02 14:02:01 +03:00
Andrew Dolgov
248c62a1cc
filters: fix limit/offset for test dialog
2017-12-02 13:54:18 +03:00
Andrew Dolgov
bf4a79eaa9
prefs: start PDO switchover
2017-12-02 13:49:35 +03:00
Andrew Dolgov
f594717d18
filters: use PDO
2017-12-02 13:28:13 +03:00
Andrew Dolgov
21295a52aa
labels: PDO
2017-12-02 12:45:33 +03:00
Andrew Dolgov
c2418a559b
pref-users: PDO
2017-12-02 12:23:41 +03:00
Andrew Dolgov
93ca6c95b8
pref-system: PDO
2017-12-02 12:03:39 +03:00
Andrew Dolgov
7039370368
pref-prefs: PDO
2017-12-02 12:01:56 +03:00
Andrew Dolgov
f8108cc28d
pluginhost: save_data() fixes
2017-12-02 11:31:02 +03:00
Andrew Dolgov
8af94f1292
pluginhost: use PDO
2017-12-02 11:25:43 +03:00
Andrew Dolgov
0500e14cc2
update_rss_feed: transaction lock article processing
2017-12-02 11:16:33 +03:00
Andrew Dolgov
0567016b40
rssutils: PDO
2017-12-02 09:56:34 +03:00
Andrew Dolgov
afcb105f4e
rssutils: start PDO switch
2017-12-02 08:38:57 +03:00
Andrew Dolgov
1d92297a96
dbupdater: use PDO
2017-12-02 01:28:30 +03:00
Andrew Dolgov
c949a9282e
OPML: use PDO; minor fixes
2017-12-02 01:08:30 +03:00
Andrew Dolgov
4102eb843f
sql logger: pdo
2017-12-02 00:13:28 +03:00
Andrew Dolgov
c1c08aed39
labels: PDO
2017-12-02 00:06:17 +03:00
Andrew Dolgov
fbe7cb0a48
rpc: switch to PDO
2017-12-01 23:49:14 +03:00
Andrew Dolgov
9652fa6b66
API: small fix
2017-12-01 22:49:12 +03:00
Andrew Dolgov
3467e1fd7c
api: switch to PDO
2017-12-01 22:46:22 +03:00
Andrew Dolgov
dd90eefae1
PDO: set unicode for mysql and other connection params
2017-12-01 22:14:54 +03:00
Andrew Dolgov
aee3f0e6d9
fix typo
2017-12-01 22:07:39 +03:00
Andrew Dolgov
7fc303e6ab
query feed headlines: fix limit/offset
2017-12-01 21:07:55 +03:00
Andrew Dolgov
cb13089af1
public: use PDO headlines result (2)
2017-12-01 20:57:55 +03:00
Andrew Dolgov
dc393a580b
public: use PDO headlines result
2017-12-01 20:57:05 +03:00
Andrew Dolgov
3623ebb1a1
feeds: handle escaping
2017-12-01 20:52:30 +03:00
Andrew Dolgov
c9b6ca8b70
feeds: remove escaping
2017-12-01 20:26:51 +03:00
Andrew Dolgov
b5791f11c5
queryfeedheadlines: PDOize (1)
2017-12-01 20:25:13 +03:00
Andrew Dolgov
29f1908e03
feeds: right before queryfeedheadlines()
2017-12-01 20:15:25 +03:00
Andrew Dolgov
cc9450c309
ccache, misc: fixes
...
feeds: start PDO transition
2017-12-01 19:42:02 +03:00
Andrew Dolgov
1271407eea
public: partial conversion to PDO, misc fixes
2017-12-01 18:57:34 +03:00
Andrew Dolgov
fbde19580c
db_prefs: PDO
2017-12-01 18:40:48 +03:00
Andrew Dolgov
abf94f00b4
digest: use PDO
2017-12-01 18:31:23 +03:00
Andrew Dolgov
9ead64f6d8
dlg: PDO
2017-12-01 18:16:58 +03:00
Andrew Dolgov
933ff559e6
ccache: PDO
2017-12-01 18:03:33 +03:00
Andrew Dolgov
a25ac0d7c8
counters: PDO
2017-12-01 17:47:29 +03:00
Andrew Dolgov
c9d5c26041
auth/base: PDO
...
functions: fix small pdo-related bug
2017-12-01 17:40:53 +03:00
Andrew Dolgov
2c57df75ff
article: remove db_escape..()
2017-12-01 17:35:22 +03:00
Andrew Dolgov
d0e73ed8ae
article: switch to PDO
2017-12-01 17:33:59 +03:00
Andrew Dolgov
2e46b434da
pdo: set warnings
2017-12-01 16:56:15 +03:00
Andrew Dolgov
c39ee27235
article: start pdo
2017-12-01 15:31:16 +03:00
Andrew Dolgov
bfc54b0369
Merge branch 'pdo-experimental' of git.fakecake.org:tt-rss into pdo-experimental
2017-12-01 10:17:36 +03:00
Andrew Dolgov
d9e60c0f68
Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental
2017-12-01 10:17:18 +03:00
Andrew Dolgov
e50c8eaa4e
enforce unconditional requests every 6 hours even if server claims data is not modified
2017-11-30 13:12:28 +03:00
Andrew Dolgov
8adb3ec472
add some WIP pdo stuff
2017-11-30 12:28:07 +03:00
Andrew Dolgov
ca82bb03c8
rm db_stmt
2017-11-30 11:53:21 +03:00
Andrew Dolgov
99bda9cc12
add some starting pdo glue
2017-11-30 10:47:42 +03:00
Andrew Dolgov
9dd336a2c3
generate base css files using lessc
2017-11-29 18:55:12 +03:00
dim0x69
5395526444
add HOOK_UNSUBSCRIBE_FEED
2017-11-27 11:46:46 +01:00
Andrew Dolgov
2352c320c2
fix possible sql injection in public/forgotpass
2017-11-20 08:48:18 +03:00
Andrew Dolgov
9d930af9e1
fetch_file_contents: improve error handling
...
1. if request fails get error string from http response status line
2. do not override http error with possible CURL/php specific last error
3. fix silent php error generated while processing response headers to get last modified value
2017-10-30 13:13:10 +03:00
Andrew Dolgov
91f49ba17d
api, setArticleLabel: allow JSON booleans
2017-10-15 16:47:44 +03:00
fox
d320b55af9
Merge branch 'sort_title_date' of ggrandou/tt-rss into master
2017-10-13 05:53:03 +00:00
Gilles Grandou
f9ad33c2d8
allows favicons to be in Windows PC BMP format
2017-10-09 22:58:00 +02:00
Gilles Grandou
81d96c0dee
makes 'order by title' to sort by title and by ascending date
...
* this allows to chronologically browse all articles with the
same title.
2017-10-09 22:50:03 +02:00
Andrew Dolgov
8b73bd28d8
remove apache-specific x-sendfile stuff
...
implement a hook (HOOK_SEND_LOCAL_FILE) which plugins may use to send files
via httpd-specific implementation to increase performance typically on larger files
2017-10-08 17:14:56 +03:00
fox
b1d1bc901f
Merge branch 'checkbox-feed' of dxbi/tt-rss into master
2017-10-06 06:47:54 +00:00
Felix Eckhofer
cc50affb62
Add checkbox for authentication in edit feed dialog
...
This makes the UI more consistent with the "add feed" dialog and
prevents overzealous password-managers from leaking the login password.
2017-10-06 08:37:37 +02:00
Andrew Dolgov
51b521c326
fix batch feed editor using wrong SQL syntax when saving feed password
...
remove uses of auth_pass_encrypted in several other places
2017-10-06 09:22:04 +03:00
wn_
3476690cbf
Only require an array of basic info from 'HOOK_FEED_BASIC_INFO'.
...
Removes the need for the plugin to provide feed content.
Gives plugins a chance to provide 'title' and 'site_url' basic info.
Falls back to attempting retrieval+parsing of the fetch URL if needed.
2017-09-26 20:42:33 -05:00
wn_
bec5ba93e2
Add 'HOOK_FEED_BASIC_INFO' to enable plugins to provide basic feed info.
...
It's expected the plugin will return content parsable by FeedParser, which
will act as an interface to the basic feed info. In the case of a plugin
that also uses 'HOOK_FETCH_FEED', both might return the same content.
The hook signature was made somewhat similar to 'HOOK_FETCH_FEED'.
2017-09-24 19:37:49 -05:00
wn_
f3774b9d65
Use 'saveHTML' when generating HTML from a DOMDocument.
...
This primarily occurs when modifying article content. If 'saveXML' is
used following 'loadHTML' there is the possibility of strangeness, such
as a self-closing anchor tag.
Note that the DOMDocument used in 'classes/feeditem/atom.php' came from
'loadXML', but we use 'saveHTML' since we're returning HTML content.
2017-09-09 13:51:59 -05:00
Andrew Dolgov
153cb6d305
add support for http 304 not modified (no timestamp calculation bullshit like last time)
2017-08-17 14:40:21 +03:00
Andrew Dolgov
edefcec19d
filters/edit: properly parse feed-specific legacy format filter rules
2017-08-14 22:29:50 +03:00
Andrew Dolgov
ab8daa0389
use mysqli_set_charset() to set MYSQL_CHARSET
2017-08-09 08:05:52 +03:00
Andrew Dolgov
20d2195f13
rssutils: include comment count when calculating article hash
2017-08-06 20:20:39 +03:00
Andrew Dolgov
51f13e7736
get_all_labels: order by caption
2017-07-30 15:25:49 +03:00
Andrew Dolgov
5e78b0c253
do not base headlines label context submenu on feed tree labels category
2017-07-30 11:55:30 +03:00
Andrew Dolgov
be61f1c45c
filters dialog: do not break markup on long feed names
2017-07-09 16:39:25 +03:00
Andrew Dolgov
b2d42e960b
replace some usages of SELF_URL_PATH with get_self_url_prefix()
2017-07-06 23:01:44 +03:00
Andrew Dolgov
667d32fd26
remove obsolete forum plugin links
...
mention how to enable system plugins in the UI
2017-07-04 16:28:45 +03:00
Andrew Dolgov
7b994e4bec
filters: when adding rule select all feeds by default
2017-07-02 22:55:36 +03:00
Andrew Dolgov
57a1143c9d
dbupdater: fail if version file missing
2017-07-02 20:53:07 +03:00
Andrew Dolgov
02f3992a5a
Revert "Revert "filters: support matching on multiple feeds/categories""
...
This reverts commit f5d174bda9
.
2017-07-02 20:37:52 +03:00
Andrew Dolgov
f5d174bda9
Revert "filters: support matching on multiple feeds/categories"
...
This reverts commit 0bf7e007bb
.
2017-07-02 20:37:01 +03:00
Andrew Dolgov
e0f51d786f
Merge branch 'master' of git.fakecake.org:tt-rss
2017-07-02 20:27:31 +03:00
Andrew Dolgov
0bf7e007bb
filters: support matching on multiple feeds/categories
...
opml: update filter export/import for new format
2017-07-02 20:27:21 +03:00
Andrew Dolgov
c053b97697
pref/feeds: start user category ordering from 1
...
api, getFeeds: send subcategory order_id
2017-06-26 16:29:57 +03:00
Andrew Dolgov
e130b283a7
db prefs: ignore cache when preference requested for specified UID (in case cached value of a different profile is stored)
...
prefs: show (and set) enabled plugins for default profile only
2017-06-24 14:29:07 +03:00
Andrew Dolgov
93af11cb7a
update_daemon_common: do not escape feed_url twice, remove some comments and stuff
2017-06-13 20:09:33 +03:00
Andrew Dolgov
6fd0399694
tunables:
...
* add CACHE_MAX_DAYS as a tunable generic expiry interval for various cached files
* add some comments to tunables in functions.php
* rename _MIN_CACHE_FILE_SIZE to MIN_CACHE_FILE_SIZE
* respect MIN_CACHE_FILE_SIZE setting in a few more places where content is cached
2017-05-29 23:14:42 +03:00
Andrew Dolgov
e50a647916
add HOOK_FORMAT_ARTICLE & HOOK_FORMAT_ARTICLE_CDM
...
Feeds::format_headlines_list: add some comments for cdm article closing tags
2017-05-26 23:22:00 +03:00
Andrew Dolgov
9e381bc202
classes/Plugin: remove dbh & host fields; set init() and about() as abstract methods.
2017-05-23 21:16:30 +03:00
Andrew Dolgov
5b6ea1ef91
remove pubsubhubbub: dead
2017-05-16 10:41:20 +03:00
Andrew Dolgov
8f0a59f34a
share function: remove tt-rss prefix from page title
2017-05-11 09:56:51 +03:00
Andrew Dolgov
c114a2596f
move add_feed_url() to pref_feeds
2017-05-11 09:07:49 +03:00
Andrew Dolgov
4fd0790804
fix DAEMON_SLEEP_INTERVAL not being defined when used
...
enforce minimum 60 sec spawn/sleep interval in update processes
2017-05-06 10:54:14 +03:00
Andrew Dolgov
e6c886bf66
wrap rssfuncs into rssutils class
2017-05-05 18:10:07 +03:00
Andrew Dolgov
65af3b2cbb
move counter stuff to a separate class
2017-05-05 11:54:31 +03:00
Andrew Dolgov
40f4a7aa6b
feeditem_common: add get_element()
2017-05-05 09:21:10 +03:00
Andrew Dolgov
7c9b5a3fe4
move label stuff to Labels class
...
fix some unresolved functions
2017-05-04 15:57:40 +03:00
Andrew Dolgov
c2f0f24e4c
move digest stuff to Digest class
2017-05-04 15:41:38 +03:00
Andrew Dolgov
0086a89740
move some label stuff to labels.php
...
move getfeedcategory() to Feeds
2017-05-04 15:36:36 +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