@@ -27,21 +27,21 @@ |
||
27 | 27 | |
28 | 28 | $application = new Application(); |
29 | 29 | $application->registerRoutes($this, [ |
30 | - 'routes' => [ |
|
31 | - [ |
|
32 | - 'name' => 'Preview#getPreview', |
|
33 | - 'url' => '/ajax/preview.php', |
|
34 | - 'verb' => 'GET', |
|
35 | - ], |
|
36 | - ], |
|
30 | + 'routes' => [ |
|
31 | + [ |
|
32 | + 'name' => 'Preview#getPreview', |
|
33 | + 'url' => '/ajax/preview.php', |
|
34 | + 'verb' => 'GET', |
|
35 | + ], |
|
36 | + ], |
|
37 | 37 | ]); |
38 | 38 | |
39 | 39 | $this->create('files_trashbin_ajax_delete', 'ajax/delete.php') |
40 | - ->actionInclude('files_trashbin/ajax/delete.php'); |
|
40 | + ->actionInclude('files_trashbin/ajax/delete.php'); |
|
41 | 41 | $this->create('files_trashbin_ajax_isEmpty', 'ajax/isEmpty.php') |
42 | - ->actionInclude('files_trashbin/ajax/isEmpty.php'); |
|
42 | + ->actionInclude('files_trashbin/ajax/isEmpty.php'); |
|
43 | 43 | $this->create('files_trashbin_ajax_list', 'ajax/list.php') |
44 | - ->actionInclude('files_trashbin/ajax/list.php'); |
|
44 | + ->actionInclude('files_trashbin/ajax/list.php'); |
|
45 | 45 | $this->create('files_trashbin_ajax_undelete', 'ajax/undelete.php') |
46 | - ->actionInclude('files_trashbin/ajax/undelete.php'); |
|
46 | + ->actionInclude('files_trashbin/ajax/undelete.php'); |
|
47 | 47 |
@@ -26,27 +26,27 @@ |
||
26 | 26 | |
27 | 27 | class RequestTime extends Controller { |
28 | 28 | |
29 | - /** |
|
30 | - * @NoAdminRequired |
|
31 | - * |
|
32 | - * @param string $search |
|
33 | - * @return JSONResponse |
|
34 | - */ |
|
35 | - public function getTimezones($search = '') { |
|
36 | - $timezones = \DateTimeZone::listIdentifiers(); |
|
29 | + /** |
|
30 | + * @NoAdminRequired |
|
31 | + * |
|
32 | + * @param string $search |
|
33 | + * @return JSONResponse |
|
34 | + */ |
|
35 | + public function getTimezones($search = '') { |
|
36 | + $timezones = \DateTimeZone::listIdentifiers(); |
|
37 | 37 | |
38 | - if ($search !== '') { |
|
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | - return strpos(strtolower($timezone), strtolower($search)) !== false; |
|
41 | - }); |
|
42 | - } |
|
38 | + if ($search !== '') { |
|
39 | + $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | + return strpos(strtolower($timezone), strtolower($search)) !== false; |
|
41 | + }); |
|
42 | + } |
|
43 | 43 | |
44 | - $timezones = array_slice($timezones, 0, 10); |
|
44 | + $timezones = array_slice($timezones, 0, 10); |
|
45 | 45 | |
46 | - $response = []; |
|
47 | - foreach ($timezones as $timezone) { |
|
48 | - $response[$timezone] = $timezone; |
|
49 | - } |
|
50 | - return new JSONResponse($response); |
|
51 | - } |
|
46 | + $response = []; |
|
47 | + foreach ($timezones as $timezone) { |
|
48 | + $response[$timezone] = $timezone; |
|
49 | + } |
|
50 | + return new JSONResponse($response); |
|
51 | + } |
|
52 | 52 | } |
@@ -29,100 +29,100 @@ |
||
29 | 29 | |
30 | 30 | class FlowOperations extends Controller { |
31 | 31 | |
32 | - /** @var Manager */ |
|
33 | - protected $manager; |
|
32 | + /** @var Manager */ |
|
33 | + protected $manager; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param IRequest $request |
|
37 | - * @param Manager $manager |
|
38 | - */ |
|
39 | - public function __construct(IRequest $request, Manager $manager) { |
|
40 | - parent::__construct('workflowengine', $request); |
|
41 | - $this->manager = $manager; |
|
42 | - } |
|
35 | + /** |
|
36 | + * @param IRequest $request |
|
37 | + * @param Manager $manager |
|
38 | + */ |
|
39 | + public function __construct(IRequest $request, Manager $manager) { |
|
40 | + parent::__construct('workflowengine', $request); |
|
41 | + $this->manager = $manager; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @NoCSRFRequired |
|
46 | - * |
|
47 | - * @param string $class |
|
48 | - * @return JSONResponse |
|
49 | - */ |
|
50 | - public function getOperations($class) { |
|
51 | - $operations = $this->manager->getOperations($class); |
|
44 | + /** |
|
45 | + * @NoCSRFRequired |
|
46 | + * |
|
47 | + * @param string $class |
|
48 | + * @return JSONResponse |
|
49 | + */ |
|
50 | + public function getOperations($class) { |
|
51 | + $operations = $this->manager->getOperations($class); |
|
52 | 52 | |
53 | - foreach ($operations as &$operation) { |
|
54 | - $operation = $this->prepareOperation($operation); |
|
55 | - } |
|
53 | + foreach ($operations as &$operation) { |
|
54 | + $operation = $this->prepareOperation($operation); |
|
55 | + } |
|
56 | 56 | |
57 | - return new JSONResponse($operations); |
|
58 | - } |
|
57 | + return new JSONResponse($operations); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @PasswordConfirmationRequired |
|
62 | - * |
|
63 | - * @param string $class |
|
64 | - * @param string $name |
|
65 | - * @param array[] $checks |
|
66 | - * @param string $operation |
|
67 | - * @return JSONResponse The added element |
|
68 | - */ |
|
69 | - public function addOperation($class, $name, $checks, $operation) { |
|
70 | - try { |
|
71 | - $operation = $this->manager->addOperation($class, $name, $checks, $operation); |
|
72 | - $operation = $this->prepareOperation($operation); |
|
73 | - return new JSONResponse($operation); |
|
74 | - } catch (\UnexpectedValueException $e) { |
|
75 | - return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST); |
|
76 | - } |
|
77 | - } |
|
60 | + /** |
|
61 | + * @PasswordConfirmationRequired |
|
62 | + * |
|
63 | + * @param string $class |
|
64 | + * @param string $name |
|
65 | + * @param array[] $checks |
|
66 | + * @param string $operation |
|
67 | + * @return JSONResponse The added element |
|
68 | + */ |
|
69 | + public function addOperation($class, $name, $checks, $operation) { |
|
70 | + try { |
|
71 | + $operation = $this->manager->addOperation($class, $name, $checks, $operation); |
|
72 | + $operation = $this->prepareOperation($operation); |
|
73 | + return new JSONResponse($operation); |
|
74 | + } catch (\UnexpectedValueException $e) { |
|
75 | + return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST); |
|
76 | + } |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * @PasswordConfirmationRequired |
|
81 | - * |
|
82 | - * @param int $id |
|
83 | - * @param string $name |
|
84 | - * @param array[] $checks |
|
85 | - * @param string $operation |
|
86 | - * @return JSONResponse The updated element |
|
87 | - */ |
|
88 | - public function updateOperation($id, $name, $checks, $operation) { |
|
89 | - try { |
|
90 | - $operation = $this->manager->updateOperation($id, $name, $checks, $operation); |
|
91 | - $operation = $this->prepareOperation($operation); |
|
92 | - return new JSONResponse($operation); |
|
93 | - } catch (\UnexpectedValueException $e) { |
|
94 | - return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST); |
|
95 | - } |
|
96 | - } |
|
79 | + /** |
|
80 | + * @PasswordConfirmationRequired |
|
81 | + * |
|
82 | + * @param int $id |
|
83 | + * @param string $name |
|
84 | + * @param array[] $checks |
|
85 | + * @param string $operation |
|
86 | + * @return JSONResponse The updated element |
|
87 | + */ |
|
88 | + public function updateOperation($id, $name, $checks, $operation) { |
|
89 | + try { |
|
90 | + $operation = $this->manager->updateOperation($id, $name, $checks, $operation); |
|
91 | + $operation = $this->prepareOperation($operation); |
|
92 | + return new JSONResponse($operation); |
|
93 | + } catch (\UnexpectedValueException $e) { |
|
94 | + return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST); |
|
95 | + } |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * @PasswordConfirmationRequired |
|
100 | - * |
|
101 | - * @param int $id |
|
102 | - * @return JSONResponse |
|
103 | - */ |
|
104 | - public function deleteOperation($id) { |
|
105 | - $deleted = $this->manager->deleteOperation((int) $id); |
|
106 | - return new JSONResponse($deleted); |
|
107 | - } |
|
98 | + /** |
|
99 | + * @PasswordConfirmationRequired |
|
100 | + * |
|
101 | + * @param int $id |
|
102 | + * @return JSONResponse |
|
103 | + */ |
|
104 | + public function deleteOperation($id) { |
|
105 | + $deleted = $this->manager->deleteOperation((int) $id); |
|
106 | + return new JSONResponse($deleted); |
|
107 | + } |
|
108 | 108 | |
109 | - /** |
|
110 | - * @param array $operation |
|
111 | - * @return array |
|
112 | - */ |
|
113 | - protected function prepareOperation(array $operation) { |
|
114 | - $checkIds = json_decode($operation['checks']); |
|
115 | - $checks = $this->manager->getChecks($checkIds); |
|
109 | + /** |
|
110 | + * @param array $operation |
|
111 | + * @return array |
|
112 | + */ |
|
113 | + protected function prepareOperation(array $operation) { |
|
114 | + $checkIds = json_decode($operation['checks']); |
|
115 | + $checks = $this->manager->getChecks($checkIds); |
|
116 | 116 | |
117 | - $operation['checks'] = []; |
|
118 | - foreach ($checks as $check) { |
|
119 | - // Remove internal values |
|
120 | - unset($check['id']); |
|
121 | - unset($check['hash']); |
|
117 | + $operation['checks'] = []; |
|
118 | + foreach ($checks as $check) { |
|
119 | + // Remove internal values |
|
120 | + unset($check['id']); |
|
121 | + unset($check['hash']); |
|
122 | 122 | |
123 | - $operation['checks'][] = $check; |
|
124 | - } |
|
123 | + $operation['checks'][] = $check; |
|
124 | + } |
|
125 | 125 | |
126 | - return $operation; |
|
127 | - } |
|
126 | + return $operation; |
|
127 | + } |
|
128 | 128 | } |
@@ -28,45 +28,45 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * {@inheritdoc} |
|
47 | - */ |
|
48 | - public function getID() { |
|
49 | - return 'workflow'; |
|
50 | - } |
|
45 | + /** |
|
46 | + * {@inheritdoc} |
|
47 | + */ |
|
48 | + public function getID() { |
|
49 | + return 'workflow'; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * {@inheritdoc} |
|
54 | - */ |
|
55 | - public function getName() { |
|
56 | - return $this->l->t('Workflow'); |
|
57 | - } |
|
52 | + /** |
|
53 | + * {@inheritdoc} |
|
54 | + */ |
|
55 | + public function getName() { |
|
56 | + return $this->l->t('Workflow'); |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * {@inheritdoc} |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 55; |
|
64 | - } |
|
59 | + /** |
|
60 | + * {@inheritdoc} |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 55; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * {@inheritdoc} |
|
68 | - */ |
|
69 | - public function getIcon() { |
|
70 | - return $this->url->imagePath('core', 'actions/tag.svg'); |
|
71 | - } |
|
66 | + /** |
|
67 | + * {@inheritdoc} |
|
68 | + */ |
|
69 | + public function getIcon() { |
|
70 | + return $this->url->imagePath('core', 'actions/tag.svg'); |
|
71 | + } |
|
72 | 72 | } |
@@ -28,94 +28,94 @@ |
||
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 | - * @param IStorage $storage |
|
46 | - * @param string $path |
|
47 | - */ |
|
48 | - public function setFileInfo(IStorage $storage, $path) { |
|
49 | - // Nothing changes here with a different path |
|
50 | - } |
|
44 | + /** |
|
45 | + * @param IStorage $storage |
|
46 | + * @param string $path |
|
47 | + */ |
|
48 | + public function setFileInfo(IStorage $storage, $path) { |
|
49 | + // Nothing changes here with a different path |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return string |
|
54 | - */ |
|
55 | - abstract protected function getActualValue(); |
|
52 | + /** |
|
53 | + * @return string |
|
54 | + */ |
|
55 | + abstract protected function getActualValue(); |
|
56 | 56 | |
57 | - /** |
|
58 | - * @param string $operator |
|
59 | - * @param string $value |
|
60 | - * @return bool |
|
61 | - */ |
|
62 | - public function executeCheck($operator, $value) { |
|
63 | - $actualValue = $this->getActualValue(); |
|
64 | - return $this->executeStringCheck($operator, $value, $actualValue); |
|
65 | - } |
|
57 | + /** |
|
58 | + * @param string $operator |
|
59 | + * @param string $value |
|
60 | + * @return bool |
|
61 | + */ |
|
62 | + public function executeCheck($operator, $value) { |
|
63 | + $actualValue = $this->getActualValue(); |
|
64 | + return $this->executeStringCheck($operator, $value, $actualValue); |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * @param string $operator |
|
69 | - * @param string $checkValue |
|
70 | - * @param string $actualValue |
|
71 | - * @return bool |
|
72 | - */ |
|
73 | - protected function executeStringCheck($operator, $checkValue, $actualValue) { |
|
74 | - if ($operator === 'is') { |
|
75 | - return $checkValue === $actualValue; |
|
76 | - } else if ($operator === '!is') { |
|
77 | - return $checkValue !== $actualValue; |
|
78 | - } else { |
|
79 | - $match = $this->match($checkValue, $actualValue); |
|
80 | - if ($operator === 'matches') { |
|
81 | - return $match === 1; |
|
82 | - } else { |
|
83 | - return $match === 0; |
|
84 | - } |
|
85 | - } |
|
86 | - } |
|
67 | + /** |
|
68 | + * @param string $operator |
|
69 | + * @param string $checkValue |
|
70 | + * @param string $actualValue |
|
71 | + * @return bool |
|
72 | + */ |
|
73 | + protected function executeStringCheck($operator, $checkValue, $actualValue) { |
|
74 | + if ($operator === 'is') { |
|
75 | + return $checkValue === $actualValue; |
|
76 | + } else if ($operator === '!is') { |
|
77 | + return $checkValue !== $actualValue; |
|
78 | + } else { |
|
79 | + $match = $this->match($checkValue, $actualValue); |
|
80 | + if ($operator === 'matches') { |
|
81 | + return $match === 1; |
|
82 | + } else { |
|
83 | + return $match === 0; |
|
84 | + } |
|
85 | + } |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * @param string $operator |
|
90 | - * @param string $value |
|
91 | - * @throws \UnexpectedValueException |
|
92 | - */ |
|
93 | - public function validateCheck($operator, $value) { |
|
94 | - if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) { |
|
95 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
96 | - } |
|
88 | + /** |
|
89 | + * @param string $operator |
|
90 | + * @param string $value |
|
91 | + * @throws \UnexpectedValueException |
|
92 | + */ |
|
93 | + public function validateCheck($operator, $value) { |
|
94 | + if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) { |
|
95 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
96 | + } |
|
97 | 97 | |
98 | - if (in_array($operator, ['matches', '!matches']) && |
|
99 | - @preg_match($value, null) === false) { |
|
100 | - throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2); |
|
101 | - } |
|
102 | - } |
|
98 | + if (in_array($operator, ['matches', '!matches']) && |
|
99 | + @preg_match($value, null) === false) { |
|
100 | + throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2); |
|
101 | + } |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * @param string $pattern |
|
106 | - * @param string $subject |
|
107 | - * @return int|bool |
|
108 | - */ |
|
109 | - protected function match($pattern, $subject) { |
|
110 | - $patternHash = md5($pattern); |
|
111 | - $subjectHash = md5($subject); |
|
112 | - if (isset($this->matches[$patternHash][$subjectHash])) { |
|
113 | - return $this->matches[$patternHash][$subjectHash]; |
|
114 | - } |
|
115 | - if (!isset($this->matches[$patternHash])) { |
|
116 | - $this->matches[$patternHash] = []; |
|
117 | - } |
|
118 | - $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject); |
|
119 | - return $this->matches[$patternHash][$subjectHash]; |
|
120 | - } |
|
104 | + /** |
|
105 | + * @param string $pattern |
|
106 | + * @param string $subject |
|
107 | + * @return int|bool |
|
108 | + */ |
|
109 | + protected function match($pattern, $subject) { |
|
110 | + $patternHash = md5($pattern); |
|
111 | + $subjectHash = md5($subject); |
|
112 | + if (isset($this->matches[$patternHash][$subjectHash])) { |
|
113 | + return $this->matches[$patternHash][$subjectHash]; |
|
114 | + } |
|
115 | + if (!isset($this->matches[$patternHash])) { |
|
116 | + $this->matches[$patternHash] = []; |
|
117 | + } |
|
118 | + $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject); |
|
119 | + return $this->matches[$patternHash][$subjectHash]; |
|
120 | + } |
|
121 | 121 | } |
@@ -30,90 +30,90 @@ |
||
30 | 30 | |
31 | 31 | class FileSize implements ICheck { |
32 | 32 | |
33 | - /** @var int */ |
|
34 | - protected $size; |
|
35 | - |
|
36 | - /** @var IL10N */ |
|
37 | - protected $l; |
|
38 | - |
|
39 | - /** @var IRequest */ |
|
40 | - protected $request; |
|
41 | - |
|
42 | - /** |
|
43 | - * @param IL10N $l |
|
44 | - * @param IRequest $request |
|
45 | - */ |
|
46 | - public function __construct(IL10N $l, IRequest $request) { |
|
47 | - $this->l = $l; |
|
48 | - $this->request = $request; |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @param IStorage $storage |
|
53 | - * @param string $path |
|
54 | - */ |
|
55 | - public function setFileInfo(IStorage $storage, $path) { |
|
56 | - } |
|
57 | - |
|
58 | - /** |
|
59 | - * @param string $operator |
|
60 | - * @param string $value |
|
61 | - * @return bool |
|
62 | - */ |
|
63 | - public function executeCheck($operator, $value) { |
|
64 | - $size = $this->getFileSizeFromHeader(); |
|
65 | - |
|
66 | - $value = Util::computerFileSize($value); |
|
67 | - if ($size !== false) { |
|
68 | - switch ($operator) { |
|
69 | - case 'less': |
|
70 | - return $size < $value; |
|
71 | - case '!less': |
|
72 | - return $size >= $value; |
|
73 | - case 'greater': |
|
74 | - return $size > $value; |
|
75 | - case '!greater': |
|
76 | - return $size <= $value; |
|
77 | - } |
|
78 | - } |
|
79 | - return false; |
|
80 | - } |
|
81 | - |
|
82 | - /** |
|
83 | - * @param string $operator |
|
84 | - * @param string $value |
|
85 | - * @throws \UnexpectedValueException |
|
86 | - */ |
|
87 | - public function validateCheck($operator, $value) { |
|
88 | - if (!in_array($operator, ['less', '!less', 'greater', '!greater'])) { |
|
89 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
90 | - } |
|
91 | - |
|
92 | - if (!preg_match('/^[0-9]+[ ]?[kmgt]?b$/i', $value)) { |
|
93 | - throw new \UnexpectedValueException($this->l->t('The given file size is invalid'), 2); |
|
94 | - } |
|
95 | - } |
|
96 | - |
|
97 | - /** |
|
98 | - * @return string |
|
99 | - */ |
|
100 | - protected function getFileSizeFromHeader() { |
|
101 | - if ($this->size !== null) { |
|
102 | - return $this->size; |
|
103 | - } |
|
104 | - |
|
105 | - $size = $this->request->getHeader('OC-Total-Length'); |
|
106 | - if ($size === null) { |
|
107 | - if (in_array($this->request->getMethod(), ['POST', 'PUT'])) { |
|
108 | - $size = $this->request->getHeader('Content-Length'); |
|
109 | - } |
|
110 | - } |
|
111 | - |
|
112 | - if ($size === null) { |
|
113 | - $size = false; |
|
114 | - } |
|
115 | - |
|
116 | - $this->size = $size; |
|
117 | - return $this->size; |
|
118 | - } |
|
33 | + /** @var int */ |
|
34 | + protected $size; |
|
35 | + |
|
36 | + /** @var IL10N */ |
|
37 | + protected $l; |
|
38 | + |
|
39 | + /** @var IRequest */ |
|
40 | + protected $request; |
|
41 | + |
|
42 | + /** |
|
43 | + * @param IL10N $l |
|
44 | + * @param IRequest $request |
|
45 | + */ |
|
46 | + public function __construct(IL10N $l, IRequest $request) { |
|
47 | + $this->l = $l; |
|
48 | + $this->request = $request; |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @param IStorage $storage |
|
53 | + * @param string $path |
|
54 | + */ |
|
55 | + public function setFileInfo(IStorage $storage, $path) { |
|
56 | + } |
|
57 | + |
|
58 | + /** |
|
59 | + * @param string $operator |
|
60 | + * @param string $value |
|
61 | + * @return bool |
|
62 | + */ |
|
63 | + public function executeCheck($operator, $value) { |
|
64 | + $size = $this->getFileSizeFromHeader(); |
|
65 | + |
|
66 | + $value = Util::computerFileSize($value); |
|
67 | + if ($size !== false) { |
|
68 | + switch ($operator) { |
|
69 | + case 'less': |
|
70 | + return $size < $value; |
|
71 | + case '!less': |
|
72 | + return $size >= $value; |
|
73 | + case 'greater': |
|
74 | + return $size > $value; |
|
75 | + case '!greater': |
|
76 | + return $size <= $value; |
|
77 | + } |
|
78 | + } |
|
79 | + return false; |
|
80 | + } |
|
81 | + |
|
82 | + /** |
|
83 | + * @param string $operator |
|
84 | + * @param string $value |
|
85 | + * @throws \UnexpectedValueException |
|
86 | + */ |
|
87 | + public function validateCheck($operator, $value) { |
|
88 | + if (!in_array($operator, ['less', '!less', 'greater', '!greater'])) { |
|
89 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
90 | + } |
|
91 | + |
|
92 | + if (!preg_match('/^[0-9]+[ ]?[kmgt]?b$/i', $value)) { |
|
93 | + throw new \UnexpectedValueException($this->l->t('The given file size is invalid'), 2); |
|
94 | + } |
|
95 | + } |
|
96 | + |
|
97 | + /** |
|
98 | + * @return string |
|
99 | + */ |
|
100 | + protected function getFileSizeFromHeader() { |
|
101 | + if ($this->size !== null) { |
|
102 | + return $this->size; |
|
103 | + } |
|
104 | + |
|
105 | + $size = $this->request->getHeader('OC-Total-Length'); |
|
106 | + if ($size === null) { |
|
107 | + if (in_array($this->request->getMethod(), ['POST', 'PUT'])) { |
|
108 | + $size = $this->request->getHeader('Content-Length'); |
|
109 | + } |
|
110 | + } |
|
111 | + |
|
112 | + if ($size === null) { |
|
113 | + $size = false; |
|
114 | + } |
|
115 | + |
|
116 | + $this->size = $size; |
|
117 | + return $this->size; |
|
118 | + } |
|
119 | 119 | } |
@@ -29,101 +29,101 @@ |
||
29 | 29 | |
30 | 30 | class RequestTime implements ICheck { |
31 | 31 | |
32 | - const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; |
|
33 | - const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; |
|
34 | - |
|
35 | - /** @var bool[] */ |
|
36 | - protected $cachedResults; |
|
37 | - |
|
38 | - /** @var IL10N */ |
|
39 | - protected $l; |
|
40 | - |
|
41 | - /** @var ITimeFactory */ |
|
42 | - protected $timeFactory; |
|
43 | - |
|
44 | - /** |
|
45 | - * @param ITimeFactory $timeFactory |
|
46 | - */ |
|
47 | - public function __construct(IL10N $l, ITimeFactory $timeFactory) { |
|
48 | - $this->l = $l; |
|
49 | - $this->timeFactory = $timeFactory; |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * @param IStorage $storage |
|
54 | - * @param string $path |
|
55 | - */ |
|
56 | - public function setFileInfo(IStorage $storage, $path) { |
|
57 | - // A different path doesn't change time, so nothing to do here. |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * @param string $operator |
|
62 | - * @param string $value |
|
63 | - * @return bool |
|
64 | - */ |
|
65 | - public function executeCheck($operator, $value) { |
|
66 | - $valueHash = md5($value); |
|
67 | - |
|
68 | - if (isset($this->cachedResults[$valueHash])) { |
|
69 | - return $this->cachedResults[$valueHash]; |
|
70 | - } |
|
71 | - |
|
72 | - $timestamp = $this->timeFactory->getTime(); |
|
73 | - |
|
74 | - $values = json_decode($value, true); |
|
75 | - $timestamp1 = $this->getTimestamp($timestamp, $values[0]); |
|
76 | - $timestamp2 = $this->getTimestamp($timestamp, $values[1]); |
|
77 | - |
|
78 | - if ($timestamp1 < $timestamp2) { |
|
79 | - $in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2; |
|
80 | - } else { |
|
81 | - $in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2; |
|
82 | - } |
|
83 | - |
|
84 | - return ($operator === 'in') ? $in : !$in; |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * @param int $currentTimestamp |
|
89 | - * @param string $value Format: "H:i e" |
|
90 | - * @return int |
|
91 | - */ |
|
92 | - protected function getTimestamp($currentTimestamp, $value) { |
|
93 | - list($time1, $timezone1) = explode(' ', $value); |
|
94 | - list($hour1, $minute1) = explode(':', $time1); |
|
95 | - $date1 = new \DateTime('now', new \DateTimeZone($timezone1)); |
|
96 | - $date1->setTimestamp($currentTimestamp); |
|
97 | - $date1->setTime($hour1, $minute1); |
|
98 | - |
|
99 | - return $date1->getTimestamp(); |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @param string $operator |
|
104 | - * @param string $value |
|
105 | - * @throws \UnexpectedValueException |
|
106 | - */ |
|
107 | - public function validateCheck($operator, $value) { |
|
108 | - if (!in_array($operator, ['in', '!in'])) { |
|
109 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
110 | - } |
|
111 | - |
|
112 | - $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
113 | - $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
114 | - if (!$result) { |
|
115 | - throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
|
116 | - } |
|
117 | - |
|
118 | - $values = json_decode($value, true); |
|
119 | - $time1 = \DateTime::createFromFormat('H:i e', $values[0]); |
|
120 | - if ($time1 === false) { |
|
121 | - throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3); |
|
122 | - } |
|
123 | - |
|
124 | - $time2 = \DateTime::createFromFormat('H:i e', $values[1]); |
|
125 | - if ($time2 === false) { |
|
126 | - throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4); |
|
127 | - } |
|
128 | - } |
|
32 | + const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])'; |
|
33 | + const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)'; |
|
34 | + |
|
35 | + /** @var bool[] */ |
|
36 | + protected $cachedResults; |
|
37 | + |
|
38 | + /** @var IL10N */ |
|
39 | + protected $l; |
|
40 | + |
|
41 | + /** @var ITimeFactory */ |
|
42 | + protected $timeFactory; |
|
43 | + |
|
44 | + /** |
|
45 | + * @param ITimeFactory $timeFactory |
|
46 | + */ |
|
47 | + public function __construct(IL10N $l, ITimeFactory $timeFactory) { |
|
48 | + $this->l = $l; |
|
49 | + $this->timeFactory = $timeFactory; |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * @param IStorage $storage |
|
54 | + * @param string $path |
|
55 | + */ |
|
56 | + public function setFileInfo(IStorage $storage, $path) { |
|
57 | + // A different path doesn't change time, so nothing to do here. |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * @param string $operator |
|
62 | + * @param string $value |
|
63 | + * @return bool |
|
64 | + */ |
|
65 | + public function executeCheck($operator, $value) { |
|
66 | + $valueHash = md5($value); |
|
67 | + |
|
68 | + if (isset($this->cachedResults[$valueHash])) { |
|
69 | + return $this->cachedResults[$valueHash]; |
|
70 | + } |
|
71 | + |
|
72 | + $timestamp = $this->timeFactory->getTime(); |
|
73 | + |
|
74 | + $values = json_decode($value, true); |
|
75 | + $timestamp1 = $this->getTimestamp($timestamp, $values[0]); |
|
76 | + $timestamp2 = $this->getTimestamp($timestamp, $values[1]); |
|
77 | + |
|
78 | + if ($timestamp1 < $timestamp2) { |
|
79 | + $in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2; |
|
80 | + } else { |
|
81 | + $in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2; |
|
82 | + } |
|
83 | + |
|
84 | + return ($operator === 'in') ? $in : !$in; |
|
85 | + } |
|
86 | + |
|
87 | + /** |
|
88 | + * @param int $currentTimestamp |
|
89 | + * @param string $value Format: "H:i e" |
|
90 | + * @return int |
|
91 | + */ |
|
92 | + protected function getTimestamp($currentTimestamp, $value) { |
|
93 | + list($time1, $timezone1) = explode(' ', $value); |
|
94 | + list($hour1, $minute1) = explode(':', $time1); |
|
95 | + $date1 = new \DateTime('now', new \DateTimeZone($timezone1)); |
|
96 | + $date1->setTimestamp($currentTimestamp); |
|
97 | + $date1->setTime($hour1, $minute1); |
|
98 | + |
|
99 | + return $date1->getTimestamp(); |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @param string $operator |
|
104 | + * @param string $value |
|
105 | + * @throws \UnexpectedValueException |
|
106 | + */ |
|
107 | + public function validateCheck($operator, $value) { |
|
108 | + if (!in_array($operator, ['in', '!in'])) { |
|
109 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
110 | + } |
|
111 | + |
|
112 | + $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
113 | + $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
114 | + if (!$result) { |
|
115 | + throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
|
116 | + } |
|
117 | + |
|
118 | + $values = json_decode($value, true); |
|
119 | + $time1 = \DateTime::createFromFormat('H:i e', $values[0]); |
|
120 | + if ($time1 === false) { |
|
121 | + throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3); |
|
122 | + } |
|
123 | + |
|
124 | + $time2 = \DateTime::createFromFormat('H:i e', $values[1]); |
|
125 | + if ($time2 === false) { |
|
126 | + throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4); |
|
127 | + } |
|
128 | + } |
|
129 | 129 | } |
@@ -31,84 +31,84 @@ |
||
31 | 31 | |
32 | 32 | class UserGroupMembership implements ICheck { |
33 | 33 | |
34 | - /** @var string */ |
|
35 | - protected $cachedUser; |
|
36 | - |
|
37 | - /** @var string[] */ |
|
38 | - protected $cachedGroupMemberships; |
|
39 | - |
|
40 | - /** @var IUserSession */ |
|
41 | - protected $userSession; |
|
42 | - |
|
43 | - /** @var IGroupManager */ |
|
44 | - protected $groupManager; |
|
45 | - |
|
46 | - /** @var IL10N */ |
|
47 | - protected $l; |
|
48 | - |
|
49 | - /** |
|
50 | - * @param IUserSession $userSession |
|
51 | - * @param IGroupManager $groupManager |
|
52 | - * @param IL10N $l |
|
53 | - */ |
|
54 | - public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) { |
|
55 | - $this->userSession = $userSession; |
|
56 | - $this->groupManager = $groupManager; |
|
57 | - $this->l = $l; |
|
58 | - } |
|
59 | - |
|
60 | - /** |
|
61 | - * @param IStorage $storage |
|
62 | - * @param string $path |
|
63 | - */ |
|
64 | - public function setFileInfo(IStorage $storage, $path) { |
|
65 | - // A different path doesn't change group memberships, so nothing to do here. |
|
66 | - } |
|
67 | - |
|
68 | - /** |
|
69 | - * @param string $operator |
|
70 | - * @param string $value |
|
71 | - * @return bool |
|
72 | - */ |
|
73 | - public function executeCheck($operator, $value) { |
|
74 | - $user = $this->userSession->getUser(); |
|
75 | - |
|
76 | - if ($user instanceof IUser) { |
|
77 | - $groupIds = $this->getUserGroups($user); |
|
78 | - return ($operator === 'is') === in_array($value, $groupIds); |
|
79 | - } else { |
|
80 | - return $operator !== 'is'; |
|
81 | - } |
|
82 | - } |
|
83 | - |
|
84 | - |
|
85 | - /** |
|
86 | - * @param string $operator |
|
87 | - * @param string $value |
|
88 | - * @throws \UnexpectedValueException |
|
89 | - */ |
|
90 | - public function validateCheck($operator, $value) { |
|
91 | - if (!in_array($operator, ['is', '!is'])) { |
|
92 | - throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
93 | - } |
|
94 | - |
|
95 | - if (!$this->groupManager->groupExists($value)) { |
|
96 | - throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2); |
|
97 | - } |
|
98 | - } |
|
99 | - |
|
100 | - /** |
|
101 | - * @param IUser $user |
|
102 | - * @return string[] |
|
103 | - */ |
|
104 | - protected function getUserGroups(IUser $user) { |
|
105 | - $uid = $user->getUID(); |
|
106 | - |
|
107 | - if ($this->cachedUser !== $uid) { |
|
108 | - $this->cachedUser = $uid; |
|
109 | - $this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user); |
|
110 | - } |
|
111 | - |
|
112 | - return $this->cachedGroupMemberships; |
|
113 | - } |
|
34 | + /** @var string */ |
|
35 | + protected $cachedUser; |
|
36 | + |
|
37 | + /** @var string[] */ |
|
38 | + protected $cachedGroupMemberships; |
|
39 | + |
|
40 | + /** @var IUserSession */ |
|
41 | + protected $userSession; |
|
42 | + |
|
43 | + /** @var IGroupManager */ |
|
44 | + protected $groupManager; |
|
45 | + |
|
46 | + /** @var IL10N */ |
|
47 | + protected $l; |
|
48 | + |
|
49 | + /** |
|
50 | + * @param IUserSession $userSession |
|
51 | + * @param IGroupManager $groupManager |
|
52 | + * @param IL10N $l |
|
53 | + */ |
|
54 | + public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) { |
|
55 | + $this->userSession = $userSession; |
|
56 | + $this->groupManager = $groupManager; |
|
57 | + $this->l = $l; |
|
58 | + } |
|
59 | + |
|
60 | + /** |
|
61 | + * @param IStorage $storage |
|
62 | + * @param string $path |
|
63 | + */ |
|
64 | + public function setFileInfo(IStorage $storage, $path) { |
|
65 | + // A different path doesn't change group memberships, so nothing to do here. |
|
66 | + } |
|
67 | + |
|
68 | + /** |
|
69 | + * @param string $operator |
|
70 | + * @param string $value |
|
71 | + * @return bool |
|
72 | + */ |
|
73 | + public function executeCheck($operator, $value) { |
|
74 | + $user = $this->userSession->getUser(); |
|
75 | + |
|
76 | + if ($user instanceof IUser) { |
|
77 | + $groupIds = $this->getUserGroups($user); |
|
78 | + return ($operator === 'is') === in_array($value, $groupIds); |
|
79 | + } else { |
|
80 | + return $operator !== 'is'; |
|
81 | + } |
|
82 | + } |
|
83 | + |
|
84 | + |
|
85 | + /** |
|
86 | + * @param string $operator |
|
87 | + * @param string $value |
|
88 | + * @throws \UnexpectedValueException |
|
89 | + */ |
|
90 | + public function validateCheck($operator, $value) { |
|
91 | + if (!in_array($operator, ['is', '!is'])) { |
|
92 | + throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
|
93 | + } |
|
94 | + |
|
95 | + if (!$this->groupManager->groupExists($value)) { |
|
96 | + throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2); |
|
97 | + } |
|
98 | + } |
|
99 | + |
|
100 | + /** |
|
101 | + * @param IUser $user |
|
102 | + * @return string[] |
|
103 | + */ |
|
104 | + protected function getUserGroups(IUser $user) { |
|
105 | + $uid = $user->getUID(); |
|
106 | + |
|
107 | + if ($this->cachedUser !== $uid) { |
|
108 | + $this->cachedUser = $uid; |
|
109 | + $this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user); |
|
110 | + } |
|
111 | + |
|
112 | + return $this->cachedGroupMemberships; |
|
113 | + } |
|
114 | 114 | } |
@@ -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 | } |