@@ -217,7 +217,7 @@ |
||
| 217 | 217 | * @return string |
| 218 | 218 | */ |
| 219 | 219 | public function generateLinkRemoteURL($remote) { |
| 220 | - return $this->configService->generateRemoteHost($remote) . self::REMOTE_URL_LINK; |
|
| 220 | + return $this->configService->generateRemoteHost($remote).self::REMOTE_URL_LINK; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | */ |
| 454 | 454 | public static function generateLink($circleUniqueId) { |
| 455 | 455 | return \OC::$server->getURLGenerator() |
| 456 | - ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId; |
|
| 456 | + ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId; |
|
| 457 | 457 | } |
| 458 | 458 | |
| 459 | 459 | |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | */ |
| 469 | 469 | public static function generateAbsoluteLink($circleUniqueId) { |
| 470 | 470 | return \OC::$server->getURLGenerator() |
| 471 | - ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId; |
|
| 471 | + ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId; |
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | |
@@ -483,8 +483,8 @@ discard block |
||
| 483 | 483 | */ |
| 484 | 484 | public static function generateRemoteLink(FederatedLink $link) { |
| 485 | 485 | return \OC::$server->getURLGenerator() |
| 486 | - ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId() |
|
| 487 | - . '-' . $link->getToken(); |
|
| 486 | + ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId() |
|
| 487 | + . '-'.$link->getToken(); |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | public static function generateUserParameter(SharingFrame $frame) { |
| 497 | 497 | |
| 498 | 498 | if ($frame->getCloudId() !== null) { |
| 499 | - $name = $frame->getAuthor() . '@' . $frame->getCloudId(); |
|
| 499 | + $name = $frame->getAuthor().'@'.$frame->getCloudId(); |
|
| 500 | 500 | } else { |
| 501 | 501 | $name = MiscService::getDisplay($frame->getAuthor(), Member::TYPE_USER); |
| 502 | 502 | } |
@@ -265,7 +265,7 @@ |
||
| 265 | 265 | * @return DataResponse |
| 266 | 266 | */ |
| 267 | 267 | private function federatedFail($reason) { |
| 268 | - $this->miscService->log(0, 'federated fail: ' . $reason); |
|
| 268 | + $this->miscService->log(0, 'federated fail: '.$reason); |
|
| 269 | 269 | |
| 270 | 270 | return new DataResponse( |
| 271 | 271 | [ |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 77 | 77 | $qb->andWhere( |
| 78 | 78 | $expr->in( |
| 79 | - $pf . 'share_with', |
|
| 79 | + $pf.'share_with', |
|
| 80 | 80 | $qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY) |
| 81 | 81 | ) |
| 82 | 82 | ); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $expr = $qb->expr(); |
| 94 | 94 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 95 | 95 | |
| 96 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId))); |
|
| 96 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId))); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 143 | 143 | $qb->andWhere( |
| 144 | 144 | $expr->orX( |
| 145 | - $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)), |
|
| 146 | - $expr->eq($pf . 'id', $qb->createNamedParameter($circleId)) |
|
| 145 | + $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)), |
|
| 146 | + $expr->eq($pf.'id', $qb->createNamedParameter($circleId)) |
|
| 147 | 147 | ) |
| 148 | 148 | ); |
| 149 | 149 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 166 | 166 | $qb->andWhere( |
| 167 | 167 | $expr->in( |
| 168 | - $pf . 'file_source', |
|
| 168 | + $pf.'file_source', |
|
| 169 | 169 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) |
| 170 | 170 | ) |
| 171 | 171 | ); |
@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 199 | 199 | |
| 200 | 200 | if ($reShares === false) { |
| 201 | - $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 201 | + $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 202 | 202 | } else { |
| 203 | 203 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 204 | 204 | $qb->andWhere( |
| 205 | 205 | $expr->orX( |
| 206 | - $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)), |
|
| 207 | - $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 206 | + $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)), |
|
| 207 | + $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 208 | 208 | ) |
| 209 | 209 | ); |
| 210 | 210 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | |
| 227 | 227 | $tmpOrX = $expr->eq( |
| 228 | 228 | 's.share_with', |
| 229 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 229 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 230 | 230 | ); |
| 231 | 231 | |
| 232 | 232 | if ($shareId === -1) { |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | 'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX( |
| 258 | 258 | $expr->eq( |
| 259 | 259 | 'mo.circle_id', |
| 260 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 260 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 261 | 261 | ), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)), |
| 262 | 262 | $expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) |
| 263 | 263 | ) |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | return $qb->expr()->andX( |
| 314 | 314 | $expr->in( |
| 315 | 315 | $qb->createFunction( |
| 316 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 316 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 317 | 317 | ), |
| 318 | 318 | $qb->createFunction($subQb->getSQL()) |
| 319 | 319 | ) |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | return $qb->expr()->andX( |
| 352 | 352 | $expr->in( |
| 353 | 353 | $qb->createFunction( |
| 354 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 354 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 355 | 355 | ), |
| 356 | 356 | $qb->createFunction($subQb->getSQL()) |
| 357 | 357 | ) |
@@ -510,24 +510,24 @@ |
||
| 510 | 510 | switch ($type) { |
| 511 | 511 | case Circle::CIRCLES_PERSONAL: |
| 512 | 512 | return $urlGen->getAbsoluteURL( |
| 513 | - $urlGen->imagePath(Application::APP_NAME, 'personal' . $ext) |
|
| 513 | + $urlGen->imagePath(Application::APP_NAME, 'personal'.$ext) |
|
| 514 | 514 | ); |
| 515 | 515 | case Circle::CIRCLES_CLOSED: |
| 516 | 516 | return $urlGen->getAbsoluteURL( |
| 517 | - $urlGen->imagePath(Application::APP_NAME, 'closed' . $ext) |
|
| 517 | + $urlGen->imagePath(Application::APP_NAME, 'closed'.$ext) |
|
| 518 | 518 | ); |
| 519 | 519 | case Circle::CIRCLES_SECRET: |
| 520 | 520 | return $urlGen->getAbsoluteURL( |
| 521 | - $urlGen->imagePath(Application::APP_NAME, 'secret' . $ext) |
|
| 521 | + $urlGen->imagePath(Application::APP_NAME, 'secret'.$ext) |
|
| 522 | 522 | ); |
| 523 | 523 | case Circle::CIRCLES_PUBLIC: |
| 524 | 524 | return $urlGen->getAbsoluteURL( |
| 525 | - $urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext) |
|
| 525 | + $urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext) |
|
| 526 | 526 | ); |
| 527 | 527 | } |
| 528 | 528 | |
| 529 | 529 | return $urlGen->getAbsoluteURL( |
| 530 | - $urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext) |
|
| 530 | + $urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext) |
|
| 531 | 531 | ); |
| 532 | 532 | } |
| 533 | 533 | |
@@ -31,9 +31,9 @@ |
||
| 31 | 31 | |
| 32 | 32 | namespace OCA\Circles\AppInfo; |
| 33 | 33 | |
| 34 | -$composerDir = __DIR__ . '/../vendor/'; |
|
| 34 | +$composerDir = __DIR__.'/../vendor/'; |
|
| 35 | 35 | |
| 36 | -if (is_dir($composerDir) && file_exists($composerDir . 'autoload.php')) { |
|
| 37 | - require_once $composerDir . 'autoload.php'; |
|
| 36 | +if (is_dir($composerDir) && file_exists($composerDir.'autoload.php')) { |
|
| 37 | + require_once $composerDir.'autoload.php'; |
|
| 38 | 38 | } |
| 39 | 39 | |
@@ -344,7 +344,7 @@ |
||
| 344 | 344 | ); |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | - $tmpContact = $this->userId . ':' . $ident; |
|
| 347 | + $tmpContact = $this->userId.':'.$ident; |
|
| 348 | 348 | $result = MiscService::getContactData($tmpContact); |
| 349 | 349 | if (empty($result)) { |
| 350 | 350 | throw new NoUserException($this->l10n->t("This contact is not available")); |
@@ -300,19 +300,19 @@ discard block |
||
| 300 | 300 | */ |
| 301 | 301 | private function createShare($share) { |
| 302 | 302 | $this->miscService->log( |
| 303 | - 'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: ' |
|
| 304 | - . $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: ' |
|
| 305 | - . $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0 |
|
| 303 | + 'Creating share (1/4) - type: '.$share->getShareType().' - token: ' |
|
| 304 | + . $share->getToken().' - type: '.$share->getShareType().' - with: ' |
|
| 305 | + . $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0 |
|
| 306 | 306 | ); |
| 307 | 307 | |
| 308 | 308 | $qb = $this->getBaseInsertSql($share); |
| 309 | - $this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0); |
|
| 309 | + $this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0); |
|
| 310 | 310 | |
| 311 | 311 | $result = $qb->execute(); |
| 312 | - $this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0); |
|
| 312 | + $this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0); |
|
| 313 | 313 | |
| 314 | 314 | $id = $qb->getLastInsertId(); |
| 315 | - $this->miscService->log('Share created ID (4/4) : ' . $id, 0); |
|
| 315 | + $this->miscService->log('Share created ID (4/4) : '.$id, 0); |
|
| 316 | 316 | |
| 317 | 317 | try { |
| 318 | 318 | $share->setId($id); |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | public function getShareByToken($token) { |
| 538 | 538 | $qb = $this->dbConnection->getQueryBuilder(); |
| 539 | 539 | |
| 540 | - $this->miscService->log("Opening share by token '#" . $token . "'", 0); |
|
| 540 | + $this->miscService->log("Opening share by token '#".$token."'", 0); |
|
| 541 | 541 | |
| 542 | 542 | $cursor = $qb->select('*') |
| 543 | 543 | ->from('share') |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | try { |
| 562 | 562 | $data = $this->getShareByPersonalToken($token); |
| 563 | 563 | } catch (Exception $e) { |
| 564 | - $this->miscService->log("Share '#" . $token . "' not found.", 0); |
|
| 564 | + $this->miscService->log("Share '#".$token."' not found.", 0); |
|
| 565 | 565 | throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share')); |
| 566 | 566 | } |
| 567 | 567 | } |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | $share = $this->createShareObject($data); |
| 571 | 571 | } catch (InvalidShare $e) { |
| 572 | 572 | $this->miscService->log( |
| 573 | - "Share Object '#" . $token . "' not created. " . json_encode($data), 0 |
|
| 573 | + "Share Object '#".$token."' not created. ".json_encode($data), 0 |
|
| 574 | 574 | ); |
| 575 | 575 | throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share')); |
| 576 | 576 | } |
@@ -932,7 +932,7 @@ discard block |
||
| 932 | 932 | ); |
| 933 | 933 | |
| 934 | 934 | $cursor = $qb->execute(); |
| 935 | - while($data = $cursor->fetch()) { |
|
| 935 | + while ($data = $cursor->fetch()) { |
|
| 936 | 936 | $share = $this->createShareObject($data); |
| 937 | 937 | |
| 938 | 938 | yield $share; |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | use OCA\Circles\AppInfo\Application; |
| 31 | 31 | |
| 32 | 32 | |
| 33 | -require_once __DIR__ . '/autoload.php'; |
|
| 33 | +require_once __DIR__.'/autoload.php'; |
|
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | $app = \OC::$server->query(Application::class); |