@@ -148,7 +148,7 @@ |
||
| 148 | 148 | continue; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - $level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; |
|
| 151 | + $level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; |
|
| 152 | 152 | |
| 153 | 153 | if ($level === Member::LEVEL_OWNER) { |
| 154 | 154 | if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) { |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | |
| 94 | 94 | $update = $this->connection->getQueryBuilder(); |
| 95 | 95 | $update->update('circles_circles') |
| 96 | - ->set('unique_id', $update->createNamedParameter('d' . $uniqueId)) |
|
| 96 | + ->set('unique_id', $update->createNamedParameter('d'.$uniqueId)) |
|
| 97 | 97 | ->where( |
| 98 | 98 | $update->expr() |
| 99 | 99 | ->eq('id', $update->createNamedParameter($itemId)) |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | $searcher = \OC::$server->query((string)$container); |
| 89 | 89 | |
| 90 | 90 | if (!($searcher instanceof ISearch)) { |
| 91 | - $this->miscService->log('Search ' . $container . ' is not compatible exception'); |
|
| 91 | + $this->miscService->log('Search '.$container.' is not compatible exception'); |
|
| 92 | 92 | continue; |
| 93 | 93 | } |
| 94 | 94 | |
@@ -184,7 +184,7 @@ |
||
| 184 | 184 | if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0) |
| 185 | 185 | && strpos($remote, 'https://') !== 0 |
| 186 | 186 | ) { |
| 187 | - $remote = 'https://' . $remote; |
|
| 187 | + $remote = 'https://'.$remote; |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | return rtrim($remote, '/'); |
@@ -284,7 +284,7 @@ |
||
| 284 | 284 | ob_start(); |
| 285 | 285 | echo(json_encode($result)); |
| 286 | 286 | $size = ob_get_length(); |
| 287 | - header('Content-Length: ' . $size); |
|
| 287 | + header('Content-Length: '.$size); |
|
| 288 | 288 | ob_end_flush(); |
| 289 | 289 | flush(); |
| 290 | 290 | } |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | * @return string |
| 92 | 92 | */ |
| 93 | 93 | private function generateTestAsyncURL($remote) { |
| 94 | - return $this->configService->generateRemoteHost($remote) . Application::TEST_URL_ASYNC; |
|
| 94 | + return $this->configService->generateRemoteHost($remote).Application::TEST_URL_ASYNC; |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | ); |
| 118 | 118 | |
| 119 | - $this->dispatch('\OCA\Circles::onCircleCreation', ['circle' => $circle]); |
|
| 119 | + $this->dispatch('\OCA\Circles::onCircleCreation', ['circle' => $circle]); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $circle->getUniqueId(), Member::LEVEL_MEMBER, true |
| 143 | 143 | ) |
| 144 | 144 | ); |
| 145 | - $this->dispatch('\OCA\Circles::onCircleDestruction', ['circle' => $circle]); |
|
| 145 | + $this->dispatch('\OCA\Circles::onCircleDestruction', ['circle' => $circle]); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | ) |
| 187 | 187 | ) |
| 188 | 188 | ); |
| 189 | - $this->dispatch('\OCA\Circles::onMemberNew', ['circle' => $circle, 'member' => $member]); |
|
| 189 | + $this->dispatch('\OCA\Circles::onMemberNew', ['circle' => $circle, 'member' => $member]); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | ) |
| 243 | 243 | ) |
| 244 | 244 | ); |
| 245 | - $this->dispatch('\OCA\Circles::onMemberInvited', ['circle' => $circle, 'member' => $member]); |
|
| 245 | + $this->dispatch('\OCA\Circles::onMemberInvited', ['circle' => $circle, 'member' => $member]); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | ) |
| 275 | 275 | ) |
| 276 | 276 | ); |
| 277 | - $this->dispatch('\OCA\Circles::onMemberRequesting', ['circle' => $circle, 'member' => $member]); |
|
| 277 | + $this->dispatch('\OCA\Circles::onMemberRequesting', ['circle' => $circle, 'member' => $member]); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | ) |
| 308 | 308 | ) |
| 309 | 309 | ); |
| 310 | - $this->dispatch('\OCA\Circles::onMemberLeaving', ['circle' => $circle, 'member' => $member]); |
|
| 310 | + $this->dispatch('\OCA\Circles::onMemberLeaving', ['circle' => $circle, 'member' => $member]); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | $this->membersRequest->avoidDuplicateMembers($mods, [$member]); |
| 341 | 341 | |
| 342 | 342 | $this->publishEvent($event, $mods); |
| 343 | - $this->dispatch('\OCA\Circles::onMemberLevel', ['circle' => $circle, 'member' => $member]); |
|
| 343 | + $this->dispatch('\OCA\Circles::onMemberLevel', ['circle' => $circle, 'member' => $member]); |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | $circle->getUniqueId(), Member::LEVEL_MEMBER, true |
| 366 | 366 | ) |
| 367 | 367 | ); |
| 368 | - $this->dispatch('\OCA\Circles::onMemberOwner', ['circle' => $circle, 'member' => $member]); |
|
| 368 | + $this->dispatch('\OCA\Circles::onMemberOwner', ['circle' => $circle, 'member' => $member]); |
|
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | ); |
| 399 | 399 | |
| 400 | 400 | $this->publishEvent($event, $mods); |
| 401 | - $this->dispatch('\OCA\Circles::onGroupLink', ['circle' => $circle, 'group' => $group]); |
|
| 401 | + $this->dispatch('\OCA\Circles::onGroupLink', ['circle' => $circle, 'group' => $group]); |
|
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | ); |
| 432 | 432 | |
| 433 | 433 | $this->publishEvent($event, $mods); |
| 434 | - $this->dispatch('\OCA\Circles::onGroupUnlink', ['circle' => $circle, 'group' => $group]); |
|
| 434 | + $this->dispatch('\OCA\Circles::onGroupUnlink', ['circle' => $circle, 'group' => $group]); |
|
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | ); |
| 465 | 465 | |
| 466 | 466 | $this->publishEvent($event, $mods); |
| 467 | - $this->dispatch('\OCA\Circles::onGroupLevel', ['circle' => $circle, 'group' => $group]); |
|
| 467 | + $this->dispatch('\OCA\Circles::onGroupLevel', ['circle' => $circle, 'group' => $group]); |
|
| 468 | 468 | } |
| 469 | 469 | |
| 470 | 470 | |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 490 | 490 | ) |
| 491 | 491 | ); |
| 492 | - $this->dispatch('\OCA\Circles::onLinkRequestSent', ['circle' => $circle, 'link' => $link]); |
|
| 492 | + $this->dispatch('\OCA\Circles::onLinkRequestSent', ['circle' => $circle, 'link' => $link]); |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 515 | 515 | ) |
| 516 | 516 | ); |
| 517 | - $this->dispatch('\OCA\Circles::onLinkRequestReceived', ['circle' => $circle, 'link' => $link]); |
|
| 517 | + $this->dispatch('\OCA\Circles::onLinkRequestReceived', ['circle' => $circle, 'link' => $link]); |
|
| 518 | 518 | } |
| 519 | 519 | |
| 520 | 520 | |
@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 540 | 540 | ) |
| 541 | 541 | ); |
| 542 | - $this->dispatch('\OCA\Circles::onLinkRequestRejected', ['circle' => $circle, 'link' => $link]); |
|
| 542 | + $this->dispatch('\OCA\Circles::onLinkRequestRejected', ['circle' => $circle, 'link' => $link]); |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 565 | 565 | ) |
| 566 | 566 | ); |
| 567 | - $this->dispatch('\OCA\Circles::onLinkRequestCanceled', ['circle' => $circle, 'link' => $link]); |
|
| 567 | + $this->dispatch('\OCA\Circles::onLinkRequestCanceled', ['circle' => $circle, 'link' => $link]); |
|
| 568 | 568 | } |
| 569 | 569 | |
| 570 | 570 | |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 590 | 590 | ) |
| 591 | 591 | ); |
| 592 | - $this->dispatch('\OCA\Circles::onLinkRequestAccepted', ['circle' => $circle, 'link' => $link]); |
|
| 592 | + $this->dispatch('\OCA\Circles::onLinkRequestAccepted', ['circle' => $circle, 'link' => $link]); |
|
| 593 | 593 | } |
| 594 | 594 | |
| 595 | 595 | |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 615 | 615 | ) |
| 616 | 616 | ); |
| 617 | - $this->dispatch('\OCA\Circles::onLinkRequestAccepting', ['circle' => $circle, 'link' => $link]); |
|
| 617 | + $this->dispatch('\OCA\Circles::onLinkRequestAccepting', ['circle' => $circle, 'link' => $link]); |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 640 | 640 | ) |
| 641 | 641 | ); |
| 642 | - $this->dispatch('\OCA\Circles::onLinkUp', ['circle' => $circle, 'link' => $link]); |
|
| 642 | + $this->dispatch('\OCA\Circles::onLinkUp', ['circle' => $circle, 'link' => $link]); |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | |
@@ -664,7 +664,7 @@ discard block |
||
| 664 | 664 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 665 | 665 | ) |
| 666 | 666 | ); |
| 667 | - $this->dispatch('\OCA\Circles::onLinkDown', ['circle' => $circle, 'link' => $link]); |
|
| 667 | + $this->dispatch('\OCA\Circles::onLinkDown', ['circle' => $circle, 'link' => $link]); |
|
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | $link->getCircleId(), Member::LEVEL_MODERATOR, true |
| 702 | 702 | ) |
| 703 | 703 | ); |
| 704 | - $this->dispatch('\OCA\Circles::onLinkRemove', ['circle' => $circle, 'link' => $link]); |
|
| 704 | + $this->dispatch('\OCA\Circles::onLinkRemove', ['circle' => $circle, 'link' => $link]); |
|
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | /** |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | * @param Circle $circle |
| 713 | 713 | */ |
| 714 | 714 | public function onSettingsChange(Circle $circle) { |
| 715 | - $this->dispatch('\OCA\Circles::onSettingsChange', ['circle' => $circle]); |
|
| 715 | + $this->dispatch('\OCA\Circles::onSettingsChange', ['circle' => $circle]); |
|
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | * @param array $arguments |
| 764 | 764 | */ |
| 765 | 765 | private function dispatch($context, $arguments) { |
| 766 | - $this->eventDispatcher->dispatch($context, new GenericEvent(null,$arguments)); |
|
| 766 | + $this->eventDispatcher->dispatch($context, new GenericEvent(null, $arguments)); |
|
| 767 | 767 | } |
| 768 | 768 | |
| 769 | 769 | } |
| 770 | 770 | \ No newline at end of file |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | continue; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - $replace['{' . $k . '}'] = $data[$k]['_parsed']; |
|
| 141 | + $replace['{'.$k.'}'] = $data[$k]['_parsed']; |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | $line = strtr($line, $replace); |
@@ -300,9 +300,9 @@ discard block |
||
| 300 | 300 | */ |
| 301 | 301 | protected function generateExternalMemberParameter(Member $member) { |
| 302 | 302 | return [ |
| 303 | - 'type' => 'member_' . $member->getType(), |
|
| 303 | + 'type' => 'member_'.$member->getType(), |
|
| 304 | 304 | 'id' => $member->getUserId(), |
| 305 | - 'name' => $member->getDisplayName() . ' (' . $member->getTypeString() . ')', |
|
| 305 | + 'name' => $member->getDisplayName().' ('.$member->getTypeString().')', |
|
| 306 | 306 | '_parsed' => $member->getDisplayName() |
| 307 | 307 | ]; |
| 308 | 308 | } |
@@ -338,8 +338,8 @@ discard block |
||
| 338 | 338 | return [ |
| 339 | 339 | 'type' => 'circle', |
| 340 | 340 | 'id' => $link->getUniqueId(), |
| 341 | - 'name' => $link->getToken() . '@' . $link->getAddress(), |
|
| 342 | - '_parsed' => $link->getToken() . '@' . $link->getAddress() |
|
| 341 | + 'name' => $link->getToken().'@'.$link->getAddress(), |
|
| 342 | + '_parsed' => $link->getToken().'@'.$link->getAddress() |
|
| 343 | 343 | ]; |
| 344 | 344 | } |
| 345 | 345 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $expr->eq( |
| 182 | 182 | $qb->createNamedParameter($circleUniqueId), |
| 183 | 183 | $qb->createFunction( |
| 184 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 184 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 185 | 185 | ) |
| 186 | 186 | ) |
| 187 | 187 | ); |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | $expr = $qb->expr(); |
| 255 | - $pf = '`' . $this->default_select_alias . '`.'; |
|
| 255 | + $pf = '`'.$this->default_select_alias.'`.'; |
|
| 256 | 256 | |
| 257 | 257 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 258 | 258 | $qb->selectAlias('u.user_id', 'viewer_userid') |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $expr->eq( |
| 265 | 265 | 'u.circle_id', |
| 266 | 266 | $qb->createFunction( |
| 267 | - 'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 267 | + 'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 268 | 268 | . ')' |
| 269 | 269 | ) |
| 270 | 270 | ), |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | $expr = $qb->expr(); |
| 290 | - $pf = '`' . $this->default_select_alias . '`.'; |
|
| 290 | + $pf = '`'.$this->default_select_alias.'`.'; |
|
| 291 | 291 | |
| 292 | 292 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 293 | 293 | $qb->selectAlias('o.user_id', 'owner_userid') |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $expr->andX( |
| 299 | 299 | $expr->eq( |
| 300 | 300 | $qb->createFunction( |
| 301 | - 'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 301 | + 'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 302 | 302 | . ')' |
| 303 | 303 | ) |
| 304 | 304 | , 'o.circle_id' |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $qb->expr() |
| 360 | 360 | ->eq( |
| 361 | 361 | $qb->createFunction( |
| 362 | - 'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 362 | + 'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 363 | 363 | ), |
| 364 | 364 | $qb->createNamedParameter($circleUniqueId) |
| 365 | 365 | ) |