@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) { |
154 | 154 | |
155 | 155 | $this->miscService->log( |
156 | - 'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0 |
|
156 | + 'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0 |
|
157 | 157 | ); |
158 | 158 | try { |
159 | 159 | $circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $this->initiateShare($circle->getUniqueId(), $frame->getUniqueId()); |
169 | 169 | } catch (Exception $e) { |
170 | 170 | $this->miscService->log( |
171 | - 'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage() |
|
171 | + 'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage() |
|
172 | 172 | ); |
173 | 173 | throw $e; |
174 | 174 | } |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | return true; |
319 | 319 | } catch (Exception $e) { |
320 | 320 | $this->miscService->log( |
321 | - 'fail to initialise circle share with request ' . json_encode($request) . ' - ' |
|
321 | + 'fail to initialise circle share with request '.json_encode($request).' - ' |
|
322 | 322 | . $e->getMessage(), 3 |
323 | 323 | ); |
324 | 324 | throw $e; |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | * @return string |
333 | 333 | */ |
334 | 334 | private function generatePayloadDeliveryURL($remote) { |
335 | - return $this->configService->generateRemoteHost($remote) . |
|
335 | + return $this->configService->generateRemoteHost($remote). |
|
336 | 336 | $this->urlGenerator->linkToRoute('circles.Shares.initShareDelivery'); |
337 | 337 | } |
338 | 338 | |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | |
408 | 408 | } catch (Exception $e) { |
409 | 409 | $this->miscService->log( |
410 | - 'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage() |
|
410 | + 'fail to send frame to '.$link->getAddress().' - '.$e->getMessage() |
|
411 | 411 | ); |
412 | 412 | } |
413 | 413 | } |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | */ |
464 | 464 | public static function generateLink($circleUniqueId) { |
465 | 465 | return OC::$server->getURLGenerator() |
466 | - ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId; |
|
466 | + ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId; |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public static function generateAbsoluteLink($circleUniqueId) { |
480 | 480 | return OC::$server->getURLGenerator() |
481 | - ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId; |
|
481 | + ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId; |
|
482 | 482 | } |
483 | 483 | |
484 | 484 | |
@@ -493,8 +493,8 @@ discard block |
||
493 | 493 | */ |
494 | 494 | public static function generateRemoteLink(FederatedLink $link) { |
495 | 495 | return OC::$server->getURLGenerator() |
496 | - ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId() |
|
497 | - . '-' . $link->getToken(); |
|
496 | + ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId() |
|
497 | + . '-'.$link->getToken(); |
|
498 | 498 | } |
499 | 499 | |
500 | 500 | |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | */ |
506 | 506 | public static function generateUserParameter(SharingFrame $frame) { |
507 | 507 | if ($frame->getCloudId() !== null) { |
508 | - $name = $frame->getAuthor() . '@' . $frame->getCloudId(); |
|
508 | + $name = $frame->getAuthor().'@'.$frame->getCloudId(); |
|
509 | 509 | } else { |
510 | 510 | try { |
511 | 511 | $membersService = \OC::$server->query(MembersService::class); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $this->miscService = OC::$server->query(MiscService::class); |
133 | 133 | } catch (QueryException $e) { |
134 | 134 | OC::$server->getLogger() |
135 | - ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage()); |
|
135 | + ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage()); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | try { |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | * @throws IllegalIDChangeException |
326 | 326 | */ |
327 | 327 | private function generateShare($data): IShare { |
328 | - $this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data)); |
|
328 | + $this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data)); |
|
329 | 329 | |
330 | 330 | $share = new Share($this->rootFolder, $this->userManager); |
331 | 331 | $share->setId($data['id']); |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | $this->sendPasswordByMail($share, $displayName, $email, $password); |
419 | 419 | } catch (Exception $e) { |
420 | 420 | OC::$server->getLogger() |
421 | - ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage()); |
|
421 | + ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage()); |
|
422 | 422 | } |
423 | 423 | } |
424 | 424 | |
@@ -436,8 +436,8 @@ discard block |
||
436 | 436 | $message = $this->mailer->createMessage(); |
437 | 437 | |
438 | 438 | $this->logger->log( |
439 | - 0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName |
|
440 | - . ' - link: ' . $link |
|
439 | + 0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName |
|
440 | + . ' - link: '.$link |
|
441 | 441 | ); |
442 | 442 | |
443 | 443 | $subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]); |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | |
477 | 477 | $message = $this->mailer->createMessage(); |
478 | 478 | |
479 | - $this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email); |
|
479 | + $this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email); |
|
480 | 480 | |
481 | 481 | $filename = $share->getNode() |
482 | 482 | ->getName(); |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
532 | 532 | if ($initiatorEmailAddress !== null) { |
533 | 533 | $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); |
534 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
534 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
535 | 535 | } else { |
536 | 536 | $emailTemplate->addFooter(); |
537 | 537 | } |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | $emailTemplate->addHeader(); |
567 | 567 | $emailTemplate->addHeading($subject, false); |
568 | 568 | $emailTemplate->addBodyText( |
569 | - htmlspecialchars($text) . '<br>' . htmlspecialchars( |
|
569 | + htmlspecialchars($text).'<br>'.htmlspecialchars( |
|
570 | 570 | $this->l10n->t('Click the button below to open it.') |
571 | 571 | ), $text |
572 | 572 | ); |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | $this->sendMailExistingShares($template, $author->getCachedName(), $recipient); |
613 | 613 | $this->sendPasswordExistingShares($author, $recipient, $password); |
614 | 614 | } catch (Exception $e) { |
615 | - $this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage()); |
|
615 | + $this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage()); |
|
616 | 616 | } |
617 | 617 | } |
618 | 618 | |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | $authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author; |
636 | 636 | $authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null; |
637 | 637 | |
638 | - $this->logger->log(0, "Sending password mail about existing files to '" . $email . "'"); |
|
638 | + $this->logger->log(0, "Sending password mail about existing files to '".$email."'"); |
|
639 | 639 | |
640 | 640 | $plainBodyPart = $this->l10n->t( |
641 | 641 | "%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n", |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
678 | 678 | if ($authorEmail !== null) { |
679 | 679 | $message->setReplyTo([$authorEmail => $authorName]); |
680 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
680 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
681 | 681 | } else { |
682 | 682 | $emailTemplate->addFooter(); |
683 | 683 | } |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | */ |
723 | 723 | protected function generateMailExitingShares($author, $circleName) { |
724 | 724 | $this->logger->log( |
725 | - 0, "Generating mail about existing share mail from '" . $author . "' in " |
|
725 | + 0, "Generating mail about existing share mail from '".$author."' in " |
|
726 | 726 | . $circleName |
727 | 727 | ); |
728 | 728 |
@@ -95,7 +95,7 @@ |
||
95 | 95 | RequestResultNotJsonException $e |
96 | 96 | ) { |
97 | 97 | $this->miscService->log( |
98 | - 'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage() |
|
98 | + 'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage() |
|
99 | 99 | ); |
100 | 100 | |
101 | 101 | return []; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | continue; |
138 | 138 | } |
139 | 139 | |
140 | - $replace['{' . $k . '}'] = $data[$k]['_parsed']; |
|
140 | + $replace['{'.$k.'}'] = $data[$k]['_parsed']; |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | $line = strtr($line, $replace); |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | return [ |
302 | 302 | 'type' => $member->getTypeName(), |
303 | 303 | 'id' => $member->getUserId(), |
304 | - 'name' => $member->getCachedName() . ' (' . $member->getTypeString() . ')', |
|
304 | + 'name' => $member->getCachedName().' ('.$member->getTypeString().')', |
|
305 | 305 | '_parsed' => $member->getCachedName() |
306 | 306 | ]; |
307 | 307 | } |
@@ -337,8 +337,8 @@ discard block |
||
337 | 337 | return [ |
338 | 338 | 'type' => 'circle', |
339 | 339 | 'id' => $link->getUniqueId(), |
340 | - 'name' => $link->getToken() . '@' . $link->getAddress(), |
|
341 | - '_parsed' => $link->getToken() . '@' . $link->getAddress() |
|
340 | + 'name' => $link->getToken().'@'.$link->getAddress(), |
|
341 | + '_parsed' => $link->getToken().'@'.$link->getAddress() |
|
342 | 342 | ]; |
343 | 343 | } |
344 | 344 |
@@ -59,7 +59,7 @@ |
||
59 | 59 | use Throwable; |
60 | 60 | |
61 | 61 | |
62 | -require_once __DIR__ . '/../../vendor/autoload.php'; |
|
62 | +require_once __DIR__.'/../../vendor/autoload.php'; |
|
63 | 63 | |
64 | 64 | |
65 | 65 | /** |
@@ -141,9 +141,9 @@ discard block |
||
141 | 141 | $test->setAsync(true); |
142 | 142 | $token = $this->gsUpstreamService->newEvent($test); |
143 | 143 | |
144 | - $output->writeln('- Async request is sent, now waiting ' . $this->delay . ' seconds'); |
|
144 | + $output->writeln('- Async request is sent, now waiting '.$this->delay.' seconds'); |
|
145 | 145 | sleep($this->delay); |
146 | - $output->writeln('- Pause is over, checking results for ' . $token); |
|
146 | + $output->writeln('- Pause is over, checking results for '.$token); |
|
147 | 147 | |
148 | 148 | $wrappers = $this->gsUpstreamService->getEventsByToken($token); |
149 | 149 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | $localLooksGood = false; |
157 | 157 | foreach ($instances as $instance) { |
158 | - $output->write($instance . ' '); |
|
158 | + $output->write($instance.' '); |
|
159 | 159 | if (array_key_exists($instance, $result) |
160 | 160 | && $result[$instance]->getResult() |
161 | 161 | ->gInt('status') === 1) { |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $this->configService->configureRequest($request, $route, $args); |
193 | 193 | $request->setFollowLocation(false); |
194 | 194 | |
195 | - $o->write('- ' . $type . ' request on ' . $request->getCompleteUrl() . ': '); |
|
195 | + $o->write('- '.$type.' request on '.$request->getCompleteUrl().': '); |
|
196 | 196 | $this->doRequest($request); |
197 | 197 | |
198 | 198 | $color = 'error'; |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | $color = 'info'; |
202 | 202 | } |
203 | 203 | |
204 | - $o->writeln('<' . $color . '>' . $result->getStatusCode() . '</' . $color . '>'); |
|
204 | + $o->writeln('<'.$color.'>'.$result->getStatusCode().'</'.$color.'>'); |
|
205 | 205 | |
206 | 206 | if ($result->getStatusCode() === 200) { |
207 | 207 | return true; |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | |
224 | 224 | $output->writeln(''); |
225 | 225 | $output->writeln( |
226 | - 'The address <info>' . $address . '</info> seems to reach your local Nextcloud.' |
|
226 | + 'The address <info>'.$address.'</info> seems to reach your local Nextcloud.' |
|
227 | 227 | ); |
228 | 228 | |
229 | 229 | $helper = $this->getHelper('question'); |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | |
241 | 241 | $this->configService->setAppValue(ConfigService::FORCE_NC_BASE, $address); |
242 | 242 | $output->writeln( |
243 | - 'New configuration <info>' . Application::APP_ID . '.' . ConfigService::FORCE_NC_BASE . '=\'' |
|
244 | - . $address . '\'</info> stored in database' |
|
243 | + 'New configuration <info>'.Application::APP_ID.'.'.ConfigService::FORCE_NC_BASE.'=\'' |
|
244 | + . $address.'\'</info> stored in database' |
|
245 | 245 | ); |
246 | 246 | } |
247 | 247 |
@@ -93,7 +93,7 @@ |
||
93 | 93 | */ |
94 | 94 | private function listLinkedGroups(InputInterface $input, OutputInterface $output) { |
95 | 95 | if ($input->getOption('list') !== true) { |
96 | - return ; |
|
96 | + return; |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | throw new FakeException(); |
@@ -569,24 +569,24 @@ |
||
569 | 569 | switch ($type) { |
570 | 570 | case DeprecatedCircle::CIRCLES_PERSONAL: |
571 | 571 | return $urlGen->getAbsoluteURL( |
572 | - $urlGen->imagePath(Application::APP_ID, 'personal' . $ext) |
|
572 | + $urlGen->imagePath(Application::APP_ID, 'personal'.$ext) |
|
573 | 573 | ); |
574 | 574 | case DeprecatedCircle::CIRCLES_CLOSED: |
575 | 575 | return $urlGen->getAbsoluteURL( |
576 | - $urlGen->imagePath(Application::APP_ID, 'closed' . $ext) |
|
576 | + $urlGen->imagePath(Application::APP_ID, 'closed'.$ext) |
|
577 | 577 | ); |
578 | 578 | case DeprecatedCircle::CIRCLES_SECRET: |
579 | 579 | return $urlGen->getAbsoluteURL( |
580 | - $urlGen->imagePath(Application::APP_ID, 'secret' . $ext) |
|
580 | + $urlGen->imagePath(Application::APP_ID, 'secret'.$ext) |
|
581 | 581 | ); |
582 | 582 | case DeprecatedCircle::CIRCLES_PUBLIC: |
583 | 583 | return $urlGen->getAbsoluteURL( |
584 | - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) |
|
584 | + $urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext) |
|
585 | 585 | ); |
586 | 586 | } |
587 | 587 | |
588 | 588 | return $urlGen->getAbsoluteURL( |
589 | - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) |
|
589 | + $urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext) |
|
590 | 590 | ); |
591 | 591 | } |
592 | 592 |