Morris Jobke
6ecd1d9e86
Fix PHP memory leak in file_get_contents()
...
* ref https://bugs.php.net/bug.php?id=61961
* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256
* code is based on the proposal of @chriseqipe
* fixes #20261
2016-04-04 16:48:09 +02:00
Thomas Müller
f6cea3c9c4
Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page
...
In case of exception we return an html page in case the client is a b…
2016-04-04 13:51:23 +02:00
Bernhard Posselt
4887f0f9b5
Add better messages for sometimes obscure exceptions
...
* add better messages for sometimes obscure exceptions
* fix formatting
2016-04-04 10:55:46 +02:00
Thomas Müller
64d68eb2da
Merge pull request #23722 from owncloud/also-hide-password-for-private-key-password-update
...
Also replace password in updatePrivateKeyPassword
2016-04-04 10:54:59 +02:00
Joas Schilling
1d542e4ed2
Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report
...
Sanitize more data in config report
2016-04-04 09:47:02 +02:00
Jenkins for ownCloud
deca08a683
[tx-robot] updated from transifex
2016-04-02 01:55:25 -04:00
Lukas Reschke
a5f2f22c12
Sanitize more data in config report
...
This sanitizes the following keys as well:
- `proxyuserpwd`
- `shared_secret` of `log.condition`
- `license-key`
- `password` of `redis`
2016-04-01 13:03:34 +02:00
Lukas Reschke
09b14ceffc
Also replace password in updatePrivateKeyPassword
...
Fixes https://github.com/owncloud/core/issues/23717
2016-04-01 10:32:23 +02:00
Joas Schilling
0235a79b4e
Initialise the printcss array
2016-04-01 09:46:15 +02:00
Jenkins for ownCloud
cce6194368
[tx-robot] updated from transifex
2016-04-01 01:56:19 -04:00
Thomas Müller
2714dfce21
Merge pull request #23713 from owncloud/small_encryption_fix
...
make sure that we always remove the file again from the cache after t…
2016-03-31 23:13:52 +02:00
Morris Jobke
902abe33f5
Merge pull request #23676 from owncloud/handle-null-return-getAppInfo
...
Properly handle return values of OC_App::getAppInfo()
2016-03-31 22:21:50 +02:00
C. Montero Luque
0393e80c7c
Merge pull request #16857 from owncloud/printStylesheets
...
Support for print stylesheets
2016-03-31 22:13:44 +02:00
Bjoern Schiessle
e4b451491b
make sure that we always remove the file again from the cache after the version was created
2016-03-31 21:52:23 +02:00
Frank Karlitschek
f5709b511b
Merge pull request #23445 from owncloud/enc_small_improvement
...
small performance improvement: no need to calculate the header size
2016-03-31 20:38:42 +02:00
Frank Karlitschek
2bff34be56
Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set
...
Make sure that the encrypted version is set
2016-03-31 20:37:17 +02:00
Frank Karlitschek
fdb59079a2
Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages
...
fix creation of versions of encrypted files on external storages
2016-03-31 20:36:03 +02:00
Frank Karlitschek
ba8c81e6d1
Merge pull request #23526 from owncloud/fix_23337
...
Add setId and setProviderId to IShare interface
2016-03-31 20:07:02 +02:00
Bjoern Schiessle
93ed965cbb
fix creation of versions of encrypted files on external storages
...
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
2016-03-31 19:24:47 +02:00
Lukas Reschke
c427bf3b5d
Make sure that the encrypted version is set
...
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:
1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
2016-03-31 18:06:37 +02:00
Jenkins for ownCloud
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
Morris Jobke
f5beeec833
Properly handle return values of OC_App::getAppInfo()
...
* fixes #23668
2016-03-30 23:29:26 +02:00
Roeland Jago Douma
d883b877d1
Move OCP\Share over to PSR-4
...
Touching the code so moving it over to PSR-4
2016-03-30 22:55:03 +02:00
Roeland Jago Douma
2f4294e781
Add setId and setProviderID to the public interface
...
Fixes #23337
We only allow the id to be set once!
2016-03-30 22:55:03 +02:00
Thomas Müller
66ee9d56fc
Merge pull request #23628 from owncloud/avatar-remove
...
only remove avatars from the folder we store them in
2016-03-30 17:00:09 +02:00
Thomas Müller
748a59db11
Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails
...
xcache.var_size with 64M should evaluate to isAvailable
2016-03-30 16:57:02 +02:00
Joas Schilling
f1c23a92a4
xcache.var_size with 64M should evaluate to isAvailable
2016-03-30 14:54:56 +02:00
Roeland Jago Douma
9ce5e4b01f
Non moveable mount points should always be UPDATE+DELETE shareable
...
Fixes #23536
The new sharing code is much stricter in checking permissions. However
for non moveable mounts the permissions UPDATE+DELETE are not reported
on the mount point.
This is just a quick fix.
* Updated unit tests
2016-03-30 13:33:16 +02:00
Robin Appelman
c22697e09e
only remove avatars from the folder we store them in
2016-03-30 10:24:43 +02:00
Jenkins for ownCloud
fc708c1e04
[tx-robot] updated from transifex
2016-03-30 01:57:41 -04:00
Thomas Müller
37d32a93d0
Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short
...
Fix activity emails always using the short translation
2016-03-29 18:44:16 +02:00
Jenkins for ownCloud
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284
[tx-robot] updated from transifex
2016-03-27 01:55:45 -04:00
Jenkins for ownCloud
3e33b686b1
[tx-robot] updated from transifex
2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2
[tx-robot] updated from transifex
2016-03-25 01:55:47 -04:00
Thomas Müller
b966fc2233
Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal
...
Lock the mountpoint while removing
2016-03-24 22:43:46 +01:00
Thomas Müller
b8812c8cba
Merge pull request #23154 from owncloud/avatar-save-failure
...
dont die when we cant save the resized avatar, log instead
2016-03-24 22:43:17 +01:00
Lukas Reschke
95820fbd5b
Add magical regex to catch browsers
2016-03-24 19:02:16 +01:00
Thomas Müller
c46f480031
In case of exception we return an html page in case the client is a browser
2016-03-24 19:02:16 +01:00
Jörn Friedrich Dreyer
c3508df09a
add missing var
2016-03-24 12:49:43 +01:00
Thomas Müller
789df4d630
Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future
...
getAppPath can return false
2016-03-24 11:56:43 +01:00
Joas Schilling
3d9863febc
Lock the mountpoint while removing
2016-03-24 11:50:17 +01:00
Joas Schilling
c0858f42aa
Allow the activity app to set the current user when sending emails
2016-03-24 09:36:44 +01:00
Joas Schilling
dad98542a5
We are only formatting an object when it's not null
2016-03-24 09:34:19 +01:00
Lukas Reschke
117b3e0a12
getAppPath can return false
...
Fixes https://github.com/owncloud/core/issues/23533
2016-03-24 09:19:43 +01:00
Lukas Reschke
cc8c0b6a90
Check if request is sent from official ownCloud client
...
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)
While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
2016-03-24 08:59:56 +01:00
Jenkins for ownCloud
4b3af9dfe7
[tx-robot] updated from transifex
2016-03-24 01:57:28 -04:00
Thomas Müller
6fc92453f3
Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translations
...
Fix the translations of the User menu
2016-03-23 23:20:00 +01:00
Joas Schilling
6026b67280
Fix the translations of the User menu
2016-03-23 15:34:25 +01:00