@@ -34,58 +34,58 @@ |
||
34 | 34 | use Symfony\Component\Console\Output\OutputInterface; |
35 | 35 | |
36 | 36 | class ListCommand extends Base { |
37 | - /** @var IGroupManager */ |
|
38 | - protected $groupManager; |
|
37 | + /** @var IGroupManager */ |
|
38 | + protected $groupManager; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @param IGroupManager $groupManager |
|
42 | - */ |
|
43 | - public function __construct(IGroupManager $groupManager) { |
|
44 | - $this->groupManager = $groupManager; |
|
45 | - parent::__construct(); |
|
46 | - } |
|
40 | + /** |
|
41 | + * @param IGroupManager $groupManager |
|
42 | + */ |
|
43 | + public function __construct(IGroupManager $groupManager) { |
|
44 | + $this->groupManager = $groupManager; |
|
45 | + parent::__construct(); |
|
46 | + } |
|
47 | 47 | |
48 | - protected function configure() { |
|
49 | - $this |
|
50 | - ->setName('group:list') |
|
51 | - ->setDescription('list configured groups') |
|
52 | - ->addOption( |
|
53 | - 'limit', |
|
54 | - 'l', |
|
55 | - InputOption::VALUE_OPTIONAL, |
|
56 | - 'Number of groups to retrieve', |
|
57 | - 500 |
|
58 | - )->addOption( |
|
59 | - 'offset', |
|
60 | - 'o', |
|
61 | - InputOption::VALUE_OPTIONAL, |
|
62 | - 'Offset for retrieving groups', |
|
63 | - 0 |
|
64 | - )->addOption( |
|
65 | - 'output', |
|
66 | - null, |
|
67 | - InputOption::VALUE_OPTIONAL, |
|
68 | - 'Output format (plain, json or json_pretty, default is plain)', |
|
69 | - $this->defaultOutputFormat |
|
70 | - ); |
|
71 | - } |
|
48 | + protected function configure() { |
|
49 | + $this |
|
50 | + ->setName('group:list') |
|
51 | + ->setDescription('list configured groups') |
|
52 | + ->addOption( |
|
53 | + 'limit', |
|
54 | + 'l', |
|
55 | + InputOption::VALUE_OPTIONAL, |
|
56 | + 'Number of groups to retrieve', |
|
57 | + 500 |
|
58 | + )->addOption( |
|
59 | + 'offset', |
|
60 | + 'o', |
|
61 | + InputOption::VALUE_OPTIONAL, |
|
62 | + 'Offset for retrieving groups', |
|
63 | + 0 |
|
64 | + )->addOption( |
|
65 | + 'output', |
|
66 | + null, |
|
67 | + InputOption::VALUE_OPTIONAL, |
|
68 | + 'Output format (plain, json or json_pretty, default is plain)', |
|
69 | + $this->defaultOutputFormat |
|
70 | + ); |
|
71 | + } |
|
72 | 72 | |
73 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
74 | - $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
75 | - $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); |
|
76 | - } |
|
73 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
74 | + $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
75 | + $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @param IGroup[] $groups |
|
80 | - * @return array |
|
81 | - */ |
|
82 | - private function formatGroups(array $groups) { |
|
83 | - $keys = array_map(function (IGroup $group) { |
|
84 | - return $group->getGID(); |
|
85 | - }, $groups); |
|
86 | - $values = array_map(function (IGroup $group) { |
|
87 | - return array_keys($group->getUsers()); |
|
88 | - }, $groups); |
|
89 | - return array_combine($keys, $values); |
|
90 | - } |
|
78 | + /** |
|
79 | + * @param IGroup[] $groups |
|
80 | + * @return array |
|
81 | + */ |
|
82 | + private function formatGroups(array $groups) { |
|
83 | + $keys = array_map(function (IGroup $group) { |
|
84 | + return $group->getGID(); |
|
85 | + }, $groups); |
|
86 | + $values = array_map(function (IGroup $group) { |
|
87 | + return array_keys($group->getUsers()); |
|
88 | + }, $groups); |
|
89 | + return array_combine($keys, $values); |
|
90 | + } |
|
91 | 91 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | protected function execute(InputInterface $input, OutputInterface $output) { |
74 | - $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
74 | + $groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset')); |
|
75 | 75 | $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); |
76 | 76 | } |
77 | 77 | |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | * @return array |
81 | 81 | */ |
82 | 82 | private function formatGroups(array $groups) { |
83 | - $keys = array_map(function (IGroup $group) { |
|
83 | + $keys = array_map(function(IGroup $group) { |
|
84 | 84 | return $group->getGID(); |
85 | 85 | }, $groups); |
86 | - $values = array_map(function (IGroup $group) { |
|
86 | + $values = array_map(function(IGroup $group) { |
|
87 | 87 | return array_keys($group->getUsers()); |
88 | 88 | }, $groups); |
89 | 89 | return array_combine($keys, $values); |
@@ -33,47 +33,47 @@ |
||
33 | 33 | use Symfony\Component\Console\Output\OutputInterface; |
34 | 34 | |
35 | 35 | class RemoveUser extends Base { |
36 | - /** @var IUserManager */ |
|
37 | - protected $userManager; |
|
38 | - /** @var IGroupManager */ |
|
39 | - protected $groupManager; |
|
36 | + /** @var IUserManager */ |
|
37 | + protected $userManager; |
|
38 | + /** @var IGroupManager */ |
|
39 | + protected $groupManager; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IUserManager $userManager |
|
43 | - * @param IGroupManager $groupManager |
|
44 | - */ |
|
45 | - public function __construct(IUserManager $userManager, IGroupManager $groupManager) { |
|
46 | - $this->userManager = $userManager; |
|
47 | - $this->groupManager = $groupManager; |
|
48 | - parent::__construct(); |
|
49 | - } |
|
41 | + /** |
|
42 | + * @param IUserManager $userManager |
|
43 | + * @param IGroupManager $groupManager |
|
44 | + */ |
|
45 | + public function __construct(IUserManager $userManager, IGroupManager $groupManager) { |
|
46 | + $this->userManager = $userManager; |
|
47 | + $this->groupManager = $groupManager; |
|
48 | + parent::__construct(); |
|
49 | + } |
|
50 | 50 | |
51 | - protected function configure() { |
|
52 | - $this |
|
53 | - ->setName('group:removeuser') |
|
54 | - ->setDescription('remove a user from a group') |
|
55 | - ->addArgument( |
|
56 | - 'group', |
|
57 | - InputArgument::REQUIRED, |
|
58 | - 'group to remove the user from' |
|
59 | - )->addArgument( |
|
60 | - 'user', |
|
61 | - InputArgument::REQUIRED, |
|
62 | - 'user to remove from the group' |
|
63 | - ); |
|
64 | - } |
|
51 | + protected function configure() { |
|
52 | + $this |
|
53 | + ->setName('group:removeuser') |
|
54 | + ->setDescription('remove a user from a group') |
|
55 | + ->addArgument( |
|
56 | + 'group', |
|
57 | + InputArgument::REQUIRED, |
|
58 | + 'group to remove the user from' |
|
59 | + )->addArgument( |
|
60 | + 'user', |
|
61 | + InputArgument::REQUIRED, |
|
62 | + 'user to remove from the group' |
|
63 | + ); |
|
64 | + } |
|
65 | 65 | |
66 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
67 | - $group = $this->groupManager->get($input->getArgument('group')); |
|
68 | - if (is_null($group)) { |
|
69 | - $output->writeln('<error>group not found</error>'); |
|
70 | - return 1; |
|
71 | - } |
|
72 | - $user = $this->userManager->get($input->getArgument('user')); |
|
73 | - if (is_null($user)) { |
|
74 | - $output->writeln('<error>user not found</error>'); |
|
75 | - return 1; |
|
76 | - } |
|
77 | - $group->removeUser($user); |
|
78 | - } |
|
66 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
67 | + $group = $this->groupManager->get($input->getArgument('group')); |
|
68 | + if (is_null($group)) { |
|
69 | + $output->writeln('<error>group not found</error>'); |
|
70 | + return 1; |
|
71 | + } |
|
72 | + $user = $this->userManager->get($input->getArgument('user')); |
|
73 | + if (is_null($user)) { |
|
74 | + $output->writeln('<error>user not found</error>'); |
|
75 | + return 1; |
|
76 | + } |
|
77 | + $group->removeUser($user); |
|
78 | + } |
|
79 | 79 | } |
@@ -33,47 +33,47 @@ |
||
33 | 33 | use Symfony\Component\Console\Output\OutputInterface; |
34 | 34 | |
35 | 35 | class AddUser extends Base { |
36 | - /** @var IUserManager */ |
|
37 | - protected $userManager; |
|
38 | - /** @var IGroupManager */ |
|
39 | - protected $groupManager; |
|
36 | + /** @var IUserManager */ |
|
37 | + protected $userManager; |
|
38 | + /** @var IGroupManager */ |
|
39 | + protected $groupManager; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IUserManager $userManager |
|
43 | - * @param IGroupManager $groupManager |
|
44 | - */ |
|
45 | - public function __construct(IUserManager $userManager, IGroupManager $groupManager) { |
|
46 | - $this->userManager = $userManager; |
|
47 | - $this->groupManager = $groupManager; |
|
48 | - parent::__construct(); |
|
49 | - } |
|
41 | + /** |
|
42 | + * @param IUserManager $userManager |
|
43 | + * @param IGroupManager $groupManager |
|
44 | + */ |
|
45 | + public function __construct(IUserManager $userManager, IGroupManager $groupManager) { |
|
46 | + $this->userManager = $userManager; |
|
47 | + $this->groupManager = $groupManager; |
|
48 | + parent::__construct(); |
|
49 | + } |
|
50 | 50 | |
51 | - protected function configure() { |
|
52 | - $this |
|
53 | - ->setName('group:adduser') |
|
54 | - ->setDescription('add a user to a group') |
|
55 | - ->addArgument( |
|
56 | - 'group', |
|
57 | - InputArgument::REQUIRED, |
|
58 | - 'group to add the user to' |
|
59 | - )->addArgument( |
|
60 | - 'user', |
|
61 | - InputArgument::REQUIRED, |
|
62 | - 'user to add to the group' |
|
63 | - ); |
|
64 | - } |
|
51 | + protected function configure() { |
|
52 | + $this |
|
53 | + ->setName('group:adduser') |
|
54 | + ->setDescription('add a user to a group') |
|
55 | + ->addArgument( |
|
56 | + 'group', |
|
57 | + InputArgument::REQUIRED, |
|
58 | + 'group to add the user to' |
|
59 | + )->addArgument( |
|
60 | + 'user', |
|
61 | + InputArgument::REQUIRED, |
|
62 | + 'user to add to the group' |
|
63 | + ); |
|
64 | + } |
|
65 | 65 | |
66 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
67 | - $group = $this->groupManager->get($input->getArgument('group')); |
|
68 | - if (is_null($group)) { |
|
69 | - $output->writeln('<error>group not found</error>'); |
|
70 | - return 1; |
|
71 | - } |
|
72 | - $user = $this->userManager->get($input->getArgument('user')); |
|
73 | - if (is_null($user)) { |
|
74 | - $output->writeln('<error>user not found</error>'); |
|
75 | - return 1; |
|
76 | - } |
|
77 | - $group->addUser($user); |
|
78 | - } |
|
66 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
67 | + $group = $this->groupManager->get($input->getArgument('group')); |
|
68 | + if (is_null($group)) { |
|
69 | + $output->writeln('<error>group not found</error>'); |
|
70 | + return 1; |
|
71 | + } |
|
72 | + $user = $this->userManager->get($input->getArgument('user')); |
|
73 | + if (is_null($user)) { |
|
74 | + $output->writeln('<error>user not found</error>'); |
|
75 | + return 1; |
|
76 | + } |
|
77 | + $group->addUser($user); |
|
78 | + } |
|
79 | 79 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * @param string $msg the error message |
38 | 38 | * @since 7.0.0 |
39 | 39 | */ |
40 | - public function __construct($msg){ |
|
40 | + public function __construct($msg) { |
|
41 | 41 | parent::__construct($msg); |
42 | 42 | } |
43 | 43 |
@@ -33,13 +33,13 @@ |
||
33 | 33 | */ |
34 | 34 | class DoesNotExistException extends \Exception implements IMapperException { |
35 | 35 | |
36 | - /** |
|
37 | - * Constructor |
|
38 | - * @param string $msg the error message |
|
39 | - * @since 7.0.0 |
|
40 | - */ |
|
41 | - public function __construct($msg){ |
|
42 | - parent::__construct($msg); |
|
43 | - } |
|
36 | + /** |
|
37 | + * Constructor |
|
38 | + * @param string $msg the error message |
|
39 | + * @since 7.0.0 |
|
40 | + */ |
|
41 | + public function __construct($msg){ |
|
42 | + parent::__construct($msg); |
|
43 | + } |
|
44 | 44 | |
45 | 45 | } |
@@ -68,7 +68,7 @@ |
||
68 | 68 | try { |
69 | 69 | $mount = $this->globalService->getStorage($mountId); |
70 | 70 | } catch (NotFoundException $e) { |
71 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
71 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
72 | 72 | return 404; |
73 | 73 | } |
74 | 74 |
@@ -37,76 +37,76 @@ |
||
37 | 37 | use Symfony\Component\Console\Question\ConfirmationQuestion; |
38 | 38 | |
39 | 39 | class Delete extends Base { |
40 | - /** |
|
41 | - * @var GlobalStoragesService |
|
42 | - */ |
|
43 | - protected $globalService; |
|
40 | + /** |
|
41 | + * @var GlobalStoragesService |
|
42 | + */ |
|
43 | + protected $globalService; |
|
44 | 44 | |
45 | - /** |
|
46 | - * @var UserStoragesService |
|
47 | - */ |
|
48 | - protected $userService; |
|
45 | + /** |
|
46 | + * @var UserStoragesService |
|
47 | + */ |
|
48 | + protected $userService; |
|
49 | 49 | |
50 | - /** |
|
51 | - * @var IUserSession |
|
52 | - */ |
|
53 | - protected $userSession; |
|
50 | + /** |
|
51 | + * @var IUserSession |
|
52 | + */ |
|
53 | + protected $userSession; |
|
54 | 54 | |
55 | - /** |
|
56 | - * @var IUserManager |
|
57 | - */ |
|
58 | - protected $userManager; |
|
55 | + /** |
|
56 | + * @var IUserManager |
|
57 | + */ |
|
58 | + protected $userManager; |
|
59 | 59 | |
60 | - function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { |
|
61 | - parent::__construct(); |
|
62 | - $this->globalService = $globalService; |
|
63 | - $this->userService = $userService; |
|
64 | - $this->userSession = $userSession; |
|
65 | - $this->userManager = $userManager; |
|
66 | - } |
|
60 | + function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) { |
|
61 | + parent::__construct(); |
|
62 | + $this->globalService = $globalService; |
|
63 | + $this->userService = $userService; |
|
64 | + $this->userSession = $userSession; |
|
65 | + $this->userManager = $userManager; |
|
66 | + } |
|
67 | 67 | |
68 | - protected function configure() { |
|
69 | - $this |
|
70 | - ->setName('files_external:delete') |
|
71 | - ->setDescription('Delete an external mount') |
|
72 | - ->addArgument( |
|
73 | - 'mount_id', |
|
74 | - InputArgument::REQUIRED, |
|
75 | - 'The id of the mount to edit' |
|
76 | - )->addOption( |
|
77 | - 'yes', |
|
78 | - 'y', |
|
79 | - InputOption::VALUE_NONE, |
|
80 | - 'Skip confirmation' |
|
81 | - ); |
|
82 | - parent::configure(); |
|
83 | - } |
|
68 | + protected function configure() { |
|
69 | + $this |
|
70 | + ->setName('files_external:delete') |
|
71 | + ->setDescription('Delete an external mount') |
|
72 | + ->addArgument( |
|
73 | + 'mount_id', |
|
74 | + InputArgument::REQUIRED, |
|
75 | + 'The id of the mount to edit' |
|
76 | + )->addOption( |
|
77 | + 'yes', |
|
78 | + 'y', |
|
79 | + InputOption::VALUE_NONE, |
|
80 | + 'Skip confirmation' |
|
81 | + ); |
|
82 | + parent::configure(); |
|
83 | + } |
|
84 | 84 | |
85 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
86 | - $mountId = $input->getArgument('mount_id'); |
|
87 | - try { |
|
88 | - $mount = $this->globalService->getStorage($mountId); |
|
89 | - } catch (NotFoundException $e) { |
|
90 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
91 | - return 404; |
|
92 | - } |
|
85 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
86 | + $mountId = $input->getArgument('mount_id'); |
|
87 | + try { |
|
88 | + $mount = $this->globalService->getStorage($mountId); |
|
89 | + } catch (NotFoundException $e) { |
|
90 | + $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
91 | + return 404; |
|
92 | + } |
|
93 | 93 | |
94 | - $noConfirm = $input->getOption('yes'); |
|
94 | + $noConfirm = $input->getOption('yes'); |
|
95 | 95 | |
96 | - if (!$noConfirm) { |
|
97 | - $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager); |
|
98 | - $listInput = new ArrayInput([], $listCommand->getDefinition()); |
|
99 | - $listInput->setOption('output', $input->getOption('output')); |
|
100 | - $listCommand->listMounts(null, [$mount], $listInput, $output); |
|
96 | + if (!$noConfirm) { |
|
97 | + $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager); |
|
98 | + $listInput = new ArrayInput([], $listCommand->getDefinition()); |
|
99 | + $listInput->setOption('output', $input->getOption('output')); |
|
100 | + $listCommand->listMounts(null, [$mount], $listInput, $output); |
|
101 | 101 | |
102 | - $questionHelper = $this->getHelper('question'); |
|
103 | - $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false); |
|
102 | + $questionHelper = $this->getHelper('question'); |
|
103 | + $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false); |
|
104 | 104 | |
105 | - if (!$questionHelper->ask($input, $output, $question)) { |
|
106 | - return null; |
|
107 | - } |
|
108 | - } |
|
105 | + if (!$questionHelper->ask($input, $output, $question)) { |
|
106 | + return null; |
|
107 | + } |
|
108 | + } |
|
109 | 109 | |
110 | - $this->globalService->removeStorage($mountId); |
|
111 | - } |
|
110 | + $this->globalService->removeStorage($mountId); |
|
111 | + } |
|
112 | 112 | } |
@@ -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 | } |
@@ -34,77 +34,77 @@ |
||
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 | - /** @var Application $application */ |
|
66 | - $application = \OC::$server->query(Application::class); |
|
67 | - $this->userManager = \OC::$server->getUserManager(); |
|
68 | - $this->expiration = $application->getContainer()->query('Expiration'); |
|
69 | - } |
|
64 | + protected function fixDIForJobs() { |
|
65 | + /** @var Application $application */ |
|
66 | + $application = \OC::$server->query(Application::class); |
|
67 | + $this->userManager = \OC::$server->getUserManager(); |
|
68 | + $this->expiration = $application->getContainer()->query('Expiration'); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @param $argument |
|
73 | - * @throws \Exception |
|
74 | - */ |
|
75 | - protected function run($argument) { |
|
76 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
77 | - if (!$maxAge) { |
|
78 | - return; |
|
79 | - } |
|
71 | + /** |
|
72 | + * @param $argument |
|
73 | + * @throws \Exception |
|
74 | + */ |
|
75 | + protected function run($argument) { |
|
76 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
77 | + if (!$maxAge) { |
|
78 | + return; |
|
79 | + } |
|
80 | 80 | |
81 | - $this->userManager->callForSeenUsers(function(IUser $user) { |
|
82 | - $uid = $user->getUID(); |
|
83 | - if (!$this->setupFS($uid)) { |
|
84 | - return; |
|
85 | - } |
|
86 | - $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
87 | - Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
88 | - }); |
|
81 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
82 | + $uid = $user->getUID(); |
|
83 | + if (!$this->setupFS($uid)) { |
|
84 | + return; |
|
85 | + } |
|
86 | + $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |
|
87 | + Trashbin::deleteExpiredFiles($dirContent, $uid); |
|
88 | + }); |
|
89 | 89 | |
90 | - \OC_Util::tearDownFS(); |
|
91 | - } |
|
90 | + \OC_Util::tearDownFS(); |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * Act on behalf on trash item owner |
|
95 | - * @param string $user |
|
96 | - * @return boolean |
|
97 | - */ |
|
98 | - protected function setupFS($user) { |
|
99 | - \OC_Util::tearDownFS(); |
|
100 | - \OC_Util::setupFS($user); |
|
93 | + /** |
|
94 | + * Act on behalf on trash item owner |
|
95 | + * @param string $user |
|
96 | + * @return boolean |
|
97 | + */ |
|
98 | + protected function setupFS($user) { |
|
99 | + \OC_Util::tearDownFS(); |
|
100 | + \OC_Util::setupFS($user); |
|
101 | 101 | |
102 | - // Check if this user has a trashbin directory |
|
103 | - $view = new \OC\Files\View('/' . $user); |
|
104 | - if (!$view->is_dir('/files_trashbin/files')) { |
|
105 | - return false; |
|
106 | - } |
|
102 | + // Check if this user has a trashbin directory |
|
103 | + $view = new \OC\Files\View('/' . $user); |
|
104 | + if (!$view->is_dir('/files_trashbin/files')) { |
|
105 | + return false; |
|
106 | + } |
|
107 | 107 | |
108 | - return true; |
|
109 | - } |
|
108 | + return true; |
|
109 | + } |
|
110 | 110 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | <tr> |
18 | 18 | <th id='headerName' class="hidden column-name"> |
19 | 19 | <div id="headerName-container"> |
20 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
20 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
21 | 21 | </div> |
22 | 22 | </th> |
23 | 23 | <th id="headerBackend" class="hidden column-backend"> |
@@ -28,76 +28,76 @@ |
||
28 | 28 | |
29 | 29 | class LinkAction implements ILinkAction { |
30 | 30 | |
31 | - /** @var string */ |
|
32 | - private $icon; |
|
33 | - |
|
34 | - /** @var string */ |
|
35 | - private $name; |
|
36 | - |
|
37 | - /** @var string */ |
|
38 | - private $href; |
|
39 | - |
|
40 | - /** @var int */ |
|
41 | - private $priority = 10; |
|
42 | - |
|
43 | - /** |
|
44 | - * @param string $icon absolute URI to an icon |
|
45 | - */ |
|
46 | - public function setIcon($icon) { |
|
47 | - $this->icon = $icon; |
|
48 | - } |
|
49 | - |
|
50 | - /** |
|
51 | - * @param string $name |
|
52 | - */ |
|
53 | - public function setName($name) { |
|
54 | - $this->name = $name; |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * @return string |
|
59 | - */ |
|
60 | - public function getName() { |
|
61 | - return $this->name; |
|
62 | - } |
|
63 | - |
|
64 | - /** |
|
65 | - * @param int $priority |
|
66 | - */ |
|
67 | - public function setPriority($priority) { |
|
68 | - $this->priority = $priority; |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * @return int |
|
73 | - */ |
|
74 | - public function getPriority() { |
|
75 | - return $this->priority; |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * @param string $href |
|
80 | - */ |
|
81 | - public function setHref($href) { |
|
82 | - $this->href = $href; |
|
83 | - } |
|
84 | - |
|
85 | - /** |
|
86 | - * @return string |
|
87 | - */ |
|
88 | - public function getHref() { |
|
89 | - return $this->href; |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * @return array |
|
94 | - */ |
|
95 | - public function jsonSerialize() { |
|
96 | - return [ |
|
97 | - 'title' => $this->name, |
|
98 | - 'icon' => $this->icon, |
|
99 | - 'hyperlink' => $this->href, |
|
100 | - ]; |
|
101 | - } |
|
31 | + /** @var string */ |
|
32 | + private $icon; |
|
33 | + |
|
34 | + /** @var string */ |
|
35 | + private $name; |
|
36 | + |
|
37 | + /** @var string */ |
|
38 | + private $href; |
|
39 | + |
|
40 | + /** @var int */ |
|
41 | + private $priority = 10; |
|
42 | + |
|
43 | + /** |
|
44 | + * @param string $icon absolute URI to an icon |
|
45 | + */ |
|
46 | + public function setIcon($icon) { |
|
47 | + $this->icon = $icon; |
|
48 | + } |
|
49 | + |
|
50 | + /** |
|
51 | + * @param string $name |
|
52 | + */ |
|
53 | + public function setName($name) { |
|
54 | + $this->name = $name; |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * @return string |
|
59 | + */ |
|
60 | + public function getName() { |
|
61 | + return $this->name; |
|
62 | + } |
|
63 | + |
|
64 | + /** |
|
65 | + * @param int $priority |
|
66 | + */ |
|
67 | + public function setPriority($priority) { |
|
68 | + $this->priority = $priority; |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * @return int |
|
73 | + */ |
|
74 | + public function getPriority() { |
|
75 | + return $this->priority; |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * @param string $href |
|
80 | + */ |
|
81 | + public function setHref($href) { |
|
82 | + $this->href = $href; |
|
83 | + } |
|
84 | + |
|
85 | + /** |
|
86 | + * @return string |
|
87 | + */ |
|
88 | + public function getHref() { |
|
89 | + return $this->href; |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * @return array |
|
94 | + */ |
|
95 | + public function jsonSerialize() { |
|
96 | + return [ |
|
97 | + 'title' => $this->name, |
|
98 | + 'icon' => $this->icon, |
|
99 | + 'hyperlink' => $this->href, |
|
100 | + ]; |
|
101 | + } |
|
102 | 102 | |
103 | 103 | } |
@@ -33,33 +33,33 @@ |
||
33 | 33 | */ |
34 | 34 | interface IAction extends JsonSerializable { |
35 | 35 | |
36 | - /** |
|
37 | - * @param string $icon absolute URI to an icon |
|
38 | - * @since 12.0 |
|
39 | - */ |
|
40 | - public function setIcon($icon); |
|
36 | + /** |
|
37 | + * @param string $icon absolute URI to an icon |
|
38 | + * @since 12.0 |
|
39 | + */ |
|
40 | + public function setIcon($icon); |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string localized action name, e.g. 'Call' |
|
44 | - * @since 12.0 |
|
45 | - */ |
|
46 | - public function getName(); |
|
42 | + /** |
|
43 | + * @return string localized action name, e.g. 'Call' |
|
44 | + * @since 12.0 |
|
45 | + */ |
|
46 | + public function getName(); |
|
47 | 47 | |
48 | - /** |
|
49 | - * @param string $name localized action name, e.g. 'Call' |
|
50 | - * @since 12.0 |
|
51 | - */ |
|
52 | - public function setName($name); |
|
48 | + /** |
|
49 | + * @param string $name localized action name, e.g. 'Call' |
|
50 | + * @since 12.0 |
|
51 | + */ |
|
52 | + public function setName($name); |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param int $priority priorize actions, high order ones are shown on top |
|
56 | - * @since 12.0 |
|
57 | - */ |
|
58 | - public function setPriority($priority); |
|
54 | + /** |
|
55 | + * @param int $priority priorize actions, high order ones are shown on top |
|
56 | + * @since 12.0 |
|
57 | + */ |
|
58 | + public function setPriority($priority); |
|
59 | 59 | |
60 | - /** |
|
61 | - * @return int priority to priorize actions, high order ones are shown on top |
|
62 | - * @since 12.0 |
|
63 | - */ |
|
64 | - public function getPriority(); |
|
60 | + /** |
|
61 | + * @return int priority to priorize actions, high order ones are shown on top |
|
62 | + * @since 12.0 |
|
63 | + */ |
|
64 | + public function getPriority(); |
|
65 | 65 | } |