@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } catch (FederatedItemException $e) { |
| 125 | 125 | if ($input->getOption('status-code')) { |
| 126 | 126 | throw new FederatedItemException( |
| 127 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
| 127 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
| 128 | 128 | ); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | } elseif (strtolower($input->getOption('output')) !== 'none') { |
| 137 | 137 | /** @var Circle $circle */ |
| 138 | 138 | $circle = $this->deserialize($outcome, Circle::class); |
| 139 | - $output->writeln('Id: <info>' . $circle->getSingleId() . '</info>'); |
|
| 140 | - $output->writeln('Name: <info>' . $circle->getDisplayName() . '</info>'); |
|
| 141 | - $output->writeln('Owner: <info>' . $circle->getOwner()->getDisplayName() . '</info>'); |
|
| 139 | + $output->writeln('Id: <info>'.$circle->getSingleId().'</info>'); |
|
| 140 | + $output->writeln('Name: <info>'.$circle->getDisplayName().'</info>'); |
|
| 141 | + $output->writeln('Owner: <info>'.$circle->getOwner()->getDisplayName().'</info>'); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | return 0; |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | $l10n = \OC::$server::get(IFactory::class)->get('circles'); |
| 682 | 682 | $display = $l10n->t('%s (Circle owned by %s)', [$display, $circle->getOwner()->getDisplayName()]); |
| 683 | 683 | } else { |
| 684 | - $display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'; |
|
| 684 | + $display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')'; |
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | $share->setSharedWithDisplayName($display); |
@@ -787,20 +787,20 @@ discard block |
||
| 787 | 787 | */ |
| 788 | 788 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 789 | 789 | $shareTime = new DateTime(); |
| 790 | - $shareTime->setTimestamp($this->getInt($prefix . 'stime', $data)); |
|
| 791 | - |
|
| 792 | - $this->setId($this->get($prefix . 'id', $data)) |
|
| 793 | - ->setShareType($this->getInt($prefix . 'share_type', $data)) |
|
| 794 | - ->setPermissions($this->getInt($prefix . 'permissions', $data)) |
|
| 795 | - ->setItemType($this->get($prefix . 'item_type', $data)) |
|
| 796 | - ->setItemSource($this->getInt($prefix . 'item_source', $data)) |
|
| 797 | - ->setItemTarget($this->get($prefix . 'item_target', $data)) |
|
| 798 | - ->setFileSource($this->getInt($prefix . 'file_source', $data)) |
|
| 799 | - ->setFileTarget($this->get($prefix . 'file_target', $data)) |
|
| 800 | - ->setSharedWith($this->get($prefix . 'share_with', $data)) |
|
| 801 | - ->setSharedBy($this->get($prefix . 'uid_initiator', $data)) |
|
| 802 | - ->setShareOwner($this->get($prefix . 'uid_owner', $data)) |
|
| 803 | - ->setToken($this->get($prefix . 'token', $data)) |
|
| 790 | + $shareTime->setTimestamp($this->getInt($prefix.'stime', $data)); |
|
| 791 | + |
|
| 792 | + $this->setId($this->get($prefix.'id', $data)) |
|
| 793 | + ->setShareType($this->getInt($prefix.'share_type', $data)) |
|
| 794 | + ->setPermissions($this->getInt($prefix.'permissions', $data)) |
|
| 795 | + ->setItemType($this->get($prefix.'item_type', $data)) |
|
| 796 | + ->setItemSource($this->getInt($prefix.'item_source', $data)) |
|
| 797 | + ->setItemTarget($this->get($prefix.'item_target', $data)) |
|
| 798 | + ->setFileSource($this->getInt($prefix.'file_source', $data)) |
|
| 799 | + ->setFileTarget($this->get($prefix.'file_target', $data)) |
|
| 800 | + ->setSharedWith($this->get($prefix.'share_with', $data)) |
|
| 801 | + ->setSharedBy($this->get($prefix.'uid_initiator', $data)) |
|
| 802 | + ->setShareOwner($this->get($prefix.'uid_owner', $data)) |
|
| 803 | + ->setToken($this->get($prefix.'token', $data)) |
|
| 804 | 804 | ->setShareTime($shareTime); |
| 805 | 805 | |
| 806 | 806 | // if (($password = $this->get('personal_password', $data, '')) !== '') { |
@@ -809,9 +809,9 @@ discard block |
||
| 809 | 809 | // $share->setPassword($this->get('password', $data, '')); |
| 810 | 810 | // } |
| 811 | 811 | |
| 812 | - $this->setChildId($this->getInt($prefix . 'child_id', $data)) |
|
| 813 | - ->setChildFileTarget($this->get($prefix . 'child_file_target', $data)) |
|
| 814 | - ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data)) |
|
| 812 | + $this->setChildId($this->getInt($prefix.'child_id', $data)) |
|
| 813 | + ->setChildFileTarget($this->get($prefix.'child_file_target', $data)) |
|
| 814 | + ->setChildPermissions($this->getInt($prefix.'child_permissions', $data)) |
|
| 815 | 815 | ->setProviderId(ShareByCircleProvider::IDENTIFIER) |
| 816 | 816 | ->setStatus(Ishare::STATUS_ACCEPTED); |
| 817 | 817 | |