upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 23:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 67

Use proper methods for checkPasswordProtectedShare

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-08-15 10:20:40 +02:00
parent c5c23b30b9
commit 3e13e94254
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Share/Share.php
View file

@ -283,7 +283,7 @@ class Share extends Constants {
}
// password protected shares need to be authenticated
if ($checkPasswordProtection && !\OCP\Share::checkPasswordProtectedShare($row)) {
if ($checkPasswordProtection && !\OC\Share\Share::checkPasswordProtectedShare($row)) {
return false;
}

11
lib/public/Share.php
View file

@ -235,15 +235,4 @@ class Share extends \OC\Share\Constants {
public static function getBackend($itemType) {
return \OC\Share\Share::getBackend($itemType);
}
/**
* In case a password protected link is not yet authenticated this function will return false
*
* @param array $linkItem
* @return bool
* @since 7.0.0
*/
public static function checkPasswordProtectedShare(array $linkItem) {
return \OC\Share\Share::checkPasswordProtectedShare($linkItem);
}
}

2
tests/lib/Share/ShareTest.php
View file

@ -501,7 +501,7 @@ class ShareTest extends \Test\TestCase {
*/
public function testCheckPasswordProtectedShare($expected, $item) {
\OC::$server->getSession()->set('public_link_authenticated', '100');
$result = \OCP\Share::checkPasswordProtectedShare($item);
$result = \OC\Share\Share::checkPasswordProtectedShare($item);
$this->assertEquals($expected, $result);
}