upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
55646 commits 982 branches 1211 tags 8.6 GiB
Commit graph

10608 commits

Author SHA1 Message Date
Morris Jobke
bf6aa03eb3
Merge pull request #23995 from nextcloud/backport/23741/stable20 
[stable20] Unlock when promoting to exclusive lock fails
 2020-11-10 10:16:34 +01:00
Roeland Jago Douma
8edc29bfef
Merge pull request #23955 from nextcloud/backport/23938/stable20 
[stable20] Replace some usages of OC_DB in OC\Share\* with query builder
 2020-11-10 08:59:54 +01:00
John Molakvoæ (skjnldsv)
0c4297cee9 Make sure root storage is valid before checking its size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-11-09 10:05:54 +00:00
Ashod Nakashian
7298d037b2 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-09 10:03:15 +00:00
Morris Jobke
20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20 
[stable20] Use query builder instead of OC_DB in trashbin
 2020-11-09 10:27:29 +01:00
Daniel Kesselberg
a01da78f1d
Add explicit typecast for $value. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-11-09 10:13:36 +01:00
Joas Schilling
b3dfa9290d Update parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:47 +00:00
Joas Schilling
2e3cffc53b Make sure Oracle always casts everything in the best way 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:46 +00:00
Joas Schilling
c71cc6824e Use Query builder function 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:45 +00:00
Joas Schilling
d111e88d4c Fix order of GREATEST for Oracle 
As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
Oracle uses the first value to cast the rest or the values.
So when the first value is a plain int, instead of doing the math,
it will cast the expression to int and continue with a potential 0.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:44 +00:00
Roeland Jago Douma
71de05f775
Merge pull request #23951 from nextcloud/backport/23922/stable20 
[stable20] Improve query type detection
 2020-11-07 10:49:06 +01:00
Roeland Jago Douma
bac92bb814
Merge pull request #23954 from nextcloud/backport/23943/stable20 
[stable20] Fix iLike() falsely turning escaped % and _ into wildcards
 2020-11-07 09:18:23 +01:00
Roeland Jago Douma
a5c6abc93a
Merge pull request #23948 from nextcloud/backport/23940/stable20 
[stable20] Skip already loaded apps in loadApps
 2020-11-07 07:59:52 +01:00
Joas Schilling
73a09a4f54 Replace some usages of OC_DB in OC\Share\* with query builder 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:43:46 +00:00
Joas Schilling
3a7e2fbff1 Fix iLike() falsely turning escaped % and _ into wildcards 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:29:48 +00:00
Morris Jobke
f8b550dab7
Merge pull request #23935 from nextcloud/backport/23921/stable20 
[stable20] Fix casting of integer and boolean on Oracle
 2020-11-06 22:24:31 +01:00
Joas Schilling
3ffd31353c Improve query type detection 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:20:44 +00:00
Morris Jobke
a2c9915ca4
Merge pull request #23924 from nextcloud/backport/23920/stable20 
[stable20] Bearer must be in the start of the auth header
 2020-11-06 22:10:01 +01:00
Roeland Jago Douma
ef5cee12d1 Skip already loaded apps in loadApps 
Otherwise you might end up calling a lot of functions unneeded.
And while the individual calls are cheap if you multiply them by 20k
they still get somewhat expensive.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-06 21:01:12 +00:00
Joas Schilling
990bb07002
Cast bool things to numbers as that is how they are stored in the database 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 13:36:57 +01:00
Joas Schilling
2b0b57d304 Fix casting to integer on Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 10:42:15 +00:00
Roeland Jago Douma
c9bf32b454 Bearer must be in the start of the auth header 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-06 08:21:30 +00:00
Tobias Assmann
2b55a90ae4
fix: also remove use statement of UserCreatedEvent 
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
 2020-11-05 23:08:14 +01:00
Tobias Assmann
6d1ecf2218
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-05 23:08:04 +01:00
Morris Jobke
23d3586865 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:10:23 +00:00
Morris Jobke
24e93bbba4 Fetch the logger and system config once for all query builder instances 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-30 06:40:43 +00:00
Christoph Wurst
c509410b1d Type the \OCP\IUserManager::callForSeenUsers closure with Psalm 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-28 19:08:14 +00:00
Morris Jobke
017a3f86c2 Use lib instead if core as l10n module in OC_Files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-27 16:30:26 +00:00
Morris Jobke
2b12d71a0d
Merge pull request #23641 from nextcloud/backport/23602/stable20 
[stable20] Fix updates of NULL appconfig values
 2020-10-25 21:38:49 +01:00
Roeland Jago Douma
0b46ebe3c6
Merge pull request #23611 from nextcloud/backport/23606/stable20 
[stable20] Only use index of mount point when it is there
 2020-10-24 10:53:45 +02:00
Roeland Jago Douma
1cc6a0f8e3 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:45:29 +00:00
Julius Härtl
367a7bd87e Only retry fetching app store data once every 5 minutes in case it fails 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-10-22 14:14:49 +00:00
Joas Schilling
2160dc9583 Only use index of mount point when it is there 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-21 18:46:13 +00:00
Morris Jobke
41090d0faa
Merge pull request #23205 from nextcloud/backport/23012/stable20 
[stable20] Make BeforeTemplateRenderedEvent aware of the actual response
 2020-10-19 10:15:22 +02:00
Morris Jobke
cbde9d878f
Merge pull request #23514 from nextcloud/backport/23508/stable20 
[stable20] fixes potential passing of null to getUserGroupIds
 2020-10-19 10:14:06 +02:00
Morris Jobke
e95a1420f1
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 15:46:59 +02:00
Arthur Schiwon
a615e7dcfa fixes potential passing of null to getUserGroupIds 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-16 13:01:06 +00:00
Morris Jobke
2dcf50cd78 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:27:36 +00:00
Morris Jobke
96e08a508e Provide log statements for SCSS cache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 07:50:21 +00:00
Christoph Wurst
3a3d7ea6cd Type the authentication listeners 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-15 22:34:18 +00:00
Robin Windey
06895ef8cc Fix typo 'shared' 2020-10-12 18:08:36 +00:00
Joas Schilling
d68d62f052 Make sure getUsersFavoritingObject can be run without a user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-07 11:10:38 +00:00
Roeland Jago Douma
1f3e3e782f Use the correct l10n for activities 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-07 09:37:23 +00:00
Morris Jobke
21f00069fe
Merge pull request #23213 from nextcloud/backport/22937/stable20 
[stable20] Allow configuring the activity update interval of token
 2020-10-06 16:07:54 +02:00
Roeland Jago Douma
ca32ee1a65
Merge pull request #23220 from nextcloud/backport/23215/stable20 
[stable20] Only run the query to get the account data once
 2020-10-06 14:46:06 +02:00
Joas Schilling
851acc1d74 Only run the query to get the account data once 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-10-06 10:48:24 +00:00
Roeland Jago Douma
e0bc29d907 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:12 +00:00
Julius Härtl
bc0a429822 Add acutal response to BeforeTemplateRenderedEvent 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-10-05 19:53:05 +00:00
Robin Appelman
aec422a874 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-10-04 11:05:24 +00:00
Roeland Jago Douma
fa4cd4435b
Merge pull request #23089 from nextcloud/backport/23074/stable20 
[stable20] Do not match sharees on an empty email address
 2020-10-01 19:29:39 +02:00