e8a4feb1c6
Change Content-Disposition Header
...
- Make ALLOWED_CONTENT_TYPES public in order to use
- Add $fileName variable which uses "$node->getName()" to get the proper file name and "$file->getMimeType()" along with the ALLOWED_CONTENT_TYPES array in PhotoCache.php to get the proper file extension
- Make "$fileName" the name of the file in the Content-Disposition header when downloading a Contact's photo
- Add filename to the CardDAV integration image export test header
- Change headers in ImageExportPluginTest to reflect changes
Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>
2020-09-05 11:46:25 -07:00
593d64d935
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2
2020-09-04 19:53:02 +02:00
4cf29e598d
Do not keep the part file if the forbidden exception has retry set to false
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-03 11:00:24 +02:00
442af8c5d5
Minor cleanup: php-cs-fixer, tests, interface consistency
...
IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
Minor cleanup: bugs found by Psalm static checker
IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
IMipPlugin: Fixes an undefined variable for events that do not have DTEND. Also use explicit string conversion for parameters and properties in several places.
The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2020-09-02 17:54:36 +02:00
460db942a0
Update apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php
...
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
2020-08-26 12:20:46 +00:00
aadf0f6f87
move calendar settings into their own group
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-25 19:11:28 +02:00
2a054e6c04
Update the license headers for Nextcloud 20
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-08-24 14:54:25 +02:00
b0687b1182
Make icon set for CalDav event presentation, use in iMIP email.
...
iMIP e-mails were, as a hack, using filetypes icons for caldav
elements (titles, locations). This commit creates a folder of
caldav element icons. To start, they are used in iMIP emails,
but eventually should be used by any app that wants to have icon
labels for caldav elements.
Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
2020-08-20 22:16:47 +02:00
781359a582
iMIP email improvements (take 2)
...
This PR is a replacement for PR #17195 . It is intended to be simpler
to review and approve, with fewer changes, some disabled by default.
It addresses issues #12391 and #13555 , with the following changes:
- The plainText of iMIP emails has been upgraded as described in
issue #12391 . The HTML design style has not been changed.
- Some of the HTML and plainText content has been rearranged
(simplified header language, moving the event title to from text
body to the first item in the bullet list, spelling corrections,
moving the description to the end of the list), per issue #12391 .
- The interface for EMailTemplate has been extended: addBodyListItem
now takes an optional `plainIndent` parameter. Existing callers
see no change. Where new calls set the new parameter >0, the list
item label (metaInfo) is put in column 1, and the value is indented
into column 2 (properly accounting for multiple lines, if any).
- An optional dav config setting has been added,
`invitation_list_attendees`. It defaults to 'no', leaving emails
unchanged. If set by the site admin to 'yes', then iMIP emails
include, for the organizer and each attendee, their name, email,
and a ✔︎ if they have accepted the invitation.
- Minor refactoring.
Notes:
- The labels for organizers and attendees list items are new, and
require translation/localization.
- Dav config settings are documented in the code, but not in the
Administrator's Guide.
Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
2020-08-20 22:16:47 +02:00
553cda2a6d
Don't load all calendar objects into memory
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-20 07:56:25 +02:00
4361d65f5f
Merge pull request #22041 from nextcloud/feature/noid/typed_events_dav
...
Add Typed Events for CalDAV- and CardDAV-related Events
2020-08-19 19:34:12 +02:00
fedf9c69d9
Use matching parameter names form interfaces and implementations
...
Found by Psalm 3.14.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-19 18:16:35 +02:00
e6433eeb02
Typecast parameter of getAddressBookById
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-19 15:30:13 +02:00
67f1ef4658
Add Typed Events for CalDAV- and CardDAV-related Events
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-18 21:40:57 +02:00
05df385538
Merge pull request #22236 from nextcloud/bugfix/noid/dav_sharing_backend_canWrite_isOwner
...
CalDAV: Add ability to limit sharing to owner
2020-08-18 16:48:43 +02:00
14755d85d6
Add ability to limit sharing to owner
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-18 13:18:00 +02:00
6f8147b18f
Fix some MissingDocblockType or InvalidDocblock warnings.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-14 15:10:48 +02:00
f1dd87dc50
Merge pull request #22200 from cweiske/duplicated-sql-where-line
...
Remove duplicated SQL addWhere line
2020-08-14 05:43:42 +02:00
6722246aca
Return proper status when file didn't exist before
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-13 15:26:42 +02:00
860f6d8fcf
Delete chunks if the move on an upload failed
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-12 08:18:46 +02:00
ebe7081c2b
Remove duplicated SQL addWhere line
2020-08-11 21:35:48 +02:00
d2c0569b49
Fix search providers order and IDs
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-05 17:57:17 +02:00
55473dd2eb
Merge pull request #22104 from nextcloud/enh/search/make-app-handle-the-order-logic
...
Make apps handle the order logic
2020-08-05 16:38:45 +02:00
ea8f68bea6
Hand in the route and the parameters of the request
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-08-05 12:52:16 +00:00
a4d511d827
Merge pull request #22099 from nextcloud/fix/unified-search
2020-08-05 14:17:42 +02:00
d98f7c1bd8
Make apps handle the order logic
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-05 11:37:45 +02:00
b0c5457c42
IAddressBook: add isShared and isSystemAddressBook
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-05 09:04:41 +02:00
71b62c4203
Show mime icon, bump bundles, make the SearchResultEntry class non-abstract, Fix header search icon, various fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-08-04 21:36:22 +02:00
72b45f9546
Merge pull request #22020 from nextcloud/feature/20918/calendar_search
...
Add Event and Task Backends for Unified Search
2020-08-04 20:54:27 +02:00
7d2f5aff1a
Merge pull request #22062 from nextcloud/fix/noid/displayname-in-incoming-remote-share-notification
...
fix display of remote users in incoming share notifications
2020-08-04 16:26:41 +00:00
900617e7d7
Add Event and Task Backends for Unified Search
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-04 16:01:59 +02:00
5fb2562332
Implement Contacts Backend for Unified Search
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-08-03 16:29:01 +02:00
a0ee4b584c
Short php syntax
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-08-03 11:25:21 +02:00
04521c6afc
coding style fixes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:18:20 +02:00
b79e34c57b
fix check for Cloud ID, missing return statements, wrong param use
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:10:54 +02:00
0763a17332
Move federated_share_added into a typed event
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-23 08:33:17 +02:00
5005510d82
Migrate DAV to the PSR container
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-16 15:44:03 +02:00
68f1283691
Do not log RequestedRangeNotSatisfiable exceptions in DAV
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-07-14 20:46:33 +02:00
aab646a9d0
Update system addressbook card only when there was a change based on a cached etag
...
Due to our old and new hook system the card dav backend listens to old and new hooks. This triggers this code multiple times and always causes an update. With this change we cache the etag during a request and only trigger the update if the etag has changed. This does not catches all not needed updates, but it does not need another round trip to the database and still covers most cases where multiple attributes are updated during one single request.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-09 11:43:58 +02:00
e878c0a054
Merge pull request #21074 from jvsalo/shared-lock-multi-release
...
Fix releasing a shared lock multiple times
2020-07-06 14:06:41 +02:00
db782fefa1
Merge pull request #21222 from nextcloud/bugfix/18965/reduce-contacts-search-load
...
Reduce contacts search load
2020-07-06 13:56:06 +02:00
d78449c01c
Merge pull request #18895 from nextcloud/bugfix/noid/fix_birthday_calendar_color
...
Changes the Birthday calendar color to slightly brighter one
2020-07-06 13:20:55 +02:00
d3d11cb826
Merge pull request #21626 from nextcloud/enhancement/injectible-callables
...
Callable parameter injection
2020-07-05 22:03:12 +02:00
4d8b4ef3cc
Merge pull request #21533 from nextcloud/techdebt/noid/dedicated-method-to-get-a-users-language
...
Techdebt/noid/dedicated method to get a users language
2020-07-04 08:56:13 +02:00
8150bcb60c
Use \OCP\IContainer::injectFn to boot the DAV app
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-03 14:37:53 +02:00
db8267db26
Use the new method everywhere
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-03 10:59:43 +02:00
0157e30ad4
Merge pull request #21599 from nextcloud/debt/noid/type-to-types
...
Replace TYPE with TYPES
2020-07-02 12:21:01 +02:00
87dd760a89
Replace TYPE with TYPES
...
As TYPE::* is deprecated.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-06-30 23:46:22 +02:00
d7c0b9cced
Also always return in app commands
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-26 15:12:11 +02:00
89ed2c37bf
Update share type constant usage
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-24 16:49:16 +02:00
1285be2bd1
Move DAV to the new bootstrap mechanism
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-06-19 15:10:20 +02:00
00e7b2b956
Reduce load of the contacts search when we know it can't match
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-15 08:47:30 +02:00
fdd8c86c60
Fix pagination of contacts search
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-10 09:38:59 +02:00
7b6b946470
Allow for compression of the PROPFIND responses
...
For now it just gzip and only for propfind (the 99% case). Already saves
a bunch since the propfinds compress so nicely.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-06-06 15:55:04 +02:00
b61b74e81a
Fix empty event UUID reminder notifications
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-06-04 11:25:36 +02:00
6886b46ee2
In LockPlugin, only release a lock if it was acquired
...
When uploading new files, getNodeForPath() will not succeed
yet so the lock cannot be acquired.
In that case, don't try to unlock it either.
Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
2020-05-24 20:26:38 +03:00
6aea539745
Merge pull request #20844 from nextcloud/feature/noid/maintenance-mode-webdav-translated
...
Translate the maintenance mode message in webdav
2020-05-11 13:10:26 +02:00
cbbe11fa1f
Rename app-generated to z-app-generated, because macOS Contacts supports only one and will pick the first one alphabetically
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-05-07 16:48:32 +02:00
ecbc009e2f
Translate the maintenance mode message in webdav
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-05-06 18:11:54 +02:00
b7b7b2872c
Fix owner on publicownerwrapper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-01 10:50:26 +02:00
0f9b88c5a9
Merge pull request #20718 from nextcloud/fix/public_share_owner_activity_mess
...
Add a wrapper to fall back to the share owner on public shares
2020-04-30 13:46:13 +02:00
b8b53a2d9a
Merge pull request #19436 from nextcloud/bugfix/noid/dav-quota-calculation
...
Do not include mountpoints when calculating quota usage on WebDAV
2020-04-30 09:13:19 +02:00
a1f3293c06
Merge pull request #19039 from nextcloud/dav-activity-provide-links-to-calendar
...
Provide links to calendar in event creation/update activities
2020-04-30 09:10:56 +02:00
bc66bdc072
Add a wrapper to fall back to the share owner on public shares
...
Else it might happen that we setup a storage that has no real owner and
activities do boom etc (looking at you groupfolders and external
storages!).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-30 08:57:01 +02:00
f662d3663b
Temporary fix contacts search
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-29 14:48:41 +02:00
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
3c5c4caa4d
Merge pull request #20632 from nextcloud/bugfix/20624
...
Only catch anonymous OPTIONS for Office
2020-04-27 10:38:32 +02:00
deb2ea9cea
Provide links to calendar in event creation/update activities
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-26 11:11:50 +02:00
902d12555e
Do not include mountpoints when calculating quota usage on WebDAV
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-24 18:15:43 +02:00
768b012000
Merge pull request #20570 from nextcloud/fix/20235/use_uploadfile
...
Use a proper upload file so propfinds return 404
2020-04-24 16:31:38 +02:00
d7161b4eee
Only catch anonymous OPTIONS for Office
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-24 14:46:07 +02:00
6709833dc7
Use paginated search for contacts
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-23 19:08:16 +02:00
8c5bb22bc1
Merge pull request #20576 from nextcloud/fix/dav/oc-etag
...
Make sure that OC-ETag is set again
2020-04-22 22:21:22 +02:00
8730cc6764
Use a proper upload file so propfinds return 404
...
Fixes #20235
By using an UploadFile we make sure that we don't need to have another
check everywhere for the path. But we just have ot check (which we have
to anyway) if it is a proper Connector/File (or directory).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-21 10:33:28 +02:00
effcd58e14
Fix usages of afterMethod -> afterMethod:*
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-21 10:19:06 +02:00
4ee56689a8
Make sure that OC-ETag is set again
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-21 10:14:31 +02:00
ed56619a20
Merge pull request #19901 from nextcloud/bugfix/noid/vcard-photo-handling
...
Improved vcard photo handling
2020-04-17 11:43:20 +02:00
29541322c1
Update list of multiple properties
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-04-17 09:38:47 +02:00
fe4527a8e2
Update Contact Size after removing photo
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-04-15 15:49:49 +02:00
648c8df516
Don't populate the PHOTO property when it's not an image
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:39 +02:00
bb754cb363
Always transform the etag and read the data
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:36 +02:00
2e9f105786
Use table variable everywhere
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-15 15:49:12 +02:00
73271aa086
DAV's exception logger should deal with any Throwable
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-15 15:28:37 +02:00
5c0637bc90
Merge pull request #20138 from nextcloud/bugfix/noid/make-remote-checking-more-generic
...
Make remote checking more generic
2020-04-15 12:48:49 +02:00
d63abebc93
Merge pull request #19351 from nextcloud/dav-upload-hash
...
Return hashes of uploaded content for dav uploads
2020-04-15 10:23:22 +02:00
5e402f8aae
Check all remotes for local access
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-14 18:56:06 +02:00
91ab811824
Verify that destination is not a directory.
...
Otherwise file_put_contents will fail later.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-04-14 12:52:12 +02:00
0408c37b3d
Only delete the default calendar setting when the default calendar
...
itself is deleted
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-13 15:07:43 +02:00
ebdf66b706
Provide dav setting for user's default calendar
...
And add tests to handle schedule-default-calendar-URL
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-04-13 15:07:42 +02:00
57403c7020
dont set headers for cli
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-13 12:57:29 +02:00
c2677682c4
Return hashes of uploaded content for dav uploads
...
hashes are set in "X-Hash-MD5", "X-Hash-SHA1" and "X-Hash-SHA256" headers.
these headers are set for file uploads and the MOVE request at the end of a multipart upload.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-04-13 12:57:27 +02:00
734c62bee0
Format code according to PSR2
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +02:00
28f8eb5dba
Add visibility to all constants
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
1584c9ae9c
Add visibility to all methods and position of static keyword
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:51:06 +02:00
caff1023ea
Format control structures, classes, methods and function
...
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
14c996d982
Use elseif instead of else if
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
3a415e4139
Remove space between switch case and colon
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:17:53 +02:00
a8a06a82d2
Remove trailing whitespaces from comments
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:09:23 +02:00
44577e4345
Remove trailing and in between spaces
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
42625a46be
Remove spaces after method or function call
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:05:56 +02:00
Jacob Neplokh
John Molakvoæ
Julius Härtl
Brad Rubenstein
Robin Appelman
Christoph Wurst
brad2014
Joas Schilling
Morris Jobke
Georg Ehrke
Daniel Kesselberg
Roeland Jago Douma
Christian Weiske
John Molakvoæ (skjnldsv)
Joas Schilling
blizzz
Roeland Jago Douma
Thomas Citharel
Jaakko Salo