@@ -168,7 +168,7 @@ |
||
| 168 | 168 | if (substr($class, -10) === 'Controller') { |
| 169 | 169 | $class = substr($class, 0, -10); |
| 170 | 170 | } |
| 171 | - return $app .'.'. $class .'.'. $function; |
|
| 171 | + return $app.'.'.$class.'.'.$function; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
@@ -35,6 +35,6 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | protected function getTableName(bool $includePrefix = true) { |
| 37 | 37 | $p = $includePrefix ? '*PREFIX*' : ''; |
| 38 | - return $p . 'ldap_user_mapping'; |
|
| 38 | + return $p.'ldap_user_mapping'; |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -35,6 +35,6 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | protected function getTableName(bool $includePrefix = true) { |
| 37 | 37 | $p = $includePrefix ? '*PREFIX*' : ''; |
| 38 | - return $p . 'ldap_group_mapping'; |
|
| 38 | + return $p.'ldap_group_mapping'; |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * @return string |
| 108 | 108 | */ |
| 109 | 109 | protected function getUserCacheKey($uid) { |
| 110 | - return 'user-' . $uid . '-lastSeenOn'; |
|
| 110 | + return 'user-'.$uid.'-lastSeenOn'; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * @return string |
| 116 | 116 | */ |
| 117 | 117 | protected function getGroupCacheKey($gid) { |
| 118 | - return 'group-' . $gid . '-lastSeenOn'; |
|
| 118 | + return 'group-'.$gid.'-lastSeenOn'; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | if ($key === null) { |
| 179 | 179 | return $prefix; |
| 180 | 180 | } |
| 181 | - return $prefix . hash('sha256', $key); |
|
| 181 | + return $prefix.hash('sha256', $key); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * @return DataDisplayResponse|NotFoundResponse |
| 82 | 82 | */ |
| 83 | 83 | public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') { |
| 84 | - $path = $this->serverRoot . "/core/img/$folder/$fileName.svg"; |
|
| 84 | + $path = $this->serverRoot."/core/img/$folder/$fileName.svg"; |
|
| 85 | 85 | return $this->getSvg($path, $color, $fileName); |
| 86 | 86 | } |
| 87 | 87 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | return new NotFoundResponse(); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - $path = $appPath . "/img/$fileName.svg"; |
|
| 107 | + $path = $appPath."/img/$fileName.svg"; |
|
| 108 | 108 | return $this->getSvg($path, $color, $fileName); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | // Set cache control |
| 135 | 135 | $ttl = 31536000; |
| 136 | 136 | $response->cacheFor($ttl); |
| 137 | - $response->addHeader('Content-Disposition', 'inline; filename="' . $fileName . '.svg"'); |
|
| 137 | + $response->addHeader('Content-Disposition', 'inline; filename="'.$fileName.'.svg"'); |
|
| 138 | 138 | $expires = new \DateTime(); |
| 139 | 139 | $expires->setTimestamp($this->timeFactory->getTime()); |
| 140 | - $expires->add(new \DateInterval('PT' . $ttl . 'S')); |
|
| 140 | + $expires->add(new \DateInterval('PT'.$ttl.'S')); |
|
| 141 | 141 | $response->addHeader('Expires', $expires->format(\DateTime::RFC1123)); |
| 142 | 142 | $response->addHeader('Pragma', 'cache'); |
| 143 | 143 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | foreach ($users as $user) { |
| 149 | 149 | $event->setAffectedUser($user) |
| 150 | 150 | ->setSubject( |
| 151 | - $user === $currentUser ? $action . '_self' : $action, |
|
| 151 | + $user === $currentUser ? $action.'_self' : $action, |
|
| 152 | 152 | [ |
| 153 | 153 | 'actor' => $currentUser, |
| 154 | 154 | 'calendar' => [ |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $event, |
| 202 | 202 | $calendarData, |
| 203 | 203 | Calendar::SUBJECT_UNSHARE_USER, |
| 204 | - Calendar::SUBJECT_DELETE . '_self' |
|
| 204 | + Calendar::SUBJECT_DELETE.'_self' |
|
| 205 | 205 | ); |
| 206 | 206 | |
| 207 | 207 | if ($owner !== $principal[2]) { |
@@ -216,15 +216,15 @@ discard block |
||
| 216 | 216 | ]; |
| 217 | 217 | |
| 218 | 218 | if ($owner === $event->getAuthor()) { |
| 219 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_you'; |
|
| 219 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_you'; |
|
| 220 | 220 | } elseif ($principal[2] === $event->getAuthor()) { |
| 221 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_self'; |
|
| 221 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_self'; |
|
| 222 | 222 | } else { |
| 223 | 223 | $event->setAffectedUser($event->getAuthor()) |
| 224 | - ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters); |
|
| 224 | + ->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters); |
|
| 225 | 225 | $this->activityManager->publish($event); |
| 226 | 226 | |
| 227 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_by'; |
|
| 227 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_by'; |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | $event->setAffectedUser($owner) |
@@ -245,13 +245,13 @@ discard block |
||
| 245 | 245 | ]; |
| 246 | 246 | |
| 247 | 247 | if ($owner === $event->getAuthor()) { |
| 248 | - $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you'; |
|
| 248 | + $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you'; |
|
| 249 | 249 | } else { |
| 250 | 250 | $event->setAffectedUser($event->getAuthor()) |
| 251 | - ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters); |
|
| 251 | + ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters); |
|
| 252 | 252 | $this->activityManager->publish($event); |
| 253 | 253 | |
| 254 | - $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by'; |
|
| 254 | + $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by'; |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | $event->setAffectedUser($owner) |
@@ -287,13 +287,13 @@ discard block |
||
| 287 | 287 | ]; |
| 288 | 288 | |
| 289 | 289 | if ($owner === $event->getAuthor()) { |
| 290 | - $subject = Calendar::SUBJECT_SHARE_USER . '_you'; |
|
| 290 | + $subject = Calendar::SUBJECT_SHARE_USER.'_you'; |
|
| 291 | 291 | } else { |
| 292 | 292 | $event->setAffectedUser($event->getAuthor()) |
| 293 | - ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters); |
|
| 293 | + ->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters); |
|
| 294 | 294 | $this->activityManager->publish($event); |
| 295 | 295 | |
| 296 | - $subject = Calendar::SUBJECT_SHARE_USER . '_by'; |
|
| 296 | + $subject = Calendar::SUBJECT_SHARE_USER.'_by'; |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | $event->setAffectedUser($owner) |
@@ -314,13 +314,13 @@ discard block |
||
| 314 | 314 | ]; |
| 315 | 315 | |
| 316 | 316 | if ($owner === $event->getAuthor()) { |
| 317 | - $subject = Calendar::SUBJECT_SHARE_GROUP . '_you'; |
|
| 317 | + $subject = Calendar::SUBJECT_SHARE_GROUP.'_you'; |
|
| 318 | 318 | } else { |
| 319 | 319 | $event->setAffectedUser($event->getAuthor()) |
| 320 | - ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters); |
|
| 320 | + ->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters); |
|
| 321 | 321 | $this->activityManager->publish($event); |
| 322 | 322 | |
| 323 | - $subject = Calendar::SUBJECT_SHARE_GROUP . '_by'; |
|
| 323 | + $subject = Calendar::SUBJECT_SHARE_GROUP.'_by'; |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | $event->setAffectedUser($owner) |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | $classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC; |
| 421 | 421 | $object = $this->getObjectNameAndType($objectData); |
| 422 | - $action = $action . '_' . $object['type']; |
|
| 422 | + $action = $action.'_'.$object['type']; |
|
| 423 | 423 | |
| 424 | 424 | if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') { |
| 425 | 425 | $action .= '_completed'; |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | $event->setAffectedUser($user) |
| 468 | 468 | ->setSubject( |
| 469 | - $user === $currentUser ? $action . '_self' : $action, |
|
| 469 | + $user === $currentUser ? $action.'_self' : $action, |
|
| 470 | 470 | $params |
| 471 | 471 | ); |
| 472 | 472 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | private function getCachedToken(string $cacheKey) { |
| 94 | - $cachedTokenString = $this->cache->get($cacheKey . '/token'); |
|
| 94 | + $cachedTokenString = $this->cache->get($cacheKey.'/token'); |
|
| 95 | 95 | if ($cachedTokenString) { |
| 96 | 96 | return json_decode($cachedTokenString, true); |
| 97 | 97 | } else { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | $this->params['cachedToken'] = $value; |
| 120 | - $this->cache->set($cacheKey . '/token', json_encode($value)); |
|
| 120 | + $this->cache->set($cacheKey.'/token', json_encode($value)); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params); |
| 150 | 150 | |
| 151 | - $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container']; |
|
| 151 | + $cacheKey = $userName.'@'.$this->params['url'].'/'.$this->params['container']; |
|
| 152 | 152 | $token = $this->getCachedToken($cacheKey); |
| 153 | 153 | $this->params['cachedToken'] = $token; |
| 154 | 154 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($authService instanceof IdentityV3Service) { |
| 185 | 185 | $token = $authService->generateTokenFromCache($cachedToken); |
| 186 | 186 | if (\is_null($token->catalog)) { |
| 187 | - $this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken)); |
|
| 187 | + $this->logger->warning('Invalid cached token for swift, no catalog set: '.json_encode($cachedToken)); |
|
| 188 | 188 | } elseif ($token->hasExpired()) { |
| 189 | 189 | $this->logger->debug('Cached token for swift expired'); |
| 190 | 190 | } else { |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | } catch (ConnectException $e) { |
| 279 | 279 | /** @var RequestInterface $request */ |
| 280 | 280 | $request = $e->getRequest(); |
| 281 | - $host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort(); |
|
| 281 | + $host = $request->getUri()->getHost().':'.$request->getUri()->getPort(); |
|
| 282 | 282 | \OC::$server->getLogger()->error("Can't connect to object storage server at $host"); |
| 283 | 283 | throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e); |
| 284 | 284 | } |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | * @return string[] the keys stored for the app |
| 38 | 38 | * @since 20.0.0 |
| 39 | 39 | */ |
| 40 | - public function getAppKeys(): array ; |
|
| 40 | + public function getAppKeys(): array; |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * Writes a new app wide value |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | ); |
| 358 | 358 | $this->session->remove('oauth.state'); |
| 359 | 359 | } else { |
| 360 | - $redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($loginName) . '&password:' . urlencode($token); |
|
| 360 | + $redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($loginName).'&password:'.urlencode($token); |
|
| 361 | 361 | |
| 362 | 362 | // Clear the token from the login here |
| 363 | 363 | $this->tokenProvider->invalidateToken($sessionId); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | return $response; |
| 396 | 396 | } |
| 397 | 397 | |
| 398 | - $redirectUri = 'nc://login/server:' . $this->getServerPath() . '&user:' . urlencode($user) . '&password:' . urlencode($password); |
|
| 398 | + $redirectUri = 'nc://login/server:'.$this->getServerPath().'&user:'.urlencode($user).'&password:'.urlencode($password); |
|
| 399 | 399 | return new Http\RedirectResponse($redirectUri); |
| 400 | 400 | } |
| 401 | 401 | |
@@ -418,6 +418,6 @@ discard block |
||
| 418 | 418 | } |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | - return $protocol . "://" . $this->request->getServerHost() . $serverPostfix; |
|
| 421 | + return $protocol."://".$this->request->getServerHost().$serverPostfix; |
|
| 422 | 422 | } |
| 423 | 423 | } |