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

686 commits

Author SHA1 Message Date
Bjoern Schiessle
d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Bjoern Schiessle
89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Robin Appelman
298011bf29 fix indention 2014-08-31 10:45:11 +02:00
Robin Appelman
c2ebc192a6 Make external shares work with imported self-signed certificates 2014-08-31 10:45:11 +02:00
Jörn Friedrich Dreyer
f551917a3c kill OC::$session 
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
 2014-08-29 10:22:21 +02:00
Clark Tomlinson
58ab105515 Merge pull request #10421 from owncloud/share-external-delete 
Remove no longer existing files from the cache when scanning external storage
 2014-08-25 11:28:50 -04:00
Morris Jobke
b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik
2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. 
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-08-19 13:55:35 +02:00
Bjoern Schiessle
c9903f2e68 make share folder configurable 2014-08-18 16:52:48 +02:00
Robin Appelman
bbe17f35a1 Remove no longer existing files from the cache when scanning external storage 2014-08-14 14:50:52 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Robin Appelman
f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Robin Appelman
eb8683e6ee trim leading slash 2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Bjoern Schiessle
f451173817 remove unused variable 2014-08-05 20:34:18 +02:00
Jörn Friedrich Dreyer
a7b4cd77b1 traverse folders in php to search in shared files 2014-07-31 12:05:29 +02:00
Björn Schießle
c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Bjoern Schiessle
b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Bjoern Schiessle
ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Robin Appelman
97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Vincent Petry
658828867c Correctly return the owner display name for children of shares 2014-07-16 12:07:02 +02:00
Vincent Petry
f4f52cf242 Fix update cleanup to only affect file and folders 
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
 2014-07-08 14:53:31 +02:00
Björn Schießle
a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete 
[sharing] unshare childrens on delete
 2014-07-04 17:42:52 +02:00
Vincent Petry
5e8959a5b3 Return and use isPreviewAvailable for share previews 
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
 2014-07-04 11:16:23 +02:00
Bjoern Schiessle
3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Vincent Petry
ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target 
don't move a share mount point into a different mount point
 2014-07-02 21:01:03 +02:00
Vincent Petry
615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points 
[sharing] rename mount point of children if parent was renamed
 2014-07-02 18:48:07 +02:00
Vincent Petry
f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available 
Handle storages not being available in webui and webdav
 2014-07-02 18:15:58 +02:00
Bjoern Schiessle
ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00
Robin Appelman
edb67f9f4d Remove invalid mounts from the active fs 2014-07-02 15:00:12 +02:00
Bjoern Schiessle
bb935978fa don't move a share mount point into a different mount point 2014-07-01 19:38:55 +02:00
Robin Appelman
8061a4ccc0 Remove external shares if the share is invalid 2014-07-01 14:58:07 +02:00
Robin Appelman
1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +02:00
Jörn Friedrich Dreyer
abc521dbf7 add missing backticks 2014-07-01 12:29:30 +02:00
Bjoern Schiessle
372d58544f no longer check if the external storage app is enabled, we use no the webdav implementation from core 2014-06-30 12:34:49 +02:00
Robin Appelman
1bb1504d24 Improve comment 2014-06-27 17:31:51 +02:00
Robin Appelman
6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation 
make sure that the etags get propagated correctly
 2014-06-26 10:26:24 +02:00
Vincent Petry
93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath 
Fix parsing of remote URL when mounting remote shares
 2014-06-25 19:59:39 +02:00
Bjoern Schiessle
38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c Fix parsing of remote URL when mounting remote shares 
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
 2014-06-25 15:11:43 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Bjoern Schiessle
84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Vincent Petry
9b001ed903 Setup the external share manager in a hook 
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
 2014-06-23 11:57:43 +02:00
Robin Appelman
3ed4e5b26b Prevent warning 2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626 Fix setupFromToken when a password is set 2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007 Fix multiple users having the same external share mountpoint 2014-06-16 15:57:01 +02:00
Robin Appelman
9670d3e98b Always send a POST body 2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48 Fix undefined index error 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5 block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd Properly expose read only public shares as read only 2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00
Robin Appelman
decb51aee6 Fix deleting of external shares 2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168 generate better storage ids 2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8 Use the movable mount system for external shares 2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b Fix check for shared files inside shares 2014-06-14 10:14:08 +02:00
Robin Appelman
64ced76beb Save mountpoints relative to the user 2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911 make sure to enable incognito mode when mounting a public link and update init status of the encryption app 2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56 Scan the entire remote share at once by requesting the full file tree from the remote server 2014-06-14 10:14:07 +02:00
Robin Appelman
a900c7aa94 Fix removing remote shares 2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d Add interface for accpeting external shares 2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166 Add coments to database and dont use sql keywords as table names 2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb add remote/add external shares to manager 2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Jörn Friedrich Dreyer
42bf466fa1 move mail template editor from core to standalone templateeditor repo 2014-06-13 12:00:23 +02:00
Robin Appelman
a978607011 Use &= 2014-06-09 12:47:00 +02:00
Bjoern Schiessle
0b2ae314c7 check if permissions exists 2014-06-06 09:56:02 +02:00
Robin Appelman
60ea4388ed Limit permissions to share permissions 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c fix unshareFromSelf() 2014-06-06 09:56:02 +02:00
Bjoern Schiessle
574de2d91b the mount point always have delete permissions to allow unmount 2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ad5d8d7980 nake sure ti create new db entry when user renames a group share 2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249 Fix phpdoc and comments 2014-06-06 09:56:01 +02:00
Bjoern Schiessle
9a48e87253 make sure that we have a path relative to data/user/files to work with 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
0ce07bb6c4 update mount point if file_target changed 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6 add additional unit tests 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
24f3f6823e get unique_name value directly from the share array 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
5132ae5e69 fix mount point move up if the parent no longer exists 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
884b9a0ecf bring back updateFileTarget() got lost during last rebase 2014-06-06 09:56:00 +02:00
Bjoern Schiessle
1b0b977678 remove share mount 2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8 Move shared mount moving from the storage to the mount 2014-06-06 09:55:59 +02:00
icewind1991
09cc7c2d44 Merge pull request #8862 from owncloud/share-overview-fixmimetype 
Fix mime type returning for shared with others files
 2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master 
Kill permissions table
 2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2 - drop permissions table and related code 
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
 2014-06-05 08:22:01 +02:00
Thomas Müller
c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0 
Update SabreDAV to 1.8.10
 2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui 
minimal mail template editor for administrators
 2014-06-04 18:44:44 +02:00
Thomas Müller
fc1d6f4c3c fixes during test 2014-06-04 15:01:36 +02:00
Thomas Müller
76e04027bc Upgrade SabreDAV to 1.8.10 
Updating SabreDAV namespaces
 2014-06-04 12:22:23 +02:00
Vincent Petry
c88509902e Fix mime type returning for "shared with others" files 
Use "path" instead of "file_target", as the latter is not always set /
reliable.
 2014-06-04 11:26:03 +02:00
Jörn Friedrich Dreyer
b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Bjoern Schiessle
916f859377 check if it is a share storage 2014-06-02 20:39:20 +02:00
Thomas Müller
2a10e78c58 no need to empty array in a special way 2014-06-02 20:17:40 +02:00
Bjoern Schiessle
e0a5f3b570 get permissions directly from share storage to avoid additional db calls 2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer
37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
icewind1991
2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof 
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
 2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9 Fixed warning when file_target is not set 
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
 2014-05-30 12:35:04 +02:00
Vincent Petry
0879a63320 Mimetype for sharing overview 2014-05-30 10:06:29 +02:00
Bjoern Schiessle
dbbb6c5945 extend OCS Share API to allow the user to ask for files shared with him 2014-05-30 10:06:28 +02:00
Robin Appelman
99d46af0b4 Use instanceOfStorage instead of instanceof 2014-05-29 13:52:58 +02:00
Bjoern Schiessle
95bd7fee9c don't lose file size during rename 2014-05-26 14:11:33 +02:00
Bjoern Schiessle
11aa2cf74b always check for unique filename, if a file gets added from outside the mount 
point should be adjusted to ne unique again
 2014-05-22 14:31:22 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Bjoern Schiessle
5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc 
* test case added to avoid adding them later
 2014-05-19 17:50:53 +02:00
Robin McCorkell
e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Robin McCorkell
6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Thomas Müller
55fc693750 @breif -> @brief 2014-05-13 19:09:15 +01:00
Vincent Petry
6e7c274d2e Merge pull request #8499 from owncloud/shareextstoragemountpointfix 
Fix sharing of ext storage mount points
 2014-05-08 22:35:01 +02:00
Vincent Petry
28f0e6307f Fix sharing of ext storage mount points 
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
 2014-05-08 10:03:07 +02:00
Vincent Petry
390549c286 Merge pull request #8221 from owncloud/type-hinting-sharing 
Type hinting fixes for sharing
 2014-05-08 09:30:50 +02:00
Bjoern Schiessle
f85e968883 Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup 2014-05-07 17:57:32 +02:00
Bjoern Schiessle
d3f957c21e remove error_log output 2014-05-07 17:56:52 +02:00
Joas Schilling
dbb93074b3 Fix endless loop on windows servers 
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
 2014-05-07 17:38:29 +02:00
Bjoern Schiessle
31bf2d4b33 we can take the permission directly from the share, no need to call the share api first 2014-05-07 16:49:07 +02:00
Bjoern Schiessle
799d8ca381 check if we have a fileinfo 2014-05-07 11:47:52 +02:00
Bjoern Schiessle
bee48f851e ignore part files 2014-05-07 11:47:27 +02:00
Björn Schießle
bf681713c8 Merge pull request #8415 from owncloud/sharing_fix_rename 
[sharing] return the new name if a mount point was renamed
 2014-05-01 14:58:29 -04:00
Bjoern Schiessle
33883a46f5 return the new name if a mount point was renamed 2014-04-30 20:29:21 +02:00
Bjoern Schiessle
20e4ad382b get the correct owner path for part files 2014-04-30 12:49:16 +02:00
icewind1991
b95aa43a5d Merge pull request #8285 from owncloud/better_getmountby_handling 
Handle return values better from Filesystem::getMountBy*
 2014-04-29 11:22:11 +02:00
Bart Visscher
66b1ad0a9b Merge branch 'master' into type-hinting-sharing 
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
 2014-04-28 17:59:41 +02:00
icewind1991
7ac7546b71 Merge pull request #8353 from owncloud/publicshare-webdav 
Expose public shares over webdav
 2014-04-26 15:55:37 +02:00
Robin Appelman
b176708505 Expose public shares over webdav 2014-04-25 14:45:18 +02:00
Robin Appelman
b42418246f Also fixed the returned internal path when getting the root shared item by id 2014-04-25 14:04:22 +02:00
Robin Appelman
c53c4b9791 fix search by mime for shared single files 2014-04-25 12:28:10 +02:00
Robin McCorkell
77e3d067f0 Better handle return values from Filesystem::getMountBy* 
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
 2014-04-25 09:50:34 +01:00
Bjoern Schiessle
7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Thomas Müller
dd1e47b3b8 typos, use, unused and return fixed 2014-04-23 12:54:26 +02:00
Robin Appelman
2049bedcaf Dont throw an error when a storage isn't found for shared cache 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
b712393e72 fix etag propagation 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
3f6e9e0102 cleanup the shared storage, always keep the whole share resource 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
c9bd2f7a6c also fetch the etag from file cache 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
d4085d8148 make sure that path is not 'false' 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
33cdd93890 fix deleting of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
bfabd247f4 fix updating of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
a86d97295e fix encryption tests after the removal of the shared folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
4967435237 show "shared by ..." for share mount point 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
6b19482f3e generate unique target name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
6d87dacad4 fix getMimeType call, we always need to check the source path 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a02fb3722b user should be able to rename/delete shared files if the owner allowed it 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
b02b6d3c23 no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
c377893f0e make sure that we have the right permissions for the mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a27db9e4ca first steps to remove the shared folder: 
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
 2014-04-23 12:54:24 +02:00
Bart Visscher
999e74e834 Fix PHPdoc in apps/files_sharing 
using scrutinizer patch
 2014-04-15 21:05:44 +02:00
Vincent Petry
0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list 
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
 2014-04-02 15:33:47 +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
27eff1ac30 Merge pull request #7293 from owncloud/update-shares-postgres 
fix update to remove shares where file doesn't exist on postgres
 2014-04-01 14:56:37 +02:00
Robin Appelman
0c2585f3ac Improve phpdoc 2014-03-31 14:29:55 +02:00
Robin Appelman
fe78d963d9 Implement getPath for shared files 2014-03-28 15:26:15 +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
Bjoern Schiessle
9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Morris Jobke
206364cd1c remove invalid shares with one SQL statement 2014-03-13 13:09:32 +01:00
Morris Jobke
ec54bc7709 Refactor update script to class and add unit test 2014-03-13 13:09:32 +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
Bjoern Schiessle
a09df0083e add 'received_from' info to the share, so that every share can have a different value 2014-03-11 12:59:37 +01:00
Bjoern Schiessle
9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Thomas Müller
15d1df055b Merge branch 'master' into display-share-owner-master 
Conflicts:
	apps/files_sharing/lib/cache.php
 2014-02-28 14:54:10 +01:00
Robin Appelman
da386aad59 Allow re-using already known fileinfo when calculating folder sizes 2014-02-28 14:23:07 +01:00
Bjoern Schiessle
3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Bjoern Schiessle
6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Thomas Müller
179fbada32 show share owner within shared folders as well 2014-02-20 18:24:42 +01:00
Thomas Müller
7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +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
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +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
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Bjoern Schiessle
a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Vincent Petry
fa5ddc3e18 Fixed searchByMime in shared cache 
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
 2014-02-05 13:29:06 +01:00
Bjoern Schiessle
f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Bjoern Schiessle
cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01:00
Bjoern Schiessle
7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
Bjoern Schiessle
eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Robin Appelman
3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Bjoern Schiessle
fa7f53e89d it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 13:38:41 +01:00
Bjoern Schiessle
d1b47021f1 don't unshare on delete 2014-01-13 16:49:16 +01:00
Vincent Petry
8eaa39f4e2 Removed special handling of part files in shared storage rename 
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
 2014-01-08 18:43:20 +01:00
Vincent Petry
89eb3759a8 Fixed sharing results to include the correct permissions 
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.

Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.

Fixes #6265
 2013-12-09 18:14:58 +01:00
Bjoern Schiessle
ace1d40ed6 get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user 2013-12-05 17:25:01 +01:00
Bjoern Schiessle
eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Vincent Petry
d2840a045d Fixed sharing hook to not remove the share before the trashbin 
Fixed the hook order between sharing app and trashbin
 2013-11-27 17:22:48 +01:00
Robin Appelman
a2015ee065 Use View::copy and View::rename when copying or renaming files in the shared storage 2013-11-11 17:58:20 +01:00
Vincent Petry
9f4fd0161e Added unit tests for shared files watcher 
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
  propagation
 2013-11-05 19:30:52 +01:00
Vincent Petry
eb6fc14f84 Removed unused method 2013-11-05 17:14:19 +01:00
Vincent Petry
e3868ba118 Fixed watcher to also update the owner's folder sizes 
Note that the root folder size is mandatory for quota calculation.
 2013-11-05 13:58:14 +01:00
Thomas Müller
d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master 
Scanner enhancments master
 2013-11-04 23:58:42 -08:00
Thomas Müller
a7cb16aab1 use === 2013-11-04 21:23:10 +01:00
Jörn Friedrich Dreyer
fdaac99526 Merge pull request #5626 from owncloud/fix_search_in_shared_files 
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
 2013-10-30 09:02:39 -07:00
Jörn Friedrich Dreyer
68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Thomas Müller
f91a4c89ca adding storage_mtime handling to SharedCache 2013-10-25 12:39:21 +02:00
Bjoern Schiessle
2221aa9ca4 run first getUsersItemShared() with the owner 2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43 update etags for user we haven't checked yet 2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946 keep a list of users we already checked to avoid loops 2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8 fix infinite loop while updating etags, fix for #4365 2013-10-23 16:33:28 +02:00
Frank Karlitschek
05523e7a70 Merge pull request #3219 from owncloud/disabled-links-ui 
Disabled links UI fixes
 2013-10-18 05:02:06 -07:00
Morris Jobke
1f1fcc6129 Remove "link" shares right after disabling the "allow_link_share" setting 2013-10-18 11:37:13 +02:00
Bjoern Schiessle
48cd9d9444 filter duplicates directly in the sql query 2013-10-18 10:23:34 +02:00
Bjoern Schiessle
e7dc6b21c8 split up reset()['path'] to make it compatible with older PHP versions 2013-10-17 15:47:36 +02:00
Bjoern Schiessle
ab6ee79e11 adjust tests 2013-10-17 11:23:07 +02:00
Bjoern Schiessle
abf10ac9bd new option to add reshares to the result 2013-10-17 11:10:31 +02:00
Bjoern Schiessle
3dd313dca2 add "received_from" and "received_from_displayname" field in case of a reshared file to the output 2013-10-10 19:46:45 +02:00
Bjoern Schiessle
288f01bf62 catch exception if db query execution fails 2013-10-07 11:06:24 +02:00
Bjoern Schiessle
4f67b7a6c3 Merge branch 'master' into remove_deleted_shares_from_db 2013-10-07 11:00:56 +02:00
Bjoern Schiessle
401740166b add comments 2013-10-04 16:50:53 +02:00
Björn Schießle
2cdf54b77d Merge pull request #4877 from owncloud/ocs_share_api 
OCS Share API
 2013-10-04 07:10:21 -07:00
Bjoern Schiessle
dd2bf69152 use true/false instead of yes/no for publicUpload and subfiles parameter 2013-10-04 12:16:47 +02:00
Bjoern Schiessle
a1fe5148b5 use always path as parameter to specify a file/folder 2013-10-04 12:10:11 +02:00
Bjoern Schiessle
aa660a3475 remove deleted shares from the database table oc_share 2013-10-02 13:26:38 +02:00
Bjoern Schiessle
513dc20d4b also return success if no shares are found. 2013-09-30 13:05:34 +02:00
Thomas Müller
63ea6844e8 - adding unit test testGetShareFromUnknownId() 
- fixing getShareFromId() for Oracle
- fixing error message
 2013-09-29 22:16:48 +02:00
Bjoern Schiessle
b9d6539d76 Merge branch 'master' into ocs_share_api 2013-09-26 13:02:39 +02:00
Thomas Müller
cd2421c7ee adding PHPDoc comments to getBackend 
ensure getChildren() is called on an instance of Share_Backend_Collection
 2013-09-24 10:37:58 +02:00
Bjoern Schiessle
259f03bee2 remove debug output 2013-09-23 14:10:09 +02:00
Jörn Friedrich Dreyer
6aeb0a99da same for search by mime 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811 add all results, sharing cache also returns entries for shared files in external storages 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda fix getAll(), refactor search by mime & search 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832 return fixed path, skip shared files outside of 'files' 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187 divide ids into chunks of 1k 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bjoern Schiessle
39920955f2 set share id to 'unknown' if we can't retrive one 2013-09-19 16:52:44 +02:00
Bjoern Schiessle
c9f1538c1f extend API to get the shares from all files in a given folder 2013-09-19 16:41:29 +02:00
Bjoern Schiessle
b947aab802 some unit test for the new ocs share api 2013-09-19 14:39:51 +02:00
Bjoern Schiessle
199121134f return error if wrong shareType is given 2013-09-19 10:33:04 +02:00
Bjoern Schiessle
171b7ebffe remove debug output 2013-09-18 10:11:20 +02:00
Bjoern Schiessle
e52639e4e6 use share ID as REST resource 2013-09-17 15:27:46 +02:00
Bjoern Schiessle
86dbb13823 more rest-style API 2013-09-17 11:53:38 +02:00
Bjoern Schiessle
ef3307f099 return error if public upload is disabled 2013-09-16 17:42:56 +02:00
Bjoern Schiessle
7aed24fa6c allow to set a different permission during initial share operation 2013-09-16 17:28:17 +02:00
Bjoern Schiessle
14437ffd15 ocs api for file sharing 2013-09-16 17:04:49 +02:00
Bjoern Schiessle
3861c9bce1 some more OCS calls for sharing 2013-09-06 16:00:01 +02:00
Bjoern Schiessle
b6ee727399 intermediate result ocs api 2013-09-06 10:49:21 +02:00
Arthur Schiwon
c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Bjoern Schiessle
21a0a96e43 intermediate results, share api 2013-09-04 17:25:15 +02:00
Thomas Müller
3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
icewind1991
d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Robin Appelman
88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Michael Gapczynski
5a47054505 Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 2013-05-29 18:22:54 -04:00
Michael Gapczynski
7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Frank Karlitschek
8a5e88b21c Merge pull request #3211 from owncloud/fix-2816 
Fix #2816 renaming shared files
 2013-05-02 00:54:09 -07:00
Michael Gapczynski
04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 -04:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Björn Schießle
c2a49b5c1f the old path no longer exists after rename, update the parent folder instead 2013-03-25 14:21:06 +01:00
Björn Schießle
abd48496d2 fix indention 2013-03-25 12:33:03 +01:00
Björn Schießle
102120f105 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-25 12:32:56 +01:00
Michael Gapczynski
e743386acf Fix correctFolders and retrieve the correct storage cache 2013-03-08 14:27:30 -05:00
Björn Schießle
02e2f7384e not only files can be reshared but also folders 2013-03-08 17:32:04 +01:00
Michael Gapczynski
20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Michael Gapczynski
4826564344 Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-03-07 17:14:34 -05:00
Michael Gapczynski
a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Michael Gapczynski
4cb5cb9693 itemSource parameter should be fileSource 2013-03-07 10:00:03 -05:00
Michael Gapczynski
812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Michael Gapczynski
771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski
4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Michael Gapczynski
e466d680fe Fix variable name in Shared_Updater 2013-03-02 13:11:57 -05:00
Michael Gapczynski
9b4d7d9925 Update ETag when file is shared 2013-03-02 12:57:29 -05:00
Michael Gapczynski
ec2a9169b9 Change remove() $user parameter to optional 2013-03-04 11:44:09 -05:00
Michael Gapczynski
b5989c933f Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-02-28 10:39:23 -05:00
Michael Gapczynski
ea83acedeb Fix target path and reuse mtime 2013-02-26 01:43:04 -05:00
Michael Gapczynski
8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Michael Gapczynski
36827d1549 Fix variable 2013-02-23 16:09:56 -05:00
Michael Gapczynski
00e28cf156 Return unknown free space for shared root folder so we can still upload partial files 2013-02-23 15:42:01 -05:00
Michael Gapczynski
b6a21cc4b5 Fix WebDAV uploading of partial shared files 2013-02-23 15:32:59 -05:00
Michael Gapczynski
09a2730f57 Include etag field for folder contents 2013-02-23 15:22:34 -05:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Bart Visscher
59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +01:00
Michael Gapczynski
3dfb1628ce Include etags for the root of the shared folder 2013-02-19 20:42:48 -05:00
Michael Gapczynski
8e3b8c7f47 Proper fix for shared links 2013-02-10 19:09:58 -05:00
Robin Appelman
a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Michael Gapczynski
8ca30d244c Implement getETag() in shared storage 2013-01-19 00:02:40 -05:00
Michael Gapczynski
36cac7f924 Return NOT_FOUND in shared cache 2013-01-10 22:29:47 -05:00
Michael Gapczynski
e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Michael Gapczynski
8f8a5bbfb7 Maked Shared_Permissions extend Permissions class 2013-01-07 18:17:14 -05:00
Michael Gapczynski
a7d4d04223 Fix mimetypes in shared cache 2013-01-07 15:27:22 -05:00
Michael Gapczynski
f144be8857 Don't mount shared storage unless there are shared files 2013-01-03 11:37:19 -05:00
Michael Gapczynski
a1f7c28e28 Use the source Scanner for shared storage when the path is specified 2013-01-01 14:47:25 -05:00
Michael Gapczynski
fe90130618 Initialize storageId variable in shared cache 2013-01-01 14:24:18 -05:00
Michael Gapczynski
268c7acfc4 Actually add Shared_Watcher 2013-01-01 13:16:42 -05:00
Michael Gapczynski
3b67613afc Remove Shared_Scanner and add Shared_Watcher instead 2013-01-01 12:43:38 -05:00
Robin Appelman
0ac78a6411 Share: fix cache put function 2013-01-01 18:10:38 +01:00
Robin Appelman
4b65dd608a Share: small phpdoc fixes 2013-01-01 18:07:10 +01:00
Michael Gapczynski
f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Michael Gapczynski
cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski
fb053f8e73 Fix retrieving of shared source paths 2012-12-29 11:09:57 -05:00
Michael Gapczynski
8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Michael Gapczynski
1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Michael Gapczynski
bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Thomas Tanghus
56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes 
check free space using folder's owner
 2012-10-23 07:02:21 -07:00
Robin Appelman
6f1fbf97f7 some namespaces fixed for the shared backend 2012-10-21 00:27:55 +02:00
Robin Appelman
cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman
5c6e9518ed drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath 2012-10-10 17:46:29 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Robin Appelman
ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Björn Schießle
550813ce41 don't use the complete path but the basename if the file/foder has no extension. Otherwise 
we can end up with  different items in the shared directory with the same name (Also folder names can contain dots)
 2012-10-02 11:41:26 +02:00
Robin Appelman
f360d7c736 add getId to shared storage backend 2012-09-23 01:51:00 +02:00
Robin Appelman
93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Bart Visscher
11bdc8baa8 Fix the mimetype filter in OC_Share_Backend_File 2012-09-21 23:17:12 +02:00
Bart Visscher
ee77ef86d3 Check mimetype filter in file share backend 2012-09-21 21:32:09 +02:00
scambra
2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Bart Visscher
01ce2babd1 Fix sharing of single files, target name was not correct 2012-09-19 21:29:16 +02:00
Michael Gapczynski
deb1fbf9a1 Provide update script for files sharing 2012-09-09 18:29:47 -04:00
Michael Gapczynski
b163bd514f Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder 2012-09-08 23:09:57 -04:00
Robin Appelman
bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Michael Gapczynski
73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Michael Gapczynski
29d1e8087d Implement generateTarget for file sharing backend 2012-09-01 13:46:57 -04:00
Michael Gapczynski
8d490b9880 Fix shared storage working with user backend defined data directories 2012-08-29 14:39:13 -04:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Georg Ehrke
ead7de6bff only mount every single homefolder when using sharing app 2012-08-27 16:10:37 +02:00
Michael Gapczynski
36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
Michael Gapczynski
3148edbdef Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders. 2012-08-24 10:01:46 -04:00
Michael Gapczynski
25d474579a Removing most of files_sharing, the Share API implemented the majority of it 2012-08-22 11:57:58 -04:00
Michael Gapczynski
df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Michael Gapczynski
ba0cf98175 Remove extra line, caused 'headers already sent' issues 2012-08-06 13:33:53 -04:00
Michael Gapczynski
3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Michael Gapczynski
4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Michael Gapczynski
7b01e3285e Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage 2012-07-23 22:05:53 -04:00
Michael Gapczynski
7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00