@@ -31,30 +31,30 @@ |
||
31 | 31 | use OCP\Command\ICommand; |
32 | 32 | |
33 | 33 | class Expire implements ICommand { |
34 | - use FileAccess; |
|
34 | + use FileAccess; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
39 | - private $user; |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | + private $user; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param string $user |
|
43 | - */ |
|
44 | - function __construct($user) { |
|
45 | - $this->user = $user; |
|
46 | - } |
|
41 | + /** |
|
42 | + * @param string $user |
|
43 | + */ |
|
44 | + function __construct($user) { |
|
45 | + $this->user = $user; |
|
46 | + } |
|
47 | 47 | |
48 | - public function handle() { |
|
49 | - $userManager = \OC::$server->getUserManager(); |
|
50 | - if (!$userManager->userExists($this->user)) { |
|
51 | - // User has been deleted already |
|
52 | - return; |
|
53 | - } |
|
48 | + public function handle() { |
|
49 | + $userManager = \OC::$server->getUserManager(); |
|
50 | + if (!$userManager->userExists($this->user)) { |
|
51 | + // User has been deleted already |
|
52 | + return; |
|
53 | + } |
|
54 | 54 | |
55 | - \OC_Util::tearDownFS(); |
|
56 | - \OC_Util::setupFS($this->user); |
|
57 | - Trashbin::expire($this->user); |
|
58 | - \OC_Util::tearDownFS(); |
|
59 | - } |
|
55 | + \OC_Util::tearDownFS(); |
|
56 | + \OC_Util::setupFS($this->user); |
|
57 | + Trashbin::expire($this->user); |
|
58 | + \OC_Util::tearDownFS(); |
|
59 | + } |
|
60 | 60 | } |
@@ -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; |