wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31708 commits 157 branches 562 tags 714 MiB
Commit graph

5527 commits

Author SHA1 Message Date
Lukas Reschke
8222ad5157
Move logout to controller 
Testable code. Yay.
 2016-04-18 21:21:52 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper 2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater 2016-04-18 17:12:59 +02:00
Lukas Reschke
14fdafaede Merge pull request #23947 from owncloud/login-to-ctrl 
Move login form into controller
 2016-04-18 11:47:57 +02:00
Roeland Jago Douma
3301bfd195
Move \OC\Notification to PSR-4 2016-04-18 09:20:06 +02:00
Roeland Jago Douma
f3d05486fd
Move \OC\Memcache to PSR-4 2016-04-18 08:21:50 +02:00
Roeland Jago Douma
d09f835dca
Move \OC\DB to PSR-4 
Besides the statement wrapper that is moved to the legacy folder
(namepsace of shame folder)
 2016-04-15 19:46:34 +02:00
Lukas Reschke
331e4efacb
Move login form into controller 
First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.
 2016-04-15 17:36:23 +02:00
Roeland Jago Douma
653325f254
Move \OC\Comments to PSR-4 2016-04-15 15:54:20 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Roeland Jago Douma
5c6079cd89
Move \OC\Command to PSR-4 2016-04-15 12:01:13 +02:00
Roeland Jago Douma
d9007ccacf
Move \OC\Cache to PSR-4 2016-04-15 09:22:37 +02:00
Roeland Jago Douma
e2c36c2903
Move \OC\Session to PSR-4 2016-04-15 07:46:19 +02:00
Thomas Müller
e3b90d7caa Merge pull request #24007 from owncloud/security_psr4 
Move \OC\Security to PSR-4
 2016-04-14 23:44:36 +02:00
Thomas Müller
b23037ec5c Merge pull request #23998 from owncloud/translate-birthday 
Translate contacts birthday
 2016-04-14 23:41:03 +02:00
Thomas Müller
f4f4f88347 Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-root 
Kill movable 3rdparty
 2016-04-14 23:33:34 +02:00
C. Montero Luque
ed1874ee97 Merge pull request #23561 from owncloud/background-scan-unscanned 
handle completely unscanned storages in the background scanner
 2016-04-14 15:23:42 -04:00
Roeland Jago Douma
9050e76d95
Move \OC\Security to PSR-4 2016-04-14 19:21:18 +02:00
Thomas Müller
dc061bae42
Kill movable 3rdparty 2016-04-14 17:59:49 +02:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982 2016-04-14 16:58:45 +02:00
Thomas Müller
0cff70bb90 Merge pull request #23991 from owncloud/handle-exceptions-in-templates 
Properly handle exception within templates
 2016-04-14 15:38:47 +02:00
Scrutinizer Auto-Fixer
25fff15487 Scrutinizer Auto-Fixes (#23959) 
* Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

* revert append() change
 2016-04-14 11:50:06 +02:00
Morris Jobke
dfb98c31a3 Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles 
Fix Share::getUsersSharingFile() for mount points
 2016-04-14 11:49:11 +02:00
Roeland Jago Douma
7b3191705c
Let the querybuilder convert 2016-04-14 11:32:34 +02:00
Robin Appelman
68746e1bdb
chunk the cleaning up of shared locks 2016-04-14 11:32:34 +02:00
Morris Jobke
12f1adb7bb
Properly handle exception within templates 
* fixes partial printed templates when exception is thrown in between
 2016-04-14 11:22:38 +02:00
Roeland Jago Douma
86e757d2b3
Move \OC\Lock to PSR-4 2016-04-14 08:28:16 +02:00
Roeland Jago Douma
e5dd4272d3
Move \OC\App to PSR-4 2016-04-13 19:53:05 +02:00
Joas Schilling
79c17cdfa6
Fix Share::getUsersSharingFile() for mount points 2016-04-13 17:44:18 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager 
The last sharing hook to be moved over.

* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
 2016-04-13 15:00:12 +02:00
Thomas Müller
7f87c3e843 Merge pull request #23962 from owncloud/activity-psr4 
Move files in \OC\Activity to PSR-4
 2016-04-13 14:10:07 +02:00
Joas Schilling
009f96cb83 Merge pull request #23963 from owncloud/lazyRoot 
Add LazyRootFolder
 2016-04-13 12:53:28 +02:00
Roeland Jago Douma
55497e09a9
Make shareproviders use the lazy root folder 2016-04-13 11:23:07 +02:00
Roeland Jago Douma
5cd8382d39
Add lazyRootFolder 2016-04-13 11:23:02 +02:00
Thomas Müller
e90a3b5ba7 Merge pull request #23954 from stweil/master 
misc: Fix some typos
 2016-04-13 11:08:58 +02:00
Roeland Jago Douma
a5a6c85c1c
Move files in \OC\Activity to PSR-4 2016-04-13 10:29:36 +02:00
Stefan Weil
ee5f5eebe5 misc: Fix some typos 
Some of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-12 18:36:39 +02:00
Björn Schießle
f17ad18865
set $share to null if getShareByToken() failed 2016-04-12 17:26:09 +02:00
Thomas Müller
fdee771aca Add unit testing capabilities for templates (#23708) 
Add unit testing capabilities for templates
 2016-04-12 12:49:11 +02:00
Roeland Douma
495a964ca2 Migrate post_groupDelete hook to share manager (#23841) 
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.

* Unit tests added

Again nothing should change it is just to cleanup old code
 2016-04-12 09:46:25 +02:00
Roeland Douma
4ddf9f98f1 Don't calculate permissions twice (#23917) 
There is no need to calculate the permissions twice.
Saves some is_dir and file_exists calls.
 2016-04-12 09:45:59 +02:00
Joas Schilling
8e16e7bf34 Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks 
Remove pre/post_addToGroup hooks for shares
 2016-04-11 15:05:20 +02:00
Morris Jobke
ddbb9b7ec4 Catch the AutoloadNotAllowedException also for legacy jobs (#23901) 
* same as #18839 for legacy jobs
* avoids spamming the log with useless entries
 2016-04-11 14:06:11 +02:00
Joshua Ruehlig
329849f2c2 To be safe don't unload until end (#23752) 
* To be safe don't unload until end

* unlink needs to be before return to actually do anything
 2016-04-11 14:04:57 +02:00
Morris Jobke
929a28421a Merge pull request #23798 from owncloud/federated-unshare-background-job 
re-try to send unshare notification if remote server is not available
 2016-04-11 11:13:00 +02:00
Thomas Müller
bab55141a6 Fixes #23899 2016-04-11 10:35:52 +02:00
Thomas Müller
e2c4a0cecd Merge pull request #23860 from owncloud/followup-23304-opening-empty-file 
Correctly return an empty string for empty files
 2016-04-11 10:08:24 +02:00
Thomas Müller
1d3d43b1e9 Merge pull request #23553 from owncloud/lock-ttl-execution-time 
Make lock ttl configurable
 2016-04-08 14:53:26 +02:00
Thomas Müller
53acb4a65f Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager 
Move public webdav auth to share manager
 2016-04-08 14:52:15 +02:00
Joas Schilling
178ad23d80
Correctly return an empty string for empty files 2016-04-08 14:50:42 +02:00
Roeland Jago Douma
bd3bde2f3b
Set proper permissions on link share 
If we do not allow public upload we should limit the permissions on
links shares upon retrieval.

* Added unit test
* Allow fetching federated shares by token as well
 2016-04-08 14:17:05 +02:00
Roeland Jago Douma
3fae4c82d2
Remove pre/post_addToGroup hooks for shares 
There is no need to perform the checks for unique targets on add to
group as we have to do this all when mounting the shares anyway.
 2016-04-08 11:56:38 +02:00
Bjoern Schiessle
fbd5c28c39 re-try to send unshare notification if remote server is not available 2016-04-08 11:32:04 +02:00
Stefan Weil
b1a856d7b7 lib: Fix typos (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-07 19:51:27 +02:00
Joas Schilling
0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook 
Migrate post_userDelete hook to share manager
 2016-04-07 13:01:10 +02:00
Robin Appelman
cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Lukas Reschke
cc5a2b549e
Replace getid3 with ID3Parser 2016-04-06 12:00:16 +02:00
Morris Jobke
046506dd14 Merge pull request #23763 from owncloud/do_not_export_share_type_2 
Share type 2 is private
 2016-04-06 09:40:13 +02:00
Thomas Müller
60f532882c Merge pull request #23794 from owncloud/handle-null-in-usermanager 
Prevent null to be passed into the closure of callForAllUsers
 2016-04-05 17:57:39 +02:00
Thomas Müller
64d400b5df Prevent null to be passed into the closure of callForAllUsers 2016-04-05 10:26:04 +02:00
Jan-Christoph Borchardt
73a6664ca8 load mobile styles last, fix #19596 2016-04-05 09:47:39 +02:00
Thomas Müller
961bb4c3e3 Merge pull request #23677 from owncloud/db-schema-migration-feedback 
Show individual sql schema migration steps during upgrade - on web as…
 2016-04-05 09:39:35 +02:00
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
4b79fb10a2 Fix verbose output of upgrade command - not progressbar in this case and the schema migration test has one progressbar now for all tables - before we had one progressbar for each table 2016-04-04 16:20:53 +02:00
Roeland Jago Douma
e0cee43cf0 Migrate post_userDelete hook to share manager 
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
 2016-04-04 14:15:38 +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
Thomas Müller
1bf4c75e8b Show individual sql schema migration steps during upgrade - on web as well as on the command line 2016-04-04 12:34:18 +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
Roeland Jago Douma
d3959ee152 Share type 2 is private 
This was added to the factory for legacy reasons when converting from
old to new sharing code. It is not used anymore so can be deleted. Which
means we no longer expose internal types.
 2016-04-04 09:00:06 +02: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
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
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
Morris Jobke
f5beeec833 Properly handle return values of OC_App::getAppInfo() 
* fixes #23668
 2016-03-30 23:29:26 +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
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
C. Montero Luque
4123185d2d Merge branch 'master' into background-scan-unscanned 2016-03-25 13:14:35 +01: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
Robin Appelman
6485d95c5a handle completely unscanned storages in the background scanner 2016-03-24 17:16:21 +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