Commit Graph

10295 Commits

Author SHA1 Message Date
Roeland Jago Douma bf9888870c Fix vsprint parameter
%2\$; is not valid. On php7 this is just ignored but on php8 it gives an
error. %2\$s; works.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-03 08:20:06 +00:00
aler9 349f754833 Fix file size computation on 32bit platforms
Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
2020-12-02 15:27:22 +00:00
Morris Jobke 21defabc41
Merge pull request #24327 from nextcloud/backport/24103/stable19
[stable19] Only check path for being accessible when the storage is a object home
2020-12-01 11:04:09 +01:00
Roeland Jago Douma 6d6382a55d
Merge pull request #24354 from nextcloud/backport/24162/stable19
[stable19] set the display name of federated sharees from addressbook
2020-11-25 16:18:12 +01:00
Arthur Schiwon 29a452c693
send expected format of cloud id
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:30 +01:00
Arthur Schiwon 10a252c905
set the display name of federated sharees from addressbook
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-25 14:32:06 +01:00
lui87kw aecf4eff27 Extra white space to follow other ifs
Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:16 +00:00
bladewing 43e401e3a2 Avoid substr() error when strpos returns false
"Exception: substr() expects parameter 3 to be int, bool given" can occur on Line 378 $mimePart = substr($icon, 0, strpos($icon, '-'));
This happens, when '-' is not found and strpos returns false instead of an int.
When this occurs, e.g., Activity hangs.

Signed-off-by: lui87kw <lukas.ifflaender@uni-wuerzburg.de>
2020-11-25 11:55:15 +00:00
Christoph Wurst 49299ed1c1 Fix the config key on the sharing expire checkbox
We don't use `shareapi_internal_enforce_expire_date` anywhere.
`shareapi_enforce_internal_expire_date` is the one we want.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-24 14:56:53 +00:00
Julius Härtl 3d0fd501f6 Only check path for being accessible when the storage is a object home
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 09:15:27 +00:00
Carlos Ferreira 8f9facccf0 Simple typo in comments 2020-11-20 19:48:09 +00:00
Roeland Jago Douma 47ee460f86
Merge pull request #24160 from nextcloud/backport/24069/stable19
[stable19] Fix default internal expiration date
2020-11-16 19:17:46 +01:00
Julius Härtl 8de8bd2326
Merge pull request #24076 from nextcloud/backport/23741/stable19
[stable19] Unlock when promoting to exclusive lock fails
2020-11-16 17:07:05 +01:00
Daniel Calviño Sánchez dd70a20da0 Fix default internal expiration date
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:11 +00:00
Joas Schilling eecac68459 Don't throw on SHOW VERSION query
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 09:02:52 +00:00
Ashod Nakashian da7f445179 Unlock when promoting to exclusive lock fails
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).

To avoid this case, we catch the LockedException
and unlock before re-throwing.

Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-11-12 19:07:35 +00:00
Joas Schilling b9db1cede3
Only use index of mount point when it is there
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 14:44:43 +01:00
Robin Appelman f70abf4939
add mount point to quota warning message
makes it more clear to the user what the quota applies to

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12 14:39:12 +01:00
Joas Schilling d5dfaf42a8 Fix iLike() falsely turning escaped % and _ into wildcards
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 09:27:28 +00:00
Morris Jobke 91242c9f0a
Merge pull request #23634 from nextcloud/backport/23374/stable19
[stable19] Only retry fetching app store data once every 5 minutes in case it fails
2020-11-09 16:59:56 +01:00
Julius Härtl 5aef556016
Only retry fetching app store data once every 5 minutes in case it fails
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-09 11:50:00 +01:00
John Molakvoæ (skjnldsv) 40a2cf96be Make sure root storage is valid before checking its size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:08:17 +00:00
Joas Schilling ce718ebd7b Improve query type detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:23:20 +00:00
Morris Jobke f97048f0d0
Merge pull request #23931 from nextcloud/backport/23917/stable19
[stable19] Do not emit UserCreatedEvent twice
2020-11-06 21:58:15 +01:00
Tobias Assmann dff10238de fix: also remove use statement of UserCreatedEvent
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-06 09:58:02 +00:00
Tobias Assmann ed46c5c94a fix: no more translation from postCreateUser hook to UserCreatedEvent anymore, as event is already emitted in user manager
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-06 09:58:00 +00:00
Roeland Jago Douma d24ca17168 Bearer must be in the start of the auth header
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 08:23:52 +00:00
Julius Härtl 9bd25d2a7f
Merge pull request #23777 from nextcloud/backport/23024/stable19 2020-11-05 18:06:12 +01:00
Morris Jobke 1b2b478ff5 No need to check if there is an avatar available, because it is generated on the fly nowadays
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-02 18:13:11 +00:00
Julius Härtl c5792f698a
Add occ command to set theming values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-02 16:23:43 +01:00
Morris Jobke 2561f4c02a Use lib instead if core as l10n module in OC_Files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-27 16:32:42 +00:00
Roeland Jago Douma bb13f940f4 Log the route not found exception on a lower level
This should be logged but it is not that critical to wanner level 3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-25 09:02:47 +00:00
Roeland Jago Douma af8ed35a1b Fix updates of NULL appconfig values
The comparisson of NULL is a bit special.
So we need to handle this a tad beter else it might not replace NULL
values. or allow you to set NULL values on updates.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-23 08:47:35 +00:00
Morris Jobke c48076c645
Clear cached app config while waiting for the SCSSCache to finish processing the file
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 18:18:26 +02:00
Morris Jobke f962fdf39a SCSSCacher - Lock should not be removed
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 11:30:10 +00:00
Morris Jobke 6a1540dd98 Provide log statements for SCSS cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 07:52:43 +00:00
Roeland Jago Douma 84a58957d5
Merge pull request #23214 from nextcloud/backport/22937/stable19
[stable19] Allow configuring the activity update interval of token
2020-10-08 11:52:45 +02:00
Joas Schilling 0fed0903e3 Only run the query to get the account data once
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 10:50:58 +00:00
Roeland Jago Douma 9375660254 Allow configuring the activity update interval of token
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-06 08:04:19 +00:00
Roeland Jago Douma 0840eedbfc
Merge pull request #22784 from nextcloud/backport/22234/stable19
[stable19] Use user mount with matching shared storage only
2020-10-01 15:31:54 +02:00
Roeland Jago Douma 830a4348f9
Merge pull request #23087 from nextcloud/backport/23013/stable19
[stable19] Show federation and email results also with exact user match unless c…
2020-10-01 09:01:25 +02:00
Roeland Jago Douma 12abb5d2d3
Merge pull request #23090 from nextcloud/backport/23074/stable19
[stable19] Do not match sharees on an empty email address
2020-10-01 09:01:08 +02:00
Julius Härtl 4fec3d09a0 Generate exception to log on php errors
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-29 08:17:23 +00:00
Christoph Wurst 1c65d33e9f Do not match sharees on an empty email address
When asking for sharees we compare not only UID and displayname but also
the email address. And if that matches we return the sharee as an exact
match. This logic had a flaw as in that it also matched the empty string
to users with no email address.

This is most noticeable when you disable sharee enumeration and open the
ownership transfer dialog. It suggested other users of the instance
before. This has stopped now.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-29 07:31:46 +00:00
Joas Schilling 679aa21075 Show federation and email results also with exact user match unless containing @
Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-29 07:19:18 +00:00
Roeland Jago Douma 164096aa26
Merge pull request #22804 from nextcloud/backport/stable19/22116-22648-22761
[stable19] Fix share transfer of single files and on the transfered node
2020-09-28 19:15:12 +02:00
Roeland Jago Douma ed22e1bf3b
Merge pull request #22904 from nextcloud/backport/22636/stable19
[stable19] Make sure that getConfig is still called for browsers that do not support CSPv3
2020-09-28 19:14:00 +02:00
Julius Härtl 14c3f1ebd8
Transfer shares of the transferred root node
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 19:03:07 +02:00
Julius Härtl 9b33e3caee
Make sure that getConfig is still called for browsers that do not support CSPv3
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 10:18:30 +02:00
korelstar bd24021efc fix: file quota was not applied in all cases 2020-09-17 07:13:18 +00:00