d4fef36237
rewrite per-feed/global strip images to strip media
2018-09-07 10:24:46 +03:00
62d0060aa1
update_daemon_common: do not abort entire batch if PDOException happens when processing individual feeds
2018-09-03 13:03:35 +03:00
01d22e255f
PDO: switch error reporting to exceptions
2018-09-03 12:30:26 +03:00
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
a291a0c00f
API: oops, forgot that headlines could be requested for a tag
2018-08-29 12:55:03 +03:00
70e180e887
API: getHeadlines: check for feed_id correctly
2018-08-29 12:53:33 +03:00
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
8ab77d19ef
Merge branch 'pullreq-enclosure-content-type' of tkappe/tt-rss into master
2018-08-21 03:47:39 +00:00
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
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
04ad631a08
Merge branch 'master' of git.fakecake.org:tt-rss
2018-08-17 10:11:53 +03:00
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
163b50b15f
cache_media: only show downloading debug message when actually downloading
2018-08-16 11:56:51 +03:00
611aeb7197
add debug stdout logger
2018-08-15 15:08:31 +03:00
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
eb43d9f4a8
fix previous to not crash if document first child is not a DOMElement or whatever
2018-08-12 19:27:04 +03:00
a377d5c981
Determine language for atom entry without a loop.
2018-08-12 16:17:13 +01:00
3bbaf902ab
Sanitize language obtained for an entry.
2018-08-12 16:12:34 +01:00
22a866edb5
Store language of entries as indicated by the feed.
2018-08-12 15:27:26 +01:00
32c0c07cc1
pluginhost: implement basic autoloader for classes bundled with plugins (uses vendor/ layout)
2018-08-07 14:36:45 +03:00
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
6e6c3a878d
update_rss_feed: limit maximum length of tsvector data because of pgsql limitations
2018-07-10 14:08:55 +03:00
310c18e6bb
move OTPHP to vendor/; additionally move Base32 class to OTPHP namespace
2018-06-20 18:27:34 +03:00
f5302247c6
share: add support for og:image, etc. metadata for shared articles
2018-05-29 22:04:02 +03:00
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
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
963c22646b
pass tsvector data as a named parameter on article update, remove escaping hacks
2018-04-03 13:57:27 +03:00
4fa64e8446
filter dialog: remove placeholder
2018-03-21 14:02:06 +03:00
e794e434da
filter dialog: add tooltip re: filter syntax
2018-03-21 13:38:36 +03:00
551f3c2c85
fixed "reset to defaults" in preferences
2018-03-15 16:26:50 +00:00
0a8cdd4b9c
remove firefox feed subscribe integration code (obsolete)
2018-03-14 18:15:21 +03:00
c9a5e5aa28
feed editor: expose site_url for editing
2018-03-01 15:43:40 +03:00
f1415df47c
prefs: expand feed tree if displaying search results
2018-02-26 11:58:53 +03:00
5edf4b73a4
add a workaround to support numeric tags
2018-02-11 10:24:24 +03:00
f6269d1bc4
add special class for feeds with disabled updates
2018-02-08 13:54:06 +03:00
a340b29ba9
pref-feeds: disable tree autoexpand
2018-02-04 09:36:56 +03:00
67bf38afda
savefeedorder, savefilterorder: do not use clean() on json payload
2018-02-04 09:33:28 +03:00
7f4a404566
include: convert some spaces to tabs
2018-01-30 10:44:31 +03:00
102a01354b
strip utf8mb4 characters in enclosures on mysql
2018-01-29 23:24:11 +03:00
26ad257de5
Fixed time stamping of new unmarked/unpublished articles
2018-01-22 22:41:24 +00:00
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
c30f5e1811
subscribe_to_feed: force-cast login and password to string
2018-01-05 06:50:37 +03:00
09be7cdd73
binding statement named param instead of positional replacement
2018-01-02 06:30:22 +00:00
8dedacf497
remove synchronous feed refreshing on ForceUpdate
2017-12-31 07:37:49 +03:00
bbc4d4bf34
treat OPML-imported feeds without a title the same as a batch import
2017-12-29 15:33:01 -08:00
1a7277570b
fix two-factor authenticaton
2017-12-22 12:29:25 +01:00
d4c05d0be2
update_rss_feed: don't try to use quoted NOW() in query
2017-12-18 18:27:23 +03:00
6fb5f17be6
pluginhost: always return an array in get_all()
2017-12-17 19:06:18 +03:00
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
d0cce0c7a4
isdefaultpassword: use method_exists() to check for check_password
2017-12-15 12:15:15 +03:00
0f05147531
properly highlight search keywords containing forward slash
2017-12-15 08:33:59 +03:00
5f19596651
Fix typo from previous pull request
2017-12-14 18:43:42 +01:00
44c6a04b61
Check if the auth module supports check_password() method before using it
2017-12-14 18:02:37 +01:00
9390ddeae2
fix single user mode login failing because of isdefaultpassword()
2017-12-14 19:27:55 +03:00
1bf468ba1a
pref-prefs: set button classes
2017-12-11 18:50:00 +03:00
121ac0481f
filter rule/action dialogs: set default action
2017-12-11 18:46:27 +03:00
ef1feb3610
subscribe dialog: add primary action
2017-12-11 18:43:53 +03:00
05e81655c3
user editor: add primary action
2017-12-11 18:41:32 +03:00
6fb5ce5e35
add some primary dialog actions; update css
2017-12-11 18:36:36 +03:00
5f7be9957f
filter,label dlg: use default action
2017-12-11 18:23:30 +03:00
320a3ba529
search form: set default action
2017-12-11 18:14:45 +03:00
f70d456a5b
Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
2017-12-11 12:54:30 +03:00
c463a95dca
Merge branch 'master' of dim0x69/tt-rss into master
2017-12-11 09:47:04 +00:00
e58a14de72
Check return value from Plugins
2017-12-11 09:41:45 +00:00
9306918767
Merge branch 'pda-rss-now' of richm/tt-rss into pdo-experimental
2017-12-11 04:01:28 +00:00
aa16334f1f
Include NOW() in prepared SQL for rssutils.php
2017-12-10 23:05:52 +00:00
1c1fc17120
synchronous feed update: catch PDO exceptions as to not break headlines output
2017-12-10 21:10:19 +03:00
83a052f1fa
pdo_connect: catch exception on create
2017-12-10 09:27:07 +03:00
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
8e1450aa15
update previous to only affect mysql
2017-12-05 22:46:18 +03:00
f76f773a16
purge_orphans: limit maximum number of deleted articles
2017-12-05 22:37:50 +03:00
99b23daee6
opml_import_filter: remove debugging
2017-12-05 10:18:54 +03:00
8f92a67e6f
some (very minor) code cleanup in feeds class
2017-12-04 10:39:50 +03:00
003a7447c3
format_headlines_list: prevent warning on first_id changed check
2017-12-04 10:26:22 +03:00
92175a8371
setpref: remove nl2br()
2017-12-04 08:27:25 +03:00
e6532439d6
force strip_tags() on all user input unless explicitly allowed
2017-12-03 23:35:38 +03:00
7c6f7bb0aa
fix some minor issues found by code analyzer
2017-12-03 23:08:04 +03:00
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
5f5b0de423
style feed icon and opml file upload controls
2017-12-03 22:35:12 +03:00
229c139c6a
ccache: properly recalculate counters for uncategorized
2017-12-03 21:34:57 +03:00
342e8a9eeb
move feeds cache directory to cache/feeds
2017-12-03 21:01:35 +03:00
7c0eb1b621
add defaultPasswordWarning nag dialog
2017-12-03 20:46:27 +03:00
31e2811a63
ttrss_zoom: fix CSS
2017-12-03 19:55:19 +03:00
2f0623c9a5
db: return adapter on get(), remove IDB wrapper
2017-12-03 14:54:15 +03:00
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
2cf93c046c
pref-users: fix sorting the table
2017-12-03 13:54:31 +03:00
28040002f3
pdo connection string: properly check for DB_PORT
2017-12-03 13:37:43 +03:00
1f16f9b8ae
feed debugger: only allow debugging users own feeds
2017-12-03 13:35:18 +03:00
93e70e36c2
force article content/etc to string when updating to avoid failing null constraint check
2017-12-03 13:32:24 +03:00
b51d44a5e6
further stylesheet simplification related fixes (2)
2017-12-03 13:26:26 +03:00
09bc54c690
further stylesheet simplification related fixes
2017-12-03 13:25:34 +03:00
5e68e24679
css/less updates
2017-12-03 12:50:07 +03:00
4dc3f7e779
api: do not use sql_bool_to_bool()
2017-12-03 11:06:49 +03:00
69563c96b4
plugin base: add type hint to init(host)
2017-12-03 10:11:32 +03:00
49a888ecce
rssutils: forbid question marks in tsvector data, PDO gets confused sometimes even by quoted ?s
2017-12-03 10:10:01 +03:00
64312bfd71
feeds: remove sql_bool_to_bool()
2017-12-03 09:44:08 +03:00
b6f3562d1e
plugin base class: init pdo object
...
plugins/share: use PDO
2017-12-03 09:43:18 +03:00
187abfe732
main classes: remove sql_bool_to_bool() kludge
2017-12-03 09:35:59 +03:00
8ff3cbb32e
filters: remove sql_bool_to_bool()
...
checkbox_to_sql_bool: return ints (???)
2017-12-03 09:26:11 +03:00
e4291ba12f
otpenable: use pdo prepare()
2017-12-03 09:10:14 +03:00
731ecac530
completeLabels: use prepare() not query()
2017-12-03 09:06:43 +03:00
7d960ce7e9
auth_internal: use PDO + other fixes
2017-12-03 00:18:08 +03:00
ab1960cf13
Merge branch 'upstream/pdo-experimental' of JustAMacUser/tt-rss into pdo-experimental
2017-12-02 19:50:00 +00:00
bfccff11c4
filter rule saving fix
2017-12-02 22:47:47 +03:00
1a05210933
Fixed PDO query to prepared statement in API::updateArticles.
2017-12-02 14:08:55 -05:00
bf6db17b8f
feeds: use PDO
2017-12-02 16:07:03 +03:00
2e52e4fd7a
feeds: more PDo stuff
2017-12-02 15:53:32 +03:00
e4befe6bf4
fix label cache being double escaped on save
...
remove some old-style escaping
2017-12-02 15:47:53 +03:00
7a1872c1e0
feeds: more PDO stuff
2017-12-02 15:36:32 +03:00
b5bf9a0ff3
remove long forgotten stuff related to feed debugging actionbar
2017-12-02 15:12:39 +03:00
91d679667e
feeds: PDO progress
2017-12-02 15:04:11 +03:00
da9ea57d1c
checkbox to sql bool related changes, some more boolean fixes
2017-12-02 14:07:48 +03:00
7ccb4e91ff
boolean handling changes which probably won't break everything
2017-12-02 14:02:01 +03:00
248c62a1cc
filters: fix limit/offset for test dialog
2017-12-02 13:54:18 +03:00
bf4a79eaa9
prefs: start PDO switchover
2017-12-02 13:49:35 +03:00
f594717d18
filters: use PDO
2017-12-02 13:28:13 +03:00
21295a52aa
labels: PDO
2017-12-02 12:45:33 +03:00
c2418a559b
pref-users: PDO
2017-12-02 12:23:41 +03:00
93ca6c95b8
pref-system: PDO
2017-12-02 12:03:39 +03:00
7039370368
pref-prefs: PDO
2017-12-02 12:01:56 +03:00
f8108cc28d
pluginhost: save_data() fixes
2017-12-02 11:31:02 +03:00
8af94f1292
pluginhost: use PDO
2017-12-02 11:25:43 +03:00
0500e14cc2
update_rss_feed: transaction lock article processing
2017-12-02 11:16:33 +03:00
0567016b40
rssutils: PDO
2017-12-02 09:56:34 +03:00
afcb105f4e
rssutils: start PDO switch
2017-12-02 08:38:57 +03:00
1d92297a96
dbupdater: use PDO
2017-12-02 01:28:30 +03:00
c949a9282e
OPML: use PDO; minor fixes
2017-12-02 01:08:30 +03:00
4102eb843f
sql logger: pdo
2017-12-02 00:13:28 +03:00
c1c08aed39
labels: PDO
2017-12-02 00:06:17 +03:00
fbe7cb0a48
rpc: switch to PDO
2017-12-01 23:49:14 +03:00
9652fa6b66
API: small fix
2017-12-01 22:49:12 +03:00
3467e1fd7c
api: switch to PDO
2017-12-01 22:46:22 +03:00
dd90eefae1
PDO: set unicode for mysql and other connection params
2017-12-01 22:14:54 +03:00
aee3f0e6d9
fix typo
2017-12-01 22:07:39 +03:00
7fc303e6ab
query feed headlines: fix limit/offset
2017-12-01 21:07:55 +03:00
cb13089af1
public: use PDO headlines result (2)
2017-12-01 20:57:55 +03:00
dc393a580b
public: use PDO headlines result
2017-12-01 20:57:05 +03:00
3623ebb1a1
feeds: handle escaping
2017-12-01 20:52:30 +03:00
c9b6ca8b70
feeds: remove escaping
2017-12-01 20:26:51 +03:00
b5791f11c5
queryfeedheadlines: PDOize (1)
2017-12-01 20:25:13 +03:00
29f1908e03
feeds: right before queryfeedheadlines()
2017-12-01 20:15:25 +03:00
cc9450c309
ccache, misc: fixes
...
feeds: start PDO transition
2017-12-01 19:42:02 +03:00
1271407eea
public: partial conversion to PDO, misc fixes
2017-12-01 18:57:34 +03:00
fbde19580c
db_prefs: PDO
2017-12-01 18:40:48 +03:00
abf94f00b4
digest: use PDO
2017-12-01 18:31:23 +03:00
9ead64f6d8
dlg: PDO
2017-12-01 18:16:58 +03:00
933ff559e6
ccache: PDO
2017-12-01 18:03:33 +03:00
a25ac0d7c8
counters: PDO
2017-12-01 17:47:29 +03:00
c9d5c26041
auth/base: PDO
...
functions: fix small pdo-related bug
2017-12-01 17:40:53 +03:00
2c57df75ff
article: remove db_escape..()
2017-12-01 17:35:22 +03:00
d0e73ed8ae
article: switch to PDO
2017-12-01 17:33:59 +03:00
2e46b434da
pdo: set warnings
2017-12-01 16:56:15 +03:00
c39ee27235
article: start pdo
2017-12-01 15:31:16 +03:00
bfc54b0369
Merge branch 'pdo-experimental' of git.fakecake.org:tt-rss into pdo-experimental
2017-12-01 10:17:36 +03:00
d9e60c0f68
Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental
2017-12-01 10:17:18 +03:00
e50c8eaa4e
enforce unconditional requests every 6 hours even if server claims data is not modified
2017-11-30 13:12:28 +03:00
8adb3ec472
add some WIP pdo stuff
2017-11-30 12:28:07 +03:00
ca82bb03c8
rm db_stmt
2017-11-30 11:53:21 +03:00
99bda9cc12
add some starting pdo glue
2017-11-30 10:47:42 +03:00
9dd336a2c3
generate base css files using lessc
2017-11-29 18:55:12 +03:00
5395526444
add HOOK_UNSUBSCRIBE_FEED
2017-11-27 11:46:46 +01:00
2352c320c2
fix possible sql injection in public/forgotpass
2017-11-20 08:48:18 +03:00
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
91f49ba17d
api, setArticleLabel: allow JSON booleans
2017-10-15 16:47:44 +03:00
d320b55af9
Merge branch 'sort_title_date' of ggrandou/tt-rss into master
2017-10-13 05:53:03 +00:00
f9ad33c2d8
allows favicons to be in Windows PC BMP format
2017-10-09 22:58:00 +02:00
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
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
b1d1bc901f
Merge branch 'checkbox-feed' of dxbi/tt-rss into master
2017-10-06 06:47:54 +00:00
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
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
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
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
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
153cb6d305
add support for http 304 not modified (no timestamp calculation bullshit like last time)
2017-08-17 14:40:21 +03:00
edefcec19d
filters/edit: properly parse feed-specific legacy format filter rules
2017-08-14 22:29:50 +03:00
ab8daa0389
use mysqli_set_charset() to set MYSQL_CHARSET
2017-08-09 08:05:52 +03:00
20d2195f13
rssutils: include comment count when calculating article hash
2017-08-06 20:20:39 +03:00
51f13e7736
get_all_labels: order by caption
2017-07-30 15:25:49 +03:00
5e78b0c253
do not base headlines label context submenu on feed tree labels category
2017-07-30 11:55:30 +03:00
be61f1c45c
filters dialog: do not break markup on long feed names
2017-07-09 16:39:25 +03:00
b2d42e960b
replace some usages of SELF_URL_PATH with get_self_url_prefix()
2017-07-06 23:01:44 +03:00
667d32fd26
remove obsolete forum plugin links
...
mention how to enable system plugins in the UI
2017-07-04 16:28:45 +03:00
7b994e4bec
filters: when adding rule select all feeds by default
2017-07-02 22:55:36 +03:00
57a1143c9d
dbupdater: fail if version file missing
2017-07-02 20:53:07 +03:00
02f3992a5a
Revert "Revert "filters: support matching on multiple feeds/categories""
...
This reverts commit f5d174bda9
2017-07-02 20:37:52 +03:00
f5d174bda9
Revert "filters: support matching on multiple feeds/categories"
...
This reverts commit 0bf7e007bb
2017-07-02 20:37:01 +03:00
e0f51d786f
Merge branch 'master' of git.fakecake.org:tt-rss
2017-07-02 20:27:31 +03:00
0bf7e007bb
filters: support matching on multiple feeds/categories
...
opml: update filter export/import for new format
2017-07-02 20:27:21 +03:00
c053b97697
pref/feeds: start user category ordering from 1
...
api, getFeeds: send subcategory order_id
2017-06-26 16:29:57 +03:00
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
93af11cb7a
update_daemon_common: do not escape feed_url twice, remove some comments and stuff
2017-06-13 20:09:33 +03:00
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
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
9e381bc202
classes/Plugin: remove dbh & host fields; set init() and about() as abstract methods.
2017-05-23 21:16:30 +03:00
5b6ea1ef91
remove pubsubhubbub: dead
2017-05-16 10:41:20 +03:00
8f0a59f34a
share function: remove tt-rss prefix from page title
2017-05-11 09:56:51 +03:00
c114a2596f
move add_feed_url() to pref_feeds
2017-05-11 09:07:49 +03:00
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
e6c886bf66
wrap rssfuncs into rssutils class
2017-05-05 18:10:07 +03:00
Andrew Dolgov
fox
Tobias Kappé
BtbN
MatthieuS
tsia
jsoares
Colin Vidal
immanuelfodor
Andrew Dolgov
Tianon Gravi
Francesco Turco
Andrew Dolgov
simonp
Benjamin Collet
dim0x69
Richard Mortimer
JustAMacUser
dim0x69
Gilles Grandou
Felix Eckhofer
wn_