@@ -95,7 +95,7 @@ |
||
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | - * @param $circleId |
|
| 98 | + * @param integer $circleId |
|
| 99 | 99 | * @param int $level |
| 100 | 100 | * |
| 101 | 101 | * @return Member[] |
@@ -64,8 +64,9 @@ |
||
| 64 | 64 | $qb = $this->getCirclesSelectSql(); |
| 65 | 65 | |
| 66 | 66 | $this->limitToId($qb, $circleId); |
| 67 | - if ($userId !== '') |
|
| 68 | - $this->limitToUserId($qb, $userId); |
|
| 67 | + if ($userId !== '') { |
|
| 68 | + $this->limitToUserId($qb, $userId); |
|
| 69 | + } |
|
| 69 | 70 | |
| 70 | 71 | // $this->leftjoinOwner($qb); |
| 71 | 72 | // $this->buildWithMemberLevel($qb, 'u.level', $level); |
@@ -53,6 +53,7 @@ discard block |
||
| 53 | 53 | * Join the Circles table |
| 54 | 54 | * |
| 55 | 55 | * @param IQueryBuilder $qb |
| 56 | + * @param string $field |
|
| 56 | 57 | */ |
| 57 | 58 | protected function joinCircles(& $qb, $field) { |
| 58 | 59 | $expr = $qb->expr(); |
@@ -108,6 +109,9 @@ discard block |
||
| 108 | 109 | |
| 109 | 110 | |
| 110 | 111 | |
| 112 | + /** |
|
| 113 | + * @param integer $level |
|
| 114 | + */ |
|
| 111 | 115 | protected function limitToMemberLevel(IQueryBuilder &$qb, $level) { |
| 112 | 116 | $qb->where( |
| 113 | 117 | $qb->expr() |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | * @param IQueryBuilder $qb |
| 69 | 69 | * @param int $circleId |
| 70 | 70 | */ |
| 71 | - protected function limitToCircle(IQueryBuilder &$qb, $circleId) { |
|
| 71 | + protected function limitToCircle(IQueryBuilder & $qb, $circleId) { |
|
| 72 | 72 | $expr = $qb->expr(); |
| 73 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 73 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 74 | 74 | |
| 75 | - $qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId))); |
|
| 75 | + $qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId))); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | * @param IQueryBuilder $qb |
| 84 | 84 | * @param int $id |
| 85 | 85 | */ |
| 86 | - protected function limitToId(IQueryBuilder &$qb, $id) { |
|
| 86 | + protected function limitToId(IQueryBuilder & $qb, $id) { |
|
| 87 | 87 | $expr = $qb->expr(); |
| 88 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 88 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 89 | 89 | |
| 90 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($id))); |
|
| 90 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id))); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * @param IQueryBuilder $qb |
| 98 | 98 | * @param string $userId |
| 99 | 99 | */ |
| 100 | - protected function limitToUserId(IQueryBuilder &$qb, $userId) { |
|
| 100 | + protected function limitToUserId(IQueryBuilder & $qb, $userId) { |
|
| 101 | 101 | // $expr = $qb->expr(); |
| 102 | 102 | // $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
| 103 | 103 | // |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | |
| 111 | - protected function limitToMemberLevel(IQueryBuilder &$qb, $level) { |
|
| 111 | + protected function limitToMemberLevel(IQueryBuilder & $qb, $level) { |
|
| 112 | 112 | $qb->where( |
| 113 | 113 | $qb->expr() |
| 114 | 114 | ->gte('m.level', $qb->createNamedParameter($level)) |
@@ -122,19 +122,19 @@ discard block |
||
| 122 | 122 | * @deprecated |
| 123 | 123 | * never used in fact. |
| 124 | 124 | */ |
| 125 | - protected function leftJoinOwner(IQueryBuilder &$qb) { |
|
| 125 | + protected function leftJoinOwner(IQueryBuilder & $qb) { |
|
| 126 | 126 | |
| 127 | 127 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 128 | 128 | return; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | $expr = $qb->expr(); |
| 132 | - $pf = $this->default_select_alias . '.'; |
|
| 132 | + $pf = $this->default_select_alias.'.'; |
|
| 133 | 133 | |
| 134 | 134 | $qb->leftJoin( |
| 135 | 135 | $this->default_select_alias, MembersMapper::TABLENAME, 'o', |
| 136 | 136 | $expr->andX( |
| 137 | - $expr->eq($pf . 'id', 'o.circle_id'), |
|
| 137 | + $expr->eq($pf.'id', 'o.circle_id'), |
|
| 138 | 138 | $expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) |
| 139 | 139 | ) |
| 140 | 140 | ); |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | * in the database and send a request to the remote circle using requestLink() |
| 164 | 164 | * If any issue, entry is removed from the database. |
| 165 | 165 | * |
| 166 | - * @param $circleId |
|
| 167 | - * @param $remote |
|
| 166 | + * @param integer $circleId |
|
| 167 | + * @param string $remote |
|
| 168 | 168 | * |
| 169 | 169 | * @return FederatedLink |
| 170 | 170 | * @throws Exception |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @param Circle $circle |
| 235 | 235 | * @param FederatedLink $link |
| 236 | 236 | * |
| 237 | - * @return int |
|
| 237 | + * @return boolean |
|
| 238 | 238 | * @throws Exception |
| 239 | 239 | */ |
| 240 | 240 | private function requestLink(Circle $circle, FederatedLink &$link) { |
@@ -328,8 +328,8 @@ discard block |
||
| 328 | 328 | |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | - * @param $circleId |
|
| 332 | - * @param $uniqueId |
|
| 331 | + * @param integer $circleId |
|
| 332 | + * @param string $uniqueId |
|
| 333 | 333 | * |
| 334 | 334 | * @return FederatedLink |
| 335 | 335 | */ |
@@ -338,6 +338,9 @@ discard block |
||
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | |
| 341 | + /** |
|
| 342 | + * @param string $token |
|
| 343 | + */ |
|
| 341 | 344 | public function initiateRemoteShare($token) { |
| 342 | 345 | $args = [ |
| 343 | 346 | 'token' => $token, |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | private function generateLinkRemoteURL($remote) { |
| 209 | 209 | if (strpos($remote, 'http') !== 0) { |
| 210 | - $remote = 'https://' . $remote; |
|
| 210 | + $remote = 'https://'.$remote; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/'; |
|
| 213 | + return rtrim($remote, '/').'/index.php/apps/circles/circles/link/'; |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | private function generatePayloadDeliveryURL($remote) { |
| 222 | 222 | if (strpos($remote, 'http') !== 0) { |
| 223 | - $remote = 'http://' . $remote; |
|
| 223 | + $remote = 'http://'.$remote; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/'; |
|
| 226 | + return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/'; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * @return int |
| 238 | 238 | * @throws Exception |
| 239 | 239 | */ |
| 240 | - private function requestLink(Circle $circle, FederatedLink &$link) { |
|
| 240 | + private function requestLink(Circle $circle, FederatedLink & $link) { |
|
| 241 | 241 | $args = [ |
| 242 | 242 | 'token' => $link->getToken(), |
| 243 | 243 | 'uniqueId' => $circle->getUniqueId(), |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | * |
| 314 | 314 | * @return bool |
| 315 | 315 | */ |
| 316 | - public function initiateLink(Circle $circle, FederatedLink &$link) { |
|
| 316 | + public function initiateLink(Circle $circle, FederatedLink & $link) { |
|
| 317 | 317 | |
| 318 | 318 | $link->setCircleId($circle->getId()); |
| 319 | 319 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | ); |
| 357 | 357 | |
| 358 | 358 | $result = json_decode($request->getBody(), true); |
| 359 | - $this->miscService->log("RESULT: " . $result); |
|
| 359 | + $this->miscService->log("RESULT: ".$result); |
|
| 360 | 360 | |
| 361 | 361 | return true; |
| 362 | 362 | } catch (Exception $e) { |
@@ -132,7 +132,7 @@ |
||
| 132 | 132 | */ |
| 133 | 133 | public function initFederatedDelivery($uniqueId) { |
| 134 | 134 | |
| 135 | - $this->miscService->log("initFederatedDelivery start " . $uniqueId); |
|
| 135 | + $this->miscService->log("initFederatedDelivery start ".$uniqueId); |
|
| 136 | 136 | |
| 137 | 137 | // We don't want to keep the connection with the client up and running |
| 138 | 138 | // as he might have others things to do |
@@ -360,7 +360,7 @@ |
||
| 360 | 360 | if ($data === false) { |
| 361 | 361 | return null; |
| 362 | 362 | } |
| 363 | -$this->miscService->log(" ---- " . var_export($data, true)); |
|
| 363 | +$this->miscService->log(" ---- ".var_export($data, true)); |
|
| 364 | 364 | $circle = new Circle($this->l10n); |
| 365 | 365 | $circle->setId($data['id']); |
| 366 | 366 | $circle->setType($data['type']); |