clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,337 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

2633 Commits

Author SHA1 Message Date
Tobias Diekershoff 921094017c
Merge pull request #6134 from annando/6128-again 
We now use our regular feed that allows anonymous polling
 2018-11-15 06:19:13 +01:00
Michael 08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling 2018-11-14 19:26:23 +00:00
Michael 268862dd7c Just some notice again 2018-11-14 10:54:42 +00:00
Michael 88a4733e5f Forgotten "use" 2018-11-14 06:00:01 +00:00
Michael 9271b21d51 Create a new GUID on user import 2018-11-14 05:58:03 +00:00
Hypolite Petovan e6557ca9c5
Merge pull request #6126 from annando/notice-return-path 
Fixes notice "PHP Notice:  Undefined index: return_path"
 2018-11-13 13:58:10 -05:00
Michael e1875cf206 Fixes notice "PHP Notice: Undefined index: return_path" 2018-11-13 18:10:37 +00:00
fabrixxm 972775e58e
Fix Notice in LegacyModule 
Notice: Only variables should be passed by reference in src/LegacyModule.php on line 68
 2018-11-13 14:37:51 +01:00
Michael b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael 109204032c Execute database update before post update is called 2018-11-12 10:36:10 +00:00
Hypolite Petovan 6e39b93eb9
Merge pull request #6114 from annando/server-discovery 
Fix wrong server detecting / improved Pleroma version numbers
 2018-11-12 00:12:13 -05:00
Michael 1e873a2815 Avoid a blocked workerqueue due to removed users 2018-11-12 05:03:12 +00:00
Michael 0937c66484 A redirect is not an error 2018-11-12 04:12:36 +00:00
Michael de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Michael 7458d793ed Removing some notices again 2018-11-11 12:15:17 +00:00
Hypolite Petovan 094e5becca
Merge pull request #6110 from annando/issue-6100 
Issue 6100: The AS object should be fetchable for every original post
 2018-11-10 20:57:07 -05:00
Hypolite Petovan a30876977d
Merge pull request #6108 from annando/fork-check 
Add some hook to check if hook should be forked
 2018-11-10 20:56:42 -05:00
Michael 8844bb690d Issue 6100: The AS object should be fetchable for every original post 2018-11-10 23:56:11 +00:00
Michael Vogel 67f9458ba6
Merge pull request #6107 from MrPetovan/bug/5996-fix-toggle-mobile-call 
Add URL encoding to toggle_mobile parameter
 2018-11-10 17:27:04 +01:00
Michael 033bf65f2c Some redesign 2018-11-10 15:20:23 +00:00
Michael 4a59a7ae7f Logger is not needed anymore 2018-11-10 15:16:48 +00:00
Michael e30d7cfc03 Add some hook to check if hook should be forked 2018-11-10 15:15:46 +00:00
Hypolite Petovan 09c94dba86 Add URL encoding to toggle_mobile parameter 2018-11-10 08:55:48 -05:00
Hypolite Petovan 1892462920 Fix formatting in Probe::uri 2018-11-10 08:24:53 -05:00
Hypolite Petovan a6a3c268bb Use atom:author/atom:uri as profile-link in Feed::import 
- Use atom:author/atom:id as profile-id
 2018-11-10 08:24:10 -05:00
Hypolite Petovan 94a71d9ffc Honor preference order in webfinger links 2018-11-10 08:23:11 -05:00
Hypolite Petovan 10a8be7943 Accept URLs with no trailing slash in Probe::uri 2018-11-10 08:22:47 -05:00
Hypolite Petovan aaae7b56df Replace obsolete Addon::callHooks call with Hook::callAll in Model\Contact 2018-11-10 08:18:16 -05:00
Hypolite Petovan 8703fe4032 Accept data structure in Logger::devLog 2018-11-10 08:17:33 -05:00
Adam Magness 218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness 063f0e9cb0 Rename escapeTags to escapeHtml 
rename function and update calls.
 2018-11-09 13:27:58 -05:00
Adam Magness b5a97c1abe Move getTags to BBCode 
move getTags function to BBCode class and update calls.
 2018-11-09 13:24:19 -05:00
Adam Magness e4354a0d7b Update and Remove isValidEmail 
change function calls, and remove unneeded function.
 2018-11-09 13:18:42 -05:00
Adam Magness 6827dbf734 bug fix 
Strings not String
 2018-11-08 12:59:00 -05:00
Adam Magness 087f50d820 Missing Use statements 
missing use
 2018-11-08 11:58:42 -05:00
Adam Magness ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness 5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness 6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness 0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness b73af72deb deindent calls 
implement function in new class
 2018-11-08 10:26:49 -05:00
Adam Magness 916b3e551e format_network_name calls 
implement formatNetworkName function
 2018-11-08 10:24:47 -05:00
Adam Magness b99925060a autoname calls 
implement getRandomName function
 2018-11-08 10:22:20 -05:00
Adam Magness 0e01568ccd escape_tags calls 
implement escapeTags function
 2018-11-08 10:20:03 -05:00
Adam Magness a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness 991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness fd597472f1 Split text.php to Strings class 
move functions to new strings class
Split text.php to Strings class

move functions to new Strings class
 2018-11-08 08:33:28 -05:00
Hypolite Petovan 1a3c88b042
Merge pull request #6097 from nupplaphil/refactor_user_identities 
Refactoring identities to Model\User::identities
 2018-11-08 06:54:48 -05:00
Hypolite Petovan c464ec33e1
Merge pull request #6099 from annando/ap-emojis 
Using CSS for custom emojis
 2018-11-08 06:54:05 -05:00
Michael 077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Hypolite Petovan 97b6d70825
Merge pull request #6096 from annando/ap-emojis 
We now directly support the custom emojis from Mastodon
 2018-11-07 20:10:16 -05:00
Philipp Holzer 8ad721988b
Refactoring identities to Model\User::identities 2018-11-08 00:38:55 +01:00
Michael cd2c7f782f We now directly support the custom emojis from Mastodon 2018-11-07 20:34:03 +00:00
Adam Magness 003eee5912 Standards 
fix indentation level, replace x() with !empty()
 2018-11-07 14:16:59 -05:00
Adam Magness 7cb9138201 Move another function 
move get_plink to Item class, and also fix up getApp since we extend BaseObject
 2018-11-07 07:19:39 -05:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Adam Magness d50a1edef4 Split text to Item 
move functions from text.php to Item class
 2018-11-06 21:12:41 -05:00
Hypolite Petovan dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n 
Split functions to L10n
 2018-11-06 13:44:30 -05:00
Hypolite Petovan dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm 0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness 301cdd23dc coding standards 2018-11-06 10:28:18 -05:00
Adam Magness dfd48596d3 Add use statement 
add use for core class
 2018-11-06 09:55:14 -05:00
Adam Magness 352da9bcf3 Update function calls 
update function calls for moved functions
 2018-11-06 09:52:58 -05:00
Adam Magness 1d571a527b Split text.php to L10n 
move functions from text.php to L10n class
 2018-11-06 09:52:58 -05:00
Michael ffb03517b6 Fixes PR 6085 2018-11-06 14:00:31 +00:00
Adam Magness 4f07ebb52f Rename properly 
rename function properly this time!
 2018-11-06 06:34:32 -05:00
Adam Magness 3eecd108c5 rename function 
rename function and update calls.
 2018-11-06 06:31:48 -05:00
fabrixxm 1858204cbd
Stop PortableContacts to raise warning on malformed register_policy 2018-11-06 12:10:23 +01:00
Adam Magness 237fc30b4e Missed use 
fix missing use statement
 2018-11-05 21:45:44 -05:00
Adam Magness 591c00dd5c bug fix 
fix variable
 2018-11-05 21:26:58 -05:00
Adam Magness a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Adam Magness e31dde6084 Split text.php to HTML class 
move functions from text.php to src/Content/Text/HTML
 2018-11-05 20:27:22 -05:00
Hypolite Petovan e8891e9ba4
Merge pull request #6082 from annando/diasppora-delivery 
Improved delivery
 2018-11-05 16:26:02 -05:00
Michael 3b565e80b6 Improved logger text 2018-11-05 20:35:17 +00:00
Philipp Holzer 049cd963f3
Using random_int directly 2018-11-05 21:15:30 +01:00
Philipp Holzer 6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Michael 59d8cae805 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-05 19:46:59 +00:00
Adam Magness 186cd1d415 Revert "Move methods to new Util/Strings class" 
This reverts commit 97fcf23371.
 2018-11-05 13:07:15 -05:00
Adam Magness 9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Adam Magness 748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00
Adam Magness 97fcf23371 Move methods to new Util/Strings class 
move string methods from xml to strings class.
 2018-11-05 07:31:45 -05:00
Adam Magness b07d47b0f7 Update function calls 
update function calls to new names
 2018-11-05 07:24:14 -05:00
Adam Magness 6cc339031a Rename functions 
rename functions
 2018-11-05 07:24:14 -05:00
Adam Magness ae4aab872f forgotten self 
forgotten self references
 2018-11-05 07:24:14 -05:00
Adam Magness 61bc9facc8 Implement functions 
implement functions relocated to xml class
 2018-11-05 07:24:14 -05:00
Adam Magness 84e900d96f Move to XML 
move functions from text to xml
 2018-11-05 07:24:14 -05:00
Michael dc4a2aeab8 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 23:19:34 +00:00
Michael ef205878b6 Cleaned up the notifier 2018-11-04 23:17:41 +00:00
Michael bd97215147 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 18:54:49 +00:00
Michael e759497af3 Fix small typo / Workerqueue count now only counts non deferred entries 2018-11-04 10:51:01 +00:00
Michael ec3cec37eb Fixes #6071: We should use the correct variable ... 2018-11-04 09:18:36 +00:00
Michael 8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Michael 1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Michael 1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Philipp Holzer 83ead5ec48
Test enhancements 2018-11-01 13:44:47 +01:00
Tobias Diekershoff e12942ce7f
Merge pull request #6058 from JonnyTischbein/issue_contact_batch_archive 
[frio] Fix unarchive contact batch action
 2018-11-01 06:41:05 +01:00
Jonny Tischbein 76c9d37006 Fix not working unarchive contact batch action 2018-10-31 21:20:44 +01:00
vinzv fc2b81d0dd
Update Install.php 
Please update messages.po at Transifex as well.
 2018-10-31 21:03:32 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Hypolite Petovan 8a46c786f3
Merge pull request #6053 from zeroadam/CoreRenderer 
Core Renderer Class
 2018-10-31 13:57:12 -04:00
Adam Magness 70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00
Philipp Holzer 2a0a7cd42a
Add missing Logger::log() 2018-10-31 17:52:41 +01:00
Adam Magness 3f74ba88c2 Move delimiter props and functions 
move left and right delimiter functions and properties to Render class.
 2018-10-31 12:12:15 -04:00
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Philipp Holzer bf878d2ebb
Adding more Logger entries in case of update process 2018-10-31 15:22:44 +01:00
Adam Magness f6c86649c2 Create Core\Renderer Class 
create new class and redirect old functions
 2018-10-31 10:03:42 -04:00
Philipp Holzer 3f813d853b
introducing Logger::log 2018-10-31 14:48:19 +01:00
Philipp Holzer e5530dfa63
refactoring query 2018-10-31 14:44:43 +01:00
Philipp Holzer 9690dfc54e
Renamed Cache flag 2018-10-31 14:44:42 +01:00
Philipp Holzer 270e817954
Adding force to update routine 
- Introduced Cache::NEVER Lock (never expiring lock)
- Force flag for dbstructure update
- Moving the business logic to central place in Update class
 2018-10-31 14:44:40 +01:00
Philipp Holzer f08f063a38
Replaced check_db in App 2018-10-31 14:44:24 +01:00
Philipp Holzer ffbad2dc81
moved check_db($via_worker) to Update::check($via_worker) 2018-10-31 14:44:23 +01:00
Philipp Holzer 87f3fe24f7
Moving UPDATE defines/constants out of boot 2018-10-31 14:44:23 +01:00
Philipp Holzer 4ae985e5ed
Setting update version & time on success 2018-10-31 14:44:23 +01:00
Philipp Holzer 26aee23254
Replacing dbupdate_ in admin.php and removing it from Worker\DBUpdate 2018-10-31 14:44:22 +01:00
Philipp Holzer f2ca3e5be4
Using Locks for Updating and writing last success to config 2018-10-31 14:44:22 +01:00
Philipp Holzer e876adef8f
Moved the functions update_db and run_update_function to a Friendica\Core\Update class 2018-10-31 14:44:21 +01:00
Adam Magness 02be1d316d Documentation 
add proper documentation.
 2018-10-31 07:32:22 -04:00
Adam Magness d9b558a8ed Update function calls 
update function calls to new class.
 2018-10-30 14:51:45 -04:00
Adam Magness 3a604029eb Create FileTag class 
create class and move functions
 2018-10-30 14:51:21 -04:00
Michael f7f96e971a Avoid duplicated delivery to Diaspora 2018-10-30 17:34:18 +00:00
Adam Magness c3ee9afa59 Bug fix 
update Logger::DEBUG to Core\Logger::
 2018-10-30 11:43:27 -04:00
Adam Magness 17ae53c9d7 Review Updates 
create array, remove getConstants function, add self references.
 2018-10-30 11:40:11 -04:00
Adam Magness 342e484533 Missing BaseObject 
add use BaseObject
 2018-10-30 10:02:52 -04:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 91ef9f238c missing use and self 
add use and self statements
 2018-10-30 09:57:14 -04:00
Adam Magness 26fbe8dfba Review Modifications 
make changes based on review.
 2018-10-30 09:57:14 -04:00
Adam Magness 7138cc97ac Correct misspelling 
correct misspelled use statement
 2018-10-30 09:57:14 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
Adam Magness d6d593d724 Create Logger class 
Create Core\Logger class and point old functions to the new ones.
 2018-10-30 09:57:14 -04:00
Hypolite Petovan f7147fae96
Merge pull request #6041 from nupplaphil/install_to_module 
Install to Module
 2018-10-30 08:17:26 -04:00
Philipp Holzer e586e49c82
Bugfixing missing 'REQUEST_URI' for relative path installation 2018-10-30 12:58:15 +01:00
Philipp Holzer cf39c9df81
Bugfixings 
- moved testargs.php to util directory
- Switch Environment check before config at automatic install
- checkPHP() is now finding the PHP binary too
- Bugfixing checkPHP() & required returned wrong status
- removing not used $_POST['phpath'] in web installer
 2018-10-30 11:30:19 +01:00
Michael 84be62982a Diaspora signature transport via AP/DFRN should be repaired now 2018-10-29 21:15:37 +00:00
Philipp Holzer f0382ab919
Refactoring Installation 
- centralized installation
- renamed Core\Install to Core\Installer
- avoid using $a->data[] for states
- removed unnecessary code
 2018-10-29 18:44:39 +01:00
Philipp Holzer 64149c41b4
Replacing error message 2018-10-29 14:40:50 +01:00
Philipp Holzer cfae736660
Code Standards 2018-10-29 14:39:09 +01:00
Philipp Holzer abb50fbf62
Install to Module 
- Move Install to Module
- Some Bugfixings
 2018-10-29 14:10:45 +01:00
Michael 4831688dc0 Diaspora signatures are now stored and transmitted correctly 2018-10-27 14:35:22 +00:00
Michael 73f596cc46 Fixes duplicated transmissions and not working undo of like/dislike 2018-10-27 11:09:23 +00:00
Michael f2ddcbe632 AP: Event participation and editing of posts are now supported 2018-10-27 06:17:17 +00:00
Hypolite Petovan 4bcd2d7708 Declare missing $lang for default template in App->runFrontend 2018-10-26 08:13:31 -04:00
Hypolite Petovan 86df648107
Merge pull request #6026 from annando/ap-event 
AP: We now transmit and process events
 2018-10-26 00:33:48 -04:00
Hypolite Petovan f174bc1bc2
Merge pull request #6028 from annando/issue-5913 
Issue 5913: Fix fatal error in "RemoveUser"
 2018-10-26 00:32:16 -04:00
Michael 348e0300a6 Issue 5913: Fix fatal error in "RemoveUser" 2018-10-26 04:27:23 +00:00
Michael cbc417114d AP: We now transmit and process events 2018-10-26 04:13:26 +00:00
Jonny Tischbein e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein 26ed71cc14 Only perform Term::deleteAllTags when needed + not needed redirect 2018-10-25 21:47:10 +02:00
Jonny Tischbein 272eb5eb82 fix doxygen header + indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Hypolite Petovan 7c0b591043 Move itemCount parameter from constructor to renderFull() 
- Remove Pager->itemCount property and Pager->setItemCount() method
- Update usage
 2018-10-25 00:07:16 -04:00
Hypolite Petovan 14237a9599 Move $pager and $page_offset out of App 
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
 2018-10-25 00:07:15 -04:00
Hypolite Petovan a976a4cb68 Add new Hook::add method to enable module hooks 2018-10-25 00:07:15 -04:00
Hypolite Petovan f1ebaf5e7d Add new Content\Pager class 2018-10-25 00:07:15 -04:00
Michael Vogel 920ffab439
Merge pull request #6024 from MrPetovan/bug/fix-disabling-addons 
Fix unsetting non-existent index in Addon::$addons on uninstall
 2018-10-25 05:28:47 +02:00
Hypolite Petovan c60a65c423 Fix unsetting non-existent index in Addon::$addons on uninstall 2018-10-24 20:44:05 -04:00
Michael 7f11b2e4e9 Deactivated BCC 2018-10-24 21:04:21 +00:00
Michael f300c8953a We now use bcc for the acl block 2018-10-24 20:06:57 +00:00
Michael 0a790227b6 Merge remote-tracking branch 'upstream/develop' into ap-delivery 2018-10-24 19:22:07 +00:00
Michael 58f82e084d Preparations to work with BCC 2018-10-24 19:19:51 +00:00
Philipp Holzer 072eeb8bec
making english sentences 2018-10-24 20:52:38 +02:00
Philipp Holzer 99a33b7335
Code standards 2018-10-24 20:44:19 +02:00
Philipp Holzer 310d49b82a
removed use Friendica\Core\System again 2018-10-24 20:24:22 +02:00
Philipp Holzer 48535c0959
Bugfixing redirects 
- Adding App->redirect if both redirects are possible
 2018-10-24 20:18:46 +02:00
Hypolite Petovan 9c9ebfc7c9
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt 
[frio] Add media / link prompt in comments
 2018-10-24 12:17:58 -04:00
Jonny Tischbein d2b5f77be9 Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards 2018-10-24 16:20:10 +02:00
Michael c25d60e107 Removed finished work from the comments 2018-10-24 04:51:37 +00:00
Michael a6f6db8d4e Improve query speed 2018-10-24 04:50:27 +00:00
Michael c0a24d80dd Remove items more memory friendly 2018-10-24 04:46:45 +00:00
Michael 95dc030926 Show deferred worker tasks in the admin interface and workerqueue logs 2018-10-23 20:38:28 +00:00
Jonny Tischbein d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
fabrixxm 035603a516 Replace Frienica\Core\Addon::isApp() withi Friendica\Core\Hook::isAddonApp() 
fix #6010
 2018-10-23 17:27:53 +02:00
vinzv cb75c40f4e adapted profile pic resize to 300px for whole system 2018-10-23 16:36:57 +02:00
Michael Vogel d61a98a995
Merge pull request #6008 from nupplaphil/fixing_tests_2 
Fixing tests - part 2
 2018-10-23 14:23:59 +02:00
Philipp Holzer a79daf3946
Fixing tests - part 2 2018-10-23 13:53:48 +02:00
Philipp Holzer 3e6ea9383b
Making redirect message more informative 2018-10-23 12:17:41 +02:00
Tobias Diekershoff dbe49a0c1a
Merge pull request #5998 from annando/ap-queue 
Unsuccessful ActivitiyPub transmission are now deferred
 2018-10-23 06:54:11 +02:00
Michael e3e714a45f Unsuccessful ActivitiyPub transmission are now deferred 2018-10-23 03:54:18 +00:00
Hypolite Petovan dc35d2f2f3
Merge pull request #5997 from annando/notice-relocation 
Fix a notice when sending relocation messages
 2018-10-22 22:40:47 -04:00
Michael 3dc0bb5c4b Fix a notice when sending relocation messages 2018-10-23 02:24:24 +00:00
Hypolite Petovan b6a0b686c4
Fix missing instance of Addon::isEnabled in App 2018-10-22 21:09:53 -04:00
Hypolite Petovan 373df31817
Fix wrong namespace for Core\System in App 2018-10-22 18:07:00 -04:00
Hypolite Petovan f6e064195a
Fix Fatal Error in App 2018-10-22 18:01:17 -04:00
Hypolite Petovan a22196edae Add/Fix Doxygen headers for classes 2018-10-22 16:50:55 -04:00
Hypolite Petovan 9eaedc576c Remove unused dbstructure hook call in App->loadDatabase 2018-10-22 16:50:55 -04:00
Hypolite Petovan 2debdbd0c9 Fix dbstructure console outputting addon structure as well 2018-10-22 16:50:55 -04:00
Hypolite Petovan 015e2a84b1 Remove obsolete require_once include/dba from Core\Addon and Core\Hook 2018-10-22 16:50:55 -04:00
Hypolite Petovan 19ffc0510b Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan fad99b8619 Switch from dbstructure.json to dbstructure.php 2018-10-22 16:50:55 -04:00
Hypolite Petovan e511790d62 Move NULL_DATE from boot.php to DBA::NULL_DATETIME 
- Add DBA::NULL_DATE constant
 2018-10-22 16:50:55 -04:00
Hypolite Petovan ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
Hypolite Petovan 0aa7671119 Add new Core\Hook class 2018-10-22 16:49:53 -04:00
Michael Vogel c0abff0bda
Merge pull request #5990 from MrPetovan/task/move-apps-out-of-app 
Road to Router Part 4: Move $apps out of App
 2018-10-22 22:47:22 +02:00
Philipp Holzer 3072c56057
goaway fix in App 2018-10-22 22:15:50 +02:00
Philipp Holzer 32af52842b
adding defaults in mod/redir.php 2018-10-22 22:13:41 +02:00
Philipp Holzer 363d00cc45
Adding $a->getBaseURL for Worker in profile_photo 
Adding a TODO for Contact::magicLink
 2018-10-22 22:13:39 +02:00
Philipp Holzer 34989480e1
removed unnecessary System use 2018-10-22 22:13:39 +02:00
Philipp Holzer 3edad1591e
replaced $return_url to $return_path to make it more clear that it is a relative path to the Friendica baseurl 2018-10-22 22:13:37 +02:00
Philipp Holzer a9510ffcdf
description fix 2018-10-22 22:13:37 +02:00
Philipp Holzer d00ddc01af
Split goaway to System::externalRedirectTo() and App->internalRedirect() 2018-10-22 22:13:35 +02:00
Philipp Holzer 2ef81108b3
Renamed System::redirect() to $a->redirect() 2018-10-22 22:13:22 +02:00
Benjamin Lorteau 339a5da946 Move $apps out of App 
- Move $nav_sel out of App
- Add new Content\Nav::getAppMenu() method
 2018-10-22 16:02:15 -04:00
Hypolite Petovan e3fe25383c Add static keyword for Core\L10n properties 2018-10-22 15:58:42 -04:00
Hypolite Petovan c6f0bea51d Move $strings from App to Core\L10n 
- Add L10n::init() call in App constructor
- Improve pushLang/popLang
- Remove no longer needed references to App
 2018-10-22 15:58:42 -04:00
Michael Vogel baa1094489
Merge pull request #5987 from MrPetovan/task/empty-index-php 
Road to Router Part 2: Empty index.php
 2018-10-22 21:56:13 +02:00
Benjamin Lorteau 37f00b5fd1 Use System::httpExit for 403 error in App 2018-10-22 15:16:59 -04:00
Hypolite Petovan a0bd96d587 Remove unwarranted doxygen comments in App 2018-10-22 08:17:55 -04:00
Michael 5c13ecdf6e Improved parsing of AP profiles 2018-10-22 07:24:47 +00:00
Hypolite Petovan e2c5a423c5 Improve App->runFrontend formatting 
- Use single-quotes instead of double
- Use strpos() instead of substr()
- Add/remove comments
- Use Config::get default value and drop the exact match for config.private_addons
 2018-10-22 00:07:56 -04:00
Hypolite Petovan 279196959c Move index.php content to App->runFrontend 
- Replace all x() by !empty() in App
- Replace all killme() with exit()
 2018-10-21 22:24:47 -04:00
rabuzarus 72a7671010
Merge pull request #5986 from annando/improve-5984 
Improve PR 5984: better check for remote users as well
 2018-10-22 00:03:19 +02:00
Michael 8e11f055b1 Improve PR 5984: better check for remote users as well 2018-10-21 21:56:46 +00:00
Michael Vogel 277fe547a1
Merge pull request #5978 from MrPetovan/task/make-username-length-configurable 
Make username length configurable
 2018-10-21 23:42:44 +02:00
Hypolite Petovan 4ec56a0975 Sets maximum to 64 for username_min/max_length config keys 2018-10-21 17:28:40 -04:00
Hypolite Petovan 1176a4240a
Merge pull request #5985 from annando/ap-followers 
AP: We now send the previous followers collection as well
 2018-10-21 17:05:34 -04:00
Michael bb3f07b0b7 We now send the previous followers collection as well 2018-10-21 20:49:50 +00:00
Michael 9b387a226c Fix webmentions and microformats ("redir" only for logged in users) 2018-10-21 20:23:08 +00:00
Hypolite Petovan c1bca43fee Changing default/max values for username_min/max_length 
- Restoring legacy default values (3 and 48 respectively)
- Lowering the max value to 150 to take the full profile URL length into
account
 2018-10-21 15:10:51 -04:00
Hypolite Petovan b08408c086 Add safeguard for username_min|max_length mutual exclusion 2018-10-21 08:28:24 -04:00
Michael Vogel f14dae8d77
Merge pull request #5979 from MrPetovan/task/mock-legacy-module 
Encapsulate legacy module functions in a BaseModule-inherited class
 2018-10-21 10:02:44 +02:00
Michael Vogel 614a549d28
Merge pull request #5976 from MrPetovan/bug/5975-add-missing-l10n-poplang 
Add missing L10n::popLang calls
 2018-10-21 09:40:49 +02:00
Hypolite Petovan b6075de6f8
Merge pull request #5982 from annando/ap-inboxes 
Bugfix: We hadn't deliverd AP posts to all intended receivers
 2018-10-21 02:57:22 -04:00
Michael 1c54c27784 Bugfix: We hadn't deliverd AP posts to all intended receivers 2018-10-21 06:10:24 +00:00
Michael c4cc7a4afb The limit for dbclean is now configurable 2018-10-21 05:41:40 +00:00
Hypolite Petovan 1a37224910 Change file_exists to is_readable in LegacyModule 2018-10-20 22:42:04 -04:00
Hypolite Petovan 5326cc0c2e Add Friendica\LegacyModule class 2018-10-20 22:34:26 -04:00
Hypolite Petovan d360bf926a Use username_min/max_length config keys in Model\User::create 2018-10-20 16:33:54 -04:00
Philipp Holzer 4392858662
Move Global Functions - Part 3 
- Replaced every CACHE definition
- Moved check_url to App->checkURL()
- Removed unused definition "ZCURL_TIMEOUT"
 2018-10-20 18:19:55 +02:00
Hypolite Petovan 4ffcb77554 Simplify L10n::t + sprintf instances 2018-10-20 09:02:35 -04:00
Hypolite Petovan a8d3a4d218 Add missing L10n::popLang calls 2018-10-20 09:02:10 -04:00
Michael fea48fa85e AP: Transmitting and receiving with non AP contacts 2018-10-20 07:53:45 +00:00
Hypolite Petovan a2666b0d02
Remove reference to deleted include/security.php 2018-10-19 15:11:51 -04:00
Benjamin Lorteau d9209b9c7a Use local temporary directory for PasswordExposedChecker cache 2018-10-19 11:26:48 -04:00
Hypolite Petovan f104817967
Merge pull request #5967 from annando/ap-nick 
Fix function naming
 2018-10-19 10:38:51 -04:00
Michael bedab33e0b Fix function naming 2018-10-19 13:08:46 +00:00
Hypolite Petovan ec0d3a6eac
Merge pull request #5946 from JonnyTischbein/move_include_security 
Move and Split include/security
 2018-10-19 08:55:08 -04:00
Jonny Tischbein cafd5ca781 update function names in logger and comments 2018-10-19 10:03:52 +02:00
Michael cdeb4682ef Use nickname based mentions for AP 2018-10-19 05:27:54 +00:00
Michael Vogel 8cecc9fb97
Merge pull request #5962 from friendica/bug/5960-fix-register-email-translation-params 
Remove superfluous L10n::t() parameter in Model\user
 2018-10-19 05:34:24 +02:00
Michael Vogel 45156652cc
Merge pull request #5963 from MrPetovan/bug/5956-catch-more-diaspora-magic-links 
Diaspora: Widen the magic link regular expression
 2018-10-19 05:30:52 +02:00
Hypolite Petovan d0681075bf Add itemsource module 2018-10-18 22:49:25 -04:00
Hypolite Petovan eb714f0487 Diaspora: Widen the magic link regular expression 2018-10-18 22:39:06 -04:00
Hypolite Petovan 8315940c39
Merge pull request #5961 from annando/simpler-item 
The handling with item-content and item-activity had been simplified
 2018-10-18 18:24:09 -04:00
Hypolite Petovan 18763e32af
Remove superfluous L10n::t() parameter in Model\user 2018-10-18 18:22:48 -04:00
Michael 0628b44f8e The handling with item-content and item-activity had been simplified 2018-10-18 21:35:48 +00:00
Hypolite Petovan ee32cf6b92
Restore preshare prepending in BBCode::convertShare 
Fixes #5955
Follow-up to #5942
 2018-10-18 11:23:48 -04:00
Michael 688174e6c0 AP: Fix "null" receiver 2018-10-18 12:25:57 +00:00
Michael 8035bad8e2 AP: Fix a notice / avoid an error when fetched content hadn't been an array 2018-10-18 05:54:44 +00:00
Hypolite Petovan da2a17495d
Merge pull request #5951 from annando/endless-contact 
Avoid endless loop when trying to fetch contact id
 2018-10-18 00:44:07 -04:00
Hypolite Petovan 6d420dfe9e
Merge pull request #5950 from annando/no-polling 
For test purposes we can now deactivate polling
 2018-10-18 00:43:35 -04:00
Michael 92816dc725 Improved loop detection 2018-10-18 03:33:08 +00:00
Michael 35da40c2cb Avoid endless loop when trying to fetch contact id 2018-10-18 03:01:34 +00:00
Michael d307aa1484 For test purposes we can now deactivate polling 2018-10-18 02:46:02 +00:00
Jonny Tischbein a937cf06a3 add remaning/moving to files not touch by refactoring because of typo 2018-10-17 22:35:49 +02:00
Michael Vogel a19f8d642d
Merge pull request #5942 from MrPetovan/feature/3218-add-convert-share-callback 
Add BBCode::convertShare callback parameter
 2018-10-17 22:01:02 +02:00
Jonny Tischbein f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments 2018-10-17 21:30:41 +02:00
Michael Vogel 389685e099
Merge pull request #5920 from MrPetovan/bug/remove-password-from-register 
Avoid storing plaintext password in register table
 2018-10-17 21:04:11 +02:00
Hypolite Petovan e254ace9d5
Merge pull request #5947 from annando/uri-id 
Use "uri-id" for item relations
 2018-10-17 14:45:40 -04:00
Michael 62ad755980 Use "uri-id" for item relations 2018-10-17 18:34:24 +00:00
Jonny Tischbein ce2b1f5715 Rename function Authentication::authenticate_success to Authentication::success 2018-10-17 18:45:32 +02:00
Jonny Tischbein 45e5a7f59f remove unsed require_onces of security.php 2018-10-17 18:39:27 +02:00
Hypolite Petovan 057385a4ec Add $is_quote_share parameter to convert share callback 
- Restore former behavior when content is present before [share] block
 2018-10-17 08:20:56 -04:00
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Hypolite Petovan 9239ecc5e0 Rework BBCode::convertShare to accept a callback function 
- Create default convertShare callback from previous code
- Remove $simplehtml = 8 case (moved to Twitter addon)
 2018-10-17 01:13:18 -04:00
Hypolite Petovan b5fb81f535 Add Mastodon/Pleroma protocol guessing 2018-10-17 01:10:07 -04:00
Hypolite Petovan c50be325bd Remove unused parameter $selected in Model\Item::fieldlist 2018-10-16 18:30:24 -04:00
Hypolite Petovan 341b83d1df Fix Undefined index: photo in ActivityPub/Receiver 2018-10-16 18:29:28 -04:00
Hypolite Petovan cb854b8b10 Fix Undefined index: timezone in Protocol\Diaspora 2018-10-16 18:29:08 -04:00
Hypolite Petovan 2b1d15de87 Fix undefined index: id in Protocol\Diaspora 2018-10-16 18:28:27 -04:00
Hypolite Petovan c4318fe05e Fix notices in Parse URL feature 2018-10-16 18:27:13 -04:00
Hypolite Petovan e9c9eb9c66 Fix notice in Worker\Delivery 2018-10-16 18:26:43 -04:00
Hypolite Petovan ff643c4b6a
Merge pull request #5940 from JonnyTischbein/issue_update_display_network 
Fix redirect after edit post to /update_*
 2018-10-16 13:37:19 -04:00
Jonny Tischbein be2e6c3929 Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774) 2018-10-16 19:14:55 +02:00
Hypolite Petovan 93c6dddc0d
Merge pull request #5939 from annando/onepoll 
Onepoll hadn't polled anymore / small relocation in zrlinit for better logging
 2018-10-16 11:27:48 -04:00
Michael 35a73b729f Onepoll hadn't polled anymore / small relocation in zrlinit for better logging 2018-10-16 13:17:01 +00:00
Tobias Diekershoff dbd2aa1196
Merge pull request #5938 from annando/magic-loop 
Avoid endless loop at magic auth
 2018-10-16 09:17:17 +02:00
Michael 012fe3c11e Avoid endless loop at magic auth 2018-10-16 06:32:12 +00:00
Hypolite Petovan 481b0ac138 Fix notices in include/enotify 2018-10-15 23:13:00 -04:00
Hypolite Petovan 0de1351a09 Fix notices in Network\Probe 2018-10-15 23:12:29 -04:00
Michael 8d0f4710a4 Signed Diaspora posts should now be stored more reliable 2018-10-15 21:42:55 +00:00
Benjamin Lorteau 9e1065ff87 Improve transition from previous behavior 
- Simplify Model\User methods parameter list
- Use DBA methods in mod/regmod
- Replace killme with exit in mod/regmod
- Simplify goaway() calls
 2018-10-15 11:58:52 -04:00
Tobias Diekershoff 664afbcafb
Merge pull request #5926 from annando/defer-worker 
Poddibility to defer worker execution
 2018-10-15 08:02:51 +02:00
Michael e2762e032c Poddibility to defer worker execution 2018-10-15 05:19:35 +00:00
Michael Vogel 0080d117ee
Merge pull request #5923 from MrPetovan/task/improve-contact-module 
Improve Contact module
 2018-10-15 06:02:55 +02:00
Hypolite Petovan aa8039373a Update formatting of Module\Contact 
- Replace double quotes with single
- Align array declarations
- Replace q() call with Model\User::getOwnerDataById()
 2018-10-14 18:30:02 -04:00
Hypolite Petovan a883a99fe6 Replace string fields by array in Module\Contact 2018-10-14 18:27:24 -04:00
Hypolite Petovan 12ddb3bb54 Replace unwarranted uses of $a->data['contact'] 2018-10-14 18:25:44 -04:00
Hypolite Petovan 57e8fb5cb1 Normalize uses of defaults() in Module\Contact 
- Remove uses without default value
- Add relevant uses
 2018-10-14 18:24:02 -04:00
Hypolite Petovan 756a4f1111 Fix remaining instances of "contacts" 2018-10-14 18:02:54 -04:00
Jonny Tischbein 3a95644848 Add Support for relativeDateTime in future + update Admin user waiting for deleting table header 2018-10-14 22:57:44 +02:00
Hypolite Petovan 74c5f1f684
Merge pull request #5891 from JonnyTischbein/move_module_contacts 
Move module contacts
 2018-10-14 16:42:50 -04:00
Jonny Tischbein e41c59b193 Fix batch action choice - All Actions for one contact were taken before 2018-10-14 21:38:38 +02:00
Jonny Tischbein d54e56c659 Fix batch action query + Fix Namespace import 2018-10-14 21:14:32 +02:00
Hypolite Petovan ce74a4d9a1
Merge pull request #5921 from annando/ap-video 
ActivityPub: Rudimentary support for videos
 2018-10-14 14:05:51 -04:00
Jonny Tischbein 5fd4402074 code standards + fixing navigation links to /contact/... 2018-10-14 20:03:22 +02:00
Michael Vogel 68af56a10e
Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense 
Fix [code] tag whitespace nonsense
 2018-10-14 20:00:19 +02:00
Michael 37ad4a7d22 ActivityPub: Rudimentary support for videos 2018-10-14 17:57:44 +00:00
Hypolite Petovan 540adaf829 Use Model\Register methods in modules 
- Update registration emails to avoid storing the plaintext password in
the register table
- Remove redundant sprintf() when used with L10n::t()
- Remove redundant Systen::baseUrl() with goaway()
 2018-10-14 12:26:18 -04:00
Hypolite Petovan 59d6dd809d
Merge pull request #5906 from annando/ap-switch 
OStatus contacts are now automatically converted to AP
 2018-10-14 12:04:52 -04:00
Hypolite Petovan 123992384b Create Model\Register 
- Add Model\User::exists method
 2018-10-14 11:34:34 -04:00
Hypolite Petovan 7f143c3159 Fix various spelling mistakes 2018-10-14 11:32:54 -04:00
Hypolite Petovan a769efae38 Remove whitespace clearing around code tags 
- Normalize inline code blocks to <code>
 2018-10-14 07:43:44 -04:00
Hypolite Petovan 6606c9cbb2
Merge pull request #5910 from nupplaphil/acctlink_followup 
FollowUp Acctlink move
 2018-10-14 06:27:02 -04:00
Hypolite Petovan 6c80601a4a
Merge pull request #5902 from nupplaphil/Install_Class_to_methods 
Install class bugfixing & tests & changed method signature
 2018-10-14 06:23:33 -04:00
Philipp Holzer 248c1b8074
Type hinting & call bugfixing 2018-10-14 10:37:19 +02:00
Philipp Holzer 753f61f633
FollowUp Acctlink move 2018-10-14 10:31:11 +02:00
Michael 6be04a73e3 The outbox is now more complete / No more duplicates in the receiver array 2018-10-14 07:47:04 +00:00
Hypolite Petovan db0b848ae3
Merge pull request #5904 from annando/ap-announce 
AP: Announce will now work
 2018-10-13 20:17:14 -04:00
Hypolite Petovan 07da170bcf
Merge pull request #5905 from nupplaphil/move_global_functions 
Move global functions
 2018-10-13 19:46:57 -04:00
Michael e829e074fc Location, coord and app are now processed as well 2018-10-13 21:37:39 +00:00
Michael aab4fa0c31 The instrument is now added, updating AP contacts is now enabled 2018-10-13 20:36:44 +00:00
Michael f60468677e We now transmit location and application as well. 2018-10-13 19:49:20 +00:00
Michael 8b9aa80aad "to" is now used for mentions, "cc" for everything else 2018-10-13 18:59:39 +00:00
Michael efad4936b0 OStatus contacts are now automatically converted to AP 2018-10-13 18:13:01 +00:00
Philipp Holzer 4f7cb049fb
isAjax bugfix 2018-10-13 19:10:46 +02:00
Michael Vogel 514ec1be6d
Merge pull request #5903 from nupplaphil/move_module_acctlink 
Move module AcctLink
 2018-10-13 19:09:59 +02:00
Philipp Holzer 3f729df258
Renamed AcctLink to Acctlink 2018-10-13 19:03:38 +02:00
Philipp Holzer 2c541afd47
Moved functions out of boot.php into class 
- z_root() => $a->getBaseURL()
- absurl() => removed because no usage
- is_ajax() => $a->isAjax()
- current_load() => System::currentLoad()
- argc() => $a->argc
- argv($x) => $a->getArgumentValue($x)
 2018-10-13 19:03:08 +02:00
Michael 3c48a1f787 AP: Announce will now work 2018-10-13 16:41:29 +00:00
Philipp Holzer 508032cf9a
Move Module AcctLink 2018-10-13 18:32:14 +02:00
Philipp Holzer c32ac7f194
Install Class to methods 
- Bugfixing Install checks (worked not as expected)
- Changed static methods from Install to class functions
- Added tests
 2018-10-13 18:09:53 +02:00
Michael d23386f9b2 Catching error when compacting doesn't work 2018-10-13 13:17:10 +00:00
Jonny Tischbein bfa05156ca change links from /contacts to /contact 2018-10-13 13:29:56 +02:00
Jonny Tischbein 738cb4ace6 finish refactoring to Module\Contact 2018-10-13 11:35:51 +02:00
Jonny Tischbein cdbddd0103 Renaming functions and class 2018-10-13 11:23:52 +02:00
Michael 4d4dd1a99c Some beautification 2018-10-12 20:52:22 +00:00
Michael 5af0ee1b95 We can now store it without any problem 2018-10-12 18:53:13 +00:00
Michael 914b3a9e3e Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature 2018-10-12 18:52:22 +00:00
Michael 1b18be6715 The virtuel fields for the diaspora signatures have to be removed at any time 2018-10-12 18:47:32 +00:00
Hypolite Petovan 986528b77f
Revert "We now store the diaspora comment data as well" 2018-10-12 10:35:43 -04:00
Jonny Tischbein 93ab82b7f0 Rename Contacts:content function 2018-10-11 23:45:01 +02:00
Jonny Tischbein ba95487abf Upate Contacts module file 2018-10-11 23:41:27 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Hypolite Petovan 735a5980bd
Merge pull request #5889 from annando/ap-store-diaspora 
We now store the diaspora comment data as well
 2018-10-11 16:42:53 -04:00
Hypolite Petovan 90254fd74b
Merge pull request #5888 from nupplaphil/curl_result_tests 
Curl result tests
 2018-10-11 16:42:09 -04:00
Michael 8268288953 We now store the diaspora comment data as well 2018-10-11 20:38:57 +00:00
Hypolite Petovan fc19373ec4
Merge pull request #5887 from annando/ap-store-conversation 
Store conversation data directly from the AP receiver
 2018-10-11 16:32:00 -04:00
Philipp Holzer b099cba4b4
CurlResult Tests & RegEx fix 2018-10-11 22:18:27 +02:00
Michael 1bf7521af8 Store conversation data directly from the AP receiver 2018-10-11 20:08:04 +00:00
Philipp Holzer 00bf0c24b6
CurlResult Tests 2018-10-11 21:19:38 +02:00
Hypolite Petovan ac1ff6c8ce Try additional $_SERVER properties to get relative path of Friendica 2018-10-11 08:54:45 -04:00
Philipp Holzer a95e7f6504
Bugfixing CurlResult 2018-10-11 07:45:04 +02:00
Hypolite Petovan a066befba5
Merge pull request #5878 from nupplaphil/curl_response_refactoring 
Curl response refactoring
 2018-10-10 18:31:49 -04:00
Philipp Holzer 9711581d49
Code standard 2018-10-10 22:51:26 +02:00
Philipp Holzer b2e7ce47b3
Renaming Curl to CurlResult 2018-10-10 22:08:13 +02:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Hypolite Petovan 67afa069ab
Merge pull request #5877 from annando/issue-5859 
Issue 5859: Avoid returning empty arrays
 2018-10-10 15:23:39 -04:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Michael c4da138eee Issue 5859: Avoid returning empty arrays 2018-10-10 19:15:16 +00:00
Philipp Holzer 2dec8895a9
Curl Response Refactoring 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
 2018-10-10 21:08:43 +02:00