f4dc9e6bf3
Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
...
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
80f83ab5e0
Do not return shares for files outside "files"
2015-03-27 13:25:23 +01:00
223cca2a07
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
2015-03-26 22:31:45 +01:00
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
3c39658a1c
When the expiration date is enforced respect this
...
Make sure that we do not allow removing of the expiration date when this
is enforced in the settings.
2015-03-19 10:07:17 +01:00
378eef7eb4
migrate share helper method to IConfig
2015-03-18 13:07:39 +01:00
dbade19362
Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
...
Better finding the remote URL from user input in share dropdown
2015-03-11 14:38:41 +01:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
b180724cd0
Extract the remote host from user input in share dropdown
...
Fix #13678
2015-02-23 11:28:41 +01:00
fbbb9fe0fd
Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook
...
Do not overwrite the shareType so the post hook is still correct
2015-02-11 15:23:13 +01:00
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
1448f281b7
for password protected link shares the password is stored in shareWith, so we need to set this manually to null for the hooks
2015-02-05 17:23:59 +01:00
2e34db2bb3
Dont create exclude list for generating the share target
2015-02-04 17:08:03 +01:00
b1d8d88df8
Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
...
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
82de50d5b9
remove trailing slash
2015-01-29 14:03:09 +01:00
8fa3e7a6bf
Do not retrieve shares through group if user has no group
2015-01-23 15:11:06 +01:00
9f137ac259
Fix reshare permission change to not impair other deletion code
...
A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.
This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.
Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.
2015-01-22 10:12:47 +01:00
40931a8b0d
Fix getItemSharedWithUser for groups
...
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
2015-01-16 18:11:13 +01:00
b6f63e9b3d
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 16:36:13 +01:00
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
60e4aa120f
Merge pull request #12350 from mprokop/link_expiration
...
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
397f14ed86
Consolidate if statement, and update unit test
2014-11-21 13:31:56 +01:00
1d4d308a6c
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.
2014-11-21 11:01:39 +01:00
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
ea4eedd35a
only users can have a display name different from the id
2014-11-18 11:46:28 +01:00
367468ff1f
make sure that we only find the shares from the correct share type if users and groups with the same ID exists
2014-11-18 11:11:49 +01:00
5192641447
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 11:03:08 +01:00
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
b7718bc212
always use the correct share type
2014-10-22 11:48:29 +02:00
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
c6c9a51b11
distinguish between file dependent shares and other shares
2014-10-13 15:04:54 +02:00
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
e115a7043f
only create a new share entry, if the user needs a different target name than the group share
2014-09-26 13:19:15 +02:00
ed85055d31
for group shares we don't need a extra db entry of groupTarget equals itemTarget
2014-09-26 13:10:31 +02:00
d242e518f9
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
2014-09-26 13:01:54 +02:00
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
968152113e
always select permissions, used in getItems()
2014-09-25 12:35:11 +02:00
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
07d43df713
only add a new row if it isn't a unique share, otherwise update the existing row
2014-09-24 14:02:02 +02:00
9f7b15582a
fix add user to group to work with grouped shares
2014-09-24 14:02:01 +02:00
bd268c35f5
generateTarget() will always find a unique target
2014-09-24 14:02:01 +02:00
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
efd485acda
Merge pull request #10858 from owncloud/issue/10847
...
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
3bf725d7e0
Adapt token size to new generation and add an option for free length specification
...
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
a0e8e88bc6
Use correct language package so the subject is correctly translated
...
Fix #10847
2014-09-04 11:23:23 +02:00
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
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
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
d9f35d8c15
we need the recipient as a additional parameter to know for which share the notification was send
2014-08-13 17:02:51 +02:00
aeef10eb47
Add scrollto to the url if sharing a file for long file lists
2014-08-09 00:21:29 +01:00
16dafa9cac
Fix link to files and folders in internal share emails
2014-08-09 00:08:45 +01:00
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02:00
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
65903a012a
Merge pull request #10025 from owncloud/l10n-typo
...
typo fix from transifex suggestion
2014-08-04 11:03:50 +02:00
7a07690b25
expire -> expiration
2014-08-02 04:02:39 +02:00
5f015067f4
suggestions by deepdiver
2014-08-01 01:39:52 +02:00
38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
90d8f42d7c
typo fix from transifex suggestion
2014-07-30 14:07:32 +02:00
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
4e87ac2bb9
make sure that we set the expire date if a date is adefault date is set
2014-07-28 22:45:03 +02:00
ecdd04374a
Allow specifying the item source in unshareFromSelf().
2014-07-26 02:00:49 +02:00
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
cd88c2fd7b
Update share.php
...
change isset with empty on line 1911
2014-07-10 13:19:35 +02:00
b395ff549b
Update share.php
...
Added isset for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```
2014-07-10 13:02:04 +02:00
851c1f87d6
Fix for #9422
2014-07-09 14:40:05 +02:00
e70a7af6da
BugFix missing $item on 'file_target' Line 1911
...
I think this should be right!
2014-07-08 10:51:05 +02:00
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
65b3d293ce
Added ORDER BY to enforce share entry order
...
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.
This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
3459f99dd6
make sure that we only delete shares for the current user
2014-06-06 09:56:02 +02:00
eec1c4398a
only unshare user share if it was shared with the current user
2014-06-06 09:56:02 +02:00
5bbfdc35d7
make sure that we remove all shares refering to the same parent
2014-06-06 09:56:02 +02:00
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
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
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
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
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
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
ab7ae004f7
Automatically copy the share expiration date when new shares are created
...
Fix #4823
2014-05-19 01:38:47 +02:00
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
fa503a4772
fix PHPDoc
2014-05-13 19:09:15 +01:00
7853bc4cac
adding PHPDoc
2014-05-13 19:09:14 +01:00
147007bdd8
fixing typo and missing @throws
2014-05-13 19:09:14 +01:00
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
50f49c57b5
Some more params are optional
2014-05-01 18:11:30 +02:00
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
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
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
35321c7d41
add additional rows to the select statement, 'stime' is needed for the expire check
2014-04-24 15:18:25 +02:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
b312d38d38
remove hard-coded shared folder
2014-04-23 12:59:22 +02:00
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
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
4c840cb61d
fix target generation for group shares
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
cfc52ccc3d
add some action items
2014-04-23 12:54:24 +02:00
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
dcc48f9b46
Merge pull request #8068 from wakeup/fix-share.php-string-extraction
...
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
6e857de6b7
Make lib/** share.php strings extractable for translation
...
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated
This should fix : #8011
2014-04-22 14:56:44 +02:00
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
352063cf0a
Fix Undefined index: storage in share.php
...
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
d418e176ce
Do not query when the list is empty
2014-04-09 15:02:06 +02:00
015b9b1dac
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-09 15:02:05 +02:00
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
850a0e7388
Verify that a file exists before we share it
2014-04-02 13:47:11 +02:00
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
3a731a01b1
select statement always need to contain file_source respectively item_source
2014-03-31 15:03:35 +02:00
e4069e1553
Emit event after setting a new expiration for a share
...
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
2d8607fae9
don't assign variables in if condition
2014-03-25 17:47:24 +01:00
5db3b049fd
add todo
2014-03-25 17:47:24 +01:00
bc0292c16d
always return an array
2014-03-25 17:47:24 +01:00
154277ab11
seperate formatResults()
2014-03-25 17:47:24 +01:00
ecde48fce8
don't assign variables in if conditions
2014-03-25 17:47:24 +01:00
078fafdc5a
use variable
2014-03-25 17:47:24 +01:00
3a459db358
seperate transformDBResults
2014-03-25 17:47:24 +01:00
6607f7cb5e
seperate creation of select statement
2014-03-25 17:47:24 +01:00
Morris Jobke
Thomas Müller
Vincent Petry
Bjoern Schiessle
Jenkins for ownCloud
Roeland Jago Douma
Joas Schilling
Robin Appelman
Miguel Prokop
Lukas Reschke
Bernhard Reiter
VicDeo
kondou
Jörn Friedrich Dreyer
Tom Needham
Volkan Gezer
Michael Kuhn
icewind1991
libasys
Daniel Hansson
Robin McCorkell
Bart Visscher
Volkan Gezer
Morris Jobke