bbf36b4879
Allow removing federated shares of locally reshared files
...
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share
Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-05 13:19:44 +00:00
44bc697a93
Update Federated sharing notifier
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-15 15:12:43 +02:00
db4e8d67e0
Show share settings only if incoming federated shares are allowed
...
Fixes #15802
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-05-31 17:38:45 +02:00
8f11d2a39b
Only show sharing section if it has content
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-05-20 18:07:24 +02:00
b3cdc317e0
update URL for federation
2018-12-27 13:12:23 +01:00
4dda244ce2
Fix logo path in personal federated sharing settings
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-29 13:18:39 +01:00
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-09 14:32:14 +02:00
1d5a9c3f97
handle unshare request from owner
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:47 +02:00
f5a816262c
accept/decline group shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:46 +02:00
7a48a85dca
fix notification when a group share is received
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:45 +02:00
b23032e4c5
implement federated group shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:44 +02:00
c8631d607e
add setting to enable/disable federated group sharing
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:41 +02:00
d805959e81
Add API to undelete delete group shares
...
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.
This endpoint makes it possible to get back the share.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:56 +02:00
ce567b6121
remove unused code
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
086e7a0aa2
remove debug output
2018-07-02 11:29:31 +02:00
8d4da30bf5
add support for different share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
27814127dd
make sure that remote url gets stored with a trailing '/'
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
5d0d33a0d4
remove unused method
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
84fc188dfc
some minor fixes and clode cleanup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
61485e3e60
fix check for reshare permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
ed415726d3
send RESHARE_CHANGE_PERMISSION message
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
2bb1956c1f
implement RESHARE_UNDO notification
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications
...
- Don't send message to owner/sharer about revoked re-shares twice.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
a176a1f318
implement unshare notification
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
fab4e561f4
send reshare over OCM API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
41a1528888
implement decline share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
8889e14c7c
implement accept share notification
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
a3948e8a12
use new API to send a federated share if possible
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
21e64ec7f4
implement receiving of federated shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
5cfe20675d
start implementing federated sharing 2.0
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
38a90130ce
move log constants to ILogger
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
093cd01ac2
Fix DI for federated file sharing controller
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 13:49:28 +02:00
dd34cb7540
Less deprecated calls to OCP\Util::writeLog
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-22 20:41:49 +02:00
f4fd0224db
Do not use \OCP\DB anymore
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-26 14:40:23 +02:00
4cbcf6f920
Remove old code to be compatible with Nextcloud 9 and before
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 14:21:12 +01:00
eb51f06a3b
Use ::class statement instead of string
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value
...
Return value immediately instead of assigning to a one-time variable
2018-01-26 10:15:39 +01:00
0a56d2185e
Return value immediately instead of assigning to a one-time variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
4dbee99b7b
Remove useless return statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
2a38605545
Properly log the full exception instead of only the message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
55532f19d9
Cleanup OC_User and OCP\User
...
* mainly removes deprecated methods and old static code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 18:39:11 +01:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
d321e9792e
Add |null to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:09:13 +02:00
de6b7668c1
sent, an invitation, - successful
2017-07-14 17:28:57 +02:00
33cb45d4a3
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:20:56 +02:00
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
Roeland Jago Douma
Joas Schilling
Morris Jobke
Julius Härtl
Jos Poortvliet
Bjoern Schiessle
Arthur Schiwon
Lukas Reschke
Allan Nordhøy