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

209 commits

Author SHA1 Message Date
Robin Appelman
54a15a8001 Use streams when generating hashes of remote files 2014-04-02 04:38:54 +02:00
Vincent Petry
d811026ec9 Merge pull request #7935 from owncloud/getpath-shared 
Make getPath work for shared files
 2014-04-01 21:59:09 +02:00
Vincent Petry
0067a4eac2 Added missing fclose in file_get_contents and file_put_contents 2014-04-01 10:08:16 +02:00
Vincent Petry
d6ce45fe61 Correctly read the full stream in file_get_contents 
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.

This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.

Added unit test with a bigger test file to cover this case.
 2014-04-01 10:07:16 +02:00
Robin Appelman
0c2585f3ac Improve phpdoc 2014-03-31 14:29:55 +02:00
Robin Appelman
f331d5f9d4 Give storages the option to implement the getById behaviour for View->getPath 2014-03-28 15:15:56 +01:00
Thomas Müller
70db348475 Merge pull request #7824 from owncloud/hash-parameter-order 
Fix parameter order for Storage\Local::hash
 2014-03-28 13:06:07 +01:00
Vincent Petry
040f430f0c Merge pull request #7829 from owncloud/cachefolderlocation 
Cache folder is now configurable
 2014-03-28 12:08:38 +01:00
Vincent Petry
e76be308eb Remove unused setUserVars utility method 
That method was moved to the external storage recently so
isn't needed here any more.
 2014-03-26 09:39:09 +01:00
Thomas Müller
ed97d872af Merge pull request #7325 from owncloud/recursive-mkdir-local 
Recursive mkdir fixes #7047
 2014-03-25 22:45:14 +01:00
Thomas Müller
1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first 
Manually triger the filecache update hooks before any other hook
 2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse 
Allow re-using already known fileinfo when calculating folder sizes
 2014-03-25 22:33:24 +01:00
Vincent Petry
10c9b8eb99 Cache folder is now configurable 
When using an external cache folder, it is automatically mounted in
FileSystem::initFileSystem so that any app can use it transparently
by creating a view on the "/$user/cache" directory.
 2014-03-24 12:57:11 +01:00
Robin Appelman
7a8f1389fe fix temporary file based common hash 2014-03-21 13:23:14 +01:00
Lukas Reschke
2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords 
Obfuscate passwords in ext storage config
 2014-03-20 16:31:12 +01:00
Robin Appelman
fffe330bbc Fix parameter order for Storage\Local::hash 2014-03-20 15:32:12 +01:00
Vincent Petry
66bc0f0848 Still return quota value when free space is unknown 
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
 2014-03-19 19:07:11 +01:00
Vincent Petry
4cb53f77b2 Moved external storage mounting code to files_external app 
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
 2014-03-19 12:45:38 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Robin Appelman
eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Robin Appelman
d55c7223a9 Merge branch 'master' into foldersize-reuse 
Conflicts:
lib/private/files/cache/homecache.php
 2014-03-11 13:04:20 +01:00
Vincent Petry
c1cb9ee9b0 Merge pull request #7650 from owncloud/quota-totalspace 
Fixed total space display when data size exceeds quota
 2014-03-11 12:40:59 +01:00
Vincent Petry
010eef95c0 Fixed total space display when data size exceeds quota 
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
 2014-03-10 17:59:14 +01:00
Vincent Petry
4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db 
[trash] fall back if file is not in db
 2014-03-10 16:04:47 +01:00
Bjoern Schiessle
4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Vincent Petry
26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix 
[master] Fixed used space to be based on unencrypted size
 2014-03-10 09:38:24 +01:00
Thomas Tanghus
212699e389 Merge pull request #7628 from owncloud/fileinfo-type 
Fix FileInfo->getType errors
 2014-03-09 23:34:01 +01:00
Robin Appelman
51165a1a04 Check if value exists before returning 2014-03-07 15:16:35 +01:00
Vincent Petry
48d63a6278 Return unencrypted_size of folder when queried 
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
 2014-03-07 14:59:09 +01:00
Robin Appelman
65f52fee4f Fix FileInfo->getType errors 2014-03-07 14:52:44 +01:00
Vincent Petry
7f24d42ca5 Propagate unencrypted_size up to the file cache root 2014-03-07 11:00:22 +01:00
Robin Appelman
895fc0fa26 Fix check if fileinfo is valid 2014-03-06 14:23:27 +01:00
Robin Appelman
a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Robin Appelman
06c6163265 Check if fields we need are actually set to prevent errors 2014-03-03 16:48:28 +01:00
Robin Appelman
c87658feda Fix updater when getFileInfo fails 2014-03-03 12:56:08 +01:00
Robin Appelman
da386aad59 Allow re-using already known fileinfo when calculating folder sizes 2014-02-28 14:23:07 +01:00
Robin Appelman
3ff12ef4ec Also send explicit cache hooks when calling file_put_contents with a resource 2014-02-28 14:21:33 +01:00
Robin Appelman
7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Robin Appelman
bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
icewind1991
59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse 
Reuse the folder id in View->getFolderContents
 2014-02-26 12:18:34 +01:00
Vincent Petry
7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 
Fix code to search for mount.json in custom data folders
 2014-02-25 15:27:47 +01:00
Vincent Petry
9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall 
Replace deleteAll call with unlink call on rename
 2014-02-25 14:52:21 +01:00
Bjoern Schiessle
ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Vincent Petry
a23ef25010 Removed unused deleteAll method on Common storage class 
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
 2014-02-24 12:21:48 +01:00
Vincent Petry
c465835e85 Replace deleteAll call with unlink call 
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
 2014-02-24 12:20:11 +01:00
Robin Appelman
f86dffd56c Merge branch 'master' into recursive-mkdir-local 2014-02-21 15:43:54 +01:00
Robin Appelman
3487a95eab Remove fileid parameter for getFolderContent 2014-02-21 15:36:24 +01:00
Robin Appelman
dd98e6333f Split getFolderContentById 2014-02-21 15:35:12 +01:00
Robin Appelman
3980a7d9c6 Merge branch 'master' into folderid-reuse 2014-02-21 15:33:12 +01:00
Lukas Reschke
f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Thomas Müller
ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 
Allow passing a root folder to get the used space from in the quota wrapper
 2014-02-20 16:47:59 +01:00
Robin Appelman
d1c392d9ad Also make "regular" local storage's mkdir recursive 2014-02-20 15:36:30 +01:00
Joshua Medeiros
76aa4714cf Recursive mkdir fixes #7047 2014-02-20 15:35:00 +01:00
Lukas Reschke
c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Luke Policinski
b01492fecd Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:28:32 +00:00
Luke Policinski
79a6d89bcc Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:23:39 +00:00
Morris Jobke
bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2014-02-19 11:51:04 +01:00
icewind1991
2d5ab1a5c4 Merge pull request #7260 from owncloud/watcher-policy 
Allow setting the frequency of which the file watcher checks for updates
 2014-02-19 11:17:27 +01:00
Robin Appelman
1331de554c Reuse the folder id in View->getFolderContents 2014-02-19 10:46:02 +01:00
Vincent Petry
e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo 
use a FileInfo object of the directory when generting the filelist
 2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Robin Appelman
2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00
Robin Appelman
d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Robin Appelman
09502fcb36 remove the JsonSerializable interface from \OC\Files\FileInfo 2014-02-14 19:26:06 +01:00
icewind1991
2a7509ee50 Merge pull request #6748 from owncloud/fileinfo 
Add a FileInfo class which holds all info of a file ...
 2014-02-14 15:16:39 +01:00
Vincent Petry
c442a03d3a Merge pull request #7075 from owncloud/quota-storagexsendfile 
Added isLocal() method to storage, used for xsendfile
 2014-02-11 14:49:39 +01:00
Robin Appelman
e6df86f4cb Merge branch 'master' into quota-space-root 2014-02-10 14:03:06 +01:00
Robin Appelman
5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Vincent Petry
788c8540aa Added isLocal() method to storage, used for xsendfile 
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
 2014-02-06 20:53:15 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Jens-Christian Fischer
11f46e121c close statement in MimeType detection is executed [#7069] 
close statement was never executed due to it being after a return
statement.
 2014-02-04 17:03:52 +01:00
Robin Appelman
0ae4022fb4 Also clean up the filecache table when deleting a storage entry 2014-02-03 16:36:21 +01:00
Tigran Mkrtchyan
8cc9727520 mount: make location of mount.json configurable 
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-01-29 17:14:23 +01:00
Robin Appelman
4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Robin Appelman
20c2aaab00 Actually rename the variable 2014-01-27 16:26:54 +01:00
Robin Appelman
c8207312c7 Fix phpdoc 2014-01-27 16:00:10 +01:00
Robin Appelman
a521949baf Allow passing a root folder to get the used space from in the quota wrapper 2014-01-27 15:41:56 +01:00
Robin Appelman
fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Robin Appelman
374e3475c9 Also remove the user's home storage from the storage table when deleting a user 2014-01-21 23:58:48 +01:00
Robin Appelman
3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Vincent Petry
1af7dab535 Fixed quota wrapper to not wrap failed fopen streams 
When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832
 2014-01-19 18:51:36 +01:00
Robin Appelman
5cb08bb9cb Merge branch 'master' into fileinfo 
Conflicts:
	tests/lib/files/cache/cache.php
 2014-01-17 14:47:29 +01:00
Vincent Petry
34559ef114 Merge pull request #6768 from owncloud/scanner-use-storage-mtime 
Use storage_mtime when determining if we can reuse cached data while scanning
 2014-01-15 01:31:33 -08:00
Robin Appelman
c01949ec0e Merge branch 'master' into fileinfo 2014-01-14 16:31:08 +01:00
Robin Appelman
203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
Robin Appelman
e706cf6c06 add Support for passing a FileInfo instance to View->putFileInfo 2014-01-13 15:57:49 +01:00
Robin Appelman
82762bb462 remove ArrayAccess, JsonSerializable from the public part of FileInfo 2014-01-13 15:13:45 +01:00
Robin Appelman
617acbd6f9 Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search 2014-01-13 14:28:49 +01:00
Vincent Petry
4faba49f0a Fix calculated folder size to use unencrypted size 
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
 2014-01-09 17:47:50 +01:00
Vincent Petry
f642ad3961 Prevent deleting storage root 
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.

Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
 2014-01-08 13:17:36 +01:00
Vincent Petry
5be4af9f51 Now also preventing to override "files" dir size with -1 
Fixes #6526
 2014-01-07 22:34:01 +01:00
Robin Appelman
25370fcb82 Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage 2014-01-02 13:19:10 +01:00
Vincent Petry
123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag 
reuse etags when doing a background scan
 2013-12-06 10:13:14 -08:00
Bart Visscher
6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Frank Karlitschek
8fdbb98899 Merge pull request #6168 from owncloud/extstorage-testtestmethod 
Added unit test for the test() method of ext storage
 2013-12-03 11:00:49 -08:00
Vincent Petry
6cf9844e9c Added unit test for the test() method 
This is to make sure that method isn't broken
 2013-12-03 14:35:53 +01:00
Robin Appelman
64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00