@@ -34,94 +34,94 @@ |
||
| 34 | 34 | |
| 35 | 35 | class ExpireTrash extends Command { |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var Expiration |
|
| 39 | - */ |
|
| 40 | - private $expiration; |
|
| 37 | + /** |
|
| 38 | + * @var Expiration |
|
| 39 | + */ |
|
| 40 | + private $expiration; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var IUserManager |
|
| 44 | - */ |
|
| 45 | - private $userManager; |
|
| 42 | + /** |
|
| 43 | + * @var IUserManager |
|
| 44 | + */ |
|
| 45 | + private $userManager; |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @param IUserManager|null $userManager |
|
| 49 | - * @param Expiration|null $expiration |
|
| 50 | - */ |
|
| 51 | - public function __construct(IUserManager $userManager = null, |
|
| 52 | - Expiration $expiration = null) { |
|
| 53 | - parent::__construct(); |
|
| 47 | + /** |
|
| 48 | + * @param IUserManager|null $userManager |
|
| 49 | + * @param Expiration|null $expiration |
|
| 50 | + */ |
|
| 51 | + public function __construct(IUserManager $userManager = null, |
|
| 52 | + Expiration $expiration = null) { |
|
| 53 | + parent::__construct(); |
|
| 54 | 54 | |
| 55 | - $this->userManager = $userManager; |
|
| 56 | - $this->expiration = $expiration; |
|
| 57 | - } |
|
| 55 | + $this->userManager = $userManager; |
|
| 56 | + $this->expiration = $expiration; |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - protected function configure() { |
|
| 60 | - $this |
|
| 61 | - ->setName('trashbin:expire') |
|
| 62 | - ->setDescription('Expires the users trashbin') |
|
| 63 | - ->addArgument( |
|
| 64 | - 'user_id', |
|
| 65 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 66 | - 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
| 67 | - ); |
|
| 68 | - } |
|
| 59 | + protected function configure() { |
|
| 60 | + $this |
|
| 61 | + ->setName('trashbin:expire') |
|
| 62 | + ->setDescription('Expires the users trashbin') |
|
| 63 | + ->addArgument( |
|
| 64 | + 'user_id', |
|
| 65 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 66 | + 'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired' |
|
| 67 | + ); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 70 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 71 | 71 | |
| 72 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 73 | - if (!$maxAge) { |
|
| 74 | - $output->writeln("No expiry configured."); |
|
| 75 | - return; |
|
| 76 | - } |
|
| 72 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 73 | + if (!$maxAge) { |
|
| 74 | + $output->writeln("No expiry configured."); |
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - $users = $input->getArgument('user_id'); |
|
| 79 | - if (!empty($users)) { |
|
| 80 | - foreach ($users as $user) { |
|
| 81 | - if ($this->userManager->userExists($user)) { |
|
| 82 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 83 | - $userObject = $this->userManager->get($user); |
|
| 84 | - $this->expireTrashForUser($userObject); |
|
| 85 | - } else { |
|
| 86 | - $output->writeln("<error>Unknown user $user</error>"); |
|
| 87 | - } |
|
| 88 | - } |
|
| 89 | - } else { |
|
| 90 | - $p = new ProgressBar($output); |
|
| 91 | - $p->start(); |
|
| 92 | - $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
| 93 | - $p->advance(); |
|
| 94 | - $this->expireTrashForUser($user); |
|
| 95 | - }); |
|
| 96 | - $p->finish(); |
|
| 97 | - $output->writeln(''); |
|
| 98 | - } |
|
| 99 | - } |
|
| 78 | + $users = $input->getArgument('user_id'); |
|
| 79 | + if (!empty($users)) { |
|
| 80 | + foreach ($users as $user) { |
|
| 81 | + if ($this->userManager->userExists($user)) { |
|
| 82 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 83 | + $userObject = $this->userManager->get($user); |
|
| 84 | + $this->expireTrashForUser($userObject); |
|
| 85 | + } else { |
|
| 86 | + $output->writeln("<error>Unknown user $user</error>"); |
|
| 87 | + } |
|
| 88 | + } |
|
| 89 | + } else { |
|
| 90 | + $p = new ProgressBar($output); |
|
| 91 | + $p->start(); |
|
| 92 | + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
| 93 | + $p->advance(); |
|
| 94 | + $this->expireTrashForUser($user); |
|
| 95 | + }); |
|
| 96 | + $p->finish(); |
|
| 97 | + $output->writeln(''); |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - function expireTrashForUser(IUser $user) { |
|
| 102 | - $uid = $user->getUID(); |
|
| 103 | - if (!$this->setupFS($uid)) { |
|
| 104 | - return; |
|
| 105 | - } |
|
| 106 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
| 107 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
| 108 | - } |
|
| 101 | + function expireTrashForUser(IUser $user) { |
|
| 102 | + $uid = $user->getUID(); |
|
| 103 | + if (!$this->setupFS($uid)) { |
|
| 104 | + return; |
|
| 105 | + } |
|
| 106 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
| 107 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
| 108 | + } |
|
| 109 | 109 | |
| 110 | - /** |
|
| 111 | - * Act on behalf on trash item owner |
|
| 112 | - * @param string $user |
|
| 113 | - * @return boolean |
|
| 114 | - */ |
|
| 115 | - protected function setupFS($user) { |
|
| 116 | - \OC_Util::tearDownFS(); |
|
| 117 | - \OC_Util::setupFS($user); |
|
| 110 | + /** |
|
| 111 | + * Act on behalf on trash item owner |
|
| 112 | + * @param string $user |
|
| 113 | + * @return boolean |
|
| 114 | + */ |
|
| 115 | + protected function setupFS($user) { |
|
| 116 | + \OC_Util::tearDownFS(); |
|
| 117 | + \OC_Util::setupFS($user); |
|
| 118 | 118 | |
| 119 | - // Check if this user has a trashbin directory |
|
| 120 | - $view = new \OC\Files\View('/' . $user); |
|
| 121 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
| 122 | - return false; |
|
| 123 | - } |
|
| 119 | + // Check if this user has a trashbin directory |
|
| 120 | + $view = new \OC\Files\View('/' . $user); |
|
| 121 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
| 122 | + return false; |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - return true; |
|
| 126 | - } |
|
| 125 | + return true; |
|
| 126 | + } |
|
| 127 | 127 | } |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | \OC_Util::setupFS($user); |
| 118 | 118 | |
| 119 | 119 | // Check if this user has a trashbin directory |
| 120 | - $view = new \OC\Files\View('/' . $user); |
|
| 120 | + $view = new \OC\Files\View('/'.$user); |
|
| 121 | 121 | if (!$view->is_dir('/files_trashbin/files')) { |
| 122 | 122 | return false; |
| 123 | 123 | } |
@@ -107,8 +107,8 @@ |
||
| 107 | 107 | protected function removeDeletedFiles($uid) { |
| 108 | 108 | \OC_Util::tearDownFS(); |
| 109 | 109 | \OC_Util::setupFS($uid); |
| 110 | - if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
| 111 | - $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
| 110 | + if ($this->rootFolder->nodeExists('/'.$uid.'/files_trashbin')) { |
|
| 111 | + $this->rootFolder->get('/'.$uid.'/files_trashbin')->delete(); |
|
| 112 | 112 | $query = $this->dbConnection->getQueryBuilder(); |
| 113 | 113 | $query->delete('files_trash') |
| 114 | 114 | ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
@@ -36,97 +36,97 @@ |
||
| 36 | 36 | |
| 37 | 37 | class CleanUp extends Command { |
| 38 | 38 | |
| 39 | - /** @var IUserManager */ |
|
| 40 | - protected $userManager; |
|
| 39 | + /** @var IUserManager */ |
|
| 40 | + protected $userManager; |
|
| 41 | 41 | |
| 42 | - /** @var IRootFolder */ |
|
| 43 | - protected $rootFolder; |
|
| 42 | + /** @var IRootFolder */ |
|
| 43 | + protected $rootFolder; |
|
| 44 | 44 | |
| 45 | - /** @var \OCP\IDBConnection */ |
|
| 46 | - protected $dbConnection; |
|
| 45 | + /** @var \OCP\IDBConnection */ |
|
| 46 | + protected $dbConnection; |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * @param IRootFolder $rootFolder |
|
| 50 | - * @param IUserManager $userManager |
|
| 51 | - * @param IDBConnection $dbConnection |
|
| 52 | - */ |
|
| 53 | - function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { |
|
| 54 | - parent::__construct(); |
|
| 55 | - $this->userManager = $userManager; |
|
| 56 | - $this->rootFolder = $rootFolder; |
|
| 57 | - $this->dbConnection = $dbConnection; |
|
| 58 | - } |
|
| 48 | + /** |
|
| 49 | + * @param IRootFolder $rootFolder |
|
| 50 | + * @param IUserManager $userManager |
|
| 51 | + * @param IDBConnection $dbConnection |
|
| 52 | + */ |
|
| 53 | + function __construct(IRootFolder $rootFolder, IUserManager $userManager, IDBConnection $dbConnection) { |
|
| 54 | + parent::__construct(); |
|
| 55 | + $this->userManager = $userManager; |
|
| 56 | + $this->rootFolder = $rootFolder; |
|
| 57 | + $this->dbConnection = $dbConnection; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - protected function configure() { |
|
| 61 | - $this |
|
| 62 | - ->setName('trashbin:cleanup') |
|
| 63 | - ->setDescription('Remove deleted files') |
|
| 64 | - ->addArgument( |
|
| 65 | - 'user_id', |
|
| 66 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 67 | - 'remove deleted files of the given user(s)' |
|
| 68 | - ) |
|
| 69 | - ->addOption( |
|
| 70 | - 'all-users', |
|
| 71 | - null, |
|
| 72 | - InputOption::VALUE_NONE, |
|
| 73 | - 'run action on all users' |
|
| 74 | - ); |
|
| 75 | - } |
|
| 60 | + protected function configure() { |
|
| 61 | + $this |
|
| 62 | + ->setName('trashbin:cleanup') |
|
| 63 | + ->setDescription('Remove deleted files') |
|
| 64 | + ->addArgument( |
|
| 65 | + 'user_id', |
|
| 66 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 67 | + 'remove deleted files of the given user(s)' |
|
| 68 | + ) |
|
| 69 | + ->addOption( |
|
| 70 | + 'all-users', |
|
| 71 | + null, |
|
| 72 | + InputOption::VALUE_NONE, |
|
| 73 | + 'run action on all users' |
|
| 74 | + ); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 78 | - $users = $input->getArgument('user_id'); |
|
| 79 | - if ((!empty($users)) and ($input->getOption('all-users'))) { |
|
| 80 | - throw new InvalidOptionException('Either specify a user_id or --all-users'); |
|
| 81 | - } elseif (!empty($users)) { |
|
| 82 | - foreach ($users as $user) { |
|
| 83 | - if ($this->userManager->userExists($user)) { |
|
| 84 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 85 | - $this->removeDeletedFiles($user); |
|
| 86 | - } else { |
|
| 87 | - $output->writeln("<error>Unknown user $user</error>"); |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - } elseif ($input->getOption('all-users')) { |
|
| 91 | - $output->writeln('Remove deleted files for all users'); |
|
| 92 | - foreach ($this->userManager->getBackends() as $backend) { |
|
| 93 | - $name = get_class($backend); |
|
| 94 | - if ($backend instanceof IUserBackend) { |
|
| 95 | - $name = $backend->getBackendName(); |
|
| 96 | - } |
|
| 97 | - $output->writeln("Remove deleted files for users on backend <info>$name</info>"); |
|
| 98 | - $limit = 500; |
|
| 99 | - $offset = 0; |
|
| 100 | - do { |
|
| 101 | - $users = $backend->getUsers('', $limit, $offset); |
|
| 102 | - foreach ($users as $user) { |
|
| 103 | - $output->writeln(" <info>$user</info>"); |
|
| 104 | - $this->removeDeletedFiles($user); |
|
| 105 | - } |
|
| 106 | - $offset += $limit; |
|
| 107 | - } while (count($users) >= $limit); |
|
| 108 | - } |
|
| 109 | - } else { |
|
| 110 | - throw new InvalidOptionException('Either specify a user_id or --all-users'); |
|
| 111 | - } |
|
| 112 | - } |
|
| 77 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 78 | + $users = $input->getArgument('user_id'); |
|
| 79 | + if ((!empty($users)) and ($input->getOption('all-users'))) { |
|
| 80 | + throw new InvalidOptionException('Either specify a user_id or --all-users'); |
|
| 81 | + } elseif (!empty($users)) { |
|
| 82 | + foreach ($users as $user) { |
|
| 83 | + if ($this->userManager->userExists($user)) { |
|
| 84 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 85 | + $this->removeDeletedFiles($user); |
|
| 86 | + } else { |
|
| 87 | + $output->writeln("<error>Unknown user $user</error>"); |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + } elseif ($input->getOption('all-users')) { |
|
| 91 | + $output->writeln('Remove deleted files for all users'); |
|
| 92 | + foreach ($this->userManager->getBackends() as $backend) { |
|
| 93 | + $name = get_class($backend); |
|
| 94 | + if ($backend instanceof IUserBackend) { |
|
| 95 | + $name = $backend->getBackendName(); |
|
| 96 | + } |
|
| 97 | + $output->writeln("Remove deleted files for users on backend <info>$name</info>"); |
|
| 98 | + $limit = 500; |
|
| 99 | + $offset = 0; |
|
| 100 | + do { |
|
| 101 | + $users = $backend->getUsers('', $limit, $offset); |
|
| 102 | + foreach ($users as $user) { |
|
| 103 | + $output->writeln(" <info>$user</info>"); |
|
| 104 | + $this->removeDeletedFiles($user); |
|
| 105 | + } |
|
| 106 | + $offset += $limit; |
|
| 107 | + } while (count($users) >= $limit); |
|
| 108 | + } |
|
| 109 | + } else { |
|
| 110 | + throw new InvalidOptionException('Either specify a user_id or --all-users'); |
|
| 111 | + } |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | - /** |
|
| 115 | - * remove deleted files for the given user |
|
| 116 | - * |
|
| 117 | - * @param string $uid |
|
| 118 | - */ |
|
| 119 | - protected function removeDeletedFiles($uid) { |
|
| 120 | - \OC_Util::tearDownFS(); |
|
| 121 | - \OC_Util::setupFS($uid); |
|
| 122 | - if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
| 123 | - $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
| 124 | - $query = $this->dbConnection->getQueryBuilder(); |
|
| 125 | - $query->delete('files_trash') |
|
| 126 | - ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
|
| 127 | - ->setParameter('uid', $uid); |
|
| 128 | - $query->execute(); |
|
| 129 | - } |
|
| 130 | - } |
|
| 114 | + /** |
|
| 115 | + * remove deleted files for the given user |
|
| 116 | + * |
|
| 117 | + * @param string $uid |
|
| 118 | + */ |
|
| 119 | + protected function removeDeletedFiles($uid) { |
|
| 120 | + \OC_Util::tearDownFS(); |
|
| 121 | + \OC_Util::setupFS($uid); |
|
| 122 | + if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
| 123 | + $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
| 124 | + $query = $this->dbConnection->getQueryBuilder(); |
|
| 125 | + $query->delete('files_trash') |
|
| 126 | + ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
|
| 127 | + ->setParameter('uid', $uid); |
|
| 128 | + $query->execute(); |
|
| 129 | + } |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | 132 | } |
@@ -33,17 +33,17 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | class Capabilities implements ICapability { |
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Return this classes capabilities |
|
| 38 | - * |
|
| 39 | - * @return array |
|
| 40 | - */ |
|
| 41 | - public function getCapabilities() { |
|
| 42 | - return [ |
|
| 43 | - 'files' => [ |
|
| 44 | - 'undelete' => true |
|
| 45 | - ] |
|
| 46 | - ]; |
|
| 47 | - } |
|
| 36 | + /** |
|
| 37 | + * Return this classes capabilities |
|
| 38 | + * |
|
| 39 | + * @return array |
|
| 40 | + */ |
|
| 41 | + public function getCapabilities() { |
|
| 42 | + return [ |
|
| 43 | + 'files' => [ |
|
| 44 | + 'undelete' => true |
|
| 45 | + ] |
|
| 46 | + ]; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | 49 | } |
@@ -34,76 +34,76 @@ |
||
| 34 | 34 | |
| 35 | 35 | class ExpireTrash extends \OC\BackgroundJob\TimedJob { |
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var Expiration |
|
| 39 | - */ |
|
| 40 | - private $expiration; |
|
| 37 | + /** |
|
| 38 | + * @var Expiration |
|
| 39 | + */ |
|
| 40 | + private $expiration; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var IUserManager |
|
| 44 | - */ |
|
| 45 | - private $userManager; |
|
| 42 | + /** |
|
| 43 | + * @var IUserManager |
|
| 44 | + */ |
|
| 45 | + private $userManager; |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @param IUserManager|null $userManager |
|
| 49 | - * @param Expiration|null $expiration |
|
| 50 | - */ |
|
| 51 | - public function __construct(IUserManager $userManager = null, |
|
| 52 | - Expiration $expiration = null) { |
|
| 53 | - // Run once per 30 minutes |
|
| 54 | - $this->setInterval(60 * 30); |
|
| 47 | + /** |
|
| 48 | + * @param IUserManager|null $userManager |
|
| 49 | + * @param Expiration|null $expiration |
|
| 50 | + */ |
|
| 51 | + public function __construct(IUserManager $userManager = null, |
|
| 52 | + Expiration $expiration = null) { |
|
| 53 | + // Run once per 30 minutes |
|
| 54 | + $this->setInterval(60 * 30); |
|
| 55 | 55 | |
| 56 | - if (is_null($expiration) || is_null($userManager)) { |
|
| 57 | - $this->fixDIForJobs(); |
|
| 58 | - } else { |
|
| 59 | - $this->userManager = $userManager; |
|
| 60 | - $this->expiration = $expiration; |
|
| 61 | - } |
|
| 62 | - } |
|
| 56 | + if (is_null($expiration) || is_null($userManager)) { |
|
| 57 | + $this->fixDIForJobs(); |
|
| 58 | + } else { |
|
| 59 | + $this->userManager = $userManager; |
|
| 60 | + $this->expiration = $expiration; |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - protected function fixDIForJobs() { |
|
| 65 | - $application = new Application(); |
|
| 66 | - $this->userManager = \OC::$server->getUserManager(); |
|
| 67 | - $this->expiration = $application->getContainer()->query('Expiration'); |
|
| 68 | - } |
|
| 64 | + protected function fixDIForJobs() { |
|
| 65 | + $application = new Application(); |
|
| 66 | + $this->userManager = \OC::$server->getUserManager(); |
|
| 67 | + $this->expiration = $application->getContainer()->query('Expiration'); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @param $argument |
|
| 72 | - * @throws \Exception |
|
| 73 | - */ |
|
| 74 | - protected function run($argument) { |
|
| 75 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 76 | - if (!$maxAge) { |
|
| 77 | - return; |
|
| 78 | - } |
|
| 70 | + /** |
|
| 71 | + * @param $argument |
|
| 72 | + * @throws \Exception |
|
| 73 | + */ |
|
| 74 | + protected function run($argument) { |
|
| 75 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 76 | + if (!$maxAge) { |
|
| 77 | + return; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - $this->userManager->callForSeenUsers(function(IUser $user) { |
|
| 81 | - $uid = $user->getUID(); |
|
| 82 | - if (!$this->setupFS($uid)) { |
|
| 83 | - return; |
|
| 84 | - } |
|
| 85 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
| 86 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
| 87 | - }); |
|
| 80 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
| 81 | + $uid = $user->getUID(); |
|
| 82 | + if (!$this->setupFS($uid)) { |
|
| 83 | + return; |
|
| 84 | + } |
|
| 85 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
| 86 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
| 87 | + }); |
|
| 88 | 88 | |
| 89 | - \OC_Util::tearDownFS(); |
|
| 90 | - } |
|
| 89 | + \OC_Util::tearDownFS(); |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Act on behalf on trash item owner |
|
| 94 | - * @param string $user |
|
| 95 | - * @return boolean |
|
| 96 | - */ |
|
| 97 | - protected function setupFS($user) { |
|
| 98 | - \OC_Util::tearDownFS(); |
|
| 99 | - \OC_Util::setupFS($user); |
|
| 92 | + /** |
|
| 93 | + * Act on behalf on trash item owner |
|
| 94 | + * @param string $user |
|
| 95 | + * @return boolean |
|
| 96 | + */ |
|
| 97 | + protected function setupFS($user) { |
|
| 98 | + \OC_Util::tearDownFS(); |
|
| 99 | + \OC_Util::setupFS($user); |
|
| 100 | 100 | |
| 101 | - // Check if this user has a trashbin directory |
|
| 102 | - $view = new \OC\Files\View('/' . $user); |
|
| 103 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
| 104 | - return false; |
|
| 105 | - } |
|
| 101 | + // Check if this user has a trashbin directory |
|
| 102 | + $view = new \OC\Files\View('/' . $user); |
|
| 103 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
| 104 | + return false; |
|
| 105 | + } |
|
| 106 | 106 | |
| 107 | - return true; |
|
| 108 | - } |
|
| 107 | + return true; |
|
| 108 | + } |
|
| 109 | 109 | } |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | \OC_Util::setupFS($user); |
| 118 | 118 | |
| 119 | 119 | // Check if this user has a trashbin directory |
| 120 | - $view = new \OC\Files\View('/' . $user); |
|
| 120 | + $view = new \OC\Files\View('/'.$user); |
|
| 121 | 121 | if (!$view->is_dir('/files_trashbin/files')) { |
| 122 | 122 | return false; |
| 123 | 123 | } |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | * @param string $value |
| 60 | 60 | * @return bool |
| 61 | 61 | */ |
| 62 | - public function executeCheck($operator, $value) { |
|
| 62 | + public function executeCheck($operator, $value) { |
|
| 63 | 63 | $actualValue = $this->getActualValue(); |
| 64 | 64 | return $this->executeStringCheck($operator, $value, $actualValue); |
| 65 | 65 | } |
@@ -28,96 +28,96 @@ |
||
| 28 | 28 | |
| 29 | 29 | abstract class AbstractStringCheck implements ICheck { |
| 30 | 30 | |
| 31 | - /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */ |
|
| 32 | - protected $matches; |
|
| 31 | + /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */ |
|
| 32 | + protected $matches; |
|
| 33 | 33 | |
| 34 | - /** @var IL10N */ |
|
| 35 | - protected $l; |
|
| 34 | + /** @var IL10N */ |
|
| 35 | + protected $l; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param IL10N $l |
|
| 39 | - */ |
|
| 40 | - public function __construct(IL10N $l) { |
|
| 41 | - $this->l = $l; |
|
| 42 | - } |
|
| 37 | + /** |
|
| 38 | + * @param IL10N $l |
|
| 39 | + */ |
|
| 40 | + public function __construct(IL10N $l) { |
|
| 41 | + $this->l = $l; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @return string |
|
| 46 | - */ |
|
| 47 | - abstract protected function getActualValue(); |
|
| 44 | + /** |
|
| 45 | + * @return string |
|
| 46 | + */ |
|
| 47 | + abstract protected function getActualValue(); |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param string $operator |
|
| 51 | - * @param string $value |
|
| 52 | - * @return bool |
|
| 53 | - */ |
|
| 54 | - public function executeCheck($operator, $value) { |
|
| 55 | - $actualValue = $this->getActualValue(); |
|
| 56 | - return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 57 | - } |
|
| 49 | + /** |
|
| 50 | + * @param string $operator |
|
| 51 | + * @param string $value |
|
| 52 | + * @return bool |
|
| 53 | + */ |
|
| 54 | + public function executeCheck($operator, $value) { |
|
| 55 | + $actualValue = $this->getActualValue(); |
|
| 56 | + return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * @param string $operator |
|
| 61 | - * @param string $checkValue |
|
| 62 | - * @param string $actualValue |
|
| 63 | - * @return bool |
|
| 64 | - */ |
|
| 65 | - protected function executeStringCheck($operator, $checkValue, $actualValue) { |
|
| 66 | - if ($operator === 'is') { |
|
| 67 | - return $checkValue === $actualValue; |
|
| 68 | - } else if ($operator === '!is') { |
|
| 69 | - return $checkValue !== $actualValue; |
|
| 70 | - } else { |
|
| 71 | - $match = $this->match($checkValue, $actualValue); |
|
| 72 | - if ($operator === 'matches') { |
|
| 73 | - return $match === 1; |
|
| 74 | - } else { |
|
| 75 | - return $match === 0; |
|
| 76 | - } |
|
| 77 | - } |
|
| 78 | - } |
|
| 59 | + /** |
|
| 60 | + * @param string $operator |
|
| 61 | + * @param string $checkValue |
|
| 62 | + * @param string $actualValue |
|
| 63 | + * @return bool |
|
| 64 | + */ |
|
| 65 | + protected function executeStringCheck($operator, $checkValue, $actualValue) { |
|
| 66 | + if ($operator === 'is') { |
|
| 67 | + return $checkValue === $actualValue; |
|
| 68 | + } else if ($operator === '!is') { |
|
| 69 | + return $checkValue !== $actualValue; |
|
| 70 | + } else { |
|
| 71 | + $match = $this->match($checkValue, $actualValue); |
|
| 72 | + if ($operator === 'matches') { |
|
| 73 | + return $match === 1; |
|
| 74 | + } else { |
|
| 75 | + return $match === 0; |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * @param string $operator |
|
| 82 | - * @param string $value |
|
| 83 | - * @throws \UnexpectedValueException |
|
| 84 | - */ |
|
| 85 | - public function validateCheck($operator, $value) { |
|
| 86 | - if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) { |
|
| 87 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
| 88 | - } |
|
| 80 | + /** |
|
| 81 | + * @param string $operator |
|
| 82 | + * @param string $value |
|
| 83 | + * @throws \UnexpectedValueException |
|
| 84 | + */ |
|
| 85 | + public function validateCheck($operator, $value) { |
|
| 86 | + if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) { |
|
| 87 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - if (in_array($operator, ['matches', '!matches']) && |
|
| 91 | - @preg_match($value, null) === false) { |
|
| 92 | - throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2); |
|
| 93 | - } |
|
| 94 | - } |
|
| 90 | + if (in_array($operator, ['matches', '!matches']) && |
|
| 91 | + @preg_match($value, null) === false) { |
|
| 92 | + throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2); |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - public function supportedEntities(): array { |
|
| 97 | - // universal by default |
|
| 98 | - return []; |
|
| 99 | - } |
|
| 96 | + public function supportedEntities(): array { |
|
| 97 | + // universal by default |
|
| 98 | + return []; |
|
| 99 | + } |
|
| 100 | 100 | |
| 101 | - public function isAvailableForScope(int $scope): bool { |
|
| 102 | - // admin only by default |
|
| 103 | - return $scope === IManager::SCOPE_ADMIN; |
|
| 104 | - } |
|
| 101 | + public function isAvailableForScope(int $scope): bool { |
|
| 102 | + // admin only by default |
|
| 103 | + return $scope === IManager::SCOPE_ADMIN; |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * @param string $pattern |
|
| 108 | - * @param string $subject |
|
| 109 | - * @return int|bool |
|
| 110 | - */ |
|
| 111 | - protected function match($pattern, $subject) { |
|
| 112 | - $patternHash = md5($pattern); |
|
| 113 | - $subjectHash = md5($subject); |
|
| 114 | - if (isset($this->matches[$patternHash][$subjectHash])) { |
|
| 115 | - return $this->matches[$patternHash][$subjectHash]; |
|
| 116 | - } |
|
| 117 | - if (!isset($this->matches[$patternHash])) { |
|
| 118 | - $this->matches[$patternHash] = []; |
|
| 119 | - } |
|
| 120 | - $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject); |
|
| 121 | - return $this->matches[$patternHash][$subjectHash]; |
|
| 122 | - } |
|
| 106 | + /** |
|
| 107 | + * @param string $pattern |
|
| 108 | + * @param string $subject |
|
| 109 | + * @return int|bool |
|
| 110 | + */ |
|
| 111 | + protected function match($pattern, $subject) { |
|
| 112 | + $patternHash = md5($pattern); |
|
| 113 | + $subjectHash = md5($subject); |
|
| 114 | + if (isset($this->matches[$patternHash][$subjectHash])) { |
|
| 115 | + return $this->matches[$patternHash][$subjectHash]; |
|
| 116 | + } |
|
| 117 | + if (!isset($this->matches[$patternHash])) { |
|
| 118 | + $this->matches[$patternHash] = []; |
|
| 119 | + } |
|
| 120 | + $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject); |
|
| 121 | + return $this->matches[$patternHash][$subjectHash]; |
|
| 122 | + } |
|
| 123 | 123 | } |
@@ -109,8 +109,8 @@ |
||
| 109 | 109 | throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
| 113 | - $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
| 112 | + $regexValue = '\"'.self::REGEX_TIME.' '.self::REGEX_TIMEZONE.'\"'; |
|
| 113 | + $result = preg_match('/^\['.$regexValue.','.$regexValue.'\]$/', $value, $matches); |
|
| 114 | 114 | if (!$result) { |
| 115 | 115 | throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
| 116 | 116 | } |
@@ -28,109 +28,109 @@ |
||
| 28 | 28 | |
| 29 | 29 | class RequestTime implements ICheck { |
| 30 | 30 | |
| 31 | - const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; |
|
| 32 | - const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; |
|
| 33 | - |
|
| 34 | - /** @var bool[] */ |
|
| 35 | - protected $cachedResults; |
|
| 36 | - |
|
| 37 | - /** @var IL10N */ |
|
| 38 | - protected $l; |
|
| 39 | - |
|
| 40 | - /** @var ITimeFactory */ |
|
| 41 | - protected $timeFactory; |
|
| 42 | - |
|
| 43 | - /** |
|
| 44 | - * @param ITimeFactory $timeFactory |
|
| 45 | - */ |
|
| 46 | - public function __construct(IL10N $l, ITimeFactory $timeFactory) { |
|
| 47 | - $this->l = $l; |
|
| 48 | - $this->timeFactory = $timeFactory; |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - /** |
|
| 52 | - * @param string $operator |
|
| 53 | - * @param string $value |
|
| 54 | - * @return bool |
|
| 55 | - */ |
|
| 56 | - public function executeCheck($operator, $value) { |
|
| 57 | - $valueHash = md5($value); |
|
| 58 | - |
|
| 59 | - if (isset($this->cachedResults[$valueHash])) { |
|
| 60 | - return $this->cachedResults[$valueHash]; |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - $timestamp = $this->timeFactory->getTime(); |
|
| 64 | - |
|
| 65 | - $values = json_decode($value, true); |
|
| 66 | - $timestamp1 = $this->getTimestamp($timestamp, $values[0]); |
|
| 67 | - $timestamp2 = $this->getTimestamp($timestamp, $values[1]); |
|
| 68 | - |
|
| 69 | - if ($timestamp1 < $timestamp2) { |
|
| 70 | - $in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2; |
|
| 71 | - } else { |
|
| 72 | - $in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2; |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - return ($operator === 'in') ? $in : !$in; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - /** |
|
| 79 | - * @param int $currentTimestamp |
|
| 80 | - * @param string $value Format: "H:i e" |
|
| 81 | - * @return int |
|
| 82 | - */ |
|
| 83 | - protected function getTimestamp($currentTimestamp, $value) { |
|
| 84 | - list($time1, $timezone1) = explode(' ', $value); |
|
| 85 | - list($hour1, $minute1) = explode(':', $time1); |
|
| 86 | - $date1 = new \DateTime('now', new \DateTimeZone($timezone1)); |
|
| 87 | - $date1->setTimestamp($currentTimestamp); |
|
| 88 | - $date1->setTime($hour1, $minute1); |
|
| 89 | - |
|
| 90 | - return $date1->getTimestamp(); |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - /** |
|
| 94 | - * @param string $operator |
|
| 95 | - * @param string $value |
|
| 96 | - * @throws \UnexpectedValueException |
|
| 97 | - */ |
|
| 98 | - public function validateCheck($operator, $value) { |
|
| 99 | - if (!in_array($operator, ['in', '!in'])) { |
|
| 100 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
| 104 | - $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
| 105 | - if (!$result) { |
|
| 106 | - throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - $values = json_decode($value, true); |
|
| 110 | - $time1 = \DateTime::createFromFormat('H:i e', $values[0]); |
|
| 111 | - if ($time1 === false) { |
|
| 112 | - throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3); |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - $time2 = \DateTime::createFromFormat('H:i e', $values[1]); |
|
| 116 | - if ($time2 === false) { |
|
| 117 | - throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4); |
|
| 118 | - } |
|
| 119 | - } |
|
| 120 | - |
|
| 121 | - public function isAvailableForScope(int $scope): bool { |
|
| 122 | - return true; |
|
| 123 | - } |
|
| 124 | - |
|
| 125 | - /** |
|
| 126 | - * returns a list of Entities the checker supports. The values must match |
|
| 127 | - * the class name of the entity. |
|
| 128 | - * |
|
| 129 | - * An empty result means the check is universally available. |
|
| 130 | - * |
|
| 131 | - * @since 18.0.0 |
|
| 132 | - */ |
|
| 133 | - public function supportedEntities(): array { |
|
| 134 | - return []; |
|
| 135 | - } |
|
| 31 | + const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; |
|
| 32 | + const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; |
|
| 33 | + |
|
| 34 | + /** @var bool[] */ |
|
| 35 | + protected $cachedResults; |
|
| 36 | + |
|
| 37 | + /** @var IL10N */ |
|
| 38 | + protected $l; |
|
| 39 | + |
|
| 40 | + /** @var ITimeFactory */ |
|
| 41 | + protected $timeFactory; |
|
| 42 | + |
|
| 43 | + /** |
|
| 44 | + * @param ITimeFactory $timeFactory |
|
| 45 | + */ |
|
| 46 | + public function __construct(IL10N $l, ITimeFactory $timeFactory) { |
|
| 47 | + $this->l = $l; |
|
| 48 | + $this->timeFactory = $timeFactory; |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + /** |
|
| 52 | + * @param string $operator |
|
| 53 | + * @param string $value |
|
| 54 | + * @return bool |
|
| 55 | + */ |
|
| 56 | + public function executeCheck($operator, $value) { |
|
| 57 | + $valueHash = md5($value); |
|
| 58 | + |
|
| 59 | + if (isset($this->cachedResults[$valueHash])) { |
|
| 60 | + return $this->cachedResults[$valueHash]; |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + $timestamp = $this->timeFactory->getTime(); |
|
| 64 | + |
|
| 65 | + $values = json_decode($value, true); |
|
| 66 | + $timestamp1 = $this->getTimestamp($timestamp, $values[0]); |
|
| 67 | + $timestamp2 = $this->getTimestamp($timestamp, $values[1]); |
|
| 68 | + |
|
| 69 | + if ($timestamp1 < $timestamp2) { |
|
| 70 | + $in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2; |
|
| 71 | + } else { |
|
| 72 | + $in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2; |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + return ($operator === 'in') ? $in : !$in; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + /** |
|
| 79 | + * @param int $currentTimestamp |
|
| 80 | + * @param string $value Format: "H:i e" |
|
| 81 | + * @return int |
|
| 82 | + */ |
|
| 83 | + protected function getTimestamp($currentTimestamp, $value) { |
|
| 84 | + list($time1, $timezone1) = explode(' ', $value); |
|
| 85 | + list($hour1, $minute1) = explode(':', $time1); |
|
| 86 | + $date1 = new \DateTime('now', new \DateTimeZone($timezone1)); |
|
| 87 | + $date1->setTimestamp($currentTimestamp); |
|
| 88 | + $date1->setTime($hour1, $minute1); |
|
| 89 | + |
|
| 90 | + return $date1->getTimestamp(); |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + /** |
|
| 94 | + * @param string $operator |
|
| 95 | + * @param string $value |
|
| 96 | + * @throws \UnexpectedValueException |
|
| 97 | + */ |
|
| 98 | + public function validateCheck($operator, $value) { |
|
| 99 | + if (!in_array($operator, ['in', '!in'])) { |
|
| 100 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
| 104 | + $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
| 105 | + if (!$result) { |
|
| 106 | + throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + $values = json_decode($value, true); |
|
| 110 | + $time1 = \DateTime::createFromFormat('H:i e', $values[0]); |
|
| 111 | + if ($time1 === false) { |
|
| 112 | + throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3); |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + $time2 = \DateTime::createFromFormat('H:i e', $values[1]); |
|
| 116 | + if ($time2 === false) { |
|
| 117 | + throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4); |
|
| 118 | + } |
|
| 119 | + } |
|
| 120 | + |
|
| 121 | + public function isAvailableForScope(int $scope): bool { |
|
| 122 | + return true; |
|
| 123 | + } |
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * returns a list of Entities the checker supports. The values must match |
|
| 127 | + * the class name of the entity. |
|
| 128 | + * |
|
| 129 | + * An empty result means the check is universally available. |
|
| 130 | + * |
|
| 131 | + * @since 18.0.0 |
|
| 132 | + */ |
|
| 133 | + public function supportedEntities(): array { |
|
| 134 | + return []; |
|
| 135 | + } |
|
| 136 | 136 | } |
@@ -27,66 +27,66 @@ |
||
| 27 | 27 | |
| 28 | 28 | class RequestURL extends AbstractStringCheck { |
| 29 | 29 | |
| 30 | - /** @var string */ |
|
| 31 | - protected $url; |
|
| 30 | + /** @var string */ |
|
| 31 | + protected $url; |
|
| 32 | 32 | |
| 33 | - /** @var IRequest */ |
|
| 34 | - protected $request; |
|
| 33 | + /** @var IRequest */ |
|
| 34 | + protected $request; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @param IL10N $l |
|
| 38 | - * @param IRequest $request |
|
| 39 | - */ |
|
| 40 | - public function __construct(IL10N $l, IRequest $request) { |
|
| 41 | - parent::__construct($l); |
|
| 42 | - $this->request = $request; |
|
| 43 | - } |
|
| 36 | + /** |
|
| 37 | + * @param IL10N $l |
|
| 38 | + * @param IRequest $request |
|
| 39 | + */ |
|
| 40 | + public function __construct(IL10N $l, IRequest $request) { |
|
| 41 | + parent::__construct($l); |
|
| 42 | + $this->request = $request; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param string $operator |
|
| 47 | - * @param string $value |
|
| 48 | - * @return bool |
|
| 49 | - */ |
|
| 50 | - public function executeCheck($operator, $value) { |
|
| 51 | - $actualValue = $this->getActualValue(); |
|
| 52 | - if (in_array($operator, ['is', '!is'])) { |
|
| 53 | - switch ($value) { |
|
| 54 | - case 'webdav': |
|
| 55 | - if ($operator === 'is') { |
|
| 56 | - return $this->isWebDAVRequest(); |
|
| 57 | - } else { |
|
| 58 | - return !$this->isWebDAVRequest(); |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 63 | - } |
|
| 45 | + /** |
|
| 46 | + * @param string $operator |
|
| 47 | + * @param string $value |
|
| 48 | + * @return bool |
|
| 49 | + */ |
|
| 50 | + public function executeCheck($operator, $value) { |
|
| 51 | + $actualValue = $this->getActualValue(); |
|
| 52 | + if (in_array($operator, ['is', '!is'])) { |
|
| 53 | + switch ($value) { |
|
| 54 | + case 'webdav': |
|
| 55 | + if ($operator === 'is') { |
|
| 56 | + return $this->isWebDAVRequest(); |
|
| 57 | + } else { |
|
| 58 | + return !$this->isWebDAVRequest(); |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @return string |
|
| 67 | - */ |
|
| 68 | - protected function getActualValue() { |
|
| 69 | - if ($this->url !== null) { |
|
| 70 | - return $this->url; |
|
| 71 | - } |
|
| 65 | + /** |
|
| 66 | + * @return string |
|
| 67 | + */ |
|
| 68 | + protected function getActualValue() { |
|
| 69 | + if ($this->url !== null) { |
|
| 70 | + return $this->url; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 74 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 75 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 76 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 73 | + $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 74 | + $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 75 | + $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 76 | + $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 77 | 77 | |
| 78 | - return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
| 79 | - } |
|
| 78 | + return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * @return bool |
|
| 83 | - */ |
|
| 84 | - protected function isWebDAVRequest() { |
|
| 85 | - return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
| 86 | - $this->request->getPathInfo() === '/webdav' || |
|
| 87 | - strpos($this->request->getPathInfo(), '/webdav/') === 0 || |
|
| 88 | - $this->request->getPathInfo() === '/dav/files' || |
|
| 89 | - strpos($this->request->getPathInfo(), '/dav/files/') === 0 |
|
| 90 | - ); |
|
| 91 | - } |
|
| 81 | + /** |
|
| 82 | + * @return bool |
|
| 83 | + */ |
|
| 84 | + protected function isWebDAVRequest() { |
|
| 85 | + return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
| 86 | + $this->request->getPathInfo() === '/webdav' || |
|
| 87 | + strpos($this->request->getPathInfo(), '/webdav/') === 0 || |
|
| 88 | + $this->request->getPathInfo() === '/dav/files' || |
|
| 89 | + strpos($this->request->getPathInfo(), '/dav/files/') === 0 |
|
| 90 | + ); |
|
| 91 | + } |
|
| 92 | 92 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param string $value |
| 48 | 48 | * @return bool |
| 49 | 49 | */ |
| 50 | - public function executeCheck($operator, $value) { |
|
| 50 | + public function executeCheck($operator, $value) { |
|
| 51 | 51 | $actualValue = $this->getActualValue(); |
| 52 | 52 | if (in_array($operator, ['is', '!is'])) { |
| 53 | 53 | switch ($value) { |
@@ -70,10 +70,10 @@ discard block |
||
| 70 | 70 | return $this->url; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 74 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 75 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 76 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 73 | + $this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + :// |
|
| 74 | + $this->url .= $this->request->getServerHost(); // E.g. localhost |
|
| 75 | + $this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php |
|
| 76 | + $this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile |
|
| 77 | 77 | |
| 78 | 78 | return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
| 79 | 79 | } |
@@ -34,23 +34,23 @@ |
||
| 34 | 34 | * ] |
| 35 | 35 | */ |
| 36 | 36 | class AlternativeHomeUserBackend extends \OC\User\Database { |
| 37 | - public function __construct() { |
|
| 38 | - parent::__construct(); |
|
| 39 | - } |
|
| 40 | - /** |
|
| 41 | - * get the user's home directory |
|
| 42 | - * @param string $uid the username |
|
| 43 | - * @return string|false |
|
| 44 | - */ |
|
| 45 | - public function getHome($uid) { |
|
| 46 | - if ($this->userExists($uid)) { |
|
| 47 | - // workaround to avoid killing the admin |
|
| 48 | - if ($uid !== 'admin') { |
|
| 49 | - $uid = md5($uid); |
|
| 50 | - } |
|
| 51 | - return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid; |
|
| 52 | - } |
|
| 37 | + public function __construct() { |
|
| 38 | + parent::__construct(); |
|
| 39 | + } |
|
| 40 | + /** |
|
| 41 | + * get the user's home directory |
|
| 42 | + * @param string $uid the username |
|
| 43 | + * @return string|false |
|
| 44 | + */ |
|
| 45 | + public function getHome($uid) { |
|
| 46 | + if ($this->userExists($uid)) { |
|
| 47 | + // workaround to avoid killing the admin |
|
| 48 | + if ($uid !== 'admin') { |
|
| 49 | + $uid = md5($uid); |
|
| 50 | + } |
|
| 51 | + return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - return false; |
|
| 55 | - } |
|
| 54 | + return false; |
|
| 55 | + } |
|
| 56 | 56 | } |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | if ($uid !== 'admin') { |
| 49 | 49 | $uid = md5($uid); |
| 50 | 50 | } |
| 51 | - return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid; |
|
| 51 | + return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$uid; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | return false; |
@@ -184,12 +184,12 @@ |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | try { |
| 187 | - $this->getDisplayNameFromContact($user . '@http://' . $server); |
|
| 187 | + $this->getDisplayNameFromContact($user.'@http://'.$server); |
|
| 188 | 188 | } catch (\OutOfBoundsException $e) { |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | try { |
| 192 | - $this->getDisplayNameFromContact($user . '@https://' . $server); |
|
| 192 | + $this->getDisplayNameFromContact($user.'@https://'.$server); |
|
| 193 | 193 | } catch (\OutOfBoundsException $e) { |
| 194 | 194 | } |
| 195 | 195 | |
@@ -35,217 +35,217 @@ |
||
| 35 | 35 | use OCP\Notification\INotifier; |
| 36 | 36 | |
| 37 | 37 | class Notifier implements INotifier { |
| 38 | - /** @var IFactory */ |
|
| 39 | - protected $factory; |
|
| 40 | - /** @var IManager */ |
|
| 41 | - protected $contactsManager; |
|
| 42 | - /** @var IURLGenerator */ |
|
| 43 | - protected $url; |
|
| 44 | - /** @var array */ |
|
| 45 | - protected $federatedContacts; |
|
| 46 | - /** @var ICloudIdManager */ |
|
| 47 | - protected $cloudIdManager; |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * @param IFactory $factory |
|
| 51 | - * @param IManager $contactsManager |
|
| 52 | - * @param IURLGenerator $url |
|
| 53 | - * @param ICloudIdManager $cloudIdManager |
|
| 54 | - */ |
|
| 55 | - public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) { |
|
| 56 | - $this->factory = $factory; |
|
| 57 | - $this->contactsManager = $contactsManager; |
|
| 58 | - $this->url = $url; |
|
| 59 | - $this->cloudIdManager = $cloudIdManager; |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * Identifier of the notifier, only use [a-z0-9_] |
|
| 64 | - * |
|
| 65 | - * @return string |
|
| 66 | - * @since 17.0.0 |
|
| 67 | - */ |
|
| 68 | - public function getID(): string { |
|
| 69 | - return 'federatedfilesharing'; |
|
| 70 | - } |
|
| 71 | - |
|
| 72 | - /** |
|
| 73 | - * Human readable name describing the notifier |
|
| 74 | - * |
|
| 75 | - * @return string |
|
| 76 | - * @since 17.0.0 |
|
| 77 | - */ |
|
| 78 | - public function getName(): string { |
|
| 79 | - return $this->factory->get('federatedfilesharing')->t('Federated sharing'); |
|
| 80 | - } |
|
| 81 | - |
|
| 82 | - /** |
|
| 83 | - * @param INotification $notification |
|
| 84 | - * @param string $languageCode The code of the language that should be used to prepare the notification |
|
| 85 | - * @return INotification |
|
| 86 | - * @throws \InvalidArgumentException |
|
| 87 | - */ |
|
| 88 | - public function prepare(INotification $notification, string $languageCode): INotification { |
|
| 89 | - if ($notification->getApp() !== 'files_sharing') { |
|
| 90 | - // Not my app => throw |
|
| 91 | - throw new \InvalidArgumentException(); |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - // Read the language from the notification |
|
| 95 | - $l = $this->factory->get('files_sharing', $languageCode); |
|
| 96 | - |
|
| 97 | - switch ($notification->getSubject()) { |
|
| 98 | - // Deal with known subjects |
|
| 99 | - case 'remote_share': |
|
| 100 | - $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'))); |
|
| 101 | - |
|
| 102 | - $params = $notification->getSubjectParameters(); |
|
| 103 | - if ($params[0] !== $params[1] && $params[1] !== null) { |
|
| 104 | - $notification->setParsedSubject( |
|
| 105 | - $l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params) |
|
| 106 | - ); |
|
| 107 | - $notification->setRichSubject( |
|
| 108 | - $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'), |
|
| 109 | - [ |
|
| 110 | - 'share' => [ |
|
| 111 | - 'type' => 'pending-federated-share', |
|
| 112 | - 'id' => $notification->getObjectId(), |
|
| 113 | - 'name' => $params[2], |
|
| 114 | - ], |
|
| 115 | - 'user' => $this->createRemoteUser($params[0]), |
|
| 116 | - 'behalf' => $this->createRemoteUser($params[1]), |
|
| 117 | - ] |
|
| 118 | - ); |
|
| 119 | - } else { |
|
| 120 | - $notification->setParsedSubject( |
|
| 121 | - $l->t('You received "%3$s" as a remote share from %1$s', $params) |
|
| 122 | - ); |
|
| 123 | - $notification->setRichSubject( |
|
| 124 | - $l->t('You received {share} as a remote share from {user}'), |
|
| 125 | - [ |
|
| 126 | - 'share' => [ |
|
| 127 | - 'type' => 'pending-federated-share', |
|
| 128 | - 'id' => $notification->getObjectId(), |
|
| 129 | - 'name' => $params[2], |
|
| 130 | - ], |
|
| 131 | - 'user' => $this->createRemoteUser($params[0]), |
|
| 132 | - ] |
|
| 133 | - ); |
|
| 134 | - } |
|
| 135 | - |
|
| 136 | - // Deal with the actions for a known subject |
|
| 137 | - foreach ($notification->getActions() as $action) { |
|
| 138 | - switch ($action->getLabel()) { |
|
| 139 | - case 'accept': |
|
| 140 | - $action->setParsedLabel( |
|
| 141 | - (string) $l->t('Accept') |
|
| 142 | - ) |
|
| 143 | - ->setPrimary(true); |
|
| 144 | - break; |
|
| 145 | - |
|
| 146 | - case 'decline': |
|
| 147 | - $action->setParsedLabel( |
|
| 148 | - (string) $l->t('Decline') |
|
| 149 | - ); |
|
| 150 | - break; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - $notification->addParsedAction($action); |
|
| 154 | - } |
|
| 155 | - return $notification; |
|
| 156 | - |
|
| 157 | - default: |
|
| 158 | - // Unknown subject => Unknown notification => throw |
|
| 159 | - throw new \InvalidArgumentException(); |
|
| 160 | - } |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * @param string $cloudId |
|
| 165 | - * @return array |
|
| 166 | - */ |
|
| 167 | - protected function createRemoteUser($cloudId) { |
|
| 168 | - $displayName = $cloudId; |
|
| 169 | - try { |
|
| 170 | - $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId); |
|
| 171 | - $displayName = $this->getDisplayName($resolvedId); |
|
| 172 | - $user = $resolvedId->getUser(); |
|
| 173 | - $server = $resolvedId->getRemote(); |
|
| 174 | - } catch (HintException $e) { |
|
| 175 | - $user = $cloudId; |
|
| 176 | - $server = ''; |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - return [ |
|
| 180 | - 'type' => 'user', |
|
| 181 | - 'id' => $user, |
|
| 182 | - 'name' => $displayName, |
|
| 183 | - 'server' => $server, |
|
| 184 | - ]; |
|
| 185 | - } |
|
| 186 | - |
|
| 187 | - /** |
|
| 188 | - * Try to find the user in the contacts |
|
| 189 | - * |
|
| 190 | - * @param ICloudId $cloudId |
|
| 191 | - * @return string |
|
| 192 | - */ |
|
| 193 | - protected function getDisplayName(ICloudId $cloudId) { |
|
| 194 | - $server = $cloudId->getRemote(); |
|
| 195 | - $user = $cloudId->getUser(); |
|
| 196 | - if (strpos($server, 'http://') === 0) { |
|
| 197 | - $server = substr($server, strlen('http://')); |
|
| 198 | - } else if (strpos($server, 'https://') === 0) { |
|
| 199 | - $server = substr($server, strlen('https://')); |
|
| 200 | - } |
|
| 201 | - |
|
| 202 | - try { |
|
| 203 | - return $this->getDisplayNameFromContact($cloudId->getId()); |
|
| 204 | - } catch (\OutOfBoundsException $e) { |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - try { |
|
| 208 | - $this->getDisplayNameFromContact($user . '@http://' . $server); |
|
| 209 | - } catch (\OutOfBoundsException $e) { |
|
| 210 | - } |
|
| 211 | - |
|
| 212 | - try { |
|
| 213 | - $this->getDisplayNameFromContact($user . '@https://' . $server); |
|
| 214 | - } catch (\OutOfBoundsException $e) { |
|
| 215 | - } |
|
| 216 | - |
|
| 217 | - return $cloudId->getId(); |
|
| 218 | - } |
|
| 219 | - |
|
| 220 | - /** |
|
| 221 | - * Try to find the user in the contacts |
|
| 222 | - * |
|
| 223 | - * @param string $federatedCloudId |
|
| 224 | - * @return string |
|
| 225 | - * @throws \OutOfBoundsException when there is no contact for the id |
|
| 226 | - */ |
|
| 227 | - protected function getDisplayNameFromContact($federatedCloudId) { |
|
| 228 | - if (isset($this->federatedContacts[$federatedCloudId])) { |
|
| 229 | - if ($this->federatedContacts[$federatedCloudId] !== '') { |
|
| 230 | - return $this->federatedContacts[$federatedCloudId]; |
|
| 231 | - } else { |
|
| 232 | - throw new \OutOfBoundsException('No contact found for federated cloud id'); |
|
| 233 | - } |
|
| 234 | - } |
|
| 235 | - |
|
| 236 | - $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']); |
|
| 237 | - foreach ($addressBookEntries as $entry) { |
|
| 238 | - if (isset($entry['CLOUD'])) { |
|
| 239 | - foreach ($entry['CLOUD'] as $cloudID) { |
|
| 240 | - if ($cloudID === $federatedCloudId) { |
|
| 241 | - $this->federatedContacts[$federatedCloudId] = $entry['FN']; |
|
| 242 | - return $entry['FN']; |
|
| 243 | - } |
|
| 244 | - } |
|
| 245 | - } |
|
| 246 | - } |
|
| 247 | - |
|
| 248 | - $this->federatedContacts[$federatedCloudId] = ''; |
|
| 249 | - throw new \OutOfBoundsException('No contact found for federated cloud id'); |
|
| 250 | - } |
|
| 38 | + /** @var IFactory */ |
|
| 39 | + protected $factory; |
|
| 40 | + /** @var IManager */ |
|
| 41 | + protected $contactsManager; |
|
| 42 | + /** @var IURLGenerator */ |
|
| 43 | + protected $url; |
|
| 44 | + /** @var array */ |
|
| 45 | + protected $federatedContacts; |
|
| 46 | + /** @var ICloudIdManager */ |
|
| 47 | + protected $cloudIdManager; |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @param IFactory $factory |
|
| 51 | + * @param IManager $contactsManager |
|
| 52 | + * @param IURLGenerator $url |
|
| 53 | + * @param ICloudIdManager $cloudIdManager |
|
| 54 | + */ |
|
| 55 | + public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) { |
|
| 56 | + $this->factory = $factory; |
|
| 57 | + $this->contactsManager = $contactsManager; |
|
| 58 | + $this->url = $url; |
|
| 59 | + $this->cloudIdManager = $cloudIdManager; |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * Identifier of the notifier, only use [a-z0-9_] |
|
| 64 | + * |
|
| 65 | + * @return string |
|
| 66 | + * @since 17.0.0 |
|
| 67 | + */ |
|
| 68 | + public function getID(): string { |
|
| 69 | + return 'federatedfilesharing'; |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + /** |
|
| 73 | + * Human readable name describing the notifier |
|
| 74 | + * |
|
| 75 | + * @return string |
|
| 76 | + * @since 17.0.0 |
|
| 77 | + */ |
|
| 78 | + public function getName(): string { |
|
| 79 | + return $this->factory->get('federatedfilesharing')->t('Federated sharing'); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * @param INotification $notification |
|
| 84 | + * @param string $languageCode The code of the language that should be used to prepare the notification |
|
| 85 | + * @return INotification |
|
| 86 | + * @throws \InvalidArgumentException |
|
| 87 | + */ |
|
| 88 | + public function prepare(INotification $notification, string $languageCode): INotification { |
|
| 89 | + if ($notification->getApp() !== 'files_sharing') { |
|
| 90 | + // Not my app => throw |
|
| 91 | + throw new \InvalidArgumentException(); |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + // Read the language from the notification |
|
| 95 | + $l = $this->factory->get('files_sharing', $languageCode); |
|
| 96 | + |
|
| 97 | + switch ($notification->getSubject()) { |
|
| 98 | + // Deal with known subjects |
|
| 99 | + case 'remote_share': |
|
| 100 | + $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'))); |
|
| 101 | + |
|
| 102 | + $params = $notification->getSubjectParameters(); |
|
| 103 | + if ($params[0] !== $params[1] && $params[1] !== null) { |
|
| 104 | + $notification->setParsedSubject( |
|
| 105 | + $l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params) |
|
| 106 | + ); |
|
| 107 | + $notification->setRichSubject( |
|
| 108 | + $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'), |
|
| 109 | + [ |
|
| 110 | + 'share' => [ |
|
| 111 | + 'type' => 'pending-federated-share', |
|
| 112 | + 'id' => $notification->getObjectId(), |
|
| 113 | + 'name' => $params[2], |
|
| 114 | + ], |
|
| 115 | + 'user' => $this->createRemoteUser($params[0]), |
|
| 116 | + 'behalf' => $this->createRemoteUser($params[1]), |
|
| 117 | + ] |
|
| 118 | + ); |
|
| 119 | + } else { |
|
| 120 | + $notification->setParsedSubject( |
|
| 121 | + $l->t('You received "%3$s" as a remote share from %1$s', $params) |
|
| 122 | + ); |
|
| 123 | + $notification->setRichSubject( |
|
| 124 | + $l->t('You received {share} as a remote share from {user}'), |
|
| 125 | + [ |
|
| 126 | + 'share' => [ |
|
| 127 | + 'type' => 'pending-federated-share', |
|
| 128 | + 'id' => $notification->getObjectId(), |
|
| 129 | + 'name' => $params[2], |
|
| 130 | + ], |
|
| 131 | + 'user' => $this->createRemoteUser($params[0]), |
|
| 132 | + ] |
|
| 133 | + ); |
|
| 134 | + } |
|
| 135 | + |
|
| 136 | + // Deal with the actions for a known subject |
|
| 137 | + foreach ($notification->getActions() as $action) { |
|
| 138 | + switch ($action->getLabel()) { |
|
| 139 | + case 'accept': |
|
| 140 | + $action->setParsedLabel( |
|
| 141 | + (string) $l->t('Accept') |
|
| 142 | + ) |
|
| 143 | + ->setPrimary(true); |
|
| 144 | + break; |
|
| 145 | + |
|
| 146 | + case 'decline': |
|
| 147 | + $action->setParsedLabel( |
|
| 148 | + (string) $l->t('Decline') |
|
| 149 | + ); |
|
| 150 | + break; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + $notification->addParsedAction($action); |
|
| 154 | + } |
|
| 155 | + return $notification; |
|
| 156 | + |
|
| 157 | + default: |
|
| 158 | + // Unknown subject => Unknown notification => throw |
|
| 159 | + throw new \InvalidArgumentException(); |
|
| 160 | + } |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * @param string $cloudId |
|
| 165 | + * @return array |
|
| 166 | + */ |
|
| 167 | + protected function createRemoteUser($cloudId) { |
|
| 168 | + $displayName = $cloudId; |
|
| 169 | + try { |
|
| 170 | + $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId); |
|
| 171 | + $displayName = $this->getDisplayName($resolvedId); |
|
| 172 | + $user = $resolvedId->getUser(); |
|
| 173 | + $server = $resolvedId->getRemote(); |
|
| 174 | + } catch (HintException $e) { |
|
| 175 | + $user = $cloudId; |
|
| 176 | + $server = ''; |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + return [ |
|
| 180 | + 'type' => 'user', |
|
| 181 | + 'id' => $user, |
|
| 182 | + 'name' => $displayName, |
|
| 183 | + 'server' => $server, |
|
| 184 | + ]; |
|
| 185 | + } |
|
| 186 | + |
|
| 187 | + /** |
|
| 188 | + * Try to find the user in the contacts |
|
| 189 | + * |
|
| 190 | + * @param ICloudId $cloudId |
|
| 191 | + * @return string |
|
| 192 | + */ |
|
| 193 | + protected function getDisplayName(ICloudId $cloudId) { |
|
| 194 | + $server = $cloudId->getRemote(); |
|
| 195 | + $user = $cloudId->getUser(); |
|
| 196 | + if (strpos($server, 'http://') === 0) { |
|
| 197 | + $server = substr($server, strlen('http://')); |
|
| 198 | + } else if (strpos($server, 'https://') === 0) { |
|
| 199 | + $server = substr($server, strlen('https://')); |
|
| 200 | + } |
|
| 201 | + |
|
| 202 | + try { |
|
| 203 | + return $this->getDisplayNameFromContact($cloudId->getId()); |
|
| 204 | + } catch (\OutOfBoundsException $e) { |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + try { |
|
| 208 | + $this->getDisplayNameFromContact($user . '@http://' . $server); |
|
| 209 | + } catch (\OutOfBoundsException $e) { |
|
| 210 | + } |
|
| 211 | + |
|
| 212 | + try { |
|
| 213 | + $this->getDisplayNameFromContact($user . '@https://' . $server); |
|
| 214 | + } catch (\OutOfBoundsException $e) { |
|
| 215 | + } |
|
| 216 | + |
|
| 217 | + return $cloudId->getId(); |
|
| 218 | + } |
|
| 219 | + |
|
| 220 | + /** |
|
| 221 | + * Try to find the user in the contacts |
|
| 222 | + * |
|
| 223 | + * @param string $federatedCloudId |
|
| 224 | + * @return string |
|
| 225 | + * @throws \OutOfBoundsException when there is no contact for the id |
|
| 226 | + */ |
|
| 227 | + protected function getDisplayNameFromContact($federatedCloudId) { |
|
| 228 | + if (isset($this->federatedContacts[$federatedCloudId])) { |
|
| 229 | + if ($this->federatedContacts[$federatedCloudId] !== '') { |
|
| 230 | + return $this->federatedContacts[$federatedCloudId]; |
|
| 231 | + } else { |
|
| 232 | + throw new \OutOfBoundsException('No contact found for federated cloud id'); |
|
| 233 | + } |
|
| 234 | + } |
|
| 235 | + |
|
| 236 | + $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']); |
|
| 237 | + foreach ($addressBookEntries as $entry) { |
|
| 238 | + if (isset($entry['CLOUD'])) { |
|
| 239 | + foreach ($entry['CLOUD'] as $cloudID) { |
|
| 240 | + if ($cloudID === $federatedCloudId) { |
|
| 241 | + $this->federatedContacts[$federatedCloudId] = $entry['FN']; |
|
| 242 | + return $entry['FN']; |
|
| 243 | + } |
|
| 244 | + } |
|
| 245 | + } |
|
| 246 | + } |
|
| 247 | + |
|
| 248 | + $this->federatedContacts[$federatedCloudId] = ''; |
|
| 249 | + throw new \OutOfBoundsException('No contact found for federated cloud id'); |
|
| 250 | + } |
|
| 251 | 251 | } |