@@ -194,7 +194,7 @@ |
||
| 194 | 194 | throw new OCSException('works only from local instance', 404); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - $userId = $currentUser->getUserId() . '/' . $userId; |
|
| 197 | + $userId = $currentUser->getUserId().'/'.$userId; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type); |
@@ -453,7 +453,7 @@ |
||
| 453 | 453 | |
| 454 | 454 | |
| 455 | 455 | /** |
| 456 | - * @NoAdminRequired |
|
| 456 | + * @NoAdminRequired |
|
| 457 | 457 | * |
| 458 | 458 | * @param string $circleId |
| 459 | 459 | * @param int $value |
@@ -74,8 +74,8 @@ |
||
| 74 | 74 | $result[$instance] = $item->gData('files'); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - \OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result)); |
|
| 78 | - \OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers)); |
|
| 77 | + \OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result)); |
|
| 78 | + \OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers)); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | } |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | * @return string |
| 110 | 110 | */ |
| 111 | 111 | protected function stripPath($path) { |
| 112 | - $prefix = '/' . $this->userId . '/files'; |
|
| 112 | + $prefix = '/'.$this->userId.'/files'; |
|
| 113 | 113 | |
| 114 | 114 | return rtrim(substr($path, strlen($prefix)), '/'); |
| 115 | 115 | } |
@@ -325,10 +325,10 @@ discard block |
||
| 325 | 325 | protected function generateMember(Circle $circle, Member $member): Member { |
| 326 | 326 | try { |
| 327 | 327 | if ($member->getSingleId() !== '') { |
| 328 | - $userId = $member->getSingleId() . '@' . $member->getInstance(); |
|
| 328 | + $userId = $member->getSingleId().'@'.$member->getInstance(); |
|
| 329 | 329 | $federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE); |
| 330 | 330 | } else { |
| 331 | - $userId = $member->getUserId() . '@' . $member->getInstance(); |
|
| 331 | + $userId = $member->getUserId().'@'.$member->getInstance(); |
|
| 332 | 332 | $federatedUser = |
| 333 | 333 | $this->federatedUserService->getFederatedUser($userId, $member->getUserType()); |
| 334 | 334 | } |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | $this->sendMailExistingShares($template, $author, $recipient); |
| 602 | 602 | $this->sendPasswordExistingShares($author, $recipient, $password); |
| 603 | 603 | } catch (Exception $e) { |
| 604 | - $this->miscService->log('Failed to send mail about existing share ' . $e->getMessage()); |
|
| 604 | + $this->miscService->log('Failed to send mail about existing share '.$e->getMessage()); |
|
| 605 | 605 | } |
| 606 | 606 | } |
| 607 | 607 | |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | $authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author; |
| 754 | 754 | $authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null; |
| 755 | 755 | |
| 756 | - $this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0); |
|
| 756 | + $this->miscService->log("Sending password mail about existing files to '".$email."'", 0); |
|
| 757 | 757 | |
| 758 | 758 | $plainBodyPart = $this->l10n->t( |
| 759 | 759 | "%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n", |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
| 796 | 796 | if ($authorEmail !== null) { |
| 797 | 797 | $message->setReplyTo([$authorEmail => $authorName]); |
| 798 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
| 798 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
| 799 | 799 | } else { |
| 800 | 800 | $emailTemplate->addFooter(); |
| 801 | 801 | } |
@@ -394,14 +394,14 @@ |
||
| 394 | 394 | * @throws FederatedUserNotFoundException |
| 395 | 395 | */ |
| 396 | 396 | public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { |
| 397 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
| 397 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
| 398 | 398 | throw new FederatedUserNotFoundException(); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 402 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
| 403 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
| 404 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 401 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 402 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
| 403 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
| 404 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 405 | 405 | |
| 406 | 406 | $this->getManager()->manageImportFromDatabase($this, $data, $prefix); |
| 407 | 407 | |
@@ -190,7 +190,7 @@ |
||
| 190 | 190 | return $this->mountPoint; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($this->mountPoint, '/'); |
|
| 193 | + return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($this->mountPoint, '/'); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | /** |
@@ -504,29 +504,29 @@ |
||
| 504 | 504 | * @throws FileCacheNotFoundException |
| 505 | 505 | */ |
| 506 | 506 | public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { |
| 507 | - if ($this->getInt($prefix . 'fileid', $data) === 0) { |
|
| 507 | + if ($this->getInt($prefix.'fileid', $data) === 0) { |
|
| 508 | 508 | throw new FileCacheNotFoundException(); |
| 509 | 509 | } |
| 510 | 510 | |
| 511 | - $this->setId($this->getInt($prefix . 'fileid', $data)); |
|
| 512 | - $this->setPath($this->get($prefix . 'path', $data)); |
|
| 513 | - $this->setPermissions($this->getInt($prefix . 'permissions', $data)); |
|
| 514 | - $this->setStorageId($this->getInt($prefix . 'storage', $data)); |
|
| 515 | - $this->setPathHash($this->get($prefix . 'path_hash', $data)); |
|
| 516 | - $this->setParent($this->getInt($prefix . 'parent', $data)); |
|
| 517 | - $this->setName($this->get($prefix . 'name', $data)); |
|
| 518 | - $this->setMimeType($this->getInt($prefix . 'mimetype', $data)); |
|
| 519 | - $this->setMimePart($this->getInt($prefix . 'mimepart', $data)); |
|
| 520 | - $this->setSize($this->getInt($prefix . 'size', $data)); |
|
| 521 | - $this->setMTime($this->getInt($prefix . 'mtime', $data)); |
|
| 522 | - $this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data)); |
|
| 523 | - $this->setEncrypted($this->getBool($prefix . 'encrypted', $data)); |
|
| 524 | - $this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data)); |
|
| 525 | - $this->setEtag($this->get($prefix . 'etag', $data)); |
|
| 526 | - $this->setChecksum($this->get($prefix . 'checksum', $data)); |
|
| 511 | + $this->setId($this->getInt($prefix.'fileid', $data)); |
|
| 512 | + $this->setPath($this->get($prefix.'path', $data)); |
|
| 513 | + $this->setPermissions($this->getInt($prefix.'permissions', $data)); |
|
| 514 | + $this->setStorageId($this->getInt($prefix.'storage', $data)); |
|
| 515 | + $this->setPathHash($this->get($prefix.'path_hash', $data)); |
|
| 516 | + $this->setParent($this->getInt($prefix.'parent', $data)); |
|
| 517 | + $this->setName($this->get($prefix.'name', $data)); |
|
| 518 | + $this->setMimeType($this->getInt($prefix.'mimetype', $data)); |
|
| 519 | + $this->setMimePart($this->getInt($prefix.'mimepart', $data)); |
|
| 520 | + $this->setSize($this->getInt($prefix.'size', $data)); |
|
| 521 | + $this->setMTime($this->getInt($prefix.'mtime', $data)); |
|
| 522 | + $this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data)); |
|
| 523 | + $this->setEncrypted($this->getBool($prefix.'encrypted', $data)); |
|
| 524 | + $this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data)); |
|
| 525 | + $this->setEtag($this->get($prefix.'etag', $data)); |
|
| 526 | + $this->setChecksum($this->get($prefix.'checksum', $data)); |
|
| 527 | 527 | |
| 528 | 528 | // small hack as there is no reason to call a recursive method for a single entry from the table |
| 529 | - $this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data)); |
|
| 529 | + $this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data)); |
|
| 530 | 530 | |
| 531 | 531 | return $this; |
| 532 | 532 | } |
@@ -794,29 +794,29 @@ discard block |
||
| 794 | 794 | * @throws MemberNotFoundException |
| 795 | 795 | */ |
| 796 | 796 | public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow { |
| 797 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
| 797 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
| 798 | 798 | throw new MemberNotFoundException(); |
| 799 | 799 | } |
| 800 | 800 | |
| 801 | - $this->setId($this->get($prefix . 'member_id', $data)); |
|
| 802 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
| 803 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 804 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
| 805 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
| 806 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 807 | - $this->setLevel($this->getInt($prefix . 'level', $data)); |
|
| 808 | - $this->setStatus($this->get($prefix . 'status', $data)); |
|
| 809 | - $this->setDisplayName($this->get($prefix . 'cached_name', $data)); |
|
| 810 | - $this->setNote($this->get($prefix . 'note', $data)); |
|
| 811 | - $this->setContactId($this->get($prefix . 'contact_id', $data)); |
|
| 812 | - $this->setContactMeta($this->get($prefix . 'contact_meta', $data)); |
|
| 813 | - |
|
| 814 | - $cachedUpdate = $this->get($prefix . 'cached_update', $data); |
|
| 801 | + $this->setId($this->get($prefix.'member_id', $data)); |
|
| 802 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
| 803 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 804 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
| 805 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
| 806 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 807 | + $this->setLevel($this->getInt($prefix.'level', $data)); |
|
| 808 | + $this->setStatus($this->get($prefix.'status', $data)); |
|
| 809 | + $this->setDisplayName($this->get($prefix.'cached_name', $data)); |
|
| 810 | + $this->setNote($this->get($prefix.'note', $data)); |
|
| 811 | + $this->setContactId($this->get($prefix.'contact_id', $data)); |
|
| 812 | + $this->setContactMeta($this->get($prefix.'contact_meta', $data)); |
|
| 813 | + |
|
| 814 | + $cachedUpdate = $this->get($prefix.'cached_update', $data); |
|
| 815 | 815 | if ($cachedUpdate !== '') { |
| 816 | 816 | $this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp()); |
| 817 | 817 | } |
| 818 | 818 | |
| 819 | - $joined = $this->get($prefix . 'joined', $data); |
|
| 819 | + $joined = $this->get($prefix.'joined', $data); |
|
| 820 | 820 | if ($joined !== '') { |
| 821 | 821 | $this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp()); |
| 822 | 822 | } |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | public static function parseLevelInt(int $level): int { |
| 897 | 897 | if (!array_key_exists($level, self::$DEF_LEVEL)) { |
| 898 | 898 | $all = implode(', ', array_keys(self::$DEF_LEVEL)); |
| 899 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
| 899 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | return $level; |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | |
| 916 | 916 | if (!$level) { |
| 917 | 917 | $all = implode(', ', array_values(self::$DEF_LEVEL)); |
| 918 | - throw new ParseMemberLevelException('Available levels: ' . $all, 121); |
|
| 918 | + throw new ParseMemberLevelException('Available levels: '.$all, 121); |
|
| 919 | 919 | } |
| 920 | 920 | |
| 921 | 921 | return (int)$level; |
@@ -933,7 +933,7 @@ discard block |
||
| 933 | 933 | |
| 934 | 934 | if ($type === false) { |
| 935 | 935 | $all = implode(', ', array_values(self::$TYPE)); |
| 936 | - throw new UserTypeNotFoundException('Available types: ' . $all); |
|
| 936 | + throw new UserTypeNotFoundException('Available types: '.$all); |
|
| 937 | 937 | } |
| 938 | 938 | |
| 939 | 939 | return (int)$type; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | try { |
| 105 | 105 | $level = Member::parseLevelString($levelString); |
| 106 | 106 | } catch (ParseMemberLevelException $e) { |
| 107 | - throw new MemberHelperException('method ' . $levelString . ' not found'); |
|
| 107 | + throw new MemberHelperException('method '.$levelString.' not found'); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $this->mustHaveLevelEqualOrAbove($level); |
@@ -122,11 +122,11 @@ discard block |
||
| 122 | 122 | try { |
| 123 | 123 | $level = Member::parseLevelString($levelString); |
| 124 | 124 | } catch (ParseMemberLevelException $e) { |
| 125 | - throw new MemberHelperException('method ' . $levelString . ' not found'); |
|
| 125 | + throw new MemberHelperException('method '.$levelString.' not found'); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ($this->member->getLevel() >= $level) { |
| 129 | - throw new MemberLevelException('Member cannot be ' . $levelString); |
|
| 129 | + throw new MemberLevelException('Member cannot be '.$levelString); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |