Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable
...
Fix undefined variable - found by Phan
2018-04-23 15:51:15 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend
...
This now uses the new interfaces
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-23 14:39:30 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable
...
Left over from a refactoring
https://github.com/nextcloud/server/pull/1940
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-23 11:50:30 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan
...
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-23 11:30:22 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset
...
Add proper comment offset support
2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host
...
Allow IPv6 database hosts
2018-04-22 20:43:29 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-19 20:14:38 +02:00
Joas Schilling
5157349b69
Fix docs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-19 17:10:03 +02:00
Joas Schilling
78ee3abb78
Move regex to a function and add tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-19 12:49:36 +02:00
Roeland Jago Douma
a0028a2a5f
Allow to skip retrieving from cache in the DiscoveryService
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-18 19:18:34 +02:00
Joas Schilling
8f7a0af951
Allow IPv6 database hosts
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 14:48:21 +02:00
Joas Schilling
f50abde7ac
Add proper comment offset support
...
The offset is based on the last known comment instead of limit-offset,
so new comments don't mess up requests which get the history of an object-
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 14:23:15 +02:00
Robin Appelman
f399e1591f
Log classnames of arguments in exception trace
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-17 13:46:36 +02:00
Robin Appelman
46d0d0cda1
fix appinfo parsing when a single localized option is provided
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-17 11:14:03 +02:00
Morris Jobke
9ee1febf62
Provide an option to disable HTML emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-16 19:00:05 +02:00
Morris Jobke
4d832cd4e3
Fixes false positive possible sql injection by phan
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-16 11:47:11 +02:00
Morris Jobke
1517b1452e
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-12 16:24:44 +02:00
Jan-Christoph Borchardt
04f47a7653
Merge pull request #8535 from nextcloud/new-color-generator
...
New color generator algorithm
2018-04-12 14:37:53 +02:00
Robin Appelman
89a9d35d90
dont keep shared database locks when running cli scripts
...
For cli scripts we don't have the assumption that the universe will be cleaned up soon
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-11 19:21:45 +02:00
Morris Jobke
88c1b8edbd
Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versions
...
Fix version comparison with minor and patch level requirements
2018-04-11 15:48:23 +02:00
Robin Appelman
96f14a2e90
log previous exception
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-11 14:35:08 +02:00
Morris Jobke
7a3ce073da
Merge pull request #8946 from nextcloud/log-exceptions-as-nested-array-2
...
Log exceptions as nested array instead of encoded json
2018-04-11 14:24:47 +02:00
Robin Appelman
15815c034f
adjust tests to new exception log format
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-11 11:46:36 +02:00
Morris Jobke
185a260f6b
Merge pull request #9074 from nextcloud/ARGON2I
...
Add ARGON2I support to the hasher
2018-04-11 11:04:42 +02:00
Morris Jobke
3d80ade8d7
Log possible exception caused by wrong version number
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-11 10:08:23 +02:00
Christoph Wurst
ac939e8fd4
Fix version comparison with minor and patch level requirements
...
If an app requires a specific minor or path level server version,
the version_compare prevented the installation as only the major
version had been compared and that checks obviously returns `false`.
Now the full version is used for comparison, making it possible to
release apps for a specific minor or patch level version of Nextcloud.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-04-11 10:08:23 +02:00
Morris Jobke
e302266a6a
Merge pull request #9137 from nextcloud/default-log-rotate-size
...
Set the default log rotate size to 100 MB
2018-04-11 02:10:54 +02:00
Morris Jobke
38961a725f
Merge pull request #8833 from nextcloud/feature/noid/add_ldap_user_hooks
...
add anounce- and (pre/|post)RevokeUser signals for non-native backends
2018-04-11 00:44:39 +02:00
Morris Jobke
058f8123e6
Set the default log rotate size to 100 MB
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-11 00:27:51 +02:00
Robin Appelman
b9583c6dce
Log exceptions as nested array instead of encoded json
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-10 15:53:43 +02:00
Christoph Wurst
6248b61193
Fix AppFetcher::setVersion phpdoc
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-04-10 12:32:56 +02:00
Morris Jobke
acbcc607ea
Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-state
...
Return proper boolean and do not save enabled state in db
2018-04-09 23:39:02 +02:00
John Molakvoæ (skjnldsv)
eae55761de
Properly return boolean on enable state
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-09 11:26:26 +02:00
John Molakvoæ (skjnldsv)
d5cfd09d47
fixup! Updated php generator
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-06 21:32:45 +02:00
John Molakvoæ (skjnldsv)
57a1dc1231
Updated php generator
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-06 21:32:44 +02:00
Daniel Calviño Sánchez
90fdf83ca7
Use zip32 only if there are less than 65536 files
...
A zip32 file can contain, at most, 65535 files (and folders), so take
that constraint into account.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-06 15:59:30 +02:00
Roeland Jago Douma
4a73f645e5
Use zip32 if possible
...
* OSX doesn't handle 64zip that well
* Some other implentations don't handle it perfectly either
* If the file is belog 4GiB (some overhead) => zip32
* This covers the 99% case I bet
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 15:59:30 +02:00
Roeland Jago Douma
8edbeb159e
Use the uid_lower column
...
This can use a proper index
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-06 13:42:52 +02:00
Jared Boone
a5b50e487e
Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
...
Fixes https://github.com/nextcloud/server/issues/8387 .
Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 16:09:08 -07:00
Roeland Jago Douma
bbc4c6036a
Merge pull request #9092 from nextcloud/log-objectstorage-stuff
...
Add more logging for the object storage during creation of the buckets
2018-04-05 21:44:48 +02:00
Morris Jobke
2f068bc9d1
Add more logging for the object storage during creation of the buckets
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-05 17:26:09 +02:00
Arthur Schiwon
373a1d5391
more consistent naming
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-05 12:46:15 +02:00
Arthur Schiwon
2ebf26e444
admin_audit and dav listen to announce and revoke signals
...
also place them in doc
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-05 12:38:43 +02:00
Roeland Jago Douma
ab04f3cb19
Fix Array to String conversion in QueryBuilder
...
Fixes #9080
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-05 09:08:32 +02:00
Roeland Jago Douma
84316aec66
Add ARGON2I support to the hasher
...
When on php7.2 we can use the new and improved ARGON2I hashing.
This adds support for that to the hasher. When verifying an old hash
we'll update rehash to move all hashes eventually to the new hash
function.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 15:43:50 +02:00
Morris Jobke
9c4d562808
Merge pull request #9063 from nextcloud/fix-callForSeenUsers
...
Move on with the next user if we found the user on one user back-end
2018-04-04 15:01:04 +02:00
Roeland Jago Douma
73e6eea57e
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:50:54 +02:00
Roeland Jago Douma
37233471b6
Add pathcache
...
* If we find the mountpoint for a path cache it
* If we modify the mount points empty the pathCache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:56 +02:00
Roeland Jago Douma
6868da9958
Make normalized cache path larger
...
On larger instances with a large number of shares this can make a real
impact as the default 512 entries are easily filled.
Making this contain max 2048 entries has basically no effect on smaller
installations (as they probably never hit the 512 now). But makes sure
we don't evict entries in the larger case.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:52 +02:00
Roeland Jago Douma
dc222aa3a5
Comparing stringlength is cheaper than strpos
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:28 +02:00
Roeland Jago Douma
e48d4c4aad
Cache the $foundMountPointLength
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:28 +02:00
Roeland Jago Douma
003c624596
Inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:28 +02:00
Roeland Jago Douma
7f1141f7e9
Make the MountManager strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:44:28 +02:00
Björn Schießle
c3900c9d0d
Merge pull request #9018 from nextcloud/fix-copy-encrypted-files
...
reset encryptionVersion to '1' if a file was stream copied
2018-04-03 18:24:27 +02:00
Bjoern Schiessle
a0923d9ffb
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:01:23 +02:00
Bjoern Schiessle
6795b35cdf
Move on with the next user if we found the user on one user back-end
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 17:00:18 +02:00
Morris Jobke
75cf631fd6
Merge pull request #9008 from nextcloud/disable-if-no-appinfo
...
Do not fail hard if no appinfo is returned during update
2018-04-03 13:32:50 +02:00
Roeland Jago Douma
cdb2cc1814
Merge pull request #8999 from nextcloud/css-js-name-based-on-apps-versions
...
Use app version to generate scss filename
2018-03-28 15:59:07 +02:00
Julius Härtl
eb6e5a27a3
Do not fail hard if no appinfo is returned during update
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 11:12:56 +02:00
John Molakvoæ (skjnldsv)
1d7b14dfb1
Use app version to generate scss filename
...
Fixed scsscacher tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 08:33:46 +02:00
Roeland Jago Douma
2124ebae72
Merge pull request #8737 from nextcloud/file_return_put_contents
...
Pass on the return value of file_put_content
2018-03-28 08:25:04 +02:00
Roeland Jago Douma
b2e34167eb
Merge pull request #8976 from nextcloud/dep_user_code
...
Remove deprecated functions from OCP\User
2018-03-28 08:23:57 +02:00
Roeland Jago Douma
1e13b3a8fa
Merge pull request #8994 from nextcloud/deprecate-theme-sync-clients
...
Deprecate theme sync clients
2018-03-28 08:23:16 +02:00
Roeland Jago Douma
53447ae2b2
Throw an exception if file_put_contents fails
...
* This will help with AppData hardening etc
* Introduced a GenericFileException for if nothing else is appropiate
- Maybe the other File exceptions should base on this?
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-27 16:23:06 +02:00
Joas Schilling
709589f2db
Merge pull request #8780 from nextcloud/bugfix/noid/query-builder-database-backends
...
Move the group database backend fully to query builder
2018-03-27 16:10:26 +02:00
Joas Schilling
b98c218201
Remove orderBy so the query works correctly on postgres
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-27 14:50:09 +02:00
Roeland Jago Douma
36dbd7ec8f
Merge pull request #8985 from nextcloud/cleanup_ocp_db
...
Cleanup ocp db
2018-03-26 21:45:25 +02:00
Julius Härtl
cf4d27b115
Use customclient_* values by default and do not use them in custom themes anymore
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-26 19:26:36 +02:00
Roeland Jago Douma
f4fd0224db
Do not use \OCP\DB anymore
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-26 14:40:23 +02:00
Roeland Jago Douma
91cc44a4e6
Remove deprecated OC_Group_Backend
...
* Private class
* Has been deprecated since NC10
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-26 14:19:04 +02:00
Joas Schilling
421a00854c
Make sure DI is done
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-26 11:35:07 +02:00
Joas Schilling
7ea00b7b5f
Move the group database backend fully to query builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-26 11:35:07 +02:00
Roeland Jago Douma
74f0e37233
Remove deprecated \OCP\User::userExists
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-26 11:16:23 +02:00
Roeland Jago Douma
7ebd96416c
Remove deprecated OCP\User::getDisplayname
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-25 20:42:03 +02:00
Roeland Jago Douma
6c8caa1641
Remove deprecated \OCP\User::getUsers
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-25 20:33:24 +02:00
Roeland Jago Douma
34cb8ea161
Merge pull request #8935 from nextcloud/backend_interfaces
...
Backend interfaces
2018-03-23 08:48:03 +01:00
Roeland Jago Douma
471272d456
Move to ABackend
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-22 16:32:05 +01:00
Roeland Jago Douma
cbd2be583a
Move Database backend over to new User/Backend interfaces
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-22 16:32:05 +01:00
Roeland Jago Douma
4e1161d254
Fix proper permissions for multiple file access
...
Fixes #8890
In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write
Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-22 12:06:41 +01:00
Morris Jobke
f843b7edfe
Merge pull request #8506 from nextcloud/use-appmanager
...
Use isInstalled of AppManger instead of reimplement it
2018-03-22 09:55:19 +01:00
Morris Jobke
be35b54f69
Merge pull request #8791 from nextcloud/cleanup-oc_json
...
Remove unused methods of OC_Json
2018-03-22 09:54:55 +01:00
Roeland Jago Douma
dc4ba31e7e
Merge pull request #8922 from nextcloud/deprecated-ocp-files-methods
...
Deprecated some methods of OCP\Files
2018-03-22 08:33:32 +01:00
Morris Jobke
24f1b8f01a
Merge pull request #8923 from nextcloud/typos
...
Fix some typos
2018-03-21 14:43:32 +01:00
Morris Jobke
78211a58e6
Remove unused methods of OC_Json
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 14:36:34 +01:00
Morris Jobke
2b73779568
Fix some typos
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 14:30:56 +01:00
Morris Jobke
8eb57dd835
Deprecate OCP\Files
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 14:29:35 +01:00
Morris Jobke
3579487798
Remove unused and deprecated methods of OCP\DB
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 12:17:55 +01:00
Morris Jobke
514de5dfa1
Use isInstalled of AppManger instead of reimplement it
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 11:34:18 +01:00
Joas Schilling
ec1e039790
Show EOL warning in the update section
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-20 15:52:30 +01:00
blizzz
7ae42f1f5d
Merge pull request #8822 from nextcloud/fix/8641/undefined-index
...
the FN is optional, carrying the displayname if present
2018-03-19 17:57:12 +01:00
Roeland Jago Douma
431750828e
Store setUserValue as string in cache
...
We cache the values we set in the setUserValue function.
However since the values are strings in the database we check if a value
is equal with string comparison
Now if the function was called with a $value of int or float. It would
be stored in the DB (and thus converted to string) and in the cache (not
converted thus as int/float).
Now if another call comes in that sets it to the same value (I'm looking
at you LDAP!). The check would fail since we would be comparing
int/float to string which fails by definition.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 12:57:48 +01:00
Roeland Jago Douma
9834f33d56
Merge pull request #8878 from nextcloud/remove_tmpfile
...
Remove deprecated tmpFile/tmpFolder
2018-03-19 12:29:08 +01:00
Roeland Jago Douma
68871caf3c
Remove unused private function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 11:32:10 +01:00
Roeland Jago Douma
1088068c60
Remove \OCP\Files::tmpFolder
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:54:39 +01:00
Roeland Jago Douma
47a3008141
Remove \OCP\Files::tmpFile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:52:35 +01:00
Morris Jobke
63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token
...
verify cached swift token
2018-03-19 10:10:04 +01:00
Robin Appelman
41954d2903
verify cached swift token
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-16 15:20:16 +01:00
Morris Jobke
ade05f40ec
Remove unused resolveReshare of old sharing code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-16 12:26:38 +01:00
Roeland Jago Douma
fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read
...
Emit read for nodes
2018-03-15 14:04:14 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name
...
Full implement group display names
2018-03-15 12:07:30 +01:00
Roeland Jago Douma
d6b326650b
Emit read for nodes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-15 11:18:39 +01:00
Roeland Jago Douma
fde08a9619
Merge pull request #8793 from nextcloud/swift-config
...
Swift uses `containter` not `bucket`
2018-03-15 08:34:58 +01:00
Roeland Jago Douma
f2b93f5246
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches
...
Fix configuration values matched in user searches
2018-03-15 08:34:21 +01:00
Daniel Calviño Sánchez
0b96a71a68
Fix configuration values matched in user searches
...
Due to a misplaced closing parenthesis the condition of the left join
clause was just "userid = uid"; the other conditions were passed as
additional parameters to "leftJoin", and thus they were ignored.
Therefore, the result set contained every preference of each user
instead of only the email, so the "WHERE configvalue LIKE XXX" matched
any configuration value of the user.
Besides the closing parenthesis this commit also fixes the literal
values. Although "Literal" objects represent literal values they must be
created through "IExpressionBuilder::literal()" to be properly quoted;
otherwise it is just a plain string, which is treated as a column name.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-14 23:31:42 +01:00
Arthur Schiwon
f42c29ebac
the FN is optional, carrying the displayname if present
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-14 14:30:45 +01:00
Roeland Jago Douma
d3e7996e80
Fix bucket and container usage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-14 13:57:14 +01:00
Roeland Jago Douma
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper
...
Remove deprecated HTTPHelper
2018-03-14 09:49:24 +01:00
Roeland Jago Douma
7785c3752f
Remove deprecated HTTPHelper
...
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 21:54:56 +01:00
blizzz
76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check
...
Properly provide local memcache check to ICacheFactory
2018-03-13 21:27:24 +01:00
Morris Jobke
dde5353f98
Properly provide local memcache check to ICacheFactory
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 18:18:04 +01:00
Morris Jobke
ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb
...
Make QueryBuilder varadic
2018-03-13 14:11:19 +01:00
Morris Jobke
45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token
...
Properly cache swift v3 token
2018-03-13 11:35:38 +01:00
Morris Jobke
7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response
...
Remove unused methods of OC_Response
2018-03-13 09:47:29 +01:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:25:32 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 09:22:26 +01:00
Morris Jobke
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api
...
Remove unused methods and constants from legacy OC_API
2018-03-13 08:52:24 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 08:07:08 +01:00
Roeland Jago Douma
4e8d5504d2
Properly cache swift v3 token
...
The V3 token has an export function. Without this the token is
effectively never cached.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-12 20:53:50 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 18:42:30 +01:00
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 17:45:49 +01:00
Morris Jobke
3655951dd7
Merge pull request #8787 from nextcloud/remove-deprecated-and-unused-methods-of-db
...
Remove deprecated and unsused methods of OCP\DB
2018-03-12 16:34:37 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper
...
Remove unused and deprecated class and interface AppHelper
2018-03-12 16:33:46 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 15:16:52 +01:00
Morris Jobke
8195b17ed7
Remove deprecated and unsused methods of OCP\DB
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 15:13:37 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination
...
Tests for email collaborators pagination
2018-03-09 11:21:21 +01:00
Roeland Jago Douma
129a608ebe
OCP\AppFramework\App strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 08:42:03 +01:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing
...
Remove base url from global cache prefix
2018-03-08 21:12:54 +01:00
Roeland Jago Douma
d05469959e
Merge pull request #8715 from nextcloud/objectstore-no-part-files
...
disable part files for object stores
2018-03-08 20:52:16 +01:00
John Molakvoæ (skjnldsv)
00122fa027
Use group displayNames in users list
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-08 17:13:49 +01:00
Joas Schilling
82137f443d
Correctly return the group name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 17:13:48 +01:00
Joas Schilling
aef86a5f5a
Show the displayname in the users group list
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 17:13:48 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 16:22:16 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master
...
Allow public page access to apps with group restrictions
2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-08 11:05:18 +01:00
Roeland Jago Douma
340e8ef16c
Make SecurityMiddleware strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-08 10:11:47 +01:00
Morris Jobke
069e3f50a7
Merge pull request #8711 from nextcloud/objectstore-write-only-fopen
...
don't read existing file when overwriting using object store
2018-03-08 09:32:39 +01:00
Roeland Jago Douma
af55b03386
Merge pull request #8662 from nextcloud/better-debugging-unit-tests
...
Better debugging for "Your test case is not allowed to access the dat…
2018-03-07 21:53:34 +01:00
Joas Schilling
1dd40b1f45
Single quotes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-07 16:50:18 +01:00
Joas Schilling
559978c50e
Suppress phan error
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-07 16:43:16 +01:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Julius Härtl
f652c28b21
Use JSCombiner from server container when searching for JS files
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705
...
Check if the cached js file exists
2018-03-07 14:45:43 +01:00
Robin Appelman
fc35352122
disable part files for object stores
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-07 13:33:35 +01:00
Roeland Jago Douma
34b86edc34
Check if the cached js file exists
...
Fixes #8705
If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-07 12:55:05 +01:00
Robin Appelman
9764e70494
don't read existing file when overwriting using object store
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-07 12:05:57 +01:00
Morris Jobke
65cc155a11
Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-limited
...
Also array_slice wide email matches of local users
2018-03-06 22:21:03 +01:00
Morris Jobke
de56915605
Merge pull request #7419 from Abijeet/feature-7175
...
Fixes #7175 - Allow to search for email address in user management
2018-03-06 21:53:37 +01:00
Morris Jobke
c88112bb41
Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-update
...
Display a list of unavailable apps for updates (aka. merge "Can I update?")
2018-03-06 21:31:06 +01:00
Morris Jobke
846b0d6a42
Merge pull request #5833 from nextcloud/fix_uninstall_rep_step
...
Run repair steps on uninstall in all cases
2018-03-06 17:57:10 +01:00
Morris Jobke
b2a9ea08a3
Remove unused and outdated hook
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 17:56:44 +01:00
Joas Schilling
09d8387b00
Try without autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 13:56:44 +01:00
Tobia De Koninck
96a5752340
Remove unused $enableAppsCache in OC_App
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2018-03-06 10:47:16 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2018-03-06 10:45:20 +01:00
Tobia De Koninck
539fdaea1e
Run repair steps on uninstall in all cases
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2018-03-06 10:41:55 +01:00
Roeland Jago Douma
d8332d43f8
Make \OC\Security\IdentityProof strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 19:33:16 +01:00
Roeland Jago Douma
5457373407
Merge pull request #8659 from nextcloud/csrf_token_strict
...
Make \OC\Security\CSRF strict
2018-03-05 19:28:10 +01:00
Joas Schilling
97c4c00e3f
Better debugging for "Your test case is not allowed to access the database."
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-05 16:06:29 +01:00
Roeland Jago Douma
4ed9b74a6b
Make OC\Security\CSP strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 15:27:05 +01:00
Roeland Jago Douma
2c8402aa17
Make \OC\Security\CSRF strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 15:01:02 +01:00
Morris Jobke
a8f56ac8c7
Merge pull request #8603 from nextcloud/enc-cleanup
...
kill old encryption migration steps
2018-03-05 11:16:27 +01:00
Roeland Jago Douma
f6fe04f3d7
Fix comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0c500e460f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Roeland Jago Douma
0cef938299
Make \OCP\Mail strict
...
* Fix typehints
* Made strict
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Joas Schilling
e05f338ff1
Add the users result only when non empty so tests stay the same
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-02 11:42:57 +01:00
Joas Schilling
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening
...
AppData hardening
2018-03-02 11:26:36 +01:00
Bjoern Schiessle
8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-03-02 10:09:52 +01:00
Roeland Jago Douma
7f736923d9
Merge pull request #8284 from nextcloud/lib_log-storage-test-failed
...
External storage test: log exceptions
2018-03-01 20:32:09 +01:00
Joas Schilling
12420aef42
Also array_slice wide email matches of local users
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-01 12:18:44 +01:00
Julien Veyssier
7da0812186
Do not throw AppNotEnabledException for app public pages - refs #6962 , refs #5309
...
It allows non-logged user to access public pages of applications restricted to a group
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2018-02-28 20:35:53 +01:00
Dan Callahan
8797590099
Correct mistaken regex wildcard in .htaccess
...
Fixes #8578
Signed-off-by: Dan Callahan <dan.callahan@gmail.com>
2018-02-28 13:50:54 +00:00
Joas Schilling
029e8cdc5b
Also allow to specify the cache file name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 11:31:33 +01:00
Morris Jobke
640db3d5fe
Merge pull request #8219 from nextcloud/fix-overwrite-url-on-cli-install
...
Fix proper overwrite URL on CLI install
2018-02-27 13:49:39 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms
...
Let the admin configure the default share permissions
2018-02-27 13:44:34 +01:00
Roeland Jago Douma
8b5997483c
Hardening of SimpleFile getContent
...
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 13:35:09 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template
...
Public page template response
2018-02-27 13:33:19 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Bjoern Schiessle
7d0102bf73
expose capabilities in js
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
Julius Härtl
e5df804834
Expose parameters as variables to templates
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:52 +01:00
Julius Härtl
b89827d761
Enable renderAs public page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:52 +01:00
Julius Härtl
0655df09d6
Pass template parameters to parent template
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:52 +01:00
Morris Jobke
7081bdbea6
Merge pull request #8553 from nextcloud/strict_logger
...
Make ILogger strict
2018-02-27 11:20:06 +01:00
Morris Jobke
8d8b22e294
Merge pull request #8552 from nextcloud/strict_session
...
Make ISession strict
2018-02-27 10:52:55 +01:00
Roeland Jago Douma
6994bce951
Loglevel is an int
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 10:45:35 +01:00
Roeland Jago Douma
83eb548d23
Typehint Throwable
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 10:43:34 +01:00
Roeland Jago Douma
4077f16aec
Make ILogger strict
...
* Make implementations strict
* Add scalar typehints
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 10:41:46 +01:00
Morris Jobke
e2cd33adfe
Fix check if theming defaults instance is available
...
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.
Fixes #8420
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-27 10:15:31 +01:00
Roeland Jago Douma
8cb6bb3987
Make ISession strict
...
* Make all implementations strict
* Add scalar types
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-26 22:20:21 +01:00
Morris Jobke
8867629cf1
Merge pull request #8359 from nextcloud/swift-v3
...
Support swift v3 authentication
2018-02-26 18:30:00 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page
...
Provide translated error message for permission error
2018-02-26 17:50:21 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-26 17:00:29 +01:00
Roeland Jago Douma
812ea354d0
User proper username + pass
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-26 14:54:18 +01:00
Robin Appelman
31dd6d6aae
add support for v3 swift auth
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-26 14:54:08 +01:00
Roeland Jago Douma
0c4c3676f6
Merge pull request #8504 from nextcloud/bugfix/noid/well-its-not-an-array
...
Dont use $info as array when its not an array
2018-02-26 13:44:57 +01:00
Joas Schilling
226e63695f
Merge pull request #8026 from nextcloud/feature/noid/allow-custom-html-in-html-emails
...
Allow custom HTML in HTML Emails
2018-02-26 13:38:39 +01:00
Joas Schilling
695e32d0a6
Merge pull request #8491 from nextcloud/strict_request
...
Make Request strict
2018-02-26 11:02:30 +01:00
Roeland Jago Douma
043a824e6a
Fix comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-22 15:51:19 +01:00
Roeland Jago Douma
0ee45d3d20
Fix proper types
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-22 15:51:19 +01:00
Roeland Jago Douma
a229095af1
Make Request strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-22 15:51:19 +01:00
Joas Schilling
1aa846107d
Dont use $info as array when its not an array
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-22 14:43:56 +01:00
Roeland Jago Douma
a423860f42
Relax what t accepts so we don't break it all
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-22 12:37:29 +01:00
Roeland Jago Douma
c2c2c06546
Merge pull request #8476 from nextcloud/strict_l10n
...
Make OCP\IL10N strict
2018-02-22 10:03:18 +01:00
Roeland Jago Douma
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck
...
Make OC\IntegrityCheck strict
2018-02-22 10:01:50 +01:00
Roeland Jago Douma
a660946ac6
Merge pull request #8490 from nextcloud/strict_systemtags
...
Make SystemTag strict
2018-02-22 10:01:20 +01:00
Roeland Jago Douma
fb41a93a95
Merge pull request #8473 from nextcloud/strict_cmr
...
Strict OCP\AppFramework\Utility\IControllerMethodReflector
2018-02-21 22:56:40 +01:00
Roeland Jago Douma
8e5657014d
Make SystemTag strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 22:08:27 +01:00
Roeland Jago Douma
72e745be26
Handle strict typing in Checker and fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 21:09:08 +01:00
Roeland Jago Douma
4859775893
Don't try to match on false
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 20:38:14 +01:00
Roeland Jago Douma
aa060f5332
Strict OCP\AppFramework\Utility\IControllerMethodReflector
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 19:55:49 +01:00
Roeland Jago Douma
8b17f0d224
Fix other tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 19:53:44 +01:00
Roeland Jago Douma
2b0d640225
Proper closure for function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 19:46:29 +01:00
Roeland Jago Douma
541056f6c2
Make OCP\IL10N strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 14:32:04 +01:00
Joas Schilling
2c840ca278
Log exceptions that happen when writing the app store reply to storage
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-21 14:14:33 +01:00
Roeland Jago Douma
4b50fe7560
Merge pull request #8466 from nextcloud/strict_middlewaredipatcher
...
Make the middlewareDispatcher strict
2018-02-21 13:57:04 +01:00
Roeland Jago Douma
8b44c16ddc
Merge pull request #8471 from nextcloud/fix_upgrade
...
getIncompatibleApps needs a string not an array
2018-02-21 13:28:10 +01:00
Roeland Jago Douma
4d5f2e64a5
Make OC\IntegrityCheck strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 13:27:29 +01:00
Roeland Jago Douma
4a41e0cc42
getIncompatibleApps needs a string not an array
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 13:00:41 +01:00
Roeland Jago Douma
7c6cc013eb
Merge pull request #8468 from nextcloud/fix-unicode-avatars
...
Use mb_* string methods to extract first character for generated avatars
2018-02-21 11:08:33 +01:00
Roeland Jago Douma
ca9f364fd4
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 10:55:52 +01:00
Roeland Jago Douma
a773b055fc
Make the middlewareDispatcher strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 10:55:24 +01:00
Morris Jobke
3bea8e05ad
Use mb_* string methods to extract first character for generated avatars
...
This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server.
See also http://php.net/manual/en/function.mb-strtoupper.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-21 10:32:46 +01:00
Roeland Jago Douma
bb0c7b2943
Make AppFramework/Http/Dispatcher strict
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 08:51:46 +01:00
blizzz
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size
...
Better result handling of email search
2018-02-20 23:02:53 +01:00
Joas Schilling
b30e035e25
Better result handling of email search
...
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-20 17:38:32 +01:00
Roeland Jago Douma
cf83eb5e77
Merge pull request #8336 from nextcloud/cleanup-unused-parameter
...
Cleanup unused parameter
2018-02-20 10:16:59 +01:00
Roeland Jago Douma
980c78048b
Merge pull request #8314 from nextcloud/openstack
...
update openstack sdk
2018-02-19 22:22:55 +01:00
Roeland Jago Douma
26a741fd36
Merge pull request #8428 from nextcloud/fix_8189
...
Use TTF fonts for avatar generation
2018-02-19 22:12:05 +01:00
Robin Appelman
817f2f8f49
adjust swift external storage to new openstack sdk
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-19 19:41:16 +01:00
Robin Appelman
3192efc415
adjust swift object storage to new openstack sdk
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-19 19:41:16 +01:00
Roeland Jago Douma
4e6d98ea8c
Merge pull request #8424 from nextcloud/fix/update-app
...
Fix updating an app
2018-02-19 15:54:49 +01:00
Roeland Jago Douma
0f57bce06c
Avatar generation use ttf (for ancient compatibility)
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-19 12:35:35 +01:00
Christoph Wurst
1a8916af59
Fix updating an up
...
OC_App has been made strict recently and the updater code was not
compatible to this. This adds the array to string conversion of the
Nextcloud version and fixes a typo in OC_App (sstring -> string)
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-02-19 10:28:41 +01:00
Morris Jobke
70b1f510f2
Use normal header() calls instead of private method calls
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-19 09:40:25 +01:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app
...
Add strict types to OC_App
2018-02-17 21:34:20 +01:00
Morris Jobke
9b68f80c4b
Add remaining type hints, that were already okay
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:23 +01:00
Morris Jobke
9fcf185c7d
Always return a string in OC_App::getCurrentApp and no boolean
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:23 +01:00
Morris Jobke
e4077672e1
Use empty array as group list in OC_App::enable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:23 +01:00
Morris Jobke
2e15c0d871
Refactor dependencies in setAppTypes
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:23 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:13 +01:00
Morris Jobke
edee243b27
OC_App::loadApps now only accepts an array as type list
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 15:27:43 +01:00
Morris Jobke
2a2833e30f
Migrate to short array syntax
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 15:18:34 +01:00
Morris Jobke
57e0881a9e
Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema
...
Validate appinfo against appstore schema
2018-02-16 22:56:10 +01:00
Morris Jobke
45e7bb7f40
Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotes
...
Don't use double quotes in MySQL queries
2018-02-16 22:55:23 +01:00
Robin Müller
6aa816915a
Don't use double quotes in MySQL queries
...
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes ).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.
This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.
Signed-off-by: Robin Müller <robin.mueller@1und1.de>
2018-02-16 15:03:12 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:23:51 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities
...
Expose navigation entries as API endpoint
2018-02-15 16:55:12 +01:00
Julius Härtl
f36e8313ff
Add throws annotation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-15 12:23:49 +01:00
Joas Schilling
339e320064
Fix existing usages
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-15 12:18:51 +01:00
Joas Schilling
350e38396f
Allow custom HTML in HTML Emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-15 12:09:19 +01:00
Julius Härtl
04053311ee
Properly encapsulate require_once for app.php
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-15 11:20:22 +01:00
Julius Härtl
e694b30a4f
Update phpDoc comments and add more type hinting
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-15 10:38:25 +01:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6
...
update guzzlehttp/guzzle to 6.3.0
2018-02-14 22:26:19 +01:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import
...
Remove unused import statements
2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Joas Schilling
a966d5256c
Merge pull request #8328 from nextcloud/bugfix/noid/filter-out-the-current-user-by-email-too
...
Filter out the current user when searching for emails too
2018-02-14 11:53:48 +01:00
Joas Schilling
c32a94b78d
Merge pull request #8337 from nextcloud/use-non-alias-method
...
Use non aliased method instead
2018-02-14 10:09:09 +01:00
Morris Jobke
e2974f1133
Simplify return statement
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:55:24 +01:00
Morris Jobke
954da26e26
Use non aliased method instead
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:48:24 +01:00
Morris Jobke
d18d323f21
Remove fromMailAddress from MailSettingsController
...
Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a
) and https://github.com/nextcloud/server/pull/4380 (bae64e8
)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:40:38 +01:00
Joas Schilling
cf216ecff2
Filter out the current user when searching for emails too
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-13 17:32:58 +01:00
Julius Härtl
ada5aed35e
Deprecate static methods and use Navigation manager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-12 17:22:33 +01:00
Julius Härtl
b6da8c5279
Add getAll to public INavigationManager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-12 17:22:32 +01:00
Julius Härtl
864474b858
Move navigation processing to the NavigationManager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-12 17:22:32 +01:00
Roland Tapken
dc99442bc1
External storage test: log exceptions
...
If an external storage test fails the exception's message is now written
into the logfile (level INFO). Additionally, the stack trace is printed
as DEBUG. This helps to resolve the reason for a failing connection.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-02-11 16:45:32 +01:00
Robin Appelman
fe23bb5916
adjust post body for new guzzle
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-09 17:13:33 +01:00
Robin Appelman
97b44605f4
Adjust dav client to new guzzle
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-09 17:13:24 +01:00
Robin Appelman
9b25ff9fcb
adjust httpclient to guzzle6
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-09 17:13:21 +01:00
Roeland Jago Douma
3e0ef7e3f2
Try to silence phan
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 15:18:26 +01:00
Robin Appelman
e34c20af7d
don't swallow exception from touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 15:18:26 +01:00
Robin Appelman
85d23dd6fc
better error message on catalog error
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 15:18:26 +01:00
Morris Jobke
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader
...
Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:30:02 +01:00
Morris Jobke
d767d01a0c
Merge pull request #8218 from nextcloud/display_proper_lang_string
...
Display the proper language strings in setttings
2018-02-08 11:13:10 +01:00
Morris Jobke
e5c08621af
Merge pull request #8023 from nextcloud/webdavsearch_limit_order_fixing
...
Respect limit and order in webdav search
2018-02-08 09:11:39 +01:00
Robin Appelman
fd09c06eb4
actually return stream from swift
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 17:10:59 +01:00
Roeland Jago Douma
c1ff12e234
CacheJail should apply limit and offset after searching
...
Else the results might not be correct.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:41:15 +01:00
Morris Jobke
4ee539fde8
Fix proper overwrite URL on CLI install
...
* regression from #7835
Steps
* having a my.config.php with a proper `overwrite.cli.url` and `htaccess.RewriteBase` set
* install with this
* before: short URLs where broken and you need to call `occ maintenance:update:htaccess` additionally to fix this
* after: occ install results in a proper htaccess like on stable13
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-07 11:40:35 +01:00
Morris Jobke
8d57d68846
Merge pull request #8217 from nextcloud/fix_8180
...
Use proper lanugage in langauge code
2018-02-07 11:37:51 +01:00
Roeland Jago Douma
4ee9315a68
Display the proper language strings in setttings
...
Since this was moved to lib, we have to the lib language files.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 11:13:55 +01:00
Roeland Jago Douma
e5be299101
Use proper lanugage in langauge code
...
Fixes #8180
The _ is not valid in language codes use - instead.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 11:04:37 +01:00
Morris Jobke
27f505667c
Merge pull request #8182 from robert-scheck/pki-validation
...
Handle SSL certificate verifications for others than Let's Encrypt
2018-02-06 16:43:39 +01:00
Morris Jobke
8fa86bf68b
Merge pull request #8173 from michaelletzgus/fix_for_each
...
Fix "undefined index" problem
2018-02-06 10:23:52 +01:00
Arno Welzel
e7c35d720d
Avoid error messages for restricted opcache API
2018-02-05 19:45:06 +01:00
Robert Scheck
7583615bab
Handle SSL certificate verifications for others than Let's Encrypt
...
Do no longer (wrongly) rewrite URLs like
* http://example.net/.well-known/pki-validation/file.txt (Comodo)
* http://example.net/.well-known/pki-validation/fileauth.txt (DigiCert, Thawte, GeoTrust)
* http://example.net/.well-known/pki-validation/gsdv.txt (GlobalSign)
* http://example.net/.well-known/pki-validation/starfield.htm (Starfield, GoDaddy)
* http://example.net/.well-known/pki-validation/swisssign-check.txt (SwissSign)
for automated SSL certificate verifications. All (common commercial)
certificate authorities (CA) except Let's Encrypt (via ACME) seem to
use "pki-validation" rather "acme-challenge" for their domain control
validation (DCV).
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2018-02-05 15:33:42 +01:00
Morris Jobke
847bd0cf74
Merge pull request #8144 from nextcloud/cache-update-occ
...
Repair step to clear frontend related caches
2018-02-05 12:15:52 +01:00
Morris Jobke
0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css
...
Fix styling issues of guest pages
2018-02-05 12:14:09 +01:00
michaelletzgus
05b8eb140c
using isset()
...
using isset() instead of array_key_exists()
2018-02-05 10:50:32 +01:00
michaelletzgus
cfa694ea73
Fix undefined index problem
...
Nextcloud 13RC4, error in logfile, triggered by "occ config:list":
Invalid argument supplied for foreach() at lib/private/AppConfig.php#297
PHP Undefined index: workflowengine at lib/private/AppConfig.php#297
Fix: Check if index exists in array before using it.
2018-02-04 15:59:23 +01:00
Julius Härtl
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
Julius Härtl
7381a81d30
Add repair step to clear frontend related caches
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
Roeland Jago Douma
53a780e31c
Do not try to get the jailed path if we can't find the id
...
Fixes #8047
If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-03 14:45:28 +01:00
Julius Härtl
c29bf24440
Load guest css on any guest and error page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 14:20:13 +01:00
Joas Schilling
c314a07e7f
Merge pull request #8134 from coliff/patch-2
...
Update iOS link to geo-detect & show correct store listing
2018-02-02 12:43:10 +01:00
Christian Oliff
18898383c5
Update defaults.php
2018-02-02 20:37:58 +09:00
Morris Jobke
cbbc6187c2
Update doc link version to 14
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 13:52:11 +01:00
Roeland Jago Douma
367b5a794d
Merge pull request #8097 from nextcloud/deprecate-static-app
...
Deprecate static methods from \OCP\App
2018-01-31 16:23:11 +01:00
Morris Jobke
c95f6a1dc9
Merge pull request #8121 from nextcloud/bugfix/8085/migrations-table-has-old-collation
...
Create the migrations table also with the UTF8mb4 collation
2018-01-31 14:43:40 +01:00
Morris Jobke
3fa92a03e5
Add deprecation checks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-31 14:15:12 +01:00
Julius Härtl
efbdad2d0c
Remove OC_App::removeApp
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:15:12 +01:00
Julius Härtl
a68895e334
Remove OC_App::installApp since it is not used anymore
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:15:10 +01:00
Julius Härtl
19a0a9a4e7
Move getAppInfo and getAppVersion to IAppManager
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:13:15 +01:00
Joas Schilling
352a48e273
Create the migrations table also with the UTF8mb4 collation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-31 13:15:00 +01:00
Roeland Jago Douma
1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore
...
Do not cache the settings/sections in the database anymore
2018-01-31 12:49:45 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss
...
SCSS hardening
2018-01-29 16:12:10 +01:00
Joas Schilling
d971b104ed
Do not cache the settings/sections in the database anymore
...
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-29 15:47:37 +01:00
Morris Jobke
01482b32a1
Merge pull request #8062 from nextcloud/use-class
...
Use ::class statement instead of string
2018-01-29 15:25:08 +01:00
Roeland Jago Douma
c0adfa4375
Don't perform CSRF check on OCS routes with Bearer auth
...
Fixes #5694
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-29 14:37:18 +01:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
Morris Jobke
a661f043e1
Remove unneeded semicolon and parentheses
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
Julius Härtl
e4c58fc473
Add typehinting an fix some minor cleanup
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 20:11:37 +01:00
Julius Härtl
6770213649
Do not rewrite absolute URLs
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:08:45 +01:00
Julius Härtl
68db09ddce
Clear injectect variables when resetting the cache
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:07:30 +01:00
Morris Jobke
9be6050cc4
Merge pull request #8072 from nextcloud/type-casting
...
Use type casting instead of *val() method
2018-01-26 17:34:55 +01:00
Julius Härtl
5eae4819bf
Make sure that injected variables do not break the CSS generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 17:03:22 +01:00
Julius Härtl
92e93704be
SCSS files are only cached if their size is > 0
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 17:02:54 +01:00
Morris Jobke
97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code
...
Cleanup unused code
2018-01-26 15:47:06 +01:00
Morris Jobke
4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index
...
Use index based string access for substr with length of 1
2018-01-26 15:40:44 +01:00
Morris Jobke
c005fc6755
Cleanup unused code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:25:19 +01:00
Morris Jobke
2ad2eb38e8
Use type casting instead of *val() method
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:01:27 +01:00
Morris Jobke
9ff51aafc5
Use index based string access for substr with length of 1
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 13:38:34 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 12:36:25 +01:00
Morris Jobke
c1e4f9f305
Use type casting instead of *val() method
...
It should be up to 6x faster
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 11:35:42 +01:00
Morris Jobke
fe7e726ab2
Merge pull request #8064 from nextcloud/background-jobs
...
Deprecated OCP interface to fetch background job type
2018-01-26 10:43:21 +01:00
Morris Jobke
9ef6148bfa
Deprecated OCP interface to fetch background job type
...
* was not used by apps and also is not needed
* migrated the documentation to IJobList
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 10:43:01 +01:00
Joas Schilling
a7ad7cb08e
Merge pull request #8053 from nextcloud/simplify-substr
...
Use short for of substr to not need strlen()
2018-01-26 10:25:09 +01:00
Joas Schilling
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
Roeland Jago Douma
fab951e4b3
Merge pull request #8057 from nextcloud/unneeded-implements
...
Implements are not needed because they are already done by base class
2018-01-26 10:00:25 +01:00
Roeland Jago Douma
e97165e0b5
Merge pull request #8055 from nextcloud/improve-loop
...
Improve conditional of loop
2018-01-26 09:59:45 +01:00
Roeland Jago Douma
5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return
...
Remove useless return statements
2018-01-26 09:51:26 +01:00
Roeland Jago Douma
43ed8b446c
Merge pull request #8060 from nextcloud/proper-codeflow
...
Use proper code flow instead of not needed else branch
2018-01-26 09:49:30 +01:00
Morris Jobke
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
Morris Jobke
16a558871c
Use proper code flow instead of not needed else branch
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 23:01:03 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
Morris Jobke
55ef34b23b
Implements are not needed because they are already done by base class
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:42:24 +01:00
Morris Jobke
870fe20acc
Use $var[] = $a instead of array_push - 2x faster
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:36:03 +01:00
Morris Jobke
c314eb74a9
Improve conditional of loop
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:33:43 +01:00
Morris Jobke
e6efa755c9
Use short for of substr to not need strlen()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:23:48 +01:00