|
@@ -436,7 +436,7 @@ discard block |
|
|
block discarded – undo |
|
436
|
436
|
$l10n = \OCP\Server::get(IFactory::class)->get('circles'); |
|
437
|
437
|
$display = $l10n->t('%s (Circle owned by %s)', [$display, $circle->getOwner()->getDisplayName()]); |
|
438
|
438
|
} else { |
|
439
|
|
- $display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'; |
|
|
439
|
+ $display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')'; |
|
440
|
440
|
} |
|
441
|
441
|
|
|
442
|
442
|
$share->setSharedWithDisplayName($display); |
|
@@ -535,20 +535,20 @@ discard block |
|
|
block discarded – undo |
|
535
|
535
|
|
|
536
|
536
|
public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
|
537
|
537
|
$shareTime = new DateTime(); |
|
538
|
|
- $shareTime->setTimestamp($this->getInt($prefix . 'stime', $data)); |
|
539
|
|
- |
|
540
|
|
- $this->setId($this->get($prefix . 'id', $data)) |
|
541
|
|
- ->setShareType($this->getInt($prefix . 'share_type', $data)) |
|
542
|
|
- ->setPermissions($this->getInt($prefix . 'permissions', $data)) |
|
543
|
|
- ->setItemType($this->get($prefix . 'item_type', $data)) |
|
544
|
|
- ->setItemSource($this->getInt($prefix . 'item_source', $data)) |
|
545
|
|
- ->setItemTarget($this->get($prefix . 'item_target', $data)) |
|
546
|
|
- ->setFileSource($this->getInt($prefix . 'file_source', $data)) |
|
547
|
|
- ->setFileTarget($this->get($prefix . 'file_target', $data)) |
|
548
|
|
- ->setSharedWith($this->get($prefix . 'share_with', $data)) |
|
549
|
|
- ->setSharedBy($this->get($prefix . 'uid_initiator', $data)) |
|
550
|
|
- ->setShareOwner($this->get($prefix . 'uid_owner', $data)) |
|
551
|
|
- ->setToken($this->get($prefix . 'token', $data)) |
|
|
538
|
+ $shareTime->setTimestamp($this->getInt($prefix.'stime', $data)); |
|
|
539
|
+ |
|
|
540
|
+ $this->setId($this->get($prefix.'id', $data)) |
|
|
541
|
+ ->setShareType($this->getInt($prefix.'share_type', $data)) |
|
|
542
|
+ ->setPermissions($this->getInt($prefix.'permissions', $data)) |
|
|
543
|
+ ->setItemType($this->get($prefix.'item_type', $data)) |
|
|
544
|
+ ->setItemSource($this->getInt($prefix.'item_source', $data)) |
|
|
545
|
+ ->setItemTarget($this->get($prefix.'item_target', $data)) |
|
|
546
|
+ ->setFileSource($this->getInt($prefix.'file_source', $data)) |
|
|
547
|
+ ->setFileTarget($this->get($prefix.'file_target', $data)) |
|
|
548
|
+ ->setSharedWith($this->get($prefix.'share_with', $data)) |
|
|
549
|
+ ->setSharedBy($this->get($prefix.'uid_initiator', $data)) |
|
|
550
|
+ ->setShareOwner($this->get($prefix.'uid_owner', $data)) |
|
|
551
|
+ ->setToken($this->get($prefix.'token', $data)) |
|
552
|
552
|
->setShareTime($shareTime); |
|
553
|
553
|
|
|
554
|
554
|
$this->importAttributesFromDatabase($this->get('attributes', $data)); |
|
@@ -559,9 +559,9 @@ discard block |
|
|
block discarded – undo |
|
559
|
559
|
// $share->setPassword($this->get('password', $data, '')); |
|
560
|
560
|
// } |
|
561
|
561
|
|
|
562
|
|
- $this->setChildId($this->getInt($prefix . 'child_id', $data)) |
|
563
|
|
- ->setChildFileTarget($this->get($prefix . 'child_file_target', $data)) |
|
564
|
|
- ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data)) |
|
|
562
|
+ $this->setChildId($this->getInt($prefix.'child_id', $data)) |
|
|
563
|
+ ->setChildFileTarget($this->get($prefix.'child_file_target', $data)) |
|
|
564
|
+ ->setChildPermissions($this->getInt($prefix.'child_permissions', $data)) |
|
565
|
565
|
->setProviderId(ShareByCircleProvider::IDENTIFIER) |
|
566
|
566
|
->setStatus(Ishare::STATUS_ACCEPTED); |
|
567
|
567
|
|