222 Commits

Author	SHA1	Message	Date
Bjoern Schiessle	b8241aa79d	remove some more debug output	2013-09-06 16:07:54 +02:00
Bjoern Schiessle	edb78c917c	remove some error_logs	2013-09-06 16:07:45 +02:00
Bjoern Schiessle	d33fabd02d	remove error logs	2013-09-06 16:07:25 +02:00
Bjoern Schiessle	627b6164c4	if the files doesn't exist yet we start with the parent to search for shares	2013-09-06 16:07:07 +02:00
kondou	e5fc7b9dbe	Merge branch 'master' into clean_up_util ... Conflicts: lib/base.php	2013-09-02 07:58:06 +02:00
Arthur Schiwon	958130e8fe	Sharing: only determine path root if owner is available	2013-08-22 00:00:40 +02:00
kondou	9c5416fe4a	Clean up \OC\Util ... - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing	2013-08-15 15:57:32 +02:00
Bjoern Schiessle	9253627327	cancel sharing if some users doesn't have a working encryption set-up.	2013-08-01 13:04:55 +02:00
Thomas Müller	17c36b5074	fixes #4026	2013-07-30 10:26:42 +02:00
Michael Gapczynski	4feff3456b	Only emit permissions hook for files and and include path	2013-07-08 17:28:18 -04:00
Michael Gapczynski	5c2a0325ba	Add update permissions hook to sharing	2013-07-08 11:40:10 -04:00
Thomas Müller	98da4bf704	removing unused getSharedItem()	2013-07-06 00:04:01 +02:00
Thomas Müller	dad91c156f	Merge branch 'master' into fixing-3942-master ... Conflicts: apps/files/ajax/upload.php	2013-07-06 00:02:11 +02:00
Thomas Müller	e159cbf527	on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function	2013-07-05 17:39:41 +02:00
Thomas Müller	352c1415be	proper fix for getting the shared item if no user is logged in	2013-07-05 13:45:21 +02:00
Jörn Friedrich Dreyer	f3c4a37a78	Merge pull request #3832 from owncloud/oracle_sql_fixes ... for oracle use BITAND() instead of & in sharing permissions sql	2013-06-28 10:22:59 -07:00
Bart Visscher	6ad7a0336f	Oracle doesn't know & as bitwise AND ... Conflicts: lib/public/share.php	2013-06-28 15:48:49 +02:00
Jörn Friedrich Dreyer	5d51118cb2	fix type of numeric columns	2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer	bf49edde6b	check item id is set	2013-06-26 19:57:28 +02:00
Jörn Friedrich Dreyer	b32d6d8487	for oracle use BITAND() instead of & in sharing permissions sql	2013-06-24 22:52:01 +02:00
Jörn Friedrich Dreyer	961a001af3	add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup	2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer	124f34422c	add missing backticks all over the place	2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer	96b1e54d4a	Merge pull request #3444 from owncloud/share-fix ... Fix undefined index for share mount point retrieval	2013-06-03 11:35:06 -07:00
Florin Peter	1337f48d64	fixes for pgsql	2013-05-29 20:41:07 +02:00
Florin Peter	f1b884aa5d	changed deprecated class	2013-05-29 20:15:04 +02:00
Florin Peter	353d19d183	fixes if cache returns false	2013-05-29 20:11:13 +02:00
Florin Peter	c8d1cd224d	fix $parent/$source typo	2013-05-29 19:58:05 +02:00
Björn Schießle	ae0f37e9e2	fix indention	2013-05-29 15:37:27 +02:00
Björn Schießle	8587f565d2	remove unnecessary variable	2013-05-29 15:14:15 +02:00
Björn Schießle	63a2bec6e5	use public API for error handling; improved while condition	2013-05-29 14:40:47 +02:00
Björn Schießle	893a1ed6f5	for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists	2013-05-29 14:19:18 +02:00
Björn Schießle	672811c103	if one public link share was found, we don't have to check it for the other folders	2013-05-29 13:12:30 +02:00
Björn Schießle	b44192f366	check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages	2013-05-29 13:10:26 +02:00
Michael Gapczynski	7a0c592f93	Fix undefined index for share mount point retrieval	2013-05-21 20:21:19 -04:00
Florin Peter	d7dc710c8b	revert changes	2013-05-17 01:22:30 +02:00
Björn Schießle	95297c2469	add pre-shared hooks	2013-05-16 17:44:28 +02:00
Florin Peter	0916769f67	fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup	2013-05-15 17:00:01 +02:00
Florin Peter	751487ded7	merge changes for files_encryption	2013-05-15 10:20:19 +02:00
Florin Peter	226aec8d56	Merge branch 'master' into files_encryption	2013-05-15 03:22:06 +02:00
Michael Gapczynski	73d7cae6df	One more mount point fix	2013-05-02 18:22:43 -04:00
Robin Appelman	809b5f81f6	Further seperation of mount management logic	2013-04-26 00:01:36 +02:00
Sam Tuke	4aa80d02be	Merge branch 'master' into files_encryption	2013-04-23 14:13:40 +02:00
Björn Schießle	b5cb5dab51	fix encryption to owncloud user for public link shares	2013-04-22 14:30:10 +02:00
Björn Schießle	b24a673714	the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared	2013-04-22 14:12:18 +02:00
Björn Schießle	fe58e4b1a6	we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again	2013-04-18 17:48:16 +02:00
Michael Gapczynski	d51a94161e	Initialize collectionTypes variable as false	2013-04-08 17:46:52 -04:00
Michael Gapczynski	e704bcd96e	Correct undefined variable in post_shared hook, fixes #2592	2013-04-07 20:05:54 -04:00
Sam Tuke	ff6f52d5ec	Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php	2013-03-28 18:39:12 +01:00
Bernhard Posselt	1e20067c00	Merge pull request #2183 from owncloud/fix-shared-statuses-again ... Fix #2080 and fix #2141	2013-03-11 02:43:16 -07:00
Björn Schießle	2d00d13a5d	use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated	2013-03-08 15:13:00 +01:00