865ac4b6e0
Rename $insert var to $qb
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-03-17 14:49:29 +07:00
51d228932f
Add trashbin migrator to export and import trashbin data
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-03-17 14:45:56 +07:00
0b01103137
Merge pull request #28438 from csware/issue-1649
2021-12-21 15:10:50 +07:00
33c1c5c91b
Show most recently deleted files first in trash can
...
Signed-off-by: Orzu Ionut <orzu.ionut@gmail.com>
2021-11-09 16:59:16 +07:00
b0d1ad5777
Add configuration flag to disable the background job for files_trashbin
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2021-10-11 12:30:36 +07:00
1c736abc35
Don't die with LockedException when removing/restoring multiple files from trash
...
fixes issue #16491
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2021-08-19 16:43:44 +07:00
98102bfa78
Improve auto expiration hint
...
Signed-off-by: szaimen <szaimen@e.mail.de>
Co-Authored-By: Pytal <24800714+Pytal@users.noreply.github.com>
2021-08-08 20:41:38 +07:00
e198dc1b20
rework search api to allow searching on multiple caches at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-06-14 16:11:22 +07:00
215aef3cbd
Update php licenses
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2021-06-04 22:02:41 +07:00
8196420063
Drop \OCP\User
...
Inlines and remaining usages and drops the deprecated public API.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-05-21 15:00:34 +07:00
bcf38692ae
Use parent wrapper to properly handle moves on the same source/target storage
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-05-14 09:41:01 +07:00
99f2fa73d1
Fix usage of rename executeUpdate
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-05-05 10:35:25 +07:00
8008b33b8d
Cleanp execute usage in the trashbin
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-03-11 15:39:42 +07:00
930b40bd8a
Remove trash items from other trash backends when deleting all
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-03-03 14:26:35 +07:00
a2ecac7197
Merge pull request #25568 from nextcloud/move-storage-disable-cache
...
disable trasbin during the moveFromStorage fallback
2021-03-02 13:23:58 +07:00
eb502c02ff
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0
...
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard ) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases )
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-02-18 13:31:24 +07:00
b5db4502d0
disable trasbin during the moveFromStorage fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-02-17 16:08:57 +07:00
a0988281ee
Do not obtain userFolder of a federated user
...
Federated shares are somewhat special. So we can't move the files from
the main user and we should try to get it from the intialized root
already.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-22 13:52:43 +07:00
c1d4f8161b
Migrate internal classes to the OCP db col types
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-12 14:09:13 +07:00
9ce3ea3368
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 14:07:05 +07:00
bdbec28a8f
Make oc_files_trash.auto_id a bigint
...
Adjusted migration.
Added to occ command to update existing tables.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-23 17:50:50 +07:00
d89a75be0b
Update all license headers for Nextcloud 21
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-16 18:48:22 +07:00
bf23555b8b
Merge pull request #24094 from nextcloud/bugfix/noid/trash-appdata
...
Only attempt to move to trash if a file is not in appdata
2020-11-19 22:29:23 +07:00
f4b036f249
Only attempt to move to trash if a file is not in appdata
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-13 08:30:35 +07:00
8027dcbc6f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 12:28:17 +07:00
e52925c5fb
Use query builder instead of OC_DB in trashbin
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 22:33:59 +07:00
2616a784c9
Restrict query when searching for versions of trashbin files
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-14 16:38:30 +07:00
d9015a8c94
Format code to a single space around binary operators
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-05 20:25:24 +07:00
e0d688c365
dont hold a transaction during the move to trash
...
because moving to trash can take a long time, keeping a transaction active for the duration can lead to issues
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-30 14:30:54 +07:00
3c47aaa2b1
Delete files that exceed trashbin size immediately
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-23 16:58:18 +07:00
930c97a0ef
Fix variable name and add spaces around path in info log line
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-17 08:58:10 +07:00
1f7f93a695
Update license headers for Nextcloud 20 (again)
...
There are still lots of outdated headers, so time for another round of
updates.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-07 14:37:44 +07:00
2513b64602
Change free space calculation
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-31 23:11:10 +07:00
2a054e6c04
Update the license headers for Nextcloud 20
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-08-24 14:54:25 +07:00
a3d30bf4a2
Merge pull request #21954 from nextcloud/techdebt/noid/bootstrap-files_trashbin
...
Use IBootstrap for the files_trashbin app
2020-08-07 11:12:09 +07:00
c2c9a6a0e1
fix object store trashbin handling
...
object stores are "special" given how they interact with the cache on their own
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-30 16:31:56 +07:00
e84504c4d6
Use IBootstrap for the files_trashbin app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-23 22:03:14 +07:00
fcad692b4a
rollback cache rename if trashbin move fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 15:24:48 +07:00
5949849322
fix moving files from external storage to object store trashbin
...
having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.
By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 15:24:44 +07:00
7b250db60b
Merge pull request #21658 from nextcloud/trashbin-configurable-size
...
allow admin to configure the max trashbin size
2020-07-21 20:46:43 +07:00
9e7426a101
Clean up container usage in files trashbin
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-16 10:29:38 +07:00
050e2fe346
allow admin to configure the max trashbin size
...
this allows an admin to configure the max trashbin size instead of always relying on the users quota.
The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-07 14:45:08 +07:00
9001438879
Move files_trashbin to migrations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-06 16:42:14 +07:00
d7c0b9cced
Also always return in app commands
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-26 15:12:11 +07:00
614acc9419
add locking to resolve concurent move to trashbin conflicts
...
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-05-06 20:36:55 +07:00
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +07:00
734c62bee0
Format code according to PSR2
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +07:00
28f8eb5dba
Add visibility to all constants
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +07: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 +07: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 +07:00
14c996d982
Use elseif instead of else if
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +07:00
afbd9c4e6e
Unify function spacing to PSR2 recommendation
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +07:00
41b5e5923a
Use exactly one empty line after the namespace declaration
...
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +07:00
1a9330cd69
Update the license headers for Nextcloud 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +07:00
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
...
Remove unused imports
2020-03-27 17:14:08 +07:00
b80ebc9674
Use the short array syntax, everywhere
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +07:00
74936c49ea
Remove unused imports
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +07:00
6127c288e8
Fix license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-01-13 14:23:49 +07:00
b3ad27f7db
Trash bin: fix exception triggered if no correct fileId is provided.
...
This fixes #17115
Signed-off-by: Simon Spannagel <simon.spannagel@cern.ch>
2020-01-07 23:47:07 +07:00
5bf3d1bb38
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +07:00
c3748cfee3
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-12-03 09:44:07 +07:00
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +07:00
136c4ef925
dont expose metadata etag for now
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:36 +07:00
1b6e647b63
expose filecache extension data in FileInfo
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:32 +07:00
13960b69da
Merge pull request #17509 from nextcloud/fix/application-singleton
...
Fix Application instances created multiple times
2019-11-04 18:18:32 +07:00
964dc0a955
set retention obligation on existing `expiration` in tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-04 16:54:22 +07:00
e8095cf737
use OCP\EventDispatcher\Event over Symfony's deprecated Event
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-17 13:31:48 +07:00
543190f8b3
Do not create Application instances directly
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-11 08:33:09 +07:00
ce433637da
allow trash backends to overwrite the tooltip for trash items
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-10-05 10:23:30 +07:00
8c77d3bfb6
Merge pull request #16664 from nextcloud/bugfix/emit-moveToTrash-limit
...
Emit moveToTrash event only for the deleting user
2019-09-06 17:46:03 +07:00
d744c04a86
Merge pull request #16534 from nextcloud/trash-copy-free-space
...
dont try to copy trash items to user if the user has not enough free space
2019-09-04 20:06:43 +07:00
9bf8ee701f
Update apps/files_trashbin/lib/Trashbin.php
...
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
2019-09-04 13:06:07 +07:00
f452e23a7d
Merge pull request #16666 from nextcloud/feature/calendar/delegation
...
Feature/calendar/delegation
2019-08-15 19:30:45 +07:00
01a4644cad
Use the proxymapper to obtain valid proxy data
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-15 15:41:27 +07:00
8e7c287e2a
Use the owner from the storage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-07 16:47:43 +07:00
41f8be47eb
files_trashbin: File can be without extension
...
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
2019-08-07 16:04:09 +07:00
b1832c8bef
Emit moveToTrash event only for the deleting user
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-08-06 17:45:50 +07:00
fafce34aa0
dont try to copy trash items to user if the user has not enough free space
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-07-29 14:05:49 +07:00
3174012adf
Add event dispatcher to OCP
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-06-25 10:02:27 +07:00
50a2ab8bc6
Use higher preview resolution in trashbin
...
For #14639
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-16 14:56:26 +07:00
62a969f056
dont try to restore a trashbin item to a readonly target
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-14 16:18:43 +07:00
0d41138c6e
prevent recursion when moving a file to the trashbin
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-13 11:42:01 +07:00
f0c85a0f5f
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
...
Change CALDAV to allow calendars be shared with circles.
2019-03-13 00:06:46 +07:00
dd2496b275
Use proper dependency injection for app manager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:00:47 +07:00
4704e719ed
Only fetch size of this storage without mount points - ref #14412
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-01 12:05:18 +07:00
f6967a974f
Revert "Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)"
...
This reverts commit e806aa658c
2019-03-01 12:03:33 +07:00
7519a9a990
Merge pull request #14412 from nextcloud/fileinfo-raw-size
...
add option to get raw size (without submounts) from fileinfo
2019-02-28 13:49:27 +07:00
3459ffc4d1
Merge pull request #13844 from felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation
...
Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
2019-02-27 15:55:20 +07:00
8fc47c6f00
add option to get raw size (without submounts) from fileinfo
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-02-27 15:35:44 +07:00
9a220214b8
add fallback for trashbin original location
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-29 15:14:04 +07:00
e806aa658c
Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)
...
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-01-26 17:23:23 +07:00
e5c3e4b76f
Add getExtension() to FileInfo
...
this is a fairly common operation so it makes sense to prevent having
to repeatedly implement it.
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-29 15:24:02 +07:00
9e0ebf1830
store user for trashitem in the trashitem
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 15:21:09 +07:00
136113a22b
remove user parameter from `ITrashItem::getOriginalLocation`
...
since the target user is known at the time of creating the trashitem
the original location can already be adjusted on a per user level
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:58:02 +07:00
f5a41e2e15
fix error message for folder preview request
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:37 +07:00
d38163e895
fix trashbin previews for modular api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:48 +07:00
4adac445dc
fix select statement
...
fix select statement
Make trashbin api modules
Apps can register trashbin backends for specific storages,
allowing them to modify trashbin behavior for storages
The old trashbin implementation has been wrapped in a "legacy" backend,
for future work this can be replaced with a new backend that better handles
shares while still keeping the legacy backend around to keep existing trash
from being accessible
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:45 +07:00
6372ae3a98
expose additional props from trashbin sabre endpoint
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:26 +07:00
68e41a3aae
trashbin:cleanup exceptions for invalid options
...
* throw on no parameters provided
* throw on --all-users and userid provided
Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 22:31:27 +07:00
6bc3d3781d
Default behaviour when no users are specified on trashbin:cleanup
...
* Add option --all-users to explicitly clean all trashbins
* Reject no users on commandline and no --all-users
* Warn when --all-users and userids are specified
Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 17:14:45 +07:00
Côme Chilliet
John Molakvoæ
Orzu Ionut
Daniel Kesselberg
Sven Strickroth
szaimen
Robin Appelman
John Molakvoæ (skjnldsv)
Christoph Wurst
Julius Härtl
Roeland Jago Douma
dependabot-preview[bot]
Vincent Petry
Morris Jobke
Joas Schilling
blizzz
Christoph Wurst
simonspa
Georg Ehrke
Roeland Jago Douma
Jakub Onderka
Felix Nieuwenhuizen
Liam Dennehy