@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * returns the index of a specific UserID in a Members List |
| 193 | 193 | * |
| 194 | 194 | * @param array $members |
| 195 | - * @param $userId |
|
| 195 | + * @param string $userId |
|
| 196 | 196 | * |
| 197 | 197 | * @return int |
| 198 | 198 | */ |
@@ -415,6 +415,9 @@ discard block |
||
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | |
| 418 | + /** |
|
| 419 | + * @param string $groupId |
|
| 420 | + */ |
|
| 418 | 421 | public function unlinkAllFromGroup($groupId) { |
| 419 | 422 | $qb = $this->getGroupsDeleteSql($groupId); |
| 420 | 423 | $qb->execute(); |
@@ -301,6 +301,9 @@ |
||
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | |
| 304 | + /** |
|
| 305 | + * @param integer $status |
|
| 306 | + */ |
|
| 304 | 307 | public function hasToBeValidStatusUpdate($status) { |
| 305 | 308 | if ($this->getStatus() === self::STATUS_LINK_DOWN && $status === self::STATUS_LINK_REMOVE) { |
| 306 | 309 | return true; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * @return IEvent |
| 75 | 75 | */ |
| 76 | 76 | protected function parseCircleEvent( |
| 77 | - IEvent &$event, Circle $circle, $remote, $ownEvent, $othersEvent |
|
| 77 | + IEvent & $event, Circle $circle, $remote, $ownEvent, $othersEvent |
|
| 78 | 78 | ) { |
| 79 | 79 | $data = [ |
| 80 | 80 | 'author' => $this->generateViewerParameter($circle), |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | * @return IEvent |
| 103 | 103 | */ |
| 104 | 104 | protected function parseMemberEvent( |
| 105 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 105 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 106 | 106 | ) { |
| 107 | 107 | $data = [ |
| 108 | 108 | 'circle' => $this->generateCircleParameter($circle), |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * |
| 129 | 129 | * @return IEvent |
| 130 | 130 | */ |
| 131 | - protected function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $remote, $line |
|
| 131 | + protected function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $remote, $line |
|
| 132 | 132 | ) { |
| 133 | 133 | $data = [ |
| 134 | 134 | 'circle' => $this->generateCircleParameter($circle), |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * @return IEvent |
| 152 | 152 | */ |
| 153 | 153 | protected function parseCircleMemberEvent( |
| 154 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 154 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent |
|
| 155 | 155 | ) { |
| 156 | 156 | $data = [ |
| 157 | 157 | 'author' => $this->generateViewerParameter($circle), |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * @return IEvent |
| 183 | 183 | */ |
| 184 | 184 | protected function parseCircleMemberAdvancedEvent( |
| 185 | - IEvent &$event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent |
|
| 185 | + IEvent & $event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent |
|
| 186 | 186 | ) { |
| 187 | 187 | $data = [ |
| 188 | 188 | 'author' => $this->generateViewerParameter($circle), |
@@ -205,13 +205,13 @@ discard block |
||
| 205 | 205 | /** |
| 206 | 206 | * @param IEvent $event |
| 207 | 207 | */ |
| 208 | - protected function generateParsedSubject(IEvent &$event) { |
|
| 208 | + protected function generateParsedSubject(IEvent & $event) { |
|
| 209 | 209 | $subject = $event->getRichSubject(); |
| 210 | 210 | $params = $event->getRichSubjectParameters(); |
| 211 | 211 | $ak = array_keys($params); |
| 212 | 212 | foreach ($ak as $k) { |
| 213 | 213 | if (is_array($params[$k])) { |
| 214 | - $subject = str_replace('{' . $k . '}', $params[$k]['parsed'], $subject); |
|
| 214 | + $subject = str_replace('{'.$k.'}', $params[$k]['parsed'], $subject); |
|
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | |
@@ -278,8 +278,8 @@ discard block |
||
| 278 | 278 | return [ |
| 279 | 279 | 'type' => 'circle', |
| 280 | 280 | 'id' => $link->getUniqueId(), |
| 281 | - 'name' => $link->getToken() . '@' . $link->getAddress(), |
|
| 282 | - 'parsed' => $link->getToken() . '@' . $link->getAddress() |
|
| 281 | + 'name' => $link->getToken().'@'.$link->getAddress(), |
|
| 282 | + 'parsed' => $link->getToken().'@'.$link->getAddress() |
|
| 283 | 283 | ]; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | |
| 73 | - private function setIcon(IEvent &$event, Circle $circle) { |
|
| 73 | + private function setIcon(IEvent & $event, Circle $circle) { |
|
| 74 | 74 | $event->setIcon( |
| 75 | 75 | CirclesService::getCircleIcon( |
| 76 | 76 | $circle->getType(), |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * |
| 88 | 88 | * @return IEvent |
| 89 | 89 | */ |
| 90 | - private function parseAsMember(IEvent &$event, Circle $circle, $params) { |
|
| 90 | + private function parseAsMember(IEvent & $event, Circle $circle, $params) { |
|
| 91 | 91 | if ($event->getType() !== 'circles_as_member') { |
| 92 | 92 | return $event; |
| 93 | 93 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @return IEvent |
| 125 | 125 | * @throws Exception |
| 126 | 126 | */ |
| 127 | - private function parseAsModerator(IEvent &$event, Circle $circle, $params) { |
|
| 127 | + private function parseAsModerator(IEvent & $event, Circle $circle, $params) { |
|
| 128 | 128 | if ($event->getType() !== 'circles_as_moderator') { |
| 129 | 129 | return $event; |
| 130 | 130 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * |
| 156 | 156 | * @return IEvent |
| 157 | 157 | */ |
| 158 | - private function parseMemberAsMember(IEvent &$event, Circle $circle) { |
|
| 158 | + private function parseMemberAsMember(IEvent & $event, Circle $circle) { |
|
| 159 | 159 | $params = $event->getSubjectParameters(); |
| 160 | 160 | $member = Member::fromJSON($params['member']); |
| 161 | 161 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | * |
| 188 | 188 | * @return IEvent |
| 189 | 189 | */ |
| 190 | - private function parseSubjectMemberJoin(IEvent &$event, Circle $circle, Member $member) { |
|
| 190 | + private function parseSubjectMemberJoin(IEvent & $event, Circle $circle, Member $member) { |
|
| 191 | 191 | if ($circle->getType() === Circle::CIRCLES_CLOSED) { |
| 192 | 192 | return $this->parseCircleMemberEvent( |
| 193 | 193 | $event, $circle, $member, |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @return IEvent |
| 216 | 216 | */ |
| 217 | - private function parseSubjectMemberAdd(IEvent &$event, Circle $circle, Member $member) { |
|
| 217 | + private function parseSubjectMemberAdd(IEvent & $event, Circle $circle, Member $member) { |
|
| 218 | 218 | if ($circle->getType() === Circle::CIRCLES_CLOSED) { |
| 219 | 219 | return $this->parseCircleMemberAdvancedEvent( |
| 220 | 220 | $event, $circle, $member, |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * |
| 245 | 245 | * @return IEvent |
| 246 | 246 | */ |
| 247 | - private function parseSubjectMemberLeft(IEvent &$event, Circle $circle, Member $member) { |
|
| 247 | + private function parseSubjectMemberLeft(IEvent & $event, Circle $circle, Member $member) { |
|
| 248 | 248 | if ($circle->getType() === Circle::CIRCLES_CLOSED |
| 249 | 249 | && $member->getLevel() === Member::LEVEL_NONE) { |
| 250 | 250 | return $this->parseSubjectNonMemberLeftClosedCircle($event, $circle, $member); |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * @return IEvent |
| 271 | 271 | */ |
| 272 | 272 | private function parseSubjectNonMemberLeftClosedCircle( |
| 273 | - IEvent &$event, Circle $circle, Member $member |
|
| 273 | + IEvent & $event, Circle $circle, Member $member |
|
| 274 | 274 | ) { |
| 275 | 275 | if ($member->getStatus() === Member::STATUS_INVITED) { |
| 276 | 276 | return $this->parseCircleMemberEvent( |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | * |
| 300 | 300 | * @return IEvent |
| 301 | 301 | */ |
| 302 | - private function parseSubjectMemberRemove(IEvent &$event, Circle $circle, Member $member) { |
|
| 302 | + private function parseSubjectMemberRemove(IEvent & $event, Circle $circle, Member $member) { |
|
| 303 | 303 | if ($circle->getType() === Circle::CIRCLES_CLOSED |
| 304 | 304 | && $member->getLevel() === Member::LEVEL_NONE) { |
| 305 | 305 | return $this->parseSubjectNonMemberRemoveClosedCircle($event, $circle, $member); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | * @return IEvent |
| 328 | 328 | */ |
| 329 | 329 | private function parseSubjectNonMemberRemoveClosedCircle( |
| 330 | - IEvent &$event, Circle $circle, Member $member |
|
| 330 | + IEvent & $event, Circle $circle, Member $member |
|
| 331 | 331 | ) { |
| 332 | 332 | if ($member->getStatus() === Member::STATUS_REQUEST) { |
| 333 | 333 | return $this->parseCircleMemberAdvancedEvent( |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | * |
| 354 | 354 | * @return IEvent |
| 355 | 355 | */ |
| 356 | - private function parseGroupAsModerator(IEvent &$event, Circle $circle) { |
|
| 356 | + private function parseGroupAsModerator(IEvent & $event, Circle $circle) { |
|
| 357 | 357 | |
| 358 | 358 | $params = $event->getSubjectParameters(); |
| 359 | 359 | $group = Member::fromJSON($params['group']); |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | * |
| 401 | 401 | * @return IEvent |
| 402 | 402 | */ |
| 403 | - private function parseMemberAsModerator(IEvent &$event, Circle $circle) { |
|
| 403 | + private function parseMemberAsModerator(IEvent & $event, Circle $circle) { |
|
| 404 | 404 | |
| 405 | 405 | $params = $event->getSubjectParameters(); |
| 406 | 406 | $member = Member::fromJSON($params['member']); |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | * |
| 450 | 450 | * @return IEvent |
| 451 | 451 | */ |
| 452 | - private function parseLinkAsModerator(IEvent &$event, Circle $circle) { |
|
| 452 | + private function parseLinkAsModerator(IEvent & $event, Circle $circle) { |
|
| 453 | 453 | |
| 454 | 454 | $params = $event->getSubjectParameters(); |
| 455 | 455 | $remote = FederatedLink::fromJSON($params['link']); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * @param IQueryBuilder $qb |
| 72 | 72 | * @param int $id |
| 73 | 73 | */ |
| 74 | - protected function limitToId(IQueryBuilder &$qb, $id) { |
|
| 74 | + protected function limitToId(IQueryBuilder & $qb, $id) { |
|
| 75 | 75 | $this->limitToDBField($qb, 'id', $id); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @param IQueryBuilder $qb |
| 83 | 83 | * @param int $uniqueId |
| 84 | 84 | */ |
| 85 | - protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) { |
|
| 85 | + protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) { |
|
| 86 | 86 | $this->limitToDBField($qb, 'unique_id', $uniqueId); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param IQueryBuilder $qb |
| 94 | 94 | * @param string $token |
| 95 | 95 | */ |
| 96 | - protected function limitToToken(IQueryBuilder &$qb, $token) { |
|
| 96 | + protected function limitToToken(IQueryBuilder & $qb, $token) { |
|
| 97 | 97 | $this->limitToDBField($qb, 'token', $token); |
| 98 | 98 | } |
| 99 | 99 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * |
| 107 | 107 | * @internal param int $circleId |
| 108 | 108 | */ |
| 109 | - protected function limitToUserId(IQueryBuilder &$qb, $userId) { |
|
| 109 | + protected function limitToUserId(IQueryBuilder & $qb, $userId) { |
|
| 110 | 110 | $this->limitToDBField($qb, 'user_id', $userId); |
| 111 | 111 | } |
| 112 | 112 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * |
| 121 | 121 | * @internal param int $circleId |
| 122 | 122 | */ |
| 123 | - protected function limitToUserType(IQueryBuilder &$qb, $type) { |
|
| 123 | + protected function limitToUserType(IQueryBuilder & $qb, $type) { |
|
| 124 | 124 | $this->limitToDBField($qb, 'user_type', $type); |
| 125 | 125 | } |
| 126 | 126 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | * @param IQueryBuilder $qb |
| 133 | 133 | * @param string $circleUniqueId |
| 134 | 134 | */ |
| 135 | - protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) { |
|
| 135 | + protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) { |
|
| 136 | 136 | $this->limitToDBField($qb, 'circle_id', $circleUniqueId); |
| 137 | 137 | } |
| 138 | 138 | |
@@ -143,15 +143,15 @@ discard block |
||
| 143 | 143 | * @param IQueryBuilder $qb |
| 144 | 144 | * @param string $circleUniqueId |
| 145 | 145 | */ |
| 146 | - protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) { |
|
| 146 | + protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) { |
|
| 147 | 147 | $expr = $qb->expr(); |
| 148 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : ''; |
|
| 148 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : ''; |
|
| 149 | 149 | |
| 150 | 150 | $qb->andWhere( |
| 151 | 151 | $expr->eq( |
| 152 | 152 | $qb->createNamedParameter($circleUniqueId), |
| 153 | 153 | $qb->createFunction( |
| 154 | - 'SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')' |
|
| 154 | + 'SUBSTR('.$pf.'`unique_id`'.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')' |
|
| 155 | 155 | ) |
| 156 | 156 | ) |
| 157 | 157 | ); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @param IQueryBuilder $qb |
| 166 | 166 | * @param int $groupId |
| 167 | 167 | */ |
| 168 | - protected function limitToGroupId(IQueryBuilder &$qb, $groupId) { |
|
| 168 | + protected function limitToGroupId(IQueryBuilder & $qb, $groupId) { |
|
| 169 | 169 | $this->limitToDBField($qb, 'group_id', $groupId); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * @param IQueryBuilder $qb |
| 177 | 177 | * @param string $name |
| 178 | 178 | */ |
| 179 | - protected function limitToName(IQueryBuilder &$qb, $name) { |
|
| 179 | + protected function limitToName(IQueryBuilder & $qb, $name) { |
|
| 180 | 180 | $this->limitToDBField($qb, 'name', $name); |
| 181 | 181 | } |
| 182 | 182 | |
@@ -188,12 +188,12 @@ discard block |
||
| 188 | 188 | * @param int $level |
| 189 | 189 | * @param string|array $pf |
| 190 | 190 | */ |
| 191 | - protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') { |
|
| 191 | + protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') { |
|
| 192 | 192 | $expr = $qb->expr(); |
| 193 | 193 | |
| 194 | 194 | if ($pf === '') { |
| 195 | - $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 196 | - $qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level))); |
|
| 195 | + $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 196 | + $qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level))); |
|
| 197 | 197 | |
| 198 | 198 | return; |
| 199 | 199 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) { |
| 209 | 209 | continue; |
| 210 | 210 | } |
| 211 | - $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level))); |
|
| 211 | + $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level))); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | $qb->andWhere($orX); |
@@ -220,15 +220,15 @@ discard block |
||
| 220 | 220 | * |
| 221 | 221 | * @param IQueryBuilder $qb |
| 222 | 222 | */ |
| 223 | - protected function limitToMembersAndAlmost(IQueryBuilder &$qb) { |
|
| 223 | + protected function limitToMembersAndAlmost(IQueryBuilder & $qb) { |
|
| 224 | 224 | $expr = $qb->expr(); |
| 225 | 225 | |
| 226 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 226 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 227 | 227 | |
| 228 | 228 | $orX = $expr->orX(); |
| 229 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 230 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 231 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 229 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 230 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 231 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 232 | 232 | |
| 233 | 233 | $qb->andWhere($orX); |
| 234 | 234 | } |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | * @param string $field |
| 240 | 240 | * @param string|integer $value |
| 241 | 241 | */ |
| 242 | - private function limitToDBField(IQueryBuilder &$qb, $field, $value) { |
|
| 242 | + private function limitToDBField(IQueryBuilder & $qb, $field, $value) { |
|
| 243 | 243 | $expr = $qb->expr(); |
| 244 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 245 | - $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value))); |
|
| 244 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 245 | + $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value))); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | |
@@ -257,9 +257,9 @@ discard block |
||
| 257 | 257 | protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') { |
| 258 | 258 | $expr = $qb->expr(); |
| 259 | 259 | |
| 260 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 260 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 261 | 261 | |
| 262 | - $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid')); |
|
| 262 | + $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid')); |
|
| 263 | 263 | if ($userId !== '') { |
| 264 | 264 | $and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId))); |
| 265 | 265 | } else { |
@@ -278,15 +278,15 @@ discard block |
||
| 278 | 278 | * |
| 279 | 279 | * @deprecated not used (14/07/17) |
| 280 | 280 | */ |
| 281 | - protected function rightJoinCircles(IQueryBuilder &$qb) { |
|
| 281 | + protected function rightJoinCircles(IQueryBuilder & $qb) { |
|
| 282 | 282 | $expr = $qb->expr(); |
| 283 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 283 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 284 | 284 | |
| 285 | 285 | $qb->from(self::TABLE_CIRCLES, 'c') |
| 286 | 286 | ->andWhere( |
| 287 | 287 | $expr->eq( |
| 288 | - $pf . 'circle_id', |
|
| 289 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')') |
|
| 288 | + $pf.'circle_id', |
|
| 289 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')') |
|
| 290 | 290 | ) |
| 291 | 291 | ); |
| 292 | 292 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | $expr->eq('ncgu.gid', 'g.group_id'), |
| 318 | 318 | $expr->eq( |
| 319 | 319 | 'g.circle_id', $qb->createFunction( |
| 320 | - 'SUBSTR(' . $field . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')' |
|
| 320 | + 'SUBSTR('.$field.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')' |
|
| 321 | 321 | ) |
| 322 | 322 | ) |
| 323 | 323 | ) |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | - * @param $circleName |
|
| 178 | + * @param string $circleName |
|
| 179 | 179 | * @param IShare $share |
| 180 | 180 | * @param string $email |
| 181 | 181 | */ |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @param $subject |
| 230 | 230 | * @param $text |
| 231 | 231 | * @param $fileName |
| 232 | - * @param $link |
|
| 232 | + * @param string $link |
|
| 233 | 233 | * |
| 234 | 234 | * @return \OCP\Mail\IEMailTemplate |
| 235 | 235 | */ |
@@ -244,7 +244,7 @@ |
||
| 244 | 244 | $emailTemplate->addHeader(); |
| 245 | 245 | $emailTemplate->addHeading($subject, false); |
| 246 | 246 | $emailTemplate->addBodyText( |
| 247 | - $text . "\n " . $this->l10n->t('Click the button below to open it.'), $text |
|
| 247 | + $text."\n ".$this->l10n->t('Click the button below to open it.'), $text |
|
| 248 | 248 | ); |
| 249 | 249 | $emailTemplate->addBodyButton($this->l10n->t('Open »%s«', [$fileName]), $link); |
| 250 | 250 | |
@@ -278,6 +278,9 @@ |
||
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | + /** |
|
| 282 | + * @param string $json |
|
| 283 | + */ |
|
| 281 | 284 | public static function fromJSON($json) { |
| 282 | 285 | |
| 283 | 286 | $arr = json_decode($json, true); |
@@ -225,7 +225,7 @@ |
||
| 225 | 225 | * @return DataResponse |
| 226 | 226 | */ |
| 227 | 227 | private function federatedFail($reason) { |
| 228 | - $this->miscService->log(2, 'federated fail: ' . $reason); |
|
| 228 | + $this->miscService->log(2, 'federated fail: '.$reason); |
|
| 229 | 229 | |
| 230 | 230 | return new DataResponse( |
| 231 | 231 | [ |
@@ -227,7 +227,7 @@ |
||
| 227 | 227 | ob_start(); |
| 228 | 228 | echo($result); |
| 229 | 229 | $size = ob_get_length(); |
| 230 | - header('Content-Length: ' . $size); |
|
| 230 | + header('Content-Length: '.$size); |
|
| 231 | 231 | ob_end_flush(); |
| 232 | 232 | flush(); |
| 233 | 233 | } |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | /** |
| 130 | - * @param $ident |
|
| 130 | + * @param string $ident |
|
| 131 | 131 | * |
| 132 | 132 | * @return mixed|string |
| 133 | 133 | */ |