Commit Graph

971 Commits

Author SHA1 Message Date
Michael a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
Michael c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
Michael 4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
Michael 02aed490e2 Owner-view added 2020-04-24 11:04:50 +00:00
Michael b50aaf87d7 Some more code standards 2020-04-24 05:39:30 +00:00
Michael bc1efdaf53 Code standards 2020-04-24 05:37:06 +00:00
Michael c3aa2730de Improved definition style 2020-04-23 07:02:18 +00:00
Michael 63ebbb8a16 We now can define views 2020-04-23 06:19:44 +00:00
Hypolite Petovan 43b8bdea07
Merge pull request #8520 from annando/term2tag
We now store tags in "tag"
2020-04-22 22:56:07 -04:00
Michael Vogel ee098277b9
Merge pull request #8530 from MrPetovan/task/8498-move-poke-to-src
Move poke module to src/
2020-04-21 05:56:59 +02:00
Hypolite Petovan 7f04aea8b1 Move poke module to src/
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
2020-04-20 11:47:08 -04:00
Michael 87aebe6af5 Default value 2020-04-19 16:43:37 +00:00
Michael 0f2215bc17 Hybrid mode for non resolvable contacts 2020-04-18 16:00:06 +00:00
Michael 5d34a90d67 Store mentioned contacts in another way 2020-04-18 14:41:26 +00:00
Michael 3ce9386cb1 Improved body scanning, increased length 2020-04-18 10:05:30 +00:00
Michael db657b0149 We now store the tags in two separate tables 2020-04-17 06:35:20 +00:00
Michael 67a67200a7 Storing mentions in Diaspora and AP 2020-04-13 23:54:28 +00:00
Michael 552fd98657 The "sign" table had been removed 2020-04-13 16:27:40 +00:00
Michael 771fe881ef Use 20 maximum feed items as default 2020-03-22 15:22:48 +00:00
Michael 04eef79be0 Merge remote-tracking branch 'upstream/2020.03-rc' into loops 2020-03-22 15:00:14 +00:00
Hypolite Petovan f2638ca65b Remove extraneous relation on item-content.id 2020-03-22 10:28:13 -04:00
Hypolite Petovan f50a39d19d Remove extraneous relation on item-activity.id 2020-03-22 10:04:30 -04:00
Michael bc069c8ebf Prevent endless loops and long running feed processing 2020-03-22 13:05:35 +00:00
Michael 82589a29cd Fix 8401: Don't let dbstructure think that it needs to update the table 2020-03-11 20:49:23 +00:00
Michael c261457b03 Store the interaction date as well. 2020-03-10 22:04:03 +00:00
Michael f27900ad78 Reduce the load of "gfollower" 2020-03-10 21:10:59 +00:00
Michael 37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
Michael d6905e29cf Query the same contact only once a month 2020-03-07 05:31:03 +00:00
Michael 9adf09be51 Don't delete and recreate the rows over and over again 2020-03-06 13:51:36 +00:00
Michael bd77556b49 New table for relations between global contacts - will replace glink in the future 2020-03-06 08:08:49 +00:00
Michael d63e903d9f Changed template for direction 2020-03-03 21:29:51 +00:00
Michael af6db65961 Store the push/pull direction in the conversation table 2020-03-03 08:01:04 +00:00
Michael dc9ea15bb1 Updated field description 2020-03-02 20:48:26 +00:00
Michael ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Hypolite Petovan 1a8110234f Move /settings/display module to src/ 2020-02-20 05:37:06 -05:00
Philipp 09961a07e4
Merge pull request #8297 from MrPetovan/task/8285-api-events
[API] Add new api/friendica/events endpoint
2020-02-16 21:07:44 +01:00
Philipp da124af6ed
Merge pull request #8293 from MrPetovan/task/5562-community-pagination
Improve community pagination
2020-02-16 19:38:49 +01:00
Hypolite Petovan e0d03615bc Add node-wide default items per page config 2020-02-16 13:04:26 -05:00
Hypolite Petovan d3b3f716f8 [API] Add new endpoint api/friendica/events 2020-02-16 12:07:39 -05:00
Michael 3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
Hypolite Petovan 682fb7e4e2 Move community module to src/
- Use boundaries pagination instead of number pages
- Trim down community update module output
- Part of https://github.com/friendica/friendica/issues/4090
2020-02-16 04:41:22 -05:00
Michael Vogel e80d68ba53
Merge pull request #8261 from MrPetovan/task/8251-use-about-for-pdesc
Use profile.about for profile description
2020-02-10 23:36:59 +01:00
Hypolite Petovan 2ec3a97393
Merge pull request #8263 from annando/remote-follow
New page for remote follow requests
2020-02-09 17:53:13 -05:00
Michael 2eebeeaa32 New page for remote follow requests 2020-02-09 17:04:35 +00:00
nupplaPhil 7d714319c8
Add license info at Friendica PHP files 2020-02-09 16:34:23 +01:00
Hypolite Petovan da09215db8 [Database] Version 1333
- Exchange profile.pdesc for profile.about
2020-02-09 02:35:46 -05:00
Hypolite Petovan a3028e69aa
Merge pull request #8211 from nupplaphil/task/mod_crepair
Move mod/crepair to src/Module/Contact/Repair
2020-02-01 08:28:29 -05:00
Hypolite Petovan 96b9619608
Merge pull request #8210 from nupplaphil/task/mod_fsuggest
Move mod/fsuggest to src/Module/SuggestFriend
2020-01-31 18:43:32 -05:00
nupplaPhil 048bb014d8
Move CRepair to Contact Advanced route 2020-02-01 00:37:11 +01:00
nupplaPhil c5653d30f3
add regex for route 2020-02-01 00:22:56 +01:00
nupplaPhil f565d590f6
Move mod/crepair to src/Module/Contact/Repair 2020-02-01 00:20:50 +01:00
Hypolite Petovan dad530802f
Merge pull request #8209 from nupplaphil/task/mod_worker
Move mod/worker to src\Module\Worker
2020-01-31 18:12:36 -05:00
nupplaPhil 34f4aedb87
Move mod/fsuggest to src/Module/SuggestFriends 2020-01-31 23:50:46 +01:00
nupplaPhil 17389de261
Move mod/worker to src\Module\Worker 2020-01-31 22:38:49 +01:00
Hypolite Petovan dd24b3bac0 Move api/profile/show to src/Module
- Update API documentation
- Update BaseApi::format to include headers by format
2020-01-29 23:31:37 -05:00
nupplaPhil c2b8c65104
Merge "notification" routes 2020-01-28 23:21:24 +01:00
nupplaPhil dd8d9d7c70
Fix ignore notification 2020-01-28 22:47:15 +01:00
nupplaPhil 82f8794215
Undo Hotfix: add missing route for ignore/discard 2020-01-28 22:36:44 +01:00
nupplaPhil 288192a7ef
Hotfix: add missing route for ignore/discard 2020-01-28 22:35:00 +01:00
Hypolite Petovan bd910342df Add custom emojis Mastodon API endpoint 2020-01-28 08:14:48 -05:00
nupplaPhil 4260b94fec
Move mod/noscrape to Module\Noscrape 2020-01-26 23:43:47 +01:00
Hypolite Petovan 46c4bfe580 Restore base profile URL behavior
- Add new profile-specific route
2020-01-26 14:21:20 -05:00
Philipp 09de4a5b47
Merge pull request #8156 from MrPetovan/task/7817-custom-fields-part-2
New custom profile fields feature part 2: Feature switcheroo
2020-01-24 20:17:52 +01:00
nupplaPhil 0f932ae723
Notify => Notification
Notifs => Notifications
2020-01-24 18:32:38 +01:00
Hypolite Petovan 2171cc8a32 [Database] Structure version 1332
- Deprecated several fields in profile table
2020-01-22 19:42:36 -05:00
Hypolite Petovan 6857d24995 [Database] Structure version 1331
- Add profile_field table
2020-01-22 19:42:33 -05:00
Hypolite Petovan d1be68b754 Move Module\Profile to Module\Profile\Index
- Move /profiles to Module\Settings\Profile\Index
2020-01-22 19:42:32 -05:00
nupplaPhil e59a9fbef7
Add explicit contact route 2020-01-23 00:31:22 +01:00
nupplaPhil fa6c33d3ac
Move mod/notifications to Module\Notification 2020-01-22 23:18:14 +01:00
Hypolite Petovan 0d1befdf2d Move /profile_photo to Module\Settings\Profile\Photo 2020-01-20 07:27:12 -05:00
nupplaPhil d5a473abda
Shorten "PConfiguration" to "PConfig" again, since the Wrapper is gone 2020-01-19 22:23:44 +01:00
nupplaPhil cb80108957
Shorten "Configuration" to "Config" again, since the Wrapper is gone 2020-01-19 21:29:36 +01:00
nupplaPhil 2838635d64
Move L10n class from L10n subdir to Core (replacing old wrapper) 2020-01-19 16:31:30 +01:00
nupplaPhil bfae6766bf
Implement Hook::callAll('storage_instance') call for addons and add a description for it.
- Remove implicit Dice usage
- Add concrete instance creating
- Adding Hook call for addon instance creating
- Updating doc for Hook
- Updating tests
2020-01-10 13:22:03 +01:00
nupplaPhil d6fab6b06b
making update really work ... 2020-01-10 13:21:59 +01:00
nupplaPhil 08edeae2f9
Make Storage testable & add tests
- Making StorageManager dynamic (DI::facStorage())
- Making concrete Storage dynamic (DI::storage())
- Add tests for Storage backend and failure handling
- Bumping Level-2/Dice to "dev-master" until new release
- Using Storage-Names instead of Storage-Classes in config (includes migration)
2020-01-10 13:21:57 +01:00
Michael bad50d31c0 Added index for performance considerations 2020-01-05 12:48:18 +00:00
Michael 30a4b0eafb Merge remote-tracking branch 'upstream/develop' into item-notification 2020-01-04 22:53:06 +00:00
Michael 4bfd0abec7 New "UserItem" class, new notification type field 2020-01-04 12:21:42 +00:00
Hypolite Petovan 52c5b0e0f3 Remove unused BBCode::scaleExternalImage parameters
- Remove now obsolete system.no_view_full_size config key
2020-01-02 20:44:15 -05:00
Hypolite Petovan 933085c626 Add missing constructor parameter to User\Cookie in dependencies.config 2020-01-01 10:56:56 -05:00
nupplaPhil c1dbb25656
Creating interfaces for Config/PConfig & fix tests 2019-12-29 20:18:19 +01:00
Hypolite Petovan 25847c4c71
Merge pull request #8022 from nupplaphil/task/mod_hcard
Move mod/hcard to src\Module\HoverCard
2019-12-28 21:42:01 -05:00
nupplaPhil 4d545825f0
optimize usage of arguments 2019-12-28 15:28:17 +01:00
nupplaPhil eeb78d2d29
Move mod/hcard to src\Module\HoverCard 2019-12-27 22:53:09 +01:00
nupplaPhil aa5771cf3e
Move Login/Logout/TwoFactor to bundled submodule "Security" 2019-12-27 22:19:28 +01:00
nupplaPhil d30e8665e1
Move mod/openid to src\Module\OpenId 2019-12-27 22:16:40 +01:00
Hypolite Petovan 94954c810b
Merge pull request #7996 from annando/poco-cleanup
The PoCo-Workers had been split
2019-12-24 05:13:36 -05:00
Tobias Diekershoff 00756737b5 Merge branch 'master' 2019.12 into develop 2019-12-23 20:03:47 +01:00
Michael 90408b9d49 Discover directory type 2019-12-21 13:48:20 +00:00
Philipp 5197833c55
Merge pull request #7930 from MrPetovan/task/7887-api-followers-request
Add POST follow request Mastodon API endpoint
2019-12-18 22:12:52 +01:00
Michael 1075bfb189 Issue 7659: Udate the "user-contact" value with the "contact" values 2019-12-17 07:10:55 +00:00
Michael 533f07e874 Issue 6867: Only display direct mentions in the corresponding API endpoint 2019-12-15 13:14:55 +00:00
Hypolite Petovan 6e4a428c73
Merge pull request #7907 from nupplaphil/task/reduce_app_deps
Cleanup Session/Authentication
2019-12-14 09:53:40 -05:00
Hypolite Petovan 2d47952921 Add POST follow request Mastodon API endpoint 2019-12-11 08:25:44 -05:00
Hypolite Petovan 1c69dda2e1
Merge pull request #7926 from annando/api-instance
API: Added endpoints /instance and /instance/peers
2019-12-11 04:07:49 -05:00
Michael 911a854255 APContact: Added follower count, following count and count of posts 2019-12-11 00:05:50 +00:00
Michael 1958bde4c0 API: Added endpoints /instance and /instance/peers 2019-12-10 21:27:09 +00:00
Philipp d0b20fb499
Merge pull request #7904 from MrPetovan/task/7887-api-followers-request
Add GET /api/v1/follow_requests Mastodon API endpoint
2019-12-10 15:53:06 +01:00
Hypolite Petovan 8016cb3cee Add GET /api/v1/follow_requests Mastodon API endpoint 2019-12-09 22:50:36 -05:00
nupplaPhil 555513e4b4
Add Session Management instances (including Depenency Injection)
- Prerequesite for mocking Sessions
- Reduce "App" class complexity
2019-12-10 00:44:56 +01:00
Michael ed2bb21360 Improved description 2019-12-09 22:00:54 +00:00
Michael 2a31b2383f Issue 7691: We can now switch to BCC for ActivityPub 2019-12-09 21:37:31 +00:00
Hypolite Petovan 22e7cab6d4
Restore system.show_unsupported_addons default value
- Wrongly removed in https://github.com/friendica/friendica/pull/7877
2019-11-29 11:44:01 -05:00
Michael 02875df596 Show the received date along with the creation date of posts 2019-11-29 06:24:02 +00:00
Michael 0979daddac Modules separated 2019-11-28 07:07:34 +00:00
Michael 2d3296f697 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-27 22:10:51 +00:00
Michael 890bbfa1a7 We now support nodeinfo version 2 / basic nodeinfo data is always enabled 2019-11-27 07:25:54 +00:00
Michael Vogel 3ed196fd9c Added option for insecure IMAP 2019-11-26 23:27:20 +01:00
Hypolite Petovan f2c31ef1c0
Merge pull request #7828 from nupplaphil/task/move_enotify
Remove unnecessary code in "include/enotify"
2019-11-09 16:48:26 -05:00
Philipp Holzer f9e3ff4b55
Remove unnecessary hash function.
- Was introduced for getting the last inserted ID before "lastInstertID()" was possible
- See b821399f00 (diff-a8e86a3c07531e66a3b0b4c8b4b07879R148)
2019-11-09 21:50:52 +01:00
Hypolite Petovan b8f2252a7f
Merge pull request #7823 from annando/pin
We can now pin posts
2019-11-07 15:10:03 -05:00
Michael ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
Michael cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
Hypolite Petovan 134d6d18f9 Pass Router parameter to module content method 2019-11-06 22:35:28 -05:00
Philipp d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport
added export and import of followed contacts to and from  CSV files
2019-11-03 20:28:08 +01:00
Tobias Diekershoff 9ceda398ae add config variable for max file size of CSV file 2019-11-03 17:25:09 +01:00
Hypolite Petovan ff27f45cb9 Move mod/hovercard to src/Module/Contact/Hovercard
- Rework hovercard.js to remove JS template interpolation
- Remove template/json output from Module/Contact/Hovercard
2019-11-02 12:48:03 -04:00
Hypolite Petovan b543ee8ac7
Merge pull request #7726 from tobiasd/20191010-uexport
move uexport module to src
2019-11-02 07:46:57 -04:00
Tobias Diekershoff 8bea9e7523 mv URL path uexport -> userexport 2019-11-02 12:44:46 +01:00
Tobias Diekershoff 15cdfdd414 mv Uexport to UserExport 2019-11-02 11:36:31 +01:00
Philipp Holzer a94c4fc440
Revert "Add not null/default value for ACL in fields"
This reverts commit 1f535016 due incompatible combination
2019-10-28 21:59:55 +01:00
Philipp Holzer 1f535016d4
Add not null/default value for ACL in fields 2019-10-28 21:47:43 +01:00
Philipp Holzer 488504314a
sort route config 2019-10-24 17:32:03 +02:00
Philipp Holzer 062e472314
Rename route '/ignored/{iid}' to '/item/ignore/{iid}' 2019-10-24 17:18:29 +02:00
Philipp Holzer 5aa73afa7e
Rename module class name 2019-10-24 09:09:47 +02:00
Philipp Holzer 17aca9bee8
move mod/ignored to src/Module/Item/Ignored 2019-10-21 21:19:28 +02:00
Philipp Holzer 7716374593
Move mod/receive to src/Module/Diaspora/receive
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
2019-10-20 13:07:16 +02:00
Philipp fed486bfc5
Merge pull request #7727 from MrPetovan/task/4090-move-manage-to-src
Move mod/manage to src/Module/Delegation
2019-10-13 18:20:47 +02:00
Hypolite Petovan 74bf3a4dc8 Replace path parameter with query string parameter in Module\Search\Saved 2019-10-13 08:39:41 -04:00
Hypolite Petovan 02f02d44dc Move mod/manage to src/Module/Delegation
- Move templates/manage to templates/delegation
- Update navigation links
- Update CSS classes
2019-10-11 19:59:06 -04:00
Tobias Diekershoff 46172b641d moved UExport to src/Module/Settings/Uexport 2019-10-11 07:38:42 +02:00
Tobias Diekershoff 50fa119f79
Merge pull request #7722 from nupplaphil/bug/7718-lang
Fix browser language detection
2019-10-10 16:54:32 +02:00
Philipp Holzer a522cf609b
Fix browser language detection (& tests) 2019-10-10 16:39:04 +02:00
Philipp cf4bae26c7
Merge pull request #7720 from MrPetovan/task/4090-move-delegate-to-src
Move mod/delegate to src/Module/Settings/Delegation
2019-10-10 10:24:15 +02:00
Hypolite Petovan 616edd0600 Move mod/delegate to src/Module/Settings/Delegation
- Move templates/delegate to templates/settings/delegation
2019-10-09 22:17:09 -04:00
Hypolite Petovan 1e737ae888 Move mod/search to src/Module/Search/Index
- Update BaseSeachModule not to depend on a single query string parameter
2019-10-07 14:27:46 -04:00
Hypolite Petovan cdefa7f32a Add new module and widget for managing saved searches 2019-10-07 14:27:46 -04:00
Hypolite Petovan 4e185ebc84 Add missing /babel route methods 2019-10-03 22:41:11 -04:00
Hypolite Petovan 8f20e2054b Move /acl module to src/
- Move Core\ACL::contactAutocomplete to Module\Search\Acl
- Rename module path to /search/acl
2019-10-03 22:40:42 -04:00
Michael 5951a522d1 Fix #7670: Inbox needs to be accessed via POST 2019-10-01 03:28:58 +00:00
Philipp Holzer aad75292f8
Add "/pending" route because of 591ba9c68e 2019-09-29 12:00:03 +02:00
Philipp Holzer 0e5cb88888
Add router config
- Introduce route.config.php structure
- Adding config loader for routes
- Adapt Module class (separation of duties)
- Add tests
2019-09-29 11:57:27 +02:00
Michael 0d32a8674b Update the "unsearchable" field in the "self" contact 2019-09-19 03:54:54 +00:00
Philipp Holzer b13dbb3dcb
Remove $_SERVER['PHP_SELF'] usage 2019-09-17 16:47:00 +02:00
Michael a483ea8acb Increasing database version number 2019-08-21 21:11:37 +00:00
Michael e430b074ce Fix table structure definition 2019-08-21 06:18:32 +00:00
Michael 5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Philipp Holzer 2c73377b39
Create Core\Process as a base for followup work 2019-08-17 09:09:13 +02:00
Philipp Holzer 90b438e082
Move mode settings to App\Mode
- Move isAjax() to App\Mode
- Move isTablet() to App\Mode
- Move isMobile() to App\Mode
- Refactor last usage of App->isBackend()
2019-08-17 09:09:13 +02:00
Hypolite Petovan 7a73445503
Merge pull request #7519 from nupplaphil/task/add_page
Add Page class (Frontend code)
2019-08-16 07:30:06 -04:00
Michael Vogel 6f944f1e53
Merge pull request #7514 from MrPetovan/bug/7507-allow-protocolless
Allow protocol-less links
2019-08-15 22:07:09 +02:00
Philipp Holzer 9f68e6b589
Add Page class for Frontend
- Move frontend logic (stylesheet, footerscript, content) to Page class
2019-08-15 20:52:42 +02:00
Philipp Holzer 08be92a862
Moved BaseURL to App namespace (because similar type as Arguments/Modules/Modes) 2019-08-15 17:23:00 +02:00
Philipp Holzer cba9fa2467
Move isBackend logic to App\Mode 2019-08-15 15:51:15 +02:00
Hypolite Petovan 0f9520f520 Increase specificity of default allowed protocols 2019-08-14 21:42:00 -04:00
Philipp Holzer b1ae58cdc5
fix tests & remove superfluous parameter 2019-08-13 16:29:16 +02:00
Philipp Holzer 0af9747c6c
Add Arguments & Modules class 2019-08-13 16:29:11 +02:00
Hypolite Petovan fcb1a78352
Revert "Introduce Arguments / Module class" 2019-08-11 18:01:11 -04:00
Philipp e9fc2af1c3
Merge pull request #7499 from annando/new_defer
Worker: The retrial value can now skip retrial levels
2019-08-11 23:27:54 +02:00
Michael Vogel e07a17daf6 Added config value 2019-08-11 23:07:06 +02:00
Philipp Holzer 2c5ba7fc15
Introduce Arguments / Module class
- move from App
- add tests for Arguments/Module class
2019-08-11 14:24:05 +02:00
Philipp Holzer 34e4968c06
Adding possibility to use a different cache-backend for locking and caching
- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
2019-08-04 15:42:39 +02:00
Philipp Holzer 86bf2ee45a
Rename *CacheDriver to *Cache because they don't act as driver anymore 2019-08-04 10:26:53 +02:00
Philipp Holzer d56bd28a07
Refactor Cache/Lock to DICE
- Refactor Cache classes
- Refactor Lock classes
- Improved test speed (removed some seperate class annotations)
2019-08-03 20:51:58 +02:00
Philipp Holzer a60eb9e33d
Use DICE for Console
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
2019-07-31 19:37:42 +02:00
Philipp Holzer 54533c57a5
friendica-7426 Database performance isn't measured anymore 2019-07-24 11:17:55 +02:00
Hypolite Petovan d7fdb42488 Database Structure Version 1320
- Add 2fa_app_specific_password
2019-07-22 07:39:28 -04:00
Philipp Holzer 55999730e0
Introduce DICE
- Adding dice library
- Adding dependency config

- Removing Factories
- Refactoring App\Mode constructor
- Refactoring App\Router constructor
- Refactoring BasePath for DI usage
- Refactoring ConfigFileLoader constructor
- Refactoring Profiler constructor

- Adjust entrypoints (index, console, worker, ..)

- Adding functional test for DI
- Fix tests because of refactorings
2019-07-21 01:22:10 +02:00
Michael 41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Philipp Holzer 92fb0a82ca
Dynamic config loading
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
2019-07-16 20:16:43 +02:00