@@ -72,17 +72,17 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | protected function getStorageConfigFromDBMount(array $mount) { |
75 | - $applicableUsers = array_filter($mount['applicable'], function ($applicable) { |
|
75 | + $applicableUsers = array_filter($mount['applicable'], function($applicable) { |
|
76 | 76 | return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER; |
77 | 77 | }); |
78 | - $applicableUsers = array_map(function ($applicable) { |
|
78 | + $applicableUsers = array_map(function($applicable) { |
|
79 | 79 | return $applicable['value']; |
80 | 80 | }, $applicableUsers); |
81 | 81 | |
82 | - $applicableGroups = array_filter($mount['applicable'], function ($applicable) { |
|
82 | + $applicableGroups = array_filter($mount['applicable'], function($applicable) { |
|
83 | 83 | return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP; |
84 | 84 | }); |
85 | - $applicableGroups = array_map(function ($applicable) { |
|
85 | + $applicableGroups = array_map(function($applicable) { |
|
86 | 86 | return $applicable['value']; |
87 | 87 | }, $applicableGroups); |
88 | 88 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $mount['priority'] |
99 | 99 | ); |
100 | 100 | $config->setType($mount['type']); |
101 | - $config->setId((int)$mount['mount_id']); |
|
101 | + $config->setId((int) $mount['mount_id']); |
|
102 | 102 | return $config; |
103 | 103 | } catch (\UnexpectedValueException $e) { |
104 | 104 | // don't die if a storage backend doesn't exist |
@@ -126,11 +126,11 @@ discard block |
||
126 | 126 | protected function readConfig() { |
127 | 127 | $mounts = $this->readDBConfig(); |
128 | 128 | $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
129 | - $configs = array_filter($configs, function ($config) { |
|
129 | + $configs = array_filter($configs, function($config) { |
|
130 | 130 | return $config instanceof StorageConfig; |
131 | 131 | }); |
132 | 132 | |
133 | - $keys = array_map(function (StorageConfig $config) { |
|
133 | + $keys = array_map(function(StorageConfig $config) { |
|
134 | 134 | return $config->getId(); |
135 | 135 | }, $configs); |
136 | 136 | |
@@ -149,14 +149,14 @@ discard block |
||
149 | 149 | $mount = $this->dbConfig->getMountById($id); |
150 | 150 | |
151 | 151 | if (!is_array($mount)) { |
152 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
152 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | $config = $this->getStorageConfigFromDBMount($mount); |
156 | 156 | if ($this->isApplicable($config)) { |
157 | 157 | return $config; |
158 | 158 | } else { |
159 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
159 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
@@ -379,13 +379,13 @@ discard block |
||
379 | 379 | $existingMount = $this->dbConfig->getMountById($id); |
380 | 380 | |
381 | 381 | if (!is_array($existingMount)) { |
382 | - throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage'); |
|
382 | + throw new NotFoundException('Storage with ID "'.$id.'" not found while updating storage'); |
|
383 | 383 | } |
384 | 384 | |
385 | 385 | $oldStorage = $this->getStorageConfigFromDBMount($existingMount); |
386 | 386 | |
387 | 387 | if ($oldStorage->getBackend() instanceof InvalidBackend) { |
388 | - throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend'); |
|
388 | + throw new NotFoundException('Storage with id "'.$id.'" cannot be edited due to missing backend'); |
|
389 | 389 | } |
390 | 390 | |
391 | 391 | $removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers()); |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | $existingMount = $this->dbConfig->getMountById($id); |
463 | 463 | |
464 | 464 | if (!is_array($existingMount)) { |
465 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
465 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | $this->dbConfig->removeMount($id); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * @param \OCP\IL10N $l10n |
47 | 47 | * @param Defaults $theme |
48 | 48 | */ |
49 | - public function __construct($template, $requestToken, $l10n, $theme ) { |
|
49 | + public function __construct($template, $requestToken, $l10n, $theme) { |
|
50 | 50 | $this->vars = array(); |
51 | 51 | $this->vars['requesttoken'] = $requestToken; |
52 | 52 | $this->l10n = $l10n; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) { |
65 | 65 | // Check if the app is in the app folder or in the root |
66 | - if( file_exists($app_dir.'/templates/' )) { |
|
66 | + if (file_exists($app_dir.'/templates/')) { |
|
67 | 67 | return [ |
68 | 68 | $serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/', |
69 | 69 | $app_dir.'/templates/', |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | * |
99 | 99 | * If the key existed before, it will be overwritten |
100 | 100 | */ |
101 | - public function assign( $key, $value) { |
|
101 | + public function assign($key, $value) { |
|
102 | 102 | $this->vars[$key] = $value; |
103 | 103 | return true; |
104 | 104 | } |
@@ -113,12 +113,12 @@ discard block |
||
113 | 113 | * exists, the value will be appended. It can be accessed via |
114 | 114 | * $_[$key][$position] in the template. |
115 | 115 | */ |
116 | - public function append( $key, $value ) { |
|
117 | - if( array_key_exists( $key, $this->vars )) { |
|
116 | + public function append($key, $value) { |
|
117 | + if (array_key_exists($key, $this->vars)) { |
|
118 | 118 | $this->vars[$key][] = $value; |
119 | 119 | } |
120 | - else{ |
|
121 | - $this->vars[$key] = array( $value ); |
|
120 | + else { |
|
121 | + $this->vars[$key] = array($value); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | |
@@ -130,10 +130,10 @@ discard block |
||
130 | 130 | */ |
131 | 131 | public function printPage() { |
132 | 132 | $data = $this->fetchPage(); |
133 | - if( $data === false ) { |
|
133 | + if ($data === false) { |
|
134 | 134 | return false; |
135 | 135 | } |
136 | - else{ |
|
136 | + else { |
|
137 | 137 | print $data; |
138 | 138 | return true; |
139 | 139 | } |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | $l = $this->l10n; |
167 | 167 | $theme = $this->theme; |
168 | 168 | |
169 | - if(!is_null($additionalParams)) { |
|
170 | - $_ = array_merge( $additionalParams, $this->vars ); |
|
169 | + if (!is_null($additionalParams)) { |
|
170 | + $_ = array_merge($additionalParams, $this->vars); |
|
171 | 171 | foreach ($_ as $var => $value) { |
172 | 172 | ${$var} = $value; |
173 | 173 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $timezones = \DateTimeZone::listIdentifiers(); |
37 | 37 | |
38 | 38 | if ($search !== '') { |
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
39 | + $timezones = array_filter($timezones, function($timezone) use ($search) { |
|
40 | 40 | return stripos($timezone, $search) !== false; |
41 | 41 | }); |
42 | 42 | } |
@@ -63,10 +63,10 @@ |
||
63 | 63 | */ |
64 | 64 | protected function execute(InputInterface $input, OutputInterface $output) { |
65 | 65 | $appid = $input->getArgument('appid'); |
66 | - $path = (string)$input->getOption('path'); |
|
66 | + $path = (string) $input->getOption('path'); |
|
67 | 67 | $result = $this->checker->verifyAppSignature($appid, $path); |
68 | 68 | $this->writeArrayInOutputFormat($input, $output, $result); |
69 | - if (count($result)>0){ |
|
69 | + if (count($result) > 0) { |
|
70 | 70 | return 1; |
71 | 71 | } |
72 | 72 | } |
@@ -58,13 +58,13 @@ |
||
58 | 58 | * @since 13.0.0 |
59 | 59 | */ |
60 | 60 | protected function getValidatedType($type) { |
61 | - $type = trim((string)$type); |
|
61 | + $type = trim((string) $type); |
|
62 | 62 | |
63 | - if($type === '') { |
|
63 | + if ($type === '') { |
|
64 | 64 | throw new \InvalidArgumentException('Type must not be empty'); |
65 | 65 | } |
66 | 66 | |
67 | - if($type === 'exact') { |
|
67 | + if ($type === 'exact') { |
|
68 | 68 | throw new \InvalidArgumentException('Provided type is a reserved word'); |
69 | 69 | } |
70 | 70 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function generate($name, $parameters = array(), $absolute = false) { |
54 | 54 | asort($parameters); |
55 | - $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute; |
|
55 | + $key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute; |
|
56 | 56 | $cachedKey = $this->cache->get($key); |
57 | 57 | if ($cachedKey) { |
58 | 58 | return $cachedKey; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $userSession, |
61 | 61 | $groupManager, |
62 | 62 | function($name) { |
63 | - $nodes = \OC::$server->getUserFolder()->getById((int)$name); |
|
63 | + $nodes = \OC::$server->getUserFolder()->getById((int) $name); |
|
64 | 64 | return !empty($nodes); |
65 | 65 | } |
66 | 66 | ), |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) { |
100 | - return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId()); |
|
100 | + return $this->commentsManager->getNumberOfCommentsForObject('files', (string) $node->getId()); |
|
101 | 101 | }); |
102 | 102 | |
103 | 103 | $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) { |
@@ -129,13 +129,13 @@ discard block |
||
129 | 129 | * @return mixed|string |
130 | 130 | */ |
131 | 131 | public function getCommentsLink(Node $node) { |
132 | - $href = $this->server->getBaseUri(); |
|
132 | + $href = $this->server->getBaseUri(); |
|
133 | 133 | $entryPoint = strpos($href, '/remote.php/'); |
134 | - if($entryPoint === false) { |
|
134 | + if ($entryPoint === false) { |
|
135 | 135 | // in case we end up somewhere else, unexpectedly. |
136 | 136 | return null; |
137 | 137 | } |
138 | - $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId()); |
|
138 | + $commentsPart = 'dav/comments/files/'.rawurldecode($node->getId()); |
|
139 | 139 | $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/')); |
140 | 140 | return $href; |
141 | 141 | } |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function getUnreadCount(Node $node) { |
151 | 151 | $user = $this->userSession->getUser(); |
152 | - if(is_null($user)) { |
|
152 | + if (is_null($user)) { |
|
153 | 153 | return null; |
154 | 154 | } |
155 | 155 | |
156 | - $lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user); |
|
156 | + $lastRead = $this->commentsManager->getReadMark('files', (string) $node->getId(), $user); |
|
157 | 157 | |
158 | - return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead); |
|
158 | + return $this->commentsManager->getNumberOfCommentsForObject('files', (string) $node->getId(), $lastRead); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | /** @var bool */ |
46 | 46 | private $canPurgeToSaveSpace; |
47 | 47 | |
48 | - public function __construct(IConfig $config,ITimeFactory $timeFactory){ |
|
48 | + public function __construct(IConfig $config, ITimeFactory $timeFactory) { |
|
49 | 49 | $this->timeFactory = $timeFactory; |
50 | 50 | $this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto'); |
51 | 51 | |
@@ -58,14 +58,14 @@ discard block |
||
58 | 58 | * Is versions expiration enabled |
59 | 59 | * @return bool |
60 | 60 | */ |
61 | - public function isEnabled(){ |
|
61 | + public function isEnabled() { |
|
62 | 62 | return $this->retentionObligation !== 'disabled'; |
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | 66 | * Is default expiration active |
67 | 67 | */ |
68 | - public function shouldAutoExpire(){ |
|
68 | + public function shouldAutoExpire() { |
|
69 | 69 | return $this->minAge === self::NO_OBLIGATION |
70 | 70 | || $this->maxAge === self::NO_OBLIGATION; |
71 | 71 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param bool $quotaExceeded |
77 | 77 | * @return bool |
78 | 78 | */ |
79 | - public function isExpired($timestamp, $quotaExceeded = false){ |
|
79 | + public function isExpired($timestamp, $quotaExceeded = false) { |
|
80 | 80 | // No expiration if disabled |
81 | 81 | if (!$this->isEnabled()) { |
82 | 82 | return false; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $time = $this->timeFactory->getTime(); |
91 | 91 | // Never expire dates in future e.g. misconfiguration or negative time |
92 | 92 | // adjustment |
93 | - if ($time<$timestamp) { |
|
93 | + if ($time < $timestamp) { |
|
94 | 94 | return false; |
95 | 95 | } |
96 | 96 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * Get maximal retention obligation as a timestamp |
118 | 118 | * @return int |
119 | 119 | */ |
120 | - public function getMaxAgeAsTimestamp(){ |
|
120 | + public function getMaxAgeAsTimestamp() { |
|
121 | 121 | $maxAge = false; |
122 | 122 | if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) { |
123 | 123 | $time = $this->timeFactory->getTime(); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * Read versions_retention_obligation, validate it |
131 | 131 | * and set private members accordingly |
132 | 132 | */ |
133 | - private function parseRetentionObligation(){ |
|
133 | + private function parseRetentionObligation() { |
|
134 | 134 | $splitValues = explode(',', $this->retentionObligation); |
135 | 135 | if (!isset($splitValues[0])) { |
136 | 136 | $minValue = 'auto'; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | if (!ctype_digit($minValue) && $minValue !== 'auto') { |
150 | 150 | $isValid = false; |
151 | 151 | \OC::$server->getLogger()->warning( |
152 | - $minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
152 | + $minValue.' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
153 | 153 | ['app'=>'files_versions'] |
154 | 154 | ); |
155 | 155 | } |
@@ -157,12 +157,12 @@ discard block |
||
157 | 157 | if (!ctype_digit($maxValue) && $maxValue !== 'auto') { |
158 | 158 | $isValid = false; |
159 | 159 | \OC::$server->getLogger()->warning( |
160 | - $maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
160 | + $maxValue.' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
161 | 161 | ['app'=>'files_versions'] |
162 | 162 | ); |
163 | 163 | } |
164 | 164 | |
165 | - if (!$isValid){ |
|
165 | + if (!$isValid) { |
|
166 | 166 | $minValue = 'auto'; |
167 | 167 | $maxValue = 'auto'; |
168 | 168 | } |
@@ -175,13 +175,13 @@ discard block |
||
175 | 175 | $this->canPurgeToSaveSpace = true; |
176 | 176 | } elseif ($minValue !== 'auto' && $maxValue === 'auto') { |
177 | 177 | // Keep for X days but delete anytime if space needed |
178 | - $this->minAge = (int)$minValue; |
|
178 | + $this->minAge = (int) $minValue; |
|
179 | 179 | $this->maxAge = self::NO_OBLIGATION; |
180 | 180 | $this->canPurgeToSaveSpace = true; |
181 | 181 | } elseif ($minValue === 'auto' && $maxValue !== 'auto') { |
182 | 182 | // Delete anytime if space needed, Delete all older than max automatically |
183 | 183 | $this->minAge = self::NO_OBLIGATION; |
184 | - $this->maxAge = (int)$maxValue; |
|
184 | + $this->maxAge = (int) $maxValue; |
|
185 | 185 | $this->canPurgeToSaveSpace = true; |
186 | 186 | } elseif ($minValue !== 'auto' && $maxValue !== 'auto') { |
187 | 187 | // Delete all older than max OR older than min if space needed |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | $maxValue = $minValue; |
192 | 192 | } |
193 | 193 | |
194 | - $this->minAge = (int)$minValue; |
|
195 | - $this->maxAge = (int)$maxValue; |
|
194 | + $this->minAge = (int) $minValue; |
|
195 | + $this->maxAge = (int) $maxValue; |
|
196 | 196 | $this->canPurgeToSaveSpace = false; |
197 | 197 | } |
198 | 198 | } |