nextcloud /
server
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | namespace OCA\User_LDAP\Controller; |
| 24 | 24 | |
| 25 | 25 | use OC\HintException; |
| 26 | -use OC_Util; |
|
| 27 | 26 | use OCP\AppFramework\Controller; |
| 28 | 27 | use OCP\AppFramework\Http\RedirectResponse; |
| 29 | 28 | use OCP\AppFramework\Http\TemplateResponse; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * @return TemplateResponse|RedirectResponse |
| 86 | 86 | */ |
| 87 | 87 | public function showRenewPasswordForm($user) { |
| 88 | - if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 88 | + if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 89 | 89 | return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
| 90 | 90 | } |
| 91 | 91 | $parameters = []; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @return RedirectResponse |
| 130 | 130 | */ |
| 131 | 131 | public function tryRenewPassword($user, $oldPassword, $newPassword) { |
| 132 | - if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 132 | + if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 133 | 133 | return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
| 134 | 134 | } |
| 135 | 135 | $args = !is_null($user) ? ['user' => $user] : []; |
@@ -37,144 +37,144 @@ |
||
| 37 | 37 | use OCP\IUserManager; |
| 38 | 38 | |
| 39 | 39 | class RenewPasswordController extends Controller { |
| 40 | - /** @var IUserManager */ |
|
| 41 | - private $userManager; |
|
| 42 | - /** @var IConfig */ |
|
| 43 | - private $config; |
|
| 44 | - /** @var IL10N */ |
|
| 45 | - protected $l10n; |
|
| 46 | - /** @var ISession */ |
|
| 47 | - private $session; |
|
| 48 | - /** @var IURLGenerator */ |
|
| 49 | - private $urlGenerator; |
|
| 40 | + /** @var IUserManager */ |
|
| 41 | + private $userManager; |
|
| 42 | + /** @var IConfig */ |
|
| 43 | + private $config; |
|
| 44 | + /** @var IL10N */ |
|
| 45 | + protected $l10n; |
|
| 46 | + /** @var ISession */ |
|
| 47 | + private $session; |
|
| 48 | + /** @var IURLGenerator */ |
|
| 49 | + private $urlGenerator; |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @param string $appName |
|
| 53 | - * @param IRequest $request |
|
| 54 | - * @param IUserManager $userManager |
|
| 55 | - * @param IConfig $config |
|
| 56 | - * @param IURLGenerator $urlGenerator |
|
| 57 | - */ |
|
| 58 | - function __construct($appName, IRequest $request, IUserManager $userManager, |
|
| 59 | - IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) { |
|
| 60 | - parent::__construct($appName, $request); |
|
| 61 | - $this->userManager = $userManager; |
|
| 62 | - $this->config = $config; |
|
| 63 | - $this->l10n = $l10n; |
|
| 64 | - $this->session = $session; |
|
| 65 | - $this->urlGenerator = $urlGenerator; |
|
| 66 | - } |
|
| 51 | + /** |
|
| 52 | + * @param string $appName |
|
| 53 | + * @param IRequest $request |
|
| 54 | + * @param IUserManager $userManager |
|
| 55 | + * @param IConfig $config |
|
| 56 | + * @param IURLGenerator $urlGenerator |
|
| 57 | + */ |
|
| 58 | + function __construct($appName, IRequest $request, IUserManager $userManager, |
|
| 59 | + IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) { |
|
| 60 | + parent::__construct($appName, $request); |
|
| 61 | + $this->userManager = $userManager; |
|
| 62 | + $this->config = $config; |
|
| 63 | + $this->l10n = $l10n; |
|
| 64 | + $this->session = $session; |
|
| 65 | + $this->urlGenerator = $urlGenerator; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @PublicPage |
|
| 70 | - * @NoCSRFRequired |
|
| 71 | - * |
|
| 72 | - * @return RedirectResponse |
|
| 73 | - */ |
|
| 74 | - public function cancel() { |
|
| 75 | - return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 76 | - } |
|
| 68 | + /** |
|
| 69 | + * @PublicPage |
|
| 70 | + * @NoCSRFRequired |
|
| 71 | + * |
|
| 72 | + * @return RedirectResponse |
|
| 73 | + */ |
|
| 74 | + public function cancel() { |
|
| 75 | + return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /** |
|
| 79 | - * @PublicPage |
|
| 80 | - * @NoCSRFRequired |
|
| 81 | - * @UseSession |
|
| 82 | - * |
|
| 83 | - * @param string $user |
|
| 84 | - * |
|
| 85 | - * @return TemplateResponse|RedirectResponse |
|
| 86 | - */ |
|
| 87 | - public function showRenewPasswordForm($user) { |
|
| 88 | - if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 89 | - return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 90 | - } |
|
| 91 | - $parameters = []; |
|
| 92 | - $renewPasswordMessages = $this->session->get('renewPasswordMessages'); |
|
| 93 | - $errors = []; |
|
| 94 | - $messages = []; |
|
| 95 | - if (is_array($renewPasswordMessages)) { |
|
| 96 | - list($errors, $messages) = $renewPasswordMessages; |
|
| 97 | - } |
|
| 98 | - $this->session->remove('renewPasswordMessages'); |
|
| 99 | - foreach ($errors as $value) { |
|
| 100 | - $parameters[$value] = true; |
|
| 101 | - } |
|
| 78 | + /** |
|
| 79 | + * @PublicPage |
|
| 80 | + * @NoCSRFRequired |
|
| 81 | + * @UseSession |
|
| 82 | + * |
|
| 83 | + * @param string $user |
|
| 84 | + * |
|
| 85 | + * @return TemplateResponse|RedirectResponse |
|
| 86 | + */ |
|
| 87 | + public function showRenewPasswordForm($user) { |
|
| 88 | + if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 89 | + return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 90 | + } |
|
| 91 | + $parameters = []; |
|
| 92 | + $renewPasswordMessages = $this->session->get('renewPasswordMessages'); |
|
| 93 | + $errors = []; |
|
| 94 | + $messages = []; |
|
| 95 | + if (is_array($renewPasswordMessages)) { |
|
| 96 | + list($errors, $messages) = $renewPasswordMessages; |
|
| 97 | + } |
|
| 98 | + $this->session->remove('renewPasswordMessages'); |
|
| 99 | + foreach ($errors as $value) { |
|
| 100 | + $parameters[$value] = true; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - $parameters['messages'] = $messages; |
|
| 104 | - $parameters['user'] = $user; |
|
| 103 | + $parameters['messages'] = $messages; |
|
| 104 | + $parameters['user'] = $user; |
|
| 105 | 105 | |
| 106 | - $parameters['canResetPassword'] = true; |
|
| 107 | - $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', ''); |
|
| 108 | - if (!$parameters['resetPasswordLink']) { |
|
| 109 | - $userObj = $this->userManager->get($user); |
|
| 110 | - if ($userObj instanceof IUser) { |
|
| 111 | - $parameters['canResetPassword'] = $userObj->canChangePassword(); |
|
| 112 | - } |
|
| 113 | - } |
|
| 114 | - $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'); |
|
| 106 | + $parameters['canResetPassword'] = true; |
|
| 107 | + $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', ''); |
|
| 108 | + if (!$parameters['resetPasswordLink']) { |
|
| 109 | + $userObj = $this->userManager->get($user); |
|
| 110 | + if ($userObj instanceof IUser) { |
|
| 111 | + $parameters['canResetPassword'] = $userObj->canChangePassword(); |
|
| 112 | + } |
|
| 113 | + } |
|
| 114 | + $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'); |
|
| 115 | 115 | |
| 116 | - return new TemplateResponse( |
|
| 117 | - $this->appName, 'renewpassword', $parameters, 'guest' |
|
| 118 | - ); |
|
| 119 | - } |
|
| 116 | + return new TemplateResponse( |
|
| 117 | + $this->appName, 'renewpassword', $parameters, 'guest' |
|
| 118 | + ); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * @PublicPage |
|
| 123 | - * @UseSession |
|
| 124 | - * |
|
| 125 | - * @param string $user |
|
| 126 | - * @param string $oldPassword |
|
| 127 | - * @param string $newPassword |
|
| 128 | - * |
|
| 129 | - * @return RedirectResponse |
|
| 130 | - */ |
|
| 131 | - public function tryRenewPassword($user, $oldPassword, $newPassword) { |
|
| 132 | - if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 133 | - return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 134 | - } |
|
| 135 | - $args = !is_null($user) ? ['user' => $user] : []; |
|
| 136 | - $loginResult = $this->userManager->checkPassword($user, $oldPassword); |
|
| 137 | - if ($loginResult === false) { |
|
| 138 | - $this->session->set('renewPasswordMessages', [ |
|
| 139 | - ['invalidpassword'], [] |
|
| 140 | - ]); |
|
| 141 | - return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args)); |
|
| 142 | - } |
|
| 121 | + /** |
|
| 122 | + * @PublicPage |
|
| 123 | + * @UseSession |
|
| 124 | + * |
|
| 125 | + * @param string $user |
|
| 126 | + * @param string $oldPassword |
|
| 127 | + * @param string $newPassword |
|
| 128 | + * |
|
| 129 | + * @return RedirectResponse |
|
| 130 | + */ |
|
| 131 | + public function tryRenewPassword($user, $oldPassword, $newPassword) { |
|
| 132 | + if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') { |
|
| 133 | + return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')); |
|
| 134 | + } |
|
| 135 | + $args = !is_null($user) ? ['user' => $user] : []; |
|
| 136 | + $loginResult = $this->userManager->checkPassword($user, $oldPassword); |
|
| 137 | + if ($loginResult === false) { |
|
| 138 | + $this->session->set('renewPasswordMessages', [ |
|
| 139 | + ['invalidpassword'], [] |
|
| 140 | + ]); |
|
| 141 | + return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args)); |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - try { |
|
| 145 | - if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) { |
|
| 146 | - $this->session->set('loginMessages', [ |
|
| 147 | - [], [$this->l10n->t("Please login with the new password")] |
|
| 148 | - ]); |
|
| 149 | - $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false'); |
|
| 150 | - return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); |
|
| 151 | - } else { |
|
| 152 | - $this->session->set('renewPasswordMessages', [ |
|
| 153 | - ['internalexception'], [] |
|
| 154 | - ]); |
|
| 155 | - } |
|
| 156 | - } catch (HintException $e) { |
|
| 157 | - $this->session->set('renewPasswordMessages', [ |
|
| 158 | - [], [$e->getHint()] |
|
| 159 | - ]); |
|
| 160 | - } |
|
| 144 | + try { |
|
| 145 | + if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) { |
|
| 146 | + $this->session->set('loginMessages', [ |
|
| 147 | + [], [$this->l10n->t("Please login with the new password")] |
|
| 148 | + ]); |
|
| 149 | + $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false'); |
|
| 150 | + return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); |
|
| 151 | + } else { |
|
| 152 | + $this->session->set('renewPasswordMessages', [ |
|
| 153 | + ['internalexception'], [] |
|
| 154 | + ]); |
|
| 155 | + } |
|
| 156 | + } catch (HintException $e) { |
|
| 157 | + $this->session->set('renewPasswordMessages', [ |
|
| 158 | + [], [$e->getHint()] |
|
| 159 | + ]); |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args)); |
|
| 163 | - } |
|
| 162 | + return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args)); |
|
| 163 | + } |
|
| 164 | 164 | |
| 165 | - /** |
|
| 166 | - * @PublicPage |
|
| 167 | - * @NoCSRFRequired |
|
| 168 | - * @UseSession |
|
| 169 | - * |
|
| 170 | - * @return RedirectResponse |
|
| 171 | - */ |
|
| 172 | - public function showLoginFormInvalidPassword($user) { |
|
| 173 | - $args = !is_null($user) ? ['user' => $user] : []; |
|
| 174 | - $this->session->set('loginMessages', [ |
|
| 175 | - ['invalidpassword'], [] |
|
| 176 | - ]); |
|
| 177 | - return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); |
|
| 178 | - } |
|
| 165 | + /** |
|
| 166 | + * @PublicPage |
|
| 167 | + * @NoCSRFRequired |
|
| 168 | + * @UseSession |
|
| 169 | + * |
|
| 170 | + * @return RedirectResponse |
|
| 171 | + */ |
|
| 172 | + public function showLoginFormInvalidPassword($user) { |
|
| 173 | + $args = !is_null($user) ? ['user' => $user] : []; |
|
| 174 | + $this->session->set('loginMessages', [ |
|
| 175 | + ['invalidpassword'], [] |
|
| 176 | + ]); |
|
| 177 | + return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args)); |
|
| 178 | + } |
|
| 179 | 179 | |
| 180 | 180 | } |
@@ -104,6 +104,10 @@ |
||
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | + /** |
|
| 108 | + * @param string $href |
|
| 109 | + * @param string $path |
|
| 110 | + */ |
|
| 107 | 111 | public function getPropertyDefinitionsForScope($href, $path) { |
| 108 | 112 | // all valid scopes support the same schema |
| 109 | 113 | |
@@ -49,234 +49,234 @@ |
||
| 49 | 49 | use SearchDAV\XML\Order; |
| 50 | 50 | |
| 51 | 51 | class FileSearchBackend implements ISearchBackend { |
| 52 | - /** @var CachingTree */ |
|
| 53 | - private $tree; |
|
| 52 | + /** @var CachingTree */ |
|
| 53 | + private $tree; |
|
| 54 | 54 | |
| 55 | - /** @var IUser */ |
|
| 56 | - private $user; |
|
| 55 | + /** @var IUser */ |
|
| 56 | + private $user; |
|
| 57 | 57 | |
| 58 | - /** @var IRootFolder */ |
|
| 59 | - private $rootFolder; |
|
| 58 | + /** @var IRootFolder */ |
|
| 59 | + private $rootFolder; |
|
| 60 | 60 | |
| 61 | - /** @var IManager */ |
|
| 62 | - private $shareManager; |
|
| 61 | + /** @var IManager */ |
|
| 62 | + private $shareManager; |
|
| 63 | 63 | |
| 64 | - /** @var View */ |
|
| 65 | - private $view; |
|
| 64 | + /** @var View */ |
|
| 65 | + private $view; |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * FileSearchBackend constructor. |
|
| 69 | - * |
|
| 70 | - * @param CachingTree $tree |
|
| 71 | - * @param IUser $user |
|
| 72 | - * @param IRootFolder $rootFolder |
|
| 73 | - * @param IManager $shareManager |
|
| 74 | - * @param View $view |
|
| 75 | - * @internal param IRootFolder $rootFolder |
|
| 76 | - */ |
|
| 77 | - public function __construct(CachingTree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) { |
|
| 78 | - $this->tree = $tree; |
|
| 79 | - $this->user = $user; |
|
| 80 | - $this->rootFolder = $rootFolder; |
|
| 81 | - $this->shareManager = $shareManager; |
|
| 82 | - $this->view = $view; |
|
| 83 | - } |
|
| 67 | + /** |
|
| 68 | + * FileSearchBackend constructor. |
|
| 69 | + * |
|
| 70 | + * @param CachingTree $tree |
|
| 71 | + * @param IUser $user |
|
| 72 | + * @param IRootFolder $rootFolder |
|
| 73 | + * @param IManager $shareManager |
|
| 74 | + * @param View $view |
|
| 75 | + * @internal param IRootFolder $rootFolder |
|
| 76 | + */ |
|
| 77 | + public function __construct(CachingTree $tree, IUser $user, IRootFolder $rootFolder, IManager $shareManager, View $view) { |
|
| 78 | + $this->tree = $tree; |
|
| 79 | + $this->user = $user; |
|
| 80 | + $this->rootFolder = $rootFolder; |
|
| 81 | + $this->shareManager = $shareManager; |
|
| 82 | + $this->view = $view; |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * Search endpoint will be remote.php/dav |
|
| 87 | - * |
|
| 88 | - * @return string |
|
| 89 | - */ |
|
| 90 | - public function getArbiterPath() { |
|
| 91 | - return ''; |
|
| 92 | - } |
|
| 85 | + /** |
|
| 86 | + * Search endpoint will be remote.php/dav |
|
| 87 | + * |
|
| 88 | + * @return string |
|
| 89 | + */ |
|
| 90 | + public function getArbiterPath() { |
|
| 91 | + return ''; |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - public function isValidScope($href, $depth, $path) { |
|
| 95 | - // only allow scopes inside the dav server |
|
| 96 | - if (is_null($path)) { |
|
| 97 | - return false; |
|
| 98 | - } |
|
| 94 | + public function isValidScope($href, $depth, $path) { |
|
| 95 | + // only allow scopes inside the dav server |
|
| 96 | + if (is_null($path)) { |
|
| 97 | + return false; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - try { |
|
| 101 | - $node = $this->tree->getNodeForPath($path); |
|
| 102 | - return $node instanceof Directory; |
|
| 103 | - } catch (NotFound $e) { |
|
| 104 | - return false; |
|
| 105 | - } |
|
| 106 | - } |
|
| 100 | + try { |
|
| 101 | + $node = $this->tree->getNodeForPath($path); |
|
| 102 | + return $node instanceof Directory; |
|
| 103 | + } catch (NotFound $e) { |
|
| 104 | + return false; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - public function getPropertyDefinitionsForScope($href, $path) { |
|
| 109 | - // all valid scopes support the same schema |
|
| 108 | + public function getPropertyDefinitionsForScope($href, $path) { |
|
| 109 | + // all valid scopes support the same schema |
|
| 110 | 110 | |
| 111 | - //todo dynamically load all propfind properties that are supported |
|
| 112 | - return [ |
|
| 113 | - // queryable properties |
|
| 114 | - new SearchPropertyDefinition('{DAV:}displayname', true, false, true), |
|
| 115 | - new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), |
|
| 116 | - new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME), |
|
| 117 | - new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 118 | - new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN), |
|
| 119 | - new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 111 | + //todo dynamically load all propfind properties that are supported |
|
| 112 | + return [ |
|
| 113 | + // queryable properties |
|
| 114 | + new SearchPropertyDefinition('{DAV:}displayname', true, false, true), |
|
| 115 | + new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), |
|
| 116 | + new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME), |
|
| 117 | + new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 118 | + new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN), |
|
| 119 | + new SearchPropertyDefinition(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, true, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 120 | 120 | |
| 121 | - // select only properties |
|
| 122 | - new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false), |
|
| 123 | - new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false), |
|
| 124 | - new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false), |
|
| 125 | - new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false), |
|
| 126 | - new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false), |
|
| 127 | - new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false), |
|
| 128 | - new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false), |
|
| 129 | - new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false), |
|
| 130 | - new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN), |
|
| 131 | - new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 132 | - ]; |
|
| 133 | - } |
|
| 121 | + // select only properties |
|
| 122 | + new SearchPropertyDefinition('{DAV:}resourcetype', false, true, false), |
|
| 123 | + new SearchPropertyDefinition('{DAV:}getcontentlength', false, true, false), |
|
| 124 | + new SearchPropertyDefinition(FilesPlugin::CHECKSUMS_PROPERTYNAME, false, true, false), |
|
| 125 | + new SearchPropertyDefinition(FilesPlugin::PERMISSIONS_PROPERTYNAME, false, true, false), |
|
| 126 | + new SearchPropertyDefinition(FilesPlugin::GETETAG_PROPERTYNAME, false, true, false), |
|
| 127 | + new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, false, true, false), |
|
| 128 | + new SearchPropertyDefinition(FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME, false, true, false), |
|
| 129 | + new SearchPropertyDefinition(FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME, false, true, false), |
|
| 130 | + new SearchPropertyDefinition(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_BOOLEAN), |
|
| 131 | + new SearchPropertyDefinition(FilesPlugin::FILEID_PROPERTYNAME, false, true, false, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER), |
|
| 132 | + ]; |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - /** |
|
| 136 | - * @param BasicSearch $search |
|
| 137 | - * @return SearchResult[] |
|
| 138 | - */ |
|
| 139 | - public function search(BasicSearch $search) { |
|
| 140 | - if (count($search->from) !== 1) { |
|
| 141 | - throw new \InvalidArgumentException('Searching more than one folder is not supported'); |
|
| 142 | - } |
|
| 143 | - $query = $this->transformQuery($search); |
|
| 144 | - $scope = $search->from[0]; |
|
| 145 | - if ($scope->path === null) { |
|
| 146 | - throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead'); |
|
| 147 | - } |
|
| 148 | - $node = $this->tree->getNodeForPath($scope->path); |
|
| 149 | - if (!$node instanceof Directory) { |
|
| 150 | - throw new \InvalidArgumentException('Search is only supported on directories'); |
|
| 151 | - } |
|
| 135 | + /** |
|
| 136 | + * @param BasicSearch $search |
|
| 137 | + * @return SearchResult[] |
|
| 138 | + */ |
|
| 139 | + public function search(BasicSearch $search) { |
|
| 140 | + if (count($search->from) !== 1) { |
|
| 141 | + throw new \InvalidArgumentException('Searching more than one folder is not supported'); |
|
| 142 | + } |
|
| 143 | + $query = $this->transformQuery($search); |
|
| 144 | + $scope = $search->from[0]; |
|
| 145 | + if ($scope->path === null) { |
|
| 146 | + throw new \InvalidArgumentException('Using uri\'s as scope is not supported, please use a path relative to the search arbiter instead'); |
|
| 147 | + } |
|
| 148 | + $node = $this->tree->getNodeForPath($scope->path); |
|
| 149 | + if (!$node instanceof Directory) { |
|
| 150 | + throw new \InvalidArgumentException('Search is only supported on directories'); |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | - $fileInfo = $node->getFileInfo(); |
|
| 154 | - $folder = $this->rootFolder->get($fileInfo->getPath()); |
|
| 155 | - /** @var Folder $folder $results */ |
|
| 156 | - $results = $folder->search($query); |
|
| 153 | + $fileInfo = $node->getFileInfo(); |
|
| 154 | + $folder = $this->rootFolder->get($fileInfo->getPath()); |
|
| 155 | + /** @var Folder $folder $results */ |
|
| 156 | + $results = $folder->search($query); |
|
| 157 | 157 | |
| 158 | - return array_map(function (Node $node) { |
|
| 159 | - if ($node instanceof Folder) { |
|
| 160 | - $davNode = new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager); |
|
| 161 | - } else { |
|
| 162 | - $davNode = new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager); |
|
| 163 | - } |
|
| 164 | - $path = $this->getHrefForNode($node); |
|
| 165 | - $this->tree->cacheNode($davNode, $path); |
|
| 166 | - return new SearchResult($davNode, $path); |
|
| 167 | - }, $results); |
|
| 168 | - } |
|
| 158 | + return array_map(function (Node $node) { |
|
| 159 | + if ($node instanceof Folder) { |
|
| 160 | + $davNode = new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager); |
|
| 161 | + } else { |
|
| 162 | + $davNode = new \OCA\DAV\Connector\Sabre\File($this->view, $node, $this->shareManager); |
|
| 163 | + } |
|
| 164 | + $path = $this->getHrefForNode($node); |
|
| 165 | + $this->tree->cacheNode($davNode, $path); |
|
| 166 | + return new SearchResult($davNode, $path); |
|
| 167 | + }, $results); |
|
| 168 | + } |
|
| 169 | 169 | |
| 170 | - /** |
|
| 171 | - * @param Node $node |
|
| 172 | - * @return string |
|
| 173 | - */ |
|
| 174 | - private function getHrefForNode(Node $node) { |
|
| 175 | - $base = '/files/' . $this->user->getUID(); |
|
| 176 | - return $base . $this->view->getRelativePath($node->getPath()); |
|
| 177 | - } |
|
| 170 | + /** |
|
| 171 | + * @param Node $node |
|
| 172 | + * @return string |
|
| 173 | + */ |
|
| 174 | + private function getHrefForNode(Node $node) { |
|
| 175 | + $base = '/files/' . $this->user->getUID(); |
|
| 176 | + return $base . $this->view->getRelativePath($node->getPath()); |
|
| 177 | + } |
|
| 178 | 178 | |
| 179 | - /** |
|
| 180 | - * @param BasicSearch $query |
|
| 181 | - * @return ISearchQuery |
|
| 182 | - */ |
|
| 183 | - private function transformQuery(BasicSearch $query) { |
|
| 184 | - // TODO offset, limit |
|
| 185 | - $orders = array_map([$this, 'mapSearchOrder'], $query->orderBy); |
|
| 186 | - return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user); |
|
| 187 | - } |
|
| 179 | + /** |
|
| 180 | + * @param BasicSearch $query |
|
| 181 | + * @return ISearchQuery |
|
| 182 | + */ |
|
| 183 | + private function transformQuery(BasicSearch $query) { |
|
| 184 | + // TODO offset, limit |
|
| 185 | + $orders = array_map([$this, 'mapSearchOrder'], $query->orderBy); |
|
| 186 | + return new SearchQuery($this->transformSearchOperation($query->where), 0, 0, $orders, $this->user); |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | - /** |
|
| 190 | - * @param Order $order |
|
| 191 | - * @return ISearchOrder |
|
| 192 | - */ |
|
| 193 | - private function mapSearchOrder(Order $order) { |
|
| 194 | - return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property)); |
|
| 195 | - } |
|
| 189 | + /** |
|
| 190 | + * @param Order $order |
|
| 191 | + * @return ISearchOrder |
|
| 192 | + */ |
|
| 193 | + private function mapSearchOrder(Order $order) { |
|
| 194 | + return new SearchOrder($order->order === Order::ASC ? ISearchOrder::DIRECTION_ASCENDING : ISearchOrder::DIRECTION_DESCENDING, $this->mapPropertyNameToColumn($order->property)); |
|
| 195 | + } |
|
| 196 | 196 | |
| 197 | - /** |
|
| 198 | - * @param Operator $operator |
|
| 199 | - * @return ISearchOperator |
|
| 200 | - */ |
|
| 201 | - private function transformSearchOperation(Operator $operator) { |
|
| 202 | - list(, $trimmedType) = explode('}', $operator->type); |
|
| 203 | - switch ($operator->type) { |
|
| 204 | - case Operator::OPERATION_AND: |
|
| 205 | - case Operator::OPERATION_OR: |
|
| 206 | - case Operator::OPERATION_NOT: |
|
| 207 | - $arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments); |
|
| 208 | - return new SearchBinaryOperator($trimmedType, $arguments); |
|
| 209 | - case Operator::OPERATION_EQUAL: |
|
| 210 | - case Operator::OPERATION_GREATER_OR_EQUAL_THAN: |
|
| 211 | - case Operator::OPERATION_GREATER_THAN: |
|
| 212 | - case Operator::OPERATION_LESS_OR_EQUAL_THAN: |
|
| 213 | - case Operator::OPERATION_LESS_THAN: |
|
| 214 | - case Operator::OPERATION_IS_LIKE: |
|
| 215 | - if (count($operator->arguments) !== 2) { |
|
| 216 | - throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation'); |
|
| 217 | - } |
|
| 218 | - if (!is_string($operator->arguments[0])) { |
|
| 219 | - throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property'); |
|
| 220 | - } |
|
| 221 | - if (!($operator->arguments[1] instanceof Literal)) { |
|
| 222 | - throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal'); |
|
| 223 | - } |
|
| 224 | - return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value)); |
|
| 225 | - case Operator::OPERATION_IS_COLLECTION: |
|
| 226 | - return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE); |
|
| 227 | - default: |
|
| 228 | - throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')'); |
|
| 229 | - } |
|
| 230 | - } |
|
| 197 | + /** |
|
| 198 | + * @param Operator $operator |
|
| 199 | + * @return ISearchOperator |
|
| 200 | + */ |
|
| 201 | + private function transformSearchOperation(Operator $operator) { |
|
| 202 | + list(, $trimmedType) = explode('}', $operator->type); |
|
| 203 | + switch ($operator->type) { |
|
| 204 | + case Operator::OPERATION_AND: |
|
| 205 | + case Operator::OPERATION_OR: |
|
| 206 | + case Operator::OPERATION_NOT: |
|
| 207 | + $arguments = array_map([$this, 'transformSearchOperation'], $operator->arguments); |
|
| 208 | + return new SearchBinaryOperator($trimmedType, $arguments); |
|
| 209 | + case Operator::OPERATION_EQUAL: |
|
| 210 | + case Operator::OPERATION_GREATER_OR_EQUAL_THAN: |
|
| 211 | + case Operator::OPERATION_GREATER_THAN: |
|
| 212 | + case Operator::OPERATION_LESS_OR_EQUAL_THAN: |
|
| 213 | + case Operator::OPERATION_LESS_THAN: |
|
| 214 | + case Operator::OPERATION_IS_LIKE: |
|
| 215 | + if (count($operator->arguments) !== 2) { |
|
| 216 | + throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation'); |
|
| 217 | + } |
|
| 218 | + if (!is_string($operator->arguments[0])) { |
|
| 219 | + throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property'); |
|
| 220 | + } |
|
| 221 | + if (!($operator->arguments[1] instanceof Literal)) { |
|
| 222 | + throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal'); |
|
| 223 | + } |
|
| 224 | + return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value)); |
|
| 225 | + case Operator::OPERATION_IS_COLLECTION: |
|
| 226 | + return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE); |
|
| 227 | + default: |
|
| 228 | + throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')'); |
|
| 229 | + } |
|
| 230 | + } |
|
| 231 | 231 | |
| 232 | - /** |
|
| 233 | - * @param string $propertyName |
|
| 234 | - * @return string |
|
| 235 | - */ |
|
| 236 | - private function mapPropertyNameToColumn($propertyName) { |
|
| 237 | - switch ($propertyName) { |
|
| 238 | - case '{DAV:}displayname': |
|
| 239 | - return 'name'; |
|
| 240 | - case '{DAV:}getcontenttype': |
|
| 241 | - return 'mimetype'; |
|
| 242 | - case '{DAV:}getlastmodified': |
|
| 243 | - return 'mtime'; |
|
| 244 | - case FilesPlugin::SIZE_PROPERTYNAME: |
|
| 245 | - return 'size'; |
|
| 246 | - case TagsPlugin::FAVORITE_PROPERTYNAME: |
|
| 247 | - return 'favorite'; |
|
| 248 | - case TagsPlugin::TAGS_PROPERTYNAME: |
|
| 249 | - return 'tagname'; |
|
| 250 | - case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME: |
|
| 251 | - return 'fileid'; |
|
| 252 | - default: |
|
| 253 | - throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName); |
|
| 254 | - } |
|
| 255 | - } |
|
| 232 | + /** |
|
| 233 | + * @param string $propertyName |
|
| 234 | + * @return string |
|
| 235 | + */ |
|
| 236 | + private function mapPropertyNameToColumn($propertyName) { |
|
| 237 | + switch ($propertyName) { |
|
| 238 | + case '{DAV:}displayname': |
|
| 239 | + return 'name'; |
|
| 240 | + case '{DAV:}getcontenttype': |
|
| 241 | + return 'mimetype'; |
|
| 242 | + case '{DAV:}getlastmodified': |
|
| 243 | + return 'mtime'; |
|
| 244 | + case FilesPlugin::SIZE_PROPERTYNAME: |
|
| 245 | + return 'size'; |
|
| 246 | + case TagsPlugin::FAVORITE_PROPERTYNAME: |
|
| 247 | + return 'favorite'; |
|
| 248 | + case TagsPlugin::TAGS_PROPERTYNAME: |
|
| 249 | + return 'tagname'; |
|
| 250 | + case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME: |
|
| 251 | + return 'fileid'; |
|
| 252 | + default: |
|
| 253 | + throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName); |
|
| 254 | + } |
|
| 255 | + } |
|
| 256 | 256 | |
| 257 | - private function castValue($propertyName, $value) { |
|
| 258 | - $allProps = $this->getPropertyDefinitionsForScope('', ''); |
|
| 259 | - foreach ($allProps as $prop) { |
|
| 260 | - if ($prop->name === $propertyName) { |
|
| 261 | - $dataType = $prop->dataType; |
|
| 262 | - switch ($dataType) { |
|
| 263 | - case SearchPropertyDefinition::DATATYPE_BOOLEAN: |
|
| 264 | - return $value === 'yes'; |
|
| 265 | - case SearchPropertyDefinition::DATATYPE_DECIMAL: |
|
| 266 | - case SearchPropertyDefinition::DATATYPE_INTEGER: |
|
| 267 | - case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER: |
|
| 268 | - return 0 + $value; |
|
| 269 | - case SearchPropertyDefinition::DATATYPE_DATETIME: |
|
| 270 | - if (is_numeric($value)) { |
|
| 271 | - return 0 + $value; |
|
| 272 | - } |
|
| 273 | - $date = \DateTime::createFromFormat(\DateTime::ATOM, $value); |
|
| 274 | - return ($date instanceof \DateTime) ? $date->getTimestamp() : 0; |
|
| 275 | - default: |
|
| 276 | - return $value; |
|
| 277 | - } |
|
| 278 | - } |
|
| 279 | - } |
|
| 280 | - return $value; |
|
| 281 | - } |
|
| 257 | + private function castValue($propertyName, $value) { |
|
| 258 | + $allProps = $this->getPropertyDefinitionsForScope('', ''); |
|
| 259 | + foreach ($allProps as $prop) { |
|
| 260 | + if ($prop->name === $propertyName) { |
|
| 261 | + $dataType = $prop->dataType; |
|
| 262 | + switch ($dataType) { |
|
| 263 | + case SearchPropertyDefinition::DATATYPE_BOOLEAN: |
|
| 264 | + return $value === 'yes'; |
|
| 265 | + case SearchPropertyDefinition::DATATYPE_DECIMAL: |
|
| 266 | + case SearchPropertyDefinition::DATATYPE_INTEGER: |
|
| 267 | + case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER: |
|
| 268 | + return 0 + $value; |
|
| 269 | + case SearchPropertyDefinition::DATATYPE_DATETIME: |
|
| 270 | + if (is_numeric($value)) { |
|
| 271 | + return 0 + $value; |
|
| 272 | + } |
|
| 273 | + $date = \DateTime::createFromFormat(\DateTime::ATOM, $value); |
|
| 274 | + return ($date instanceof \DateTime) ? $date->getTimestamp() : 0; |
|
| 275 | + default: |
|
| 276 | + return $value; |
|
| 277 | + } |
|
| 278 | + } |
|
| 279 | + } |
|
| 280 | + return $value; |
|
| 281 | + } |
|
| 282 | 282 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | /** @var Folder $folder $results */ |
| 156 | 156 | $results = $folder->search($query); |
| 157 | 157 | |
| 158 | - return array_map(function (Node $node) { |
|
| 158 | + return array_map(function(Node $node) { |
|
| 159 | 159 | if ($node instanceof Folder) { |
| 160 | 160 | $davNode = new \OCA\DAV\Connector\Sabre\Directory($this->view, $node, $this->tree, $this->shareManager); |
| 161 | 161 | } else { |
@@ -172,8 +172,8 @@ discard block |
||
| 172 | 172 | * @return string |
| 173 | 173 | */ |
| 174 | 174 | private function getHrefForNode(Node $node) { |
| 175 | - $base = '/files/' . $this->user->getUID(); |
|
| 176 | - return $base . $this->view->getRelativePath($node->getPath()); |
|
| 175 | + $base = '/files/'.$this->user->getUID(); |
|
| 176 | + return $base.$this->view->getRelativePath($node->getPath()); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
@@ -213,19 +213,19 @@ discard block |
||
| 213 | 213 | case Operator::OPERATION_LESS_THAN: |
| 214 | 214 | case Operator::OPERATION_IS_LIKE: |
| 215 | 215 | if (count($operator->arguments) !== 2) { |
| 216 | - throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation'); |
|
| 216 | + throw new \InvalidArgumentException('Invalid number of arguments for '.$trimmedType.' operation'); |
|
| 217 | 217 | } |
| 218 | 218 | if (!is_string($operator->arguments[0])) { |
| 219 | - throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property'); |
|
| 219 | + throw new \InvalidArgumentException('Invalid argument 1 for '.$trimmedType.' operation, expected property'); |
|
| 220 | 220 | } |
| 221 | 221 | if (!($operator->arguments[1] instanceof Literal)) { |
| 222 | - throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal'); |
|
| 222 | + throw new \InvalidArgumentException('Invalid argument 2 for '.$trimmedType.' operation, expected literal'); |
|
| 223 | 223 | } |
| 224 | 224 | return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($operator->arguments[0]), $this->castValue($operator->arguments[0], $operator->arguments[1]->value)); |
| 225 | 225 | case Operator::OPERATION_IS_COLLECTION: |
| 226 | 226 | return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE); |
| 227 | 227 | default: |
| 228 | - throw new \InvalidArgumentException('Unsupported operation ' . $trimmedType . ' (' . $operator->type . ')'); |
|
| 228 | + throw new \InvalidArgumentException('Unsupported operation '.$trimmedType.' ('.$operator->type.')'); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | case FilesPlugin::INTERNAL_FILEID_PROPERTYNAME: |
| 251 | 251 | return 'fileid'; |
| 252 | 252 | default: |
| 253 | - throw new \InvalidArgumentException('Unsupported property for search or order: ' . $propertyName); |
|
| 253 | + throw new \InvalidArgumentException('Unsupported property for search or order: '.$propertyName); |
|
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | private $filePath; |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * @param string|resource $filePath the path to the file or a file handle which should be streamed |
|
| 40 | + * @param string $filePath the path to the file or a file handle which should be streamed |
|
| 41 | 41 | * @since 8.1.0 |
| 42 | 42 | */ |
| 43 | 43 | public function __construct ($filePath) { |
@@ -33,33 +33,33 @@ |
||
| 33 | 33 | * @since 8.1.0 |
| 34 | 34 | */ |
| 35 | 35 | class StreamResponse extends Response implements ICallbackResponse { |
| 36 | - /** @var string */ |
|
| 37 | - private $filePath; |
|
| 36 | + /** @var string */ |
|
| 37 | + private $filePath; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param string|resource $filePath the path to the file or a file handle which should be streamed |
|
| 41 | - * @since 8.1.0 |
|
| 42 | - */ |
|
| 43 | - public function __construct ($filePath) { |
|
| 44 | - $this->filePath = $filePath; |
|
| 45 | - } |
|
| 39 | + /** |
|
| 40 | + * @param string|resource $filePath the path to the file or a file handle which should be streamed |
|
| 41 | + * @since 8.1.0 |
|
| 42 | + */ |
|
| 43 | + public function __construct ($filePath) { |
|
| 44 | + $this->filePath = $filePath; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Streams the file using readfile |
|
| 50 | - * |
|
| 51 | - * @param IOutput $output a small wrapper that handles output |
|
| 52 | - * @since 8.1.0 |
|
| 53 | - */ |
|
| 54 | - public function callback (IOutput $output) { |
|
| 55 | - // handle caching |
|
| 56 | - if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
| 57 | - if (!(is_resource($this->filePath) || file_exists($this->filePath))) { |
|
| 58 | - $output->setHttpResponseCode(Http::STATUS_NOT_FOUND); |
|
| 59 | - } elseif ($output->setReadfile($this->filePath) === false) { |
|
| 60 | - $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST); |
|
| 61 | - } |
|
| 62 | - } |
|
| 63 | - } |
|
| 48 | + /** |
|
| 49 | + * Streams the file using readfile |
|
| 50 | + * |
|
| 51 | + * @param IOutput $output a small wrapper that handles output |
|
| 52 | + * @since 8.1.0 |
|
| 53 | + */ |
|
| 54 | + public function callback (IOutput $output) { |
|
| 55 | + // handle caching |
|
| 56 | + if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
| 57 | + if (!(is_resource($this->filePath) || file_exists($this->filePath))) { |
|
| 58 | + $output->setHttpResponseCode(Http::STATUS_NOT_FOUND); |
|
| 59 | + } elseif ($output->setReadfile($this->filePath) === false) { |
|
| 60 | + $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | 65 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param string|resource $filePath the path to the file or a file handle which should be streamed |
| 41 | 41 | * @since 8.1.0 |
| 42 | 42 | */ |
| 43 | - public function __construct ($filePath) { |
|
| 43 | + public function __construct($filePath) { |
|
| 44 | 44 | $this->filePath = $filePath; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * @param IOutput $output a small wrapper that handles output |
| 52 | 52 | * @since 8.1.0 |
| 53 | 53 | */ |
| 54 | - public function callback (IOutput $output) { |
|
| 54 | + public function callback(IOutput $output) { |
|
| 55 | 55 | // handle caching |
| 56 | 56 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
| 57 | 57 | if (!(is_resource($this->filePath) || file_exists($this->filePath))) { |
@@ -47,6 +47,9 @@ |
||
| 47 | 47 | $this->allowUnauthenticatedAccess = false; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | + /** |
|
| 51 | + * @param string $privileges |
|
| 52 | + */ |
|
| 50 | 53 | function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) { |
| 51 | 54 | $access = parent::checkPrivileges($uri, $privileges, $recursion, false); |
| 52 | 55 | if($access === false && $throwExceptions) { |
@@ -43,50 +43,50 @@ |
||
| 43 | 43 | * @package OCA\DAV\Connector\Sabre |
| 44 | 44 | */ |
| 45 | 45 | class DavAclPlugin extends \Sabre\DAVACL\Plugin { |
| 46 | - public function __construct() { |
|
| 47 | - $this->hideNodesFromListings = true; |
|
| 48 | - $this->allowUnauthenticatedAccess = false; |
|
| 49 | - } |
|
| 46 | + public function __construct() { |
|
| 47 | + $this->hideNodesFromListings = true; |
|
| 48 | + $this->allowUnauthenticatedAccess = false; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) { |
|
| 52 | - $access = parent::checkPrivileges($uri, $privileges, $recursion, false); |
|
| 53 | - if($access === false && $throwExceptions) { |
|
| 54 | - /** @var INode $node */ |
|
| 55 | - $node = $this->server->tree->getNodeForPath($uri); |
|
| 51 | + function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) { |
|
| 52 | + $access = parent::checkPrivileges($uri, $privileges, $recursion, false); |
|
| 53 | + if($access === false && $throwExceptions) { |
|
| 54 | + /** @var INode $node */ |
|
| 55 | + $node = $this->server->tree->getNodeForPath($uri); |
|
| 56 | 56 | |
| 57 | - switch(get_class($node)) { |
|
| 58 | - case 'OCA\DAV\CardDAV\AddressBook': |
|
| 59 | - $type = 'Addressbook'; |
|
| 60 | - break; |
|
| 61 | - default: |
|
| 62 | - $type = 'Node'; |
|
| 63 | - break; |
|
| 64 | - } |
|
| 65 | - throw new NotFound( |
|
| 66 | - sprintf( |
|
| 67 | - "%s with name '%s' could not be found", |
|
| 68 | - $type, |
|
| 69 | - $node->getName() |
|
| 70 | - ) |
|
| 71 | - ); |
|
| 72 | - } |
|
| 57 | + switch(get_class($node)) { |
|
| 58 | + case 'OCA\DAV\CardDAV\AddressBook': |
|
| 59 | + $type = 'Addressbook'; |
|
| 60 | + break; |
|
| 61 | + default: |
|
| 62 | + $type = 'Node'; |
|
| 63 | + break; |
|
| 64 | + } |
|
| 65 | + throw new NotFound( |
|
| 66 | + sprintf( |
|
| 67 | + "%s with name '%s' could not be found", |
|
| 68 | + $type, |
|
| 69 | + $node->getName() |
|
| 70 | + ) |
|
| 71 | + ); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - return $access; |
|
| 75 | - } |
|
| 74 | + return $access; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - public function propFind(PropFind $propFind, INode $node) { |
|
| 78 | - // If the node is neither readable nor writable then fail unless its of |
|
| 79 | - // the standard user-principal |
|
| 80 | - if(!($node instanceof User)) { |
|
| 81 | - $path = $propFind->getPath(); |
|
| 82 | - $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false); |
|
| 83 | - $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false); |
|
| 84 | - if ($readPermissions === false && $writePermissions === false) { |
|
| 85 | - $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true); |
|
| 86 | - $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true); |
|
| 87 | - } |
|
| 88 | - } |
|
| 77 | + public function propFind(PropFind $propFind, INode $node) { |
|
| 78 | + // If the node is neither readable nor writable then fail unless its of |
|
| 79 | + // the standard user-principal |
|
| 80 | + if(!($node instanceof User)) { |
|
| 81 | + $path = $propFind->getPath(); |
|
| 82 | + $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false); |
|
| 83 | + $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false); |
|
| 84 | + if ($readPermissions === false && $writePermissions === false) { |
|
| 85 | + $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, true); |
|
| 86 | + $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, true); |
|
| 87 | + } |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - return parent::propFind($propFind, $node); |
|
| 91 | - } |
|
| 90 | + return parent::propFind($propFind, $node); |
|
| 91 | + } |
|
| 92 | 92 | } |
@@ -50,11 +50,11 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) { |
| 52 | 52 | $access = parent::checkPrivileges($uri, $privileges, $recursion, false); |
| 53 | - if($access === false && $throwExceptions) { |
|
| 53 | + if ($access === false && $throwExceptions) { |
|
| 54 | 54 | /** @var INode $node */ |
| 55 | 55 | $node = $this->server->tree->getNodeForPath($uri); |
| 56 | 56 | |
| 57 | - switch(get_class($node)) { |
|
| 57 | + switch (get_class($node)) { |
|
| 58 | 58 | case 'OCA\DAV\CardDAV\AddressBook': |
| 59 | 59 | $type = 'Addressbook'; |
| 60 | 60 | break; |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | public function propFind(PropFind $propFind, INode $node) { |
| 78 | 78 | // If the node is neither readable nor writable then fail unless its of |
| 79 | 79 | // the standard user-principal |
| 80 | - if(!($node instanceof User)) { |
|
| 80 | + if (!($node instanceof User)) { |
|
| 81 | 81 | $path = $propFind->getPath(); |
| 82 | 82 | $readPermissions = $this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false); |
| 83 | 83 | $writePermissions = $this->checkPrivileges($path, '{DAV:}write', self::R_PARENT, false); |
@@ -100,6 +100,7 @@ discard block |
||
| 100 | 100 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 101 | 101 | * @param \OCP\Lock\ILockingProvider $provider |
| 102 | 102 | * @throws \OCP\Lock\LockedException |
| 103 | + * @return void |
|
| 103 | 104 | */ |
| 104 | 105 | public function acquireLock($path, $type, ILockingProvider $provider); |
| 105 | 106 | |
@@ -108,6 +109,7 @@ discard block |
||
| 108 | 109 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 109 | 110 | * @param \OCP\Lock\ILockingProvider $provider |
| 110 | 111 | * @throws \OCP\Lock\LockedException |
| 112 | + * @return void |
|
| 111 | 113 | */ |
| 112 | 114 | public function releaseLock($path, $type, ILockingProvider $provider); |
| 113 | 115 | |
@@ -116,6 +118,7 @@ discard block |
||
| 116 | 118 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
| 117 | 119 | * @param \OCP\Lock\ILockingProvider $provider |
| 118 | 120 | * @throws \OCP\Lock\LockedException |
| 121 | + * @return void |
|
| 119 | 122 | */ |
| 120 | 123 | public function changeLock($path, $type, ILockingProvider $provider); |
| 121 | 124 | } |
@@ -32,90 +32,90 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | interface Storage extends \OCP\Files\Storage { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * get a cache instance for the storage |
|
| 37 | - * |
|
| 38 | - * @param string $path |
|
| 39 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache |
|
| 40 | - * @return \OC\Files\Cache\Cache |
|
| 41 | - */ |
|
| 42 | - public function getCache($path = '', $storage = null); |
|
| 35 | + /** |
|
| 36 | + * get a cache instance for the storage |
|
| 37 | + * |
|
| 38 | + * @param string $path |
|
| 39 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache |
|
| 40 | + * @return \OC\Files\Cache\Cache |
|
| 41 | + */ |
|
| 42 | + public function getCache($path = '', $storage = null); |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * get a scanner instance for the storage |
|
| 46 | - * |
|
| 47 | - * @param string $path |
|
| 48 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner |
|
| 49 | - * @return \OC\Files\Cache\Scanner |
|
| 50 | - */ |
|
| 51 | - public function getScanner($path = '', $storage = null); |
|
| 44 | + /** |
|
| 45 | + * get a scanner instance for the storage |
|
| 46 | + * |
|
| 47 | + * @param string $path |
|
| 48 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner |
|
| 49 | + * @return \OC\Files\Cache\Scanner |
|
| 50 | + */ |
|
| 51 | + public function getScanner($path = '', $storage = null); |
|
| 52 | 52 | |
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * get the user id of the owner of a file or folder |
|
| 56 | - * |
|
| 57 | - * @param string $path |
|
| 58 | - * @return string |
|
| 59 | - */ |
|
| 60 | - public function getOwner($path); |
|
| 54 | + /** |
|
| 55 | + * get the user id of the owner of a file or folder |
|
| 56 | + * |
|
| 57 | + * @param string $path |
|
| 58 | + * @return string |
|
| 59 | + */ |
|
| 60 | + public function getOwner($path); |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * get a watcher instance for the cache |
|
| 64 | - * |
|
| 65 | - * @param string $path |
|
| 66 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 67 | - * @return \OC\Files\Cache\Watcher |
|
| 68 | - */ |
|
| 69 | - public function getWatcher($path = '', $storage = null); |
|
| 62 | + /** |
|
| 63 | + * get a watcher instance for the cache |
|
| 64 | + * |
|
| 65 | + * @param string $path |
|
| 66 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 67 | + * @return \OC\Files\Cache\Watcher |
|
| 68 | + */ |
|
| 69 | + public function getWatcher($path = '', $storage = null); |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * get a propagator instance for the cache |
|
| 73 | - * |
|
| 74 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 75 | - * @return \OC\Files\Cache\Propagator |
|
| 76 | - */ |
|
| 77 | - public function getPropagator($storage = null); |
|
| 71 | + /** |
|
| 72 | + * get a propagator instance for the cache |
|
| 73 | + * |
|
| 74 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 75 | + * @return \OC\Files\Cache\Propagator |
|
| 76 | + */ |
|
| 77 | + public function getPropagator($storage = null); |
|
| 78 | 78 | |
| 79 | - /** |
|
| 80 | - * get a updater instance for the cache |
|
| 81 | - * |
|
| 82 | - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 83 | - * @return \OC\Files\Cache\Updater |
|
| 84 | - */ |
|
| 85 | - public function getUpdater($storage = null); |
|
| 79 | + /** |
|
| 80 | + * get a updater instance for the cache |
|
| 81 | + * |
|
| 82 | + * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher |
|
| 83 | + * @return \OC\Files\Cache\Updater |
|
| 84 | + */ |
|
| 85 | + public function getUpdater($storage = null); |
|
| 86 | 86 | |
| 87 | - /** |
|
| 88 | - * @return \OC\Files\Cache\Storage |
|
| 89 | - */ |
|
| 90 | - public function getStorageCache(); |
|
| 87 | + /** |
|
| 88 | + * @return \OC\Files\Cache\Storage |
|
| 89 | + */ |
|
| 90 | + public function getStorageCache(); |
|
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * @param string $path |
|
| 94 | - * @return array |
|
| 95 | - */ |
|
| 96 | - public function getMetaData($path); |
|
| 92 | + /** |
|
| 93 | + * @param string $path |
|
| 94 | + * @return array |
|
| 95 | + */ |
|
| 96 | + public function getMetaData($path); |
|
| 97 | 97 | |
| 98 | - /** |
|
| 99 | - * @param string $path The path of the file to acquire the lock for |
|
| 100 | - * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 101 | - * @param \OCP\Lock\ILockingProvider $provider |
|
| 102 | - * @throws \OCP\Lock\LockedException |
|
| 103 | - */ |
|
| 104 | - public function acquireLock($path, $type, ILockingProvider $provider); |
|
| 98 | + /** |
|
| 99 | + * @param string $path The path of the file to acquire the lock for |
|
| 100 | + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 101 | + * @param \OCP\Lock\ILockingProvider $provider |
|
| 102 | + * @throws \OCP\Lock\LockedException |
|
| 103 | + */ |
|
| 104 | + public function acquireLock($path, $type, ILockingProvider $provider); |
|
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * @param string $path The path of the file to release the lock for |
|
| 108 | - * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 109 | - * @param \OCP\Lock\ILockingProvider $provider |
|
| 110 | - * @throws \OCP\Lock\LockedException |
|
| 111 | - */ |
|
| 112 | - public function releaseLock($path, $type, ILockingProvider $provider); |
|
| 106 | + /** |
|
| 107 | + * @param string $path The path of the file to release the lock for |
|
| 108 | + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 109 | + * @param \OCP\Lock\ILockingProvider $provider |
|
| 110 | + * @throws \OCP\Lock\LockedException |
|
| 111 | + */ |
|
| 112 | + public function releaseLock($path, $type, ILockingProvider $provider); |
|
| 113 | 113 | |
| 114 | - /** |
|
| 115 | - * @param string $path The path of the file to change the lock for |
|
| 116 | - * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 117 | - * @param \OCP\Lock\ILockingProvider $provider |
|
| 118 | - * @throws \OCP\Lock\LockedException |
|
| 119 | - */ |
|
| 120 | - public function changeLock($path, $type, ILockingProvider $provider); |
|
| 114 | + /** |
|
| 115 | + * @param string $path The path of the file to change the lock for |
|
| 116 | + * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
|
| 117 | + * @param \OCP\Lock\ILockingProvider $provider |
|
| 118 | + * @throws \OCP\Lock\LockedException |
|
| 119 | + */ |
|
| 120 | + public function changeLock($path, $type, ILockingProvider $provider); |
|
| 121 | 121 | } |
@@ -2,17 +2,17 @@ |
||
| 2 | 2 | |
| 3 | 3 | <div class="section"> |
| 4 | 4 | <h2><?php p($l->t('File handling')); ?></h2> |
| 5 | - <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label> |
|
| 5 | + <label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label> |
|
| 6 | 6 | <span id="maxUploadSizeSettingsMsg" class="msg"></span> |
| 7 | 7 | <br /> |
| 8 | - <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
| 9 | - <?php if($_['displayMaxPossibleUploadSize']):?> |
|
| 8 | + <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
| 9 | + <?php if ($_['displayMaxPossibleUploadSize']):?> |
|
| 10 | 10 | (<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) |
| 11 | - <?php endif;?> |
|
| 11 | + <?php endif; ?> |
|
| 12 | 12 | <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" /> |
| 13 | - <?php if($_['uploadChangable']): ?> |
|
| 13 | + <?php if ($_['uploadChangable']): ?> |
|
| 14 | 14 | <input type="submit" id="submitMaxUpload" |
| 15 | - value="<?php p($l->t( 'Save' )); ?>"/> |
|
| 15 | + value="<?php p($l->t('Save')); ?>"/> |
|
| 16 | 16 | <p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> |
| 17 | 17 | <?php else: ?> |
| 18 | 18 | <p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> |
@@ -14,7 +14,10 @@ |
||
| 14 | 14 | <input type="submit" id="submitMaxUpload" |
| 15 | 15 | value="<?php p($l->t( 'Save' )); ?>"/> |
| 16 | 16 | <p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> |
| 17 | - <?php else: ?> |
|
| 18 | - <p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> |
|
| 17 | + <?php else { |
|
| 18 | + : ?> |
|
| 19 | + <p><em><?php p($l->t('Missing permissions to edit from here.')); |
|
| 20 | +} |
|
| 21 | +?></em></p> |
|
| 19 | 22 | <?php endif; ?> |
| 20 | 23 | </div> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | $dir = '/'; |
| 27 | 27 | |
| 28 | 28 | if (isset($_GET['dir'])) { |
| 29 | - $dir = (string)$_GET['dir']; |
|
| 29 | + $dir = (string)$_GET['dir']; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | OCP\JSON::checkLoggedIn(); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | // send back json |
| 36 | 36 | try { |
| 37 | - OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir))); |
|
| 37 | + OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir))); |
|
| 38 | 38 | } catch (\OCP\Files\NotFoundException $e) { |
| 39 | - OCP\JSON::error(['data' => ['message' => 'Folder not found']]); |
|
| 39 | + OCP\JSON::error(['data' => ['message' => 'Folder not found']]); |
|
| 40 | 40 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $dir = '/'; |
| 27 | 27 | |
| 28 | 28 | if (isset($_GET['dir'])) { |
| 29 | - $dir = (string)$_GET['dir']; |
|
| 29 | + $dir = (string) $_GET['dir']; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | OCP\JSON::checkLoggedIn(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $l = \OC::$server->getL10N('files'); |
| 29 | 29 | |
| 30 | 30 | // Load the files |
| 31 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
| 31 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
| 32 | 32 | $dir = \OC\Files\Filesystem::normalizePath($dir); |
| 33 | 33 | |
| 34 | 34 | try { |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | $data = array(); |
| 42 | - $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
| 42 | + $baseUrl = OCP\Util::linkTo('files', 'index.php').'?dir='; |
|
| 43 | 43 | |
| 44 | 44 | $permissions = $dirInfo->getPermissions(); |
| 45 | 45 | |
| 46 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
| 46 | + $sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; |
|
| 47 | 47 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
| 48 | 48 | $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
| 49 | 49 | |
@@ -32,72 +32,72 @@ |
||
| 32 | 32 | $dir = \OC\Files\Filesystem::normalizePath($dir); |
| 33 | 33 | |
| 34 | 34 | try { |
| 35 | - $dirInfo = \OC\Files\Filesystem::getFileInfo($dir); |
|
| 36 | - if (!$dirInfo || !$dirInfo->getType() === 'dir') { |
|
| 37 | - header("HTTP/1.0 404 Not Found"); |
|
| 38 | - exit(); |
|
| 39 | - } |
|
| 35 | + $dirInfo = \OC\Files\Filesystem::getFileInfo($dir); |
|
| 36 | + if (!$dirInfo || !$dirInfo->getType() === 'dir') { |
|
| 37 | + header("HTTP/1.0 404 Not Found"); |
|
| 38 | + exit(); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - $data = array(); |
|
| 42 | - $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
| 41 | + $data = array(); |
|
| 42 | + $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
| 43 | 43 | |
| 44 | - $permissions = $dirInfo->getPermissions(); |
|
| 44 | + $permissions = $dirInfo->getPermissions(); |
|
| 45 | 45 | |
| 46 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
| 47 | - $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
|
| 48 | - $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
|
| 46 | + $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
| 47 | + $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
|
| 48 | + $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
|
| 49 | 49 | |
| 50 | - $files = []; |
|
| 51 | - // Clean up duplicates from array |
|
| 52 | - if (is_array($mimetypeFilters) && count($mimetypeFilters)) { |
|
| 53 | - $mimetypeFilters = array_unique($mimetypeFilters); |
|
| 50 | + $files = []; |
|
| 51 | + // Clean up duplicates from array |
|
| 52 | + if (is_array($mimetypeFilters) && count($mimetypeFilters)) { |
|
| 53 | + $mimetypeFilters = array_unique($mimetypeFilters); |
|
| 54 | 54 | |
| 55 | - if (!in_array('httpd/unix-directory', $mimetypeFilters)) { |
|
| 56 | - // append folder filter to be able to browse folders |
|
| 57 | - $mimetypeFilters[] = 'httpd/unix-directory'; |
|
| 58 | - } |
|
| 55 | + if (!in_array('httpd/unix-directory', $mimetypeFilters)) { |
|
| 56 | + // append folder filter to be able to browse folders |
|
| 57 | + $mimetypeFilters[] = 'httpd/unix-directory'; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - // create filelist with mimetype filter - as getFiles only supports on |
|
| 61 | - // mimetype filter at once we will filter this folder for each |
|
| 62 | - // mimetypeFilter |
|
| 63 | - foreach ($mimetypeFilters as $mimetypeFilter) { |
|
| 64 | - $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter)); |
|
| 65 | - } |
|
| 60 | + // create filelist with mimetype filter - as getFiles only supports on |
|
| 61 | + // mimetype filter at once we will filter this folder for each |
|
| 62 | + // mimetypeFilter |
|
| 63 | + foreach ($mimetypeFilters as $mimetypeFilter) { |
|
| 64 | + $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter)); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - // sort the files accordingly |
|
| 68 | - $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection); |
|
| 69 | - } else { |
|
| 70 | - // create file list without mimetype filter |
|
| 71 | - $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); |
|
| 72 | - } |
|
| 67 | + // sort the files accordingly |
|
| 68 | + $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection); |
|
| 69 | + } else { |
|
| 70 | + // create file list without mimetype filter |
|
| 71 | + $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - $data['directory'] = $dir; |
|
| 75 | - $data['files'] = \OCA\Files\Helper::formatFileInfos($files); |
|
| 76 | - $data['permissions'] = $permissions; |
|
| 74 | + $data['directory'] = $dir; |
|
| 75 | + $data['files'] = \OCA\Files\Helper::formatFileInfos($files); |
|
| 76 | + $data['permissions'] = $permissions; |
|
| 77 | 77 | |
| 78 | - OCP\JSON::success(array('data' => $data)); |
|
| 78 | + OCP\JSON::success(array('data' => $data)); |
|
| 79 | 79 | } catch (\OCP\Files\StorageNotAvailableException $e) { |
| 80 | - \OCP\Util::logException('files', $e); |
|
| 81 | - OCP\JSON::error([ |
|
| 82 | - 'data' => [ |
|
| 83 | - 'exception' => '\OCP\Files\StorageNotAvailableException', |
|
| 84 | - 'message' => $l->t('Storage is temporarily not available') |
|
| 85 | - ] |
|
| 86 | - ]); |
|
| 80 | + \OCP\Util::logException('files', $e); |
|
| 81 | + OCP\JSON::error([ |
|
| 82 | + 'data' => [ |
|
| 83 | + 'exception' => '\OCP\Files\StorageNotAvailableException', |
|
| 84 | + 'message' => $l->t('Storage is temporarily not available') |
|
| 85 | + ] |
|
| 86 | + ]); |
|
| 87 | 87 | } catch (\OCP\Files\StorageInvalidException $e) { |
| 88 | - \OCP\Util::logException('files', $e); |
|
| 89 | - OCP\JSON::error(array( |
|
| 90 | - 'data' => array( |
|
| 91 | - 'exception' => '\OCP\Files\StorageInvalidException', |
|
| 92 | - 'message' => $l->t('Storage invalid') |
|
| 93 | - ) |
|
| 94 | - )); |
|
| 88 | + \OCP\Util::logException('files', $e); |
|
| 89 | + OCP\JSON::error(array( |
|
| 90 | + 'data' => array( |
|
| 91 | + 'exception' => '\OCP\Files\StorageInvalidException', |
|
| 92 | + 'message' => $l->t('Storage invalid') |
|
| 93 | + ) |
|
| 94 | + )); |
|
| 95 | 95 | } catch (\Exception $e) { |
| 96 | - \OCP\Util::logException('files', $e); |
|
| 97 | - OCP\JSON::error(array( |
|
| 98 | - 'data' => array( |
|
| 99 | - 'exception' => '\Exception', |
|
| 100 | - 'message' => $l->t('Unknown error') |
|
| 101 | - ) |
|
| 102 | - )); |
|
| 96 | + \OCP\Util::logException('files', $e); |
|
| 97 | + OCP\JSON::error(array( |
|
| 98 | + 'data' => array( |
|
| 99 | + 'exception' => '\Exception', |
|
| 100 | + 'message' => $l->t('Unknown error') |
|
| 101 | + ) |
|
| 102 | + )); |
|
| 103 | 103 | } |
@@ -197,7 +197,7 @@ |
||
| 197 | 197 | protected function setSubjects(IEvent $event, $subject, array $parameters) { |
| 198 | 198 | $placeholders = $replacements = []; |
| 199 | 199 | foreach ($parameters as $placeholder => $parameter) { |
| 200 | - $placeholders[] = '{' . $placeholder . '}'; |
|
| 200 | + $placeholders[] = '{'.$placeholder.'}'; |
|
| 201 | 201 | if ($parameter['type'] === 'file') { |
| 202 | 202 | $replacements[] = $parameter['path']; |
| 203 | 203 | } else { |
@@ -33,366 +33,366 @@ |
||
| 33 | 33 | |
| 34 | 34 | class Provider implements IProvider { |
| 35 | 35 | |
| 36 | - /** @var IFactory */ |
|
| 37 | - protected $languageFactory; |
|
| 38 | - |
|
| 39 | - /** @var IL10N */ |
|
| 40 | - protected $l; |
|
| 41 | - /** @var IL10N */ |
|
| 42 | - protected $activityLang; |
|
| 43 | - |
|
| 44 | - /** @var IURLGenerator */ |
|
| 45 | - protected $url; |
|
| 46 | - |
|
| 47 | - /** @var IManager */ |
|
| 48 | - protected $activityManager; |
|
| 49 | - |
|
| 50 | - /** @var IUserManager */ |
|
| 51 | - protected $userManager; |
|
| 52 | - |
|
| 53 | - /** @var IEventMerger */ |
|
| 54 | - protected $eventMerger; |
|
| 55 | - |
|
| 56 | - /** @var string[] cached displayNames - key is the UID and value the displayname */ |
|
| 57 | - protected $displayNames = []; |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * @param IFactory $languageFactory |
|
| 61 | - * @param IURLGenerator $url |
|
| 62 | - * @param IManager $activityManager |
|
| 63 | - * @param IUserManager $userManager |
|
| 64 | - * @param IEventMerger $eventMerger |
|
| 65 | - */ |
|
| 66 | - public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) { |
|
| 67 | - $this->languageFactory = $languageFactory; |
|
| 68 | - $this->url = $url; |
|
| 69 | - $this->activityManager = $activityManager; |
|
| 70 | - $this->userManager = $userManager; |
|
| 71 | - $this->eventMerger = $eventMerger; |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - /** |
|
| 75 | - * @param string $language |
|
| 76 | - * @param IEvent $event |
|
| 77 | - * @param IEvent|null $previousEvent |
|
| 78 | - * @return IEvent |
|
| 79 | - * @throws \InvalidArgumentException |
|
| 80 | - * @since 11.0.0 |
|
| 81 | - */ |
|
| 82 | - public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
| 83 | - if ($event->getApp() !== 'files') { |
|
| 84 | - throw new \InvalidArgumentException(); |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - $this->l = $this->languageFactory->get('files', $language); |
|
| 88 | - $this->activityLang = $this->languageFactory->get('activity', $language); |
|
| 89 | - |
|
| 90 | - if ($this->activityManager->isFormattingFilteredObject()) { |
|
| 91 | - try { |
|
| 92 | - return $this->parseShortVersion($event, $previousEvent); |
|
| 93 | - } catch (\InvalidArgumentException $e) { |
|
| 94 | - // Ignore and simply use the long version... |
|
| 95 | - } |
|
| 96 | - } |
|
| 97 | - |
|
| 98 | - return $this->parseLongVersion($event, $previousEvent); |
|
| 99 | - } |
|
| 100 | - |
|
| 101 | - /** |
|
| 102 | - * @param IEvent $event |
|
| 103 | - * @param IEvent|null $previousEvent |
|
| 104 | - * @return IEvent |
|
| 105 | - * @throws \InvalidArgumentException |
|
| 106 | - * @since 11.0.0 |
|
| 107 | - */ |
|
| 108 | - public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) { |
|
| 109 | - $parsedParameters = $this->getParameters($event); |
|
| 110 | - |
|
| 111 | - if ($event->getSubject() === 'created_by') { |
|
| 112 | - $subject = $this->l->t('Created by {user}'); |
|
| 113 | - if ($this->activityManager->getRequirePNG()) { |
|
| 114 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 115 | - } else { |
|
| 116 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 117 | - } |
|
| 118 | - } else if ($event->getSubject() === 'changed_by') { |
|
| 119 | - $subject = $this->l->t('Changed by {user}'); |
|
| 120 | - if ($this->activityManager->getRequirePNG()) { |
|
| 121 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 122 | - } else { |
|
| 123 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 124 | - } |
|
| 125 | - } else if ($event->getSubject() === 'deleted_by') { |
|
| 126 | - $subject = $this->l->t('Deleted by {user}'); |
|
| 127 | - if ($this->activityManager->getRequirePNG()) { |
|
| 128 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 129 | - } else { |
|
| 130 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 131 | - } |
|
| 132 | - } else if ($event->getSubject() === 'restored_by') { |
|
| 133 | - $subject = $this->l->t('Restored by {user}'); |
|
| 134 | - } else if ($event->getSubject() === 'renamed_by') { |
|
| 135 | - $subject = $this->l->t('Renamed by {user}'); |
|
| 136 | - if ($this->activityManager->getRequirePNG()) { |
|
| 137 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 138 | - } else { |
|
| 139 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 140 | - } |
|
| 141 | - } else if ($event->getSubject() === 'moved_by') { |
|
| 142 | - $subject = $this->l->t('Moved by {user}'); |
|
| 143 | - if ($this->activityManager->getRequirePNG()) { |
|
| 144 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 145 | - } else { |
|
| 146 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 147 | - } |
|
| 148 | - } else { |
|
| 149 | - throw new \InvalidArgumentException(); |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - if (!isset($parsedParameters['user'])) { |
|
| 153 | - // External user via public link share |
|
| 154 | - $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject); |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - $this->setSubjects($event, $subject, $parsedParameters); |
|
| 158 | - |
|
| 159 | - return $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - /** |
|
| 163 | - * @param IEvent $event |
|
| 164 | - * @param IEvent|null $previousEvent |
|
| 165 | - * @return IEvent |
|
| 166 | - * @throws \InvalidArgumentException |
|
| 167 | - * @since 11.0.0 |
|
| 168 | - */ |
|
| 169 | - public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) { |
|
| 170 | - $parsedParameters = $this->getParameters($event); |
|
| 171 | - |
|
| 172 | - if ($event->getSubject() === 'created_self') { |
|
| 173 | - $subject = $this->l->t('You created {file}'); |
|
| 174 | - if ($this->activityManager->getRequirePNG()) { |
|
| 175 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 176 | - } else { |
|
| 177 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 178 | - } |
|
| 179 | - } else if ($event->getSubject() === 'created_by') { |
|
| 180 | - $subject = $this->l->t('{user} created {file}'); |
|
| 181 | - if ($this->activityManager->getRequirePNG()) { |
|
| 182 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 183 | - } else { |
|
| 184 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 185 | - } |
|
| 186 | - } else if ($event->getSubject() === 'created_public') { |
|
| 187 | - $subject = $this->l->t('{file} was created in a public folder'); |
|
| 188 | - if ($this->activityManager->getRequirePNG()) { |
|
| 189 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 190 | - } else { |
|
| 191 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 192 | - } |
|
| 193 | - } else if ($event->getSubject() === 'changed_self') { |
|
| 194 | - $subject = $this->l->t('You changed {file}'); |
|
| 195 | - if ($this->activityManager->getRequirePNG()) { |
|
| 196 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 197 | - } else { |
|
| 198 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 199 | - } |
|
| 200 | - } else if ($event->getSubject() === 'changed_by') { |
|
| 201 | - $subject = $this->l->t('{user} changed {file}'); |
|
| 202 | - if ($this->activityManager->getRequirePNG()) { |
|
| 203 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 204 | - } else { |
|
| 205 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 206 | - } |
|
| 207 | - } else if ($event->getSubject() === 'deleted_self') { |
|
| 208 | - $subject = $this->l->t('You deleted {file}'); |
|
| 209 | - if ($this->activityManager->getRequirePNG()) { |
|
| 210 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 211 | - } else { |
|
| 212 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 213 | - } |
|
| 214 | - } else if ($event->getSubject() === 'deleted_by') { |
|
| 215 | - $subject = $this->l->t('{user} deleted {file}'); |
|
| 216 | - if ($this->activityManager->getRequirePNG()) { |
|
| 217 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 218 | - } else { |
|
| 219 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 220 | - } |
|
| 221 | - } else if ($event->getSubject() === 'restored_self') { |
|
| 222 | - $subject = $this->l->t('You restored {file}'); |
|
| 223 | - } else if ($event->getSubject() === 'restored_by') { |
|
| 224 | - $subject = $this->l->t('{user} restored {file}'); |
|
| 225 | - } else if ($event->getSubject() === 'renamed_self') { |
|
| 226 | - $subject = $this->l->t('You renamed {oldfile} to {newfile}'); |
|
| 227 | - if ($this->activityManager->getRequirePNG()) { |
|
| 228 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 229 | - } else { |
|
| 230 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 231 | - } |
|
| 232 | - } else if ($event->getSubject() === 'renamed_by') { |
|
| 233 | - $subject = $this->l->t('{user} renamed {oldfile} to {newfile}'); |
|
| 234 | - if ($this->activityManager->getRequirePNG()) { |
|
| 235 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 236 | - } else { |
|
| 237 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 238 | - } |
|
| 239 | - } else if ($event->getSubject() === 'moved_self') { |
|
| 240 | - $subject = $this->l->t('You moved {oldfile} to {newfile}'); |
|
| 241 | - if ($this->activityManager->getRequirePNG()) { |
|
| 242 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 243 | - } else { |
|
| 244 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 245 | - } |
|
| 246 | - } else if ($event->getSubject() === 'moved_by') { |
|
| 247 | - $subject = $this->l->t('{user} moved {oldfile} to {newfile}'); |
|
| 248 | - if ($this->activityManager->getRequirePNG()) { |
|
| 249 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 250 | - } else { |
|
| 251 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 252 | - } |
|
| 253 | - } else { |
|
| 254 | - throw new \InvalidArgumentException(); |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - if (!isset($parsedParameters['user'])) { |
|
| 258 | - // External user via public link share |
|
| 259 | - $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject); |
|
| 260 | - } |
|
| 261 | - |
|
| 262 | - $this->setSubjects($event, $subject, $parsedParameters); |
|
| 263 | - |
|
| 264 | - $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent); |
|
| 265 | - |
|
| 266 | - if ($event->getChildEvent() === null) { |
|
| 267 | - // Couldn't group by file, maybe we can group by user |
|
| 268 | - $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - return $event; |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - protected function setSubjects(IEvent $event, $subject, array $parameters) { |
|
| 275 | - $placeholders = $replacements = []; |
|
| 276 | - foreach ($parameters as $placeholder => $parameter) { |
|
| 277 | - $placeholders[] = '{' . $placeholder . '}'; |
|
| 278 | - if ($parameter['type'] === 'file') { |
|
| 279 | - $replacements[] = $parameter['path']; |
|
| 280 | - } else { |
|
| 281 | - $replacements[] = $parameter['name']; |
|
| 282 | - } |
|
| 283 | - } |
|
| 284 | - |
|
| 285 | - $event->setParsedSubject(str_replace($placeholders, $replacements, $subject)) |
|
| 286 | - ->setRichSubject($subject, $parameters); |
|
| 287 | - } |
|
| 288 | - |
|
| 289 | - /** |
|
| 290 | - * @param IEvent $event |
|
| 291 | - * @return array |
|
| 292 | - * @throws \InvalidArgumentException |
|
| 293 | - */ |
|
| 294 | - protected function getParameters(IEvent $event) { |
|
| 295 | - $parameters = $event->getSubjectParameters(); |
|
| 296 | - switch ($event->getSubject()) { |
|
| 297 | - case 'created_self': |
|
| 298 | - case 'created_public': |
|
| 299 | - case 'changed_self': |
|
| 300 | - case 'deleted_self': |
|
| 301 | - case 'restored_self': |
|
| 302 | - return [ |
|
| 303 | - 'file' => $this->getFile($parameters[0], $event), |
|
| 304 | - ]; |
|
| 305 | - case 'created_by': |
|
| 306 | - case 'changed_by': |
|
| 307 | - case 'deleted_by': |
|
| 308 | - case 'restored_by': |
|
| 309 | - if ($parameters[1] === '') { |
|
| 310 | - // External user via public link share |
|
| 311 | - return [ |
|
| 312 | - 'file' => $this->getFile($parameters[0], $event), |
|
| 313 | - ]; |
|
| 314 | - } |
|
| 315 | - return [ |
|
| 316 | - 'file' => $this->getFile($parameters[0], $event), |
|
| 317 | - 'user' => $this->getUser($parameters[1]), |
|
| 318 | - ]; |
|
| 319 | - case 'renamed_self': |
|
| 320 | - case 'moved_self': |
|
| 321 | - return [ |
|
| 322 | - 'newfile' => $this->getFile($parameters[0]), |
|
| 323 | - 'oldfile' => $this->getFile($parameters[1]), |
|
| 324 | - ]; |
|
| 325 | - case 'renamed_by': |
|
| 326 | - case 'moved_by': |
|
| 327 | - if ($parameters[1] === '') { |
|
| 328 | - // External user via public link share |
|
| 329 | - return [ |
|
| 330 | - 'newfile' => $this->getFile($parameters[0]), |
|
| 331 | - 'oldfile' => $this->getFile($parameters[2]), |
|
| 332 | - ]; |
|
| 333 | - } |
|
| 334 | - return [ |
|
| 335 | - 'newfile' => $this->getFile($parameters[0]), |
|
| 336 | - 'user' => $this->getUser($parameters[1]), |
|
| 337 | - 'oldfile' => $this->getFile($parameters[2]), |
|
| 338 | - ]; |
|
| 339 | - } |
|
| 340 | - return []; |
|
| 341 | - } |
|
| 342 | - |
|
| 343 | - /** |
|
| 344 | - * @param array|string $parameter |
|
| 345 | - * @param IEvent|null $event |
|
| 346 | - * @return array |
|
| 347 | - * @throws \InvalidArgumentException |
|
| 348 | - */ |
|
| 349 | - protected function getFile($parameter, IEvent $event = null) { |
|
| 350 | - if (is_array($parameter)) { |
|
| 351 | - $path = reset($parameter); |
|
| 352 | - $id = (string) key($parameter); |
|
| 353 | - } else if ($event !== null) { |
|
| 354 | - // Legacy from before ownCloud 8.2 |
|
| 355 | - $path = $parameter; |
|
| 356 | - $id = $event->getObjectId(); |
|
| 357 | - } else { |
|
| 358 | - throw new \InvalidArgumentException('Could not generate file parameter'); |
|
| 359 | - } |
|
| 360 | - |
|
| 361 | - return [ |
|
| 362 | - 'type' => 'file', |
|
| 363 | - 'id' => $id, |
|
| 364 | - 'name' => basename($path), |
|
| 365 | - 'path' => trim($path, '/'), |
|
| 366 | - 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]), |
|
| 367 | - ]; |
|
| 368 | - } |
|
| 369 | - |
|
| 370 | - /** |
|
| 371 | - * @param string $uid |
|
| 372 | - * @return array |
|
| 373 | - */ |
|
| 374 | - protected function getUser($uid) { |
|
| 375 | - if (!isset($this->displayNames[$uid])) { |
|
| 376 | - $this->displayNames[$uid] = $this->getDisplayName($uid); |
|
| 377 | - } |
|
| 378 | - |
|
| 379 | - return [ |
|
| 380 | - 'type' => 'user', |
|
| 381 | - 'id' => $uid, |
|
| 382 | - 'name' => $this->displayNames[$uid], |
|
| 383 | - ]; |
|
| 384 | - } |
|
| 385 | - |
|
| 386 | - /** |
|
| 387 | - * @param string $uid |
|
| 388 | - * @return string |
|
| 389 | - */ |
|
| 390 | - protected function getDisplayName($uid) { |
|
| 391 | - $user = $this->userManager->get($uid); |
|
| 392 | - if ($user instanceof IUser) { |
|
| 393 | - return $user->getDisplayName(); |
|
| 394 | - } else { |
|
| 395 | - return $uid; |
|
| 396 | - } |
|
| 397 | - } |
|
| 36 | + /** @var IFactory */ |
|
| 37 | + protected $languageFactory; |
|
| 38 | + |
|
| 39 | + /** @var IL10N */ |
|
| 40 | + protected $l; |
|
| 41 | + /** @var IL10N */ |
|
| 42 | + protected $activityLang; |
|
| 43 | + |
|
| 44 | + /** @var IURLGenerator */ |
|
| 45 | + protected $url; |
|
| 46 | + |
|
| 47 | + /** @var IManager */ |
|
| 48 | + protected $activityManager; |
|
| 49 | + |
|
| 50 | + /** @var IUserManager */ |
|
| 51 | + protected $userManager; |
|
| 52 | + |
|
| 53 | + /** @var IEventMerger */ |
|
| 54 | + protected $eventMerger; |
|
| 55 | + |
|
| 56 | + /** @var string[] cached displayNames - key is the UID and value the displayname */ |
|
| 57 | + protected $displayNames = []; |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * @param IFactory $languageFactory |
|
| 61 | + * @param IURLGenerator $url |
|
| 62 | + * @param IManager $activityManager |
|
| 63 | + * @param IUserManager $userManager |
|
| 64 | + * @param IEventMerger $eventMerger |
|
| 65 | + */ |
|
| 66 | + public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) { |
|
| 67 | + $this->languageFactory = $languageFactory; |
|
| 68 | + $this->url = $url; |
|
| 69 | + $this->activityManager = $activityManager; |
|
| 70 | + $this->userManager = $userManager; |
|
| 71 | + $this->eventMerger = $eventMerger; |
|
| 72 | + } |
|
| 73 | + |
|
| 74 | + /** |
|
| 75 | + * @param string $language |
|
| 76 | + * @param IEvent $event |
|
| 77 | + * @param IEvent|null $previousEvent |
|
| 78 | + * @return IEvent |
|
| 79 | + * @throws \InvalidArgumentException |
|
| 80 | + * @since 11.0.0 |
|
| 81 | + */ |
|
| 82 | + public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
| 83 | + if ($event->getApp() !== 'files') { |
|
| 84 | + throw new \InvalidArgumentException(); |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + $this->l = $this->languageFactory->get('files', $language); |
|
| 88 | + $this->activityLang = $this->languageFactory->get('activity', $language); |
|
| 89 | + |
|
| 90 | + if ($this->activityManager->isFormattingFilteredObject()) { |
|
| 91 | + try { |
|
| 92 | + return $this->parseShortVersion($event, $previousEvent); |
|
| 93 | + } catch (\InvalidArgumentException $e) { |
|
| 94 | + // Ignore and simply use the long version... |
|
| 95 | + } |
|
| 96 | + } |
|
| 97 | + |
|
| 98 | + return $this->parseLongVersion($event, $previousEvent); |
|
| 99 | + } |
|
| 100 | + |
|
| 101 | + /** |
|
| 102 | + * @param IEvent $event |
|
| 103 | + * @param IEvent|null $previousEvent |
|
| 104 | + * @return IEvent |
|
| 105 | + * @throws \InvalidArgumentException |
|
| 106 | + * @since 11.0.0 |
|
| 107 | + */ |
|
| 108 | + public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) { |
|
| 109 | + $parsedParameters = $this->getParameters($event); |
|
| 110 | + |
|
| 111 | + if ($event->getSubject() === 'created_by') { |
|
| 112 | + $subject = $this->l->t('Created by {user}'); |
|
| 113 | + if ($this->activityManager->getRequirePNG()) { |
|
| 114 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 115 | + } else { |
|
| 116 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 117 | + } |
|
| 118 | + } else if ($event->getSubject() === 'changed_by') { |
|
| 119 | + $subject = $this->l->t('Changed by {user}'); |
|
| 120 | + if ($this->activityManager->getRequirePNG()) { |
|
| 121 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 122 | + } else { |
|
| 123 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 124 | + } |
|
| 125 | + } else if ($event->getSubject() === 'deleted_by') { |
|
| 126 | + $subject = $this->l->t('Deleted by {user}'); |
|
| 127 | + if ($this->activityManager->getRequirePNG()) { |
|
| 128 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 129 | + } else { |
|
| 130 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 131 | + } |
|
| 132 | + } else if ($event->getSubject() === 'restored_by') { |
|
| 133 | + $subject = $this->l->t('Restored by {user}'); |
|
| 134 | + } else if ($event->getSubject() === 'renamed_by') { |
|
| 135 | + $subject = $this->l->t('Renamed by {user}'); |
|
| 136 | + if ($this->activityManager->getRequirePNG()) { |
|
| 137 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 138 | + } else { |
|
| 139 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 140 | + } |
|
| 141 | + } else if ($event->getSubject() === 'moved_by') { |
|
| 142 | + $subject = $this->l->t('Moved by {user}'); |
|
| 143 | + if ($this->activityManager->getRequirePNG()) { |
|
| 144 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 145 | + } else { |
|
| 146 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 147 | + } |
|
| 148 | + } else { |
|
| 149 | + throw new \InvalidArgumentException(); |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + if (!isset($parsedParameters['user'])) { |
|
| 153 | + // External user via public link share |
|
| 154 | + $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject); |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + $this->setSubjects($event, $subject, $parsedParameters); |
|
| 158 | + |
|
| 159 | + return $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + /** |
|
| 163 | + * @param IEvent $event |
|
| 164 | + * @param IEvent|null $previousEvent |
|
| 165 | + * @return IEvent |
|
| 166 | + * @throws \InvalidArgumentException |
|
| 167 | + * @since 11.0.0 |
|
| 168 | + */ |
|
| 169 | + public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) { |
|
| 170 | + $parsedParameters = $this->getParameters($event); |
|
| 171 | + |
|
| 172 | + if ($event->getSubject() === 'created_self') { |
|
| 173 | + $subject = $this->l->t('You created {file}'); |
|
| 174 | + if ($this->activityManager->getRequirePNG()) { |
|
| 175 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 176 | + } else { |
|
| 177 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 178 | + } |
|
| 179 | + } else if ($event->getSubject() === 'created_by') { |
|
| 180 | + $subject = $this->l->t('{user} created {file}'); |
|
| 181 | + if ($this->activityManager->getRequirePNG()) { |
|
| 182 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 183 | + } else { |
|
| 184 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 185 | + } |
|
| 186 | + } else if ($event->getSubject() === 'created_public') { |
|
| 187 | + $subject = $this->l->t('{file} was created in a public folder'); |
|
| 188 | + if ($this->activityManager->getRequirePNG()) { |
|
| 189 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); |
|
| 190 | + } else { |
|
| 191 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); |
|
| 192 | + } |
|
| 193 | + } else if ($event->getSubject() === 'changed_self') { |
|
| 194 | + $subject = $this->l->t('You changed {file}'); |
|
| 195 | + if ($this->activityManager->getRequirePNG()) { |
|
| 196 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 197 | + } else { |
|
| 198 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 199 | + } |
|
| 200 | + } else if ($event->getSubject() === 'changed_by') { |
|
| 201 | + $subject = $this->l->t('{user} changed {file}'); |
|
| 202 | + if ($this->activityManager->getRequirePNG()) { |
|
| 203 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 204 | + } else { |
|
| 205 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 206 | + } |
|
| 207 | + } else if ($event->getSubject() === 'deleted_self') { |
|
| 208 | + $subject = $this->l->t('You deleted {file}'); |
|
| 209 | + if ($this->activityManager->getRequirePNG()) { |
|
| 210 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 211 | + } else { |
|
| 212 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 213 | + } |
|
| 214 | + } else if ($event->getSubject() === 'deleted_by') { |
|
| 215 | + $subject = $this->l->t('{user} deleted {file}'); |
|
| 216 | + if ($this->activityManager->getRequirePNG()) { |
|
| 217 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); |
|
| 218 | + } else { |
|
| 219 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); |
|
| 220 | + } |
|
| 221 | + } else if ($event->getSubject() === 'restored_self') { |
|
| 222 | + $subject = $this->l->t('You restored {file}'); |
|
| 223 | + } else if ($event->getSubject() === 'restored_by') { |
|
| 224 | + $subject = $this->l->t('{user} restored {file}'); |
|
| 225 | + } else if ($event->getSubject() === 'renamed_self') { |
|
| 226 | + $subject = $this->l->t('You renamed {oldfile} to {newfile}'); |
|
| 227 | + if ($this->activityManager->getRequirePNG()) { |
|
| 228 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 229 | + } else { |
|
| 230 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 231 | + } |
|
| 232 | + } else if ($event->getSubject() === 'renamed_by') { |
|
| 233 | + $subject = $this->l->t('{user} renamed {oldfile} to {newfile}'); |
|
| 234 | + if ($this->activityManager->getRequirePNG()) { |
|
| 235 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 236 | + } else { |
|
| 237 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 238 | + } |
|
| 239 | + } else if ($event->getSubject() === 'moved_self') { |
|
| 240 | + $subject = $this->l->t('You moved {oldfile} to {newfile}'); |
|
| 241 | + if ($this->activityManager->getRequirePNG()) { |
|
| 242 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 243 | + } else { |
|
| 244 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 245 | + } |
|
| 246 | + } else if ($event->getSubject() === 'moved_by') { |
|
| 247 | + $subject = $this->l->t('{user} moved {oldfile} to {newfile}'); |
|
| 248 | + if ($this->activityManager->getRequirePNG()) { |
|
| 249 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); |
|
| 250 | + } else { |
|
| 251 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); |
|
| 252 | + } |
|
| 253 | + } else { |
|
| 254 | + throw new \InvalidArgumentException(); |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + if (!isset($parsedParameters['user'])) { |
|
| 258 | + // External user via public link share |
|
| 259 | + $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject); |
|
| 260 | + } |
|
| 261 | + |
|
| 262 | + $this->setSubjects($event, $subject, $parsedParameters); |
|
| 263 | + |
|
| 264 | + $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent); |
|
| 265 | + |
|
| 266 | + if ($event->getChildEvent() === null) { |
|
| 267 | + // Couldn't group by file, maybe we can group by user |
|
| 268 | + $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + return $event; |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + protected function setSubjects(IEvent $event, $subject, array $parameters) { |
|
| 275 | + $placeholders = $replacements = []; |
|
| 276 | + foreach ($parameters as $placeholder => $parameter) { |
|
| 277 | + $placeholders[] = '{' . $placeholder . '}'; |
|
| 278 | + if ($parameter['type'] === 'file') { |
|
| 279 | + $replacements[] = $parameter['path']; |
|
| 280 | + } else { |
|
| 281 | + $replacements[] = $parameter['name']; |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | + |
|
| 285 | + $event->setParsedSubject(str_replace($placeholders, $replacements, $subject)) |
|
| 286 | + ->setRichSubject($subject, $parameters); |
|
| 287 | + } |
|
| 288 | + |
|
| 289 | + /** |
|
| 290 | + * @param IEvent $event |
|
| 291 | + * @return array |
|
| 292 | + * @throws \InvalidArgumentException |
|
| 293 | + */ |
|
| 294 | + protected function getParameters(IEvent $event) { |
|
| 295 | + $parameters = $event->getSubjectParameters(); |
|
| 296 | + switch ($event->getSubject()) { |
|
| 297 | + case 'created_self': |
|
| 298 | + case 'created_public': |
|
| 299 | + case 'changed_self': |
|
| 300 | + case 'deleted_self': |
|
| 301 | + case 'restored_self': |
|
| 302 | + return [ |
|
| 303 | + 'file' => $this->getFile($parameters[0], $event), |
|
| 304 | + ]; |
|
| 305 | + case 'created_by': |
|
| 306 | + case 'changed_by': |
|
| 307 | + case 'deleted_by': |
|
| 308 | + case 'restored_by': |
|
| 309 | + if ($parameters[1] === '') { |
|
| 310 | + // External user via public link share |
|
| 311 | + return [ |
|
| 312 | + 'file' => $this->getFile($parameters[0], $event), |
|
| 313 | + ]; |
|
| 314 | + } |
|
| 315 | + return [ |
|
| 316 | + 'file' => $this->getFile($parameters[0], $event), |
|
| 317 | + 'user' => $this->getUser($parameters[1]), |
|
| 318 | + ]; |
|
| 319 | + case 'renamed_self': |
|
| 320 | + case 'moved_self': |
|
| 321 | + return [ |
|
| 322 | + 'newfile' => $this->getFile($parameters[0]), |
|
| 323 | + 'oldfile' => $this->getFile($parameters[1]), |
|
| 324 | + ]; |
|
| 325 | + case 'renamed_by': |
|
| 326 | + case 'moved_by': |
|
| 327 | + if ($parameters[1] === '') { |
|
| 328 | + // External user via public link share |
|
| 329 | + return [ |
|
| 330 | + 'newfile' => $this->getFile($parameters[0]), |
|
| 331 | + 'oldfile' => $this->getFile($parameters[2]), |
|
| 332 | + ]; |
|
| 333 | + } |
|
| 334 | + return [ |
|
| 335 | + 'newfile' => $this->getFile($parameters[0]), |
|
| 336 | + 'user' => $this->getUser($parameters[1]), |
|
| 337 | + 'oldfile' => $this->getFile($parameters[2]), |
|
| 338 | + ]; |
|
| 339 | + } |
|
| 340 | + return []; |
|
| 341 | + } |
|
| 342 | + |
|
| 343 | + /** |
|
| 344 | + * @param array|string $parameter |
|
| 345 | + * @param IEvent|null $event |
|
| 346 | + * @return array |
|
| 347 | + * @throws \InvalidArgumentException |
|
| 348 | + */ |
|
| 349 | + protected function getFile($parameter, IEvent $event = null) { |
|
| 350 | + if (is_array($parameter)) { |
|
| 351 | + $path = reset($parameter); |
|
| 352 | + $id = (string) key($parameter); |
|
| 353 | + } else if ($event !== null) { |
|
| 354 | + // Legacy from before ownCloud 8.2 |
|
| 355 | + $path = $parameter; |
|
| 356 | + $id = $event->getObjectId(); |
|
| 357 | + } else { |
|
| 358 | + throw new \InvalidArgumentException('Could not generate file parameter'); |
|
| 359 | + } |
|
| 360 | + |
|
| 361 | + return [ |
|
| 362 | + 'type' => 'file', |
|
| 363 | + 'id' => $id, |
|
| 364 | + 'name' => basename($path), |
|
| 365 | + 'path' => trim($path, '/'), |
|
| 366 | + 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]), |
|
| 367 | + ]; |
|
| 368 | + } |
|
| 369 | + |
|
| 370 | + /** |
|
| 371 | + * @param string $uid |
|
| 372 | + * @return array |
|
| 373 | + */ |
|
| 374 | + protected function getUser($uid) { |
|
| 375 | + if (!isset($this->displayNames[$uid])) { |
|
| 376 | + $this->displayNames[$uid] = $this->getDisplayName($uid); |
|
| 377 | + } |
|
| 378 | + |
|
| 379 | + return [ |
|
| 380 | + 'type' => 'user', |
|
| 381 | + 'id' => $uid, |
|
| 382 | + 'name' => $this->displayNames[$uid], |
|
| 383 | + ]; |
|
| 384 | + } |
|
| 385 | + |
|
| 386 | + /** |
|
| 387 | + * @param string $uid |
|
| 388 | + * @return string |
|
| 389 | + */ |
|
| 390 | + protected function getDisplayName($uid) { |
|
| 391 | + $user = $this->userManager->get($uid); |
|
| 392 | + if ($user instanceof IUser) { |
|
| 393 | + return $user->getDisplayName(); |
|
| 394 | + } else { |
|
| 395 | + return $uid; |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | 398 | } |
