aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix unnecessary boolean castMorris Jobke2019-03-061-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #13790 from fretn/masterMorris Jobke2019-03-061-1/+1
|\ | | | | Fix for crashing occ files:scan
| * Fix for crashing occ files:scanfretn2019-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when $share === false then (int)$share['share_type'] will always be equal to (int)0 which results in following crash: [root@server nextcloud] sudo -u apache php occ files:scan someuser The current PHP memory limit is below the recommended value of 512MB. Starting scan for user 1 out of 1 (someuser) An unhandled exception has been thrown: TypeError: Argument 1 passed to OC\OCS\DiscoveryService::discover() must be of the type string, null given, called in /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php on line 382 and defined in /var/www/html/nextcloud/lib/private/OCS/DiscoveryService.php:65 Stack trace: 0 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(382): OC\OCS\DiscoveryService->discover(NULL, 'FEDERATED_SHARI...') 1 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(527): OCA\Files_Sharing\External\Manager->sendFeedbackToRemote(NULL, NULL, NULL, 'decline') 2 /var/www/html/nextcloud/apps/files_sharing/lib/External/Storage.php(216): OCA\Files_Sharing\External\Manager->removeShare('files/Someth...') 3 [internal function]: OCA\Files_Sharing\External\Storage->checkStorageAvailability() 4 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array) 5 [internal function]: OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array) 6 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array) 7 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(89): OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array) 8 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(44): OCA\Files_Sharing\External\Scanner->scanAll() 9 /var/www/html/nextcloud/lib/private/Files/Utils/Scanner.php(245): OCA\Files_Sharing\External\Scanner->scan('', true, 3) 10 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(172): OC\Files\Utils\Scanner->scan('/someuser', true, NULL) 11 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(249): OCA\Files\Command\Scan->scanFiles('someuser', '/someuser', false, Object(Symfony\Component\Console\Output\ConsoleOutput), false, true, false) 12 /var/www/html/nextcloud/3rdparty/symfony/console/Command/Command.php(251): OCA\Files\Command\Scan->execute(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 13 /var/www/html/nextcloud/core/Command/Base.php(162): Symfony\Component\Console\Command\Command->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 14 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(946): OC\Core\Command\Base->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 15 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(248): Symfony\Component\Console\Application->doRunCommand(Object(OCA\Files\Command\Scan), Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 16 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(148): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 17 /var/www/html/nextcloud/lib/private/Console/Application.php(213): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput)) 18 /var/www/html/nextcloud/console.php(96): OC\Console\Application->run() 19 /var/www/html/nextcloud/occ(11): require_once('/var/www/html/n...') 20 {main}[root@server nextcloud] Signed-off-by: fretn <frederikdelaere+github@gmail.com>
* | Search sharees on lookup server when explicitly requested by userChristoph Wurst2019-02-261-0/+2
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #13514 from nextcloud/fix-public-grid-toggleMorris Jobke2019-02-251-0/+2
|\ \ | | | | | | Fix grid toggle button on public page
| * | Fix grid toggle button on public pageJohn Molakvoæ (skjnldsv)2019-02-211-0/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Show sharing recommendationsChristoph Wurst2019-02-251-1/+157
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix writable public folder shareJulius Härtl2019-02-191-0/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Catch Request exception in testRemoteUrlRoeland Jago Douma2019-02-151-0/+3
| | | | | | | | | | | | | | Else the background job fails hard if the remote has for example an invalid certificate. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | add myself as @authorJonas Sulzer2019-01-311-0/+1
| | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | code stylingJonas Sulzer2019-01-311-2/+1
| | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | restructure codeJonas Sulzer2019-01-311-26/+23
| | | | | | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | only show "Add to your Nextcloud" on share link if federation is activatedJonas Sulzer2019-01-311-2/+14
|/ | | | Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* Add caching headers for public previewsJulius Härtl2019-01-021-2/+6
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Fix typo in "incoming"Joas Schilling2018-12-051-2/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objectsMorris Jobke2018-12-041-1/+1
|\ | | | | Validate all rich objects
| * Fix wrong used typeJoas Schilling2018-11-231-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #12628 from ↵Morris Jobke2018-11-301-0/+12
|\ \ | | | | | | | | | | | | nextcloud/bugfix/act-317/missing-activity-for-user-self-unshare Parse activity when a user self-unshares a file
| * | Parse activity when a user self-unshares a fileJoas Schilling2018-11-231-0/+12
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Add interface to allow storages from opting out of encryptionRobin Appelman2018-11-292-2/+4
| | | | | | | | | | | | As opposed to hard-coding a list of excluded storages Signed-off-by: Robin Appelman <robin@icewind.nl>
* | add capabilities for multiple share linksBjoern Schiessle2018-11-261-0/+1
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Handle permission in update of share betterRoeland Jago Douma2018-11-201-0/+4
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Rollback to default list viewJohn Molakvoæ (skjnldsv)2018-11-151-2/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #12398 from nextcloud/fix/12378Morris Jobke2018-11-131-6/+15
|\ | | | | change "Download" to "Download all files" for shared folders
| * change "Download" to "Download all files" for shared foldersJonas Sulzer2018-11-101-6/+15
| | | | | | | | | | | | fixes #12378 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | Use the defined func()->count() instead of manual countingJoas Schilling2018-11-081-1/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #12324 from ↵Morris Jobke2018-11-071-0/+4
|\ | | | | | | | | nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares Add "password" parameter to the response data of link shares
| * Add "password" parameter to the response data of link sharesDaniel Calviño Sánchez2018-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | Due to legacy reasons the password of link shares was returned in the "share_with" and "share_with_displayname" parameters of the response data. Now a proper "password" parameter is returned too; the old "share_with" and "share_with_displayname" parameters are kept, although deprecated, and they will be removed in a future version of Nextcloud. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Reduce function callsMorris Jobke2018-11-071-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Adapts the code to the new master stateMichael Weimann2018-11-071-15/+23
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Inlines the share note for file dropsMichael Weimann2018-11-071-0/+1
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Inlines the share note for file dropsMichael Weimann2018-11-071-2/+1
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Hides the header actions for file dropsMichael Weimann2018-11-071-1/+0
|/ | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* Add grid toggle for every files viewJohn Molakvoæ (skjnldsv)2018-11-061-0/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #12185 from nextcloud/cleanup/dicontainerMorris Jobke2018-11-051-1/+2
|\ | | | | Cleanup the DIContainer
| * Fix files_sharingRoeland Jago Douma2018-11-021-1/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12105 from nextcloud/using-resharing-right-to-display-sharesRoeland Jago Douma2018-11-041-4/+80
|\ \ | |/ |/| Shares are displayed to users with resharing rights
| * user can have his resharing rights revoked, yet seeing created sharesMaxence Lange2018-11-021-6/+13
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * check parents resharing rightsMaxence Lange2018-11-021-6/+14
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * limit to circles moderatorMaxence Lange2018-11-021-1/+2
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * display shares to circles moderatorMaxence Lange2018-11-021-0/+22
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * shares are displayed to users with resharing rightsMaxence Lange2018-11-021-0/+38
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | Add sending the password by Talk for a link share to ShareAPIControllerDaniel Calviño Sánchez2018-11-021-0/+20
|/ | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* allow to update lables for public link sharesBjoern Schiessle2018-11-011-1/+15
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* allow to add labels to sharesBjoern Schiessle2018-11-011-5/+13
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* allow to create multiple link shares via share apiBjoern Schiessle2018-10-311-9/+0
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Honour "hide download" in the public share pageDaniel Calviño Sánchez2018-10-301-6/+8
| | | | | | | | | | | | | When the "hide download" property of a share is set the public share page will not show the download button nor the menu with the download, direct link and "Add to your Nextcloud" actions; the "downloadURL" hidden field will not be included either in the generated HTML. Despite that, note that the "downloadURL" parameter is still set and passed to the template, as this could be needed anyway to generate previews (for example, of audio files). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Expose hide download to public pageRoeland Jago Douma2018-10-301-0/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Propegate hide download state in share providerRoeland Jago Douma2018-10-301-2/+12
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge branch 'master' of https://github.com/nextcloud/server into gridview-tableJohn Molakvoæ (skjnldsv)2018-10-231-2/+21
|\ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>