Commit Graph

54513 Commits

Author SHA1 Message Date
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 2e511e3ea0
Catch storage not available in versions expire command
External storage with session credentials is not accessible without a
user session, hence background jobs and CLI commands can't work with
them. The previously unhandled exception causes logged errors in the
nextcloud log. This patch catches the specific exception and logs it as
warnings. So for a production instance the error won't spam their logs
for this non-recoverable and technically unsolvable error if the minimum
log level is set to the default of 3 (error).

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-25 11:52:26 +01:00
Nextcloud bot 48ef5148c1
[tx-robot] updated from transifex 2020-11-25 02:19:13 +00:00
Julius Härtl ef95ac67ea Fix contacts menu position and show uid as a tooltip
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-24 17:45:59 +00:00
John Molakvoæ ef37e375db
Merge pull request #24347 from nextcloud/backport/24341/stable19
[stable19] Fix the config key on the sharing expire checkbox
2020-11-24 18:39:16 +01:00
Arthur Schiwon 52f32115e7
avoid empty null default with value that will be inserted anyways
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-24 17:32:03 +01: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
Nextcloud bot e99d6b4dad
[tx-robot] updated from transifex 2020-11-24 02:19:14 +00:00
Morris Jobke 5870bd2383
Merge pull request #24296 from nextcloud/backport/stable19/23023
[stable19] Delete files that exceed trashbin size immediately
2020-11-23 21:07:46 +01:00
Morris Jobke 2a7c990ea0
Merge pull request #24306 from nextcloud/fix/stable19-sabre-parse-xml-errors
[stable19] Update sabre/xml to fix XML parsing errors
2020-11-23 20:51:55 +01:00
Christoph Wurst 3f06a29b2b
Update sabre/xml to fix XML parsing errors
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-23 12:06:11 +01:00
Julius Härtl 1a607b2030
Delete files that exceed trashbin size immediately
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-23 09:09:39 +01:00
Nextcloud bot 22f5093f7b
[tx-robot] updated from transifex 2020-11-22 02:18:47 +00:00
Nextcloud bot de80cbc037
[tx-robot] updated from transifex 2020-11-21 02:19:35 +00:00
Morris Jobke 32503f375c
Merge pull request #24262 from nextcloud/backport/24108/stable19
[stable19] Use correct year for generated birthdays events
2020-11-20 22:41:39 +01:00
Sven Strickroth 75cdfd8dc2 Use correct year for generated birthdays events
'X-APPLE-OMIT-YEAR' is not always present, at least iOS 12.4 uses the hard coded date of 1604 (the start of the gregorian calendar) when the year is unknown.

cf. https://forums.bitfire.at/topic/2050/bday-without-year-for-vcard-3-0-if-server-drops-property-x-apple-omit-year and https://gitlab.com/CardBook/CardBook/-/issues/586

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2020-11-20 20:39:34 +00:00
Morris Jobke 7d2968aca0
Merge pull request #24260 from nextcloud/backport/24257/stable19
[stable19] Simple typo in comments
2020-11-20 21:29:31 +01:00
Carlos Ferreira 8f9facccf0 Simple typo in comments 2020-11-20 19:48:09 +00:00
Roeland Jago Douma b5d99fdc67
Merge pull request #24233 from nextcloud/backport/24211/stable19
[stable19] Fix setting images through occ for theming
2020-11-20 10:04:16 +01:00
Nextcloud bot b97416ee62
[tx-robot] updated from transifex 2020-11-20 02:20:26 +00:00
Julius Härtl cc0283e2b2 Fix setting images through occ for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-19 22:21:39 +00:00
Roeland Jago Douma e5b977589a
Merge pull request #24182 from nextcloud/backport/24102/stable19
[stable19] Check quota of subdirectories when uploading to them
2020-11-19 10:40:16 +01:00
Roeland Jago Douma 076130ba46
Merge pull request #24195 from nextcloud/backport/24098/stable19
[stable19] circleId too short in some request
2020-11-19 10:09:41 +01:00
Nextcloud bot cf65cba574
[tx-robot] updated from transifex 2020-11-19 02:20:29 +00:00
Roeland Jago Douma 666ad85b63
Merge pull request #24171 from nextcloud/version/19.0.5/final
19.0.5
2020-11-18 20:15:47 +01:00
Maxence Lange 4d0a05f81f circleId too short in some request
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-18 07:57:18 +00:00
Nextcloud bot b19fb24178
[tx-robot] updated from transifex 2020-11-18 02:18:55 +00:00
Roeland Jago Douma 29f8e6df44
Merge pull request #24184 from nextcloud/revert-24177-backport/24098/stable19
Revert "[stable19] circleId too short in some request"
2020-11-17 21:53:27 +01:00
Christoph Wurst 751aa3f6b7
Revert "[stable19] circleId too short in some request" 2020-11-17 14:21:06 +01:00
Julius Härtl a297523381
Check for target folder available quota when uploading
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-17 13:55:21 +01:00
Julius Härtl 4530877e5d Fetch quota with files propfind
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-17 12:35:20 +00:00
Christoph Wurst 8a710c8837
Merge pull request #24177 from nextcloud/backport/24098/stable19
[stable19] circleId too short in some request
2020-11-17 13:32:20 +01:00
Maxence Lange abb05a5b1f circleId too short in some request
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-17 10:25:43 +00:00
Roeland Jago Douma b57234acce
19.0.5
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 09:39:27 +01:00
Nextcloud bot ec4a226342
[tx-robot] updated from transifex 2020-11-17 02:18:44 +00:00
Roeland Jago Douma 55e15f0221
Merge pull request #24092 from nextcloud/version/19.0.5/RC2
19.0.5 RC2
2020-11-16 19:43:50 +01: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
Roeland Jago Douma fd3db61cff
Merge pull request #24111 from J0WI/backport/23239/stable19
[stable19] Fix password visibility toggles
2020-11-16 16:03:33 +01:00
Daniel Calviño Sánchez 4e094b71b6 Add integration tests for creating shares with default expiration dates
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:19 +00:00
Daniel Calviño Sánchez 8832d15069 Reset app configs by deleting the values instead of setting the defaults
This avoids the need to keep the default values in the integration tests
in sync with the code, and also makes possible to reset values with
"dynamic" defaults (defaults that depend on other values).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:16 +00:00
Daniel Calviño Sánchez a50132e4e1 Add unit tests for "validateExpirationDateInternal"
They were copied and adjusted as needed from the tests for
"validateExpirationDate".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:13 +00: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
Daniel Calviño Sánchez ca133ea2cc Add explicit time to test date for clarity
This shows in a clearer way that the expected expiration date is the
original one, but without time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:08 +00:00
Daniel Calviño Sánchez 16b1b655cf Add unit test for expiration date with date and with default
This adds back what was being actually tested in the unit test fixed in
the previous commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:05 +00:00
Daniel Calviño Sánchez 1aed476937 Fix unit test for expiration date without date but with default
The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:02 +00:00
Daniel Calviño Sánchez 2e0352182b Fix unit test method name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:59 +00:00
Daniel Calviño Sánchez e13c5ece4f Fix unit test for verifying enforced valid expiration date.
The enforced expiration date was not actually enabled, as for that
"shareapi_default_expire_date" needs to be explicitly set to "yes".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:56 +00:00
Daniel Calviño Sánchez 42782ceeba Fix unit test for verifying enforced expire date too far in the future
The test should fail if no exception was thrown, and no exception was
thrown due to a missing configuration parameter. However, the use of
"addToAssertionCount(1)" made the test pass even if no exception was
thrown and, therefore, to silently fail.

Now the missing configuration parameter was added and the test will fail
if the expected exception is not thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:19:53 +00:00