|
@@ -467,7 +467,7 @@ discard block |
|
|
block discarded – undo |
|
467
|
467
|
$l10n = Server::get(IFactory::class)->get('circles'); |
|
468
|
468
|
$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]); |
|
469
|
469
|
} else { |
|
470
|
|
- $display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'; |
|
|
470
|
+ $display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')'; |
|
471
|
471
|
} |
|
472
|
472
|
|
|
473
|
473
|
$share->setSharedWithDisplayName($display); |
|
@@ -560,25 +560,25 @@ discard block |
|
|
block discarded – undo |
|
560
|
560
|
|
|
561
|
561
|
public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
|
562
|
562
|
$shareTime = new DateTime(); |
|
563
|
|
- $shareTime->setTimestamp($this->getInt($prefix . 'stime', $data)); |
|
564
|
|
- |
|
565
|
|
- $this->setId($this->get($prefix . 'id', $data)) |
|
566
|
|
- ->setShareType($this->getInt($prefix . 'share_type', $data)) |
|
567
|
|
- ->setPermissions($this->getInt($prefix . 'permissions', $data)) |
|
568
|
|
- ->setItemType($this->get($prefix . 'item_type', $data)) |
|
569
|
|
- ->setItemSource($this->getInt($prefix . 'item_source', $data)) |
|
570
|
|
- ->setItemTarget($this->get($prefix . 'item_target', $data)) |
|
571
|
|
- ->setFileSource($this->getInt($prefix . 'file_source', $data)) |
|
572
|
|
- ->setFileTarget($this->get($prefix . 'file_target', $data)) |
|
573
|
|
- ->setSharedWith($this->get($prefix . 'share_with', $data)) |
|
574
|
|
- ->setSharedBy($this->get($prefix . 'uid_initiator', $data)) |
|
575
|
|
- ->setShareOwner($this->get($prefix . 'uid_owner', $data)) |
|
576
|
|
- ->setToken($this->get($prefix . 'token', $data)) |
|
|
563
|
+ $shareTime->setTimestamp($this->getInt($prefix.'stime', $data)); |
|
|
564
|
+ |
|
|
565
|
+ $this->setId($this->get($prefix.'id', $data)) |
|
|
566
|
+ ->setShareType($this->getInt($prefix.'share_type', $data)) |
|
|
567
|
+ ->setPermissions($this->getInt($prefix.'permissions', $data)) |
|
|
568
|
+ ->setItemType($this->get($prefix.'item_type', $data)) |
|
|
569
|
+ ->setItemSource($this->getInt($prefix.'item_source', $data)) |
|
|
570
|
+ ->setItemTarget($this->get($prefix.'item_target', $data)) |
|
|
571
|
+ ->setFileSource($this->getInt($prefix.'file_source', $data)) |
|
|
572
|
+ ->setFileTarget($this->get($prefix.'file_target', $data)) |
|
|
573
|
+ ->setSharedWith($this->get($prefix.'share_with', $data)) |
|
|
574
|
+ ->setSharedBy($this->get($prefix.'uid_initiator', $data)) |
|
|
575
|
+ ->setShareOwner($this->get($prefix.'uid_owner', $data)) |
|
|
576
|
+ ->setToken($this->get($prefix.'token', $data)) |
|
577
|
577
|
->setShareTime($shareTime) |
|
578
|
|
- ->setShareNote($this->get($prefix . 'note', $data)); |
|
|
578
|
+ ->setShareNote($this->get($prefix.'note', $data)); |
|
579
|
579
|
|
|
580
|
580
|
try { |
|
581
|
|
- $expirationDate = $this->get($prefix . 'expiration', $data); |
|
|
581
|
+ $expirationDate = $this->get($prefix.'expiration', $data); |
|
582
|
582
|
if ($expirationDate !== '') { |
|
583
|
583
|
$this->setExpirationDate(new DateTime($expirationDate)); |
|
584
|
584
|
} |
|
@@ -594,9 +594,9 @@ discard block |
|
|
block discarded – undo |
|
594
|
594
|
// $share->setPassword($this->get('password', $data, '')); |
|
595
|
595
|
// } |
|
596
|
596
|
|
|
597
|
|
- $this->setChildId($this->getInt($prefix . 'child_id', $data)) |
|
598
|
|
- ->setChildFileTarget($this->get($prefix . 'child_file_target', $data)) |
|
599
|
|
- ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data)) |
|
|
597
|
+ $this->setChildId($this->getInt($prefix.'child_id', $data)) |
|
|
598
|
+ ->setChildFileTarget($this->get($prefix.'child_file_target', $data)) |
|
|
599
|
+ ->setChildPermissions($this->getInt($prefix.'child_permissions', $data)) |
|
600
|
600
|
->setProviderId(ShareByCircleProvider::IDENTIFIER) |
|
601
|
601
|
->setStatus(Ishare::STATUS_ACCEPTED); |
|
602
|
602
|
|