@@ -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']]])) { |
@@ -273,7 +273,7 @@ |
||
| 273 | 273 | |
| 274 | 274 | |
| 275 | 275 | /** |
| 276 | - * @param $circleName |
|
| 276 | + * @param string $circleName |
|
| 277 | 277 | * |
| 278 | 278 | * @return Circle|null |
| 279 | 279 | */ |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * |
| 196 | 196 | * @param Circle $circle |
| 197 | 197 | */ |
| 198 | - private function detailsCircleMembers(Circle &$circle) { |
|
| 198 | + private function detailsCircleMembers(Circle & $circle) { |
|
| 199 | 199 | $members = |
| 200 | 200 | $this->membersRequest->getMembers($circle->getUniqueId(), $circle->getHigherViewer()); |
| 201 | 201 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | * |
| 209 | 209 | * @param Circle $circle |
| 210 | 210 | */ |
| 211 | - private function detailsCircleLinkedGroups(Circle &$circle) { |
|
| 211 | + private function detailsCircleLinkedGroups(Circle & $circle) { |
|
| 212 | 212 | $groups = []; |
| 213 | 213 | if ($this->configService->isLinkedGroupsAllowed()) { |
| 214 | 214 | $groups = |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * |
| 227 | 227 | * @param Circle $circle |
| 228 | 228 | */ |
| 229 | - private function detailsCircleFederatedCircles(Circle &$circle) { |
|
| 229 | + private function detailsCircleFederatedCircles(Circle & $circle) { |
|
| 230 | 230 | $links = []; |
| 231 | 231 | |
| 232 | 232 | try { |
@@ -407,23 +407,23 @@ discard block |
||
| 407 | 407 | switch ($type) { |
| 408 | 408 | case Circle::CIRCLES_PERSONAL: |
| 409 | 409 | return $urlGen->getAbsoluteURL( |
| 410 | - $urlGen->imagePath(Application::APP_NAME, 'personal' . $ext) |
|
| 410 | + $urlGen->imagePath(Application::APP_NAME, 'personal'.$ext) |
|
| 411 | 411 | ); |
| 412 | 412 | case Circle::CIRCLES_CLOSED: |
| 413 | 413 | return $urlGen->getAbsoluteURL( |
| 414 | - $urlGen->imagePath(Application::APP_NAME, 'closed' . $ext) |
|
| 414 | + $urlGen->imagePath(Application::APP_NAME, 'closed'.$ext) |
|
| 415 | 415 | ); |
| 416 | 416 | case Circle::CIRCLES_SECRET: |
| 417 | 417 | return $urlGen->getAbsoluteURL( |
| 418 | - $urlGen->imagePath(Application::APP_NAME, 'secret' . $ext) |
|
| 418 | + $urlGen->imagePath(Application::APP_NAME, 'secret'.$ext) |
|
| 419 | 419 | ); |
| 420 | 420 | case Circle::CIRCLES_PUBLIC: |
| 421 | 421 | return $urlGen->getAbsoluteURL( |
| 422 | - $urlGen->imagePath(Application::APP_NAME, 'public' . $ext) |
|
| 422 | + $urlGen->imagePath(Application::APP_NAME, 'public'.$ext) |
|
| 423 | 423 | ); |
| 424 | 424 | } |
| 425 | 425 | |
| 426 | - return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)); |
|
| 426 | + return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)); |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | } |
| 430 | 430 | \ No newline at end of file |
@@ -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)) |
@@ -282,7 +282,7 @@ |
||
| 282 | 282 | * generateEvent() |
| 283 | 283 | * Create an Activity Event with the basic settings for the app. |
| 284 | 284 | * |
| 285 | - * @param $type |
|
| 285 | + * @param string $type |
|
| 286 | 286 | * |
| 287 | 287 | * @return \OCP\Activity\IEvent |
| 288 | 288 | */ |
@@ -227,7 +227,7 @@ |
||
| 227 | 227 | * |
| 228 | 228 | * @param Circle $circle |
| 229 | 229 | * @param FederatedLink $link |
| 230 | - * @param $status |
|
| 230 | + * @param integer $status |
|
| 231 | 231 | * |
| 232 | 232 | * @return bool |
| 233 | 233 | */ |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | * @return string |
| 313 | 313 | */ |
| 314 | 314 | private function generateLinkRemoteURL($remote) { |
| 315 | - return $this->generateRemoteHost($remote) . self::REMOTE_URL_LINK; |
|
| 315 | + return $this->generateRemoteHost($remote).self::REMOTE_URL_LINK; |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | * @return string |
| 323 | 323 | */ |
| 324 | 324 | private function generatePayloadDeliveryURL($remote) { |
| 325 | - return $this->generateRemoteHost($remote) . self::REMOTE_URL_PAYLOAD; |
|
| 325 | + return $this->generateRemoteHost($remote).self::REMOTE_URL_PAYLOAD; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | if ((!$this->configService->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0) |
| 336 | 336 | && strpos($remote, 'https://') !== 0 |
| 337 | 337 | ) { |
| 338 | - $remote = 'https://' . $remote; |
|
| 338 | + $remote = 'https://'.$remote; |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | return rtrim($remote, '/'); |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * @return boolean |
| 353 | 353 | * @throws Exception |
| 354 | 354 | */ |
| 355 | - private function requestLink(Circle $circle, FederatedLink &$link) { |
|
| 355 | + private function requestLink(Circle $circle, FederatedLink & $link) { |
|
| 356 | 356 | $args = [ |
| 357 | 357 | 'apiVersion' => Circles::version(), |
| 358 | 358 | 'token' => $link->getToken(true), |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | * @return bool |
| 610 | 610 | * @throws Exception |
| 611 | 611 | */ |
| 612 | - public function updateLinkRemote(FederatedLink &$link) { |
|
| 612 | + public function updateLinkRemote(FederatedLink & $link) { |
|
| 613 | 613 | $args = [ |
| 614 | 614 | 'apiVersion' => Circles::version(), |
| 615 | 615 | 'token' => $link->getToken(true), |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | * |
| 648 | 648 | * @throws Exception |
| 649 | 649 | */ |
| 650 | - public function initiateLink(Circle $circle, FederatedLink &$link) { |
|
| 650 | + public function initiateLink(Circle $circle, FederatedLink & $link) { |
|
| 651 | 651 | |
| 652 | 652 | try { |
| 653 | 653 | $this->checkLinkRequestValidity($circle, $link); |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | * @return bool |
| 698 | 698 | * @throws Exception |
| 699 | 699 | */ |
| 700 | - public function receiveFrame($token, $uniqueId, SharingFrame &$frame) { |
|
| 700 | + public function receiveFrame($token, $uniqueId, SharingFrame & $frame) { |
|
| 701 | 701 | try { |
| 702 | 702 | $link = $this->circlesRequest->getLinkFromToken((string)$token, (string)$uniqueId); |
| 703 | 703 | } catch (Exception $e) { |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | |
| 822 | 822 | } catch (Exception $e) { |
| 823 | 823 | $this->miscService->log( |
| 824 | - 'Issue while sending sharing frame to ' . $link->getAddress() . ' - ' |
|
| 824 | + 'Issue while sending sharing frame to '.$link->getAddress().' - ' |
|
| 825 | 825 | . $e->getMessage() |
| 826 | 826 | ); |
| 827 | 827 | } |
@@ -185,7 +185,7 @@ |
||
| 185 | 185 | * |
| 186 | 186 | * @throws CircleAlreadyExistsException |
| 187 | 187 | */ |
| 188 | - public function createCircle(Circle &$circle, $userId) { |
|
| 188 | + public function createCircle(Circle & $circle, $userId) { |
|
| 189 | 189 | |
| 190 | 190 | if (!$this->isCircleUnique($circle, $userId)) { |
| 191 | 191 | throw new CircleAlreadyExistsException( |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * |
| 90 | 90 | * @param $container |
| 91 | 91 | */ |
| 92 | - private function registerServices(IAppContainer &$container) { |
|
| 92 | + private function registerServices(IAppContainer & $container) { |
|
| 93 | 93 | |
| 94 | 94 | $container->registerService( |
| 95 | 95 | 'MiscService', function(IAppContainer $c) { |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * |
| 184 | 184 | * @param $container |
| 185 | 185 | */ |
| 186 | - private static function registerControllers(IAppContainer &$container) { |
|
| 186 | + private static function registerControllers(IAppContainer & $container) { |
|
| 187 | 187 | |
| 188 | 188 | $container->registerService( |
| 189 | 189 | 'SettingsController', function(IAppContainer $c) { |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | * |
| 269 | 269 | * @param IAppContainer $container |
| 270 | 270 | */ |
| 271 | - private static function registerDatabaseRequesters(IAppContainer &$container) { |
|
| 271 | + private static function registerDatabaseRequesters(IAppContainer & $container) { |
|
| 272 | 272 | |
| 273 | 273 | $container->registerService( |
| 274 | 274 | 'CirclesRequest', function(IAppContainer $c) { |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | * |
| 308 | 308 | * @param $container |
| 309 | 309 | */ |
| 310 | - private static function registerCores(IAppContainer &$container) { |
|
| 310 | + private static function registerCores(IAppContainer & $container) { |
|
| 311 | 311 | |
| 312 | 312 | $container->registerService( |
| 313 | 313 | 'Logger', function(IAppContainer $c) { |
@@ -190,7 +190,7 @@ |
||
| 190 | 190 | * |
| 191 | 191 | * @throws \Exception |
| 192 | 192 | */ |
| 193 | - private function editGroupLevel(Circle $circle, Member &$group, $level) { |
|
| 193 | + private function editGroupLevel(Circle $circle, Member & $group, $level) { |
|
| 194 | 194 | try { |
| 195 | 195 | $isMod = $circle->getHigherViewer(); |
| 196 | 196 | $isMod->hasToBeAdmin(); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @param string $circleUniqueId |
| 87 | 87 | * @param string $groupId |
| 88 | 88 | * |
| 89 | - * @return array |
|
| 89 | + * @return Member[] |
|
| 90 | 90 | * @throws \Exception |
| 91 | 91 | */ |
| 92 | 92 | public function linkGroup($circleUniqueId, $groupId) { |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | /** |
| 113 | 113 | * Check if a fresh member can be generated (by linkGroup) |
| 114 | 114 | * |
| 115 | - * @param $circleId |
|
| 116 | - * @param $groupId |
|
| 115 | + * @param string $circleId |
|
| 116 | + * @param string $groupId |
|
| 117 | 117 | * |
| 118 | 118 | * @return null|Member |
| 119 | 119 | * @throws MemberAlreadyExistsException |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * @param string $groupId |
| 149 | 149 | * @param int $level |
| 150 | 150 | * |
| 151 | - * @return array |
|
| 151 | + * @return Member[] |
|
| 152 | 152 | * @throws \Exception |
| 153 | 153 | */ |
| 154 | 154 | public function levelGroup($circleUniqueId, $groupId, $level) { |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | /** |
| 187 | 187 | * @param Circle $circle |
| 188 | 188 | * @param Member $group |
| 189 | - * @param $level |
|
| 189 | + * @param integer $level |
|
| 190 | 190 | * |
| 191 | 191 | * @throws \Exception |
| 192 | 192 | */ |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | * @param string $circleUniqueId |
| 214 | 214 | * @param string $groupId |
| 215 | 215 | * |
| 216 | - * @return array |
|
| 216 | + * @return Member[] |
|
| 217 | 217 | * @throws \Exception |
| 218 | 218 | */ |
| 219 | 219 | public function unlinkGroup($circleUniqueId, $groupId) { |
@@ -432,6 +432,13 @@ |
||
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | |
| 435 | + /** |
|
| 436 | + * @param string $userId |
|
| 437 | + * @param integer $shareType |
|
| 438 | + * @param Node|null $node |
|
| 439 | + * @param integer $limit |
|
| 440 | + * @param integer $offset |
|
| 441 | + */ |
|
| 435 | 442 | private function getSharedWithCircleMembers($userId, $shareType, $node, $limit, $offset) { |
| 436 | 443 | |
| 437 | 444 | $qb = $this->getCompleteSelectSql(); |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | * @param IShare $share |
| 570 | 570 | * @param $data |
| 571 | 571 | */ |
| 572 | - private function assignShareObjectPropertiesFromParent(IShare &$share, $data) { |
|
| 572 | + private function assignShareObjectPropertiesFromParent(IShare & $share, $data) { |
|
| 573 | 573 | if (isset($data['f_permissions'])) { |
| 574 | 574 | $entryData = $data; |
| 575 | 575 | $entryData['permissions'] = $entryData['f_permissions']; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | * @param IShare $share |
| 589 | 589 | * @param $data |
| 590 | 590 | */ |
| 591 | - private function assignShareObjectSharesProperties(IShare &$share, $data) { |
|
| 591 | + private function assignShareObjectSharesProperties(IShare & $share, $data) { |
|
| 592 | 592 | $shareTime = new \DateTime(); |
| 593 | 593 | $shareTime->setTimestamp((int)$data['stime']); |
| 594 | 594 | |