|
@@ -216,7 +216,7 @@ discard block |
|
|
block discarded – undo |
|
216
|
216
|
|
|
217
|
217
|
$password = $passwordEvent->getPassword(); |
|
218
|
218
|
if ($password === null) { |
|
219
|
|
- $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS); |
|
|
219
|
+ $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS); |
|
220
|
220
|
} |
|
221
|
221
|
|
|
222
|
222
|
return $password; |
|
@@ -386,7 +386,7 @@ discard block |
|
|
block discarded – undo |
|
386
|
386
|
$text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]); |
|
387
|
387
|
|
|
388
|
388
|
$emailTemplate->addBodyText( |
|
389
|
|
- htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')), |
|
|
389
|
+ htmlspecialchars($text.' '.$this->l->t('Click the button below to open it.')), |
|
390
|
390
|
$text |
|
391
|
391
|
); |
|
392
|
392
|
$emailTemplate->addBodyButton( |
|
@@ -412,7 +412,7 @@ discard block |
|
|
block discarded – undo |
|
412
|
412
|
$initiatorEmail = $initiatorUser->getEMailAddress(); |
|
413
|
413
|
if ($initiatorEmail !== null) { |
|
414
|
414
|
$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); |
|
415
|
|
- $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')); |
|
|
415
|
+ $emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : '')); |
|
416
|
416
|
} else { |
|
417
|
417
|
$emailTemplate->addFooter(); |
|
418
|
418
|
} |
|
@@ -473,7 +473,7 @@ discard block |
|
|
block discarded – undo |
|
473
|
473
|
$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
|
474
|
474
|
if ($initiatorEmailAddress !== null) { |
|
475
|
475
|
$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); |
|
476
|
|
- $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
|
476
|
+ $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
477
|
477
|
} else { |
|
478
|
478
|
$emailTemplate->addFooter(); |
|
479
|
479
|
} |
|
@@ -530,7 +530,7 @@ discard block |
|
|
block discarded – undo |
|
530
|
530
|
$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
|
531
|
531
|
if ($initiatorEmailAddress !== null) { |
|
532
|
532
|
$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); |
|
533
|
|
- $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
|
533
|
+ $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
534
|
534
|
} else { |
|
535
|
535
|
$emailTemplate->addFooter(); |
|
536
|
536
|
} |
|
@@ -665,7 +665,7 @@ discard block |
|
|
block discarded – undo |
|
665
|
665
|
->setValue('password', $qb->createNamedParameter($password)) |
|
666
|
666
|
->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL)) |
|
667
|
667
|
->setValue('stime', $qb->createNamedParameter(time())) |
|
668
|
|
- ->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT)); |
|
|
668
|
+ ->setValue('hide_download', $qb->createNamedParameter((int) $hideDownload, IQueryBuilder::PARAM_INT)); |
|
669
|
669
|
|
|
670
|
670
|
/* |
|
671
|
671
|
* Added to fix https://github.com/owncloud/core/issues/22215 |
|
@@ -676,7 +676,7 @@ discard block |
|
|
block discarded – undo |
|
676
|
676
|
$qb->execute(); |
|
677
|
677
|
$id = $qb->getLastInsertId(); |
|
678
|
678
|
|
|
679
|
|
- return (int)$id; |
|
|
679
|
+ return (int) $id; |
|
680
|
680
|
} |
|
681
|
681
|
|
|
682
|
682
|
/** |
|
@@ -709,7 +709,7 @@ discard block |
|
|
block discarded – undo |
|
709
|
709
|
->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL)) |
|
710
|
710
|
->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE)) |
|
711
|
711
|
->set('note', $qb->createNamedParameter($share->getNote())) |
|
712
|
|
- ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT)) |
|
|
712
|
+ ->set('hide_download', $qb->createNamedParameter((int) $share->getHideDownload(), IQueryBuilder::PARAM_INT)) |
|
713
|
713
|
->execute(); |
|
714
|
714
|
|
|
715
|
715
|
if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') { |
|
@@ -955,21 +955,21 @@ discard block |
|
|
block discarded – undo |
|
955
|
955
|
*/ |
|
956
|
956
|
protected function createShareObject($data) { |
|
957
|
957
|
$share = new Share($this->rootFolder, $this->userManager); |
|
958
|
|
- $share->setId((int)$data['id']) |
|
959
|
|
- ->setShareType((int)$data['share_type']) |
|
960
|
|
- ->setPermissions((int)$data['permissions']) |
|
|
958
|
+ $share->setId((int) $data['id']) |
|
|
959
|
+ ->setShareType((int) $data['share_type']) |
|
|
960
|
+ ->setPermissions((int) $data['permissions']) |
|
961
|
961
|
->setTarget($data['file_target']) |
|
962
|
|
- ->setMailSend((bool)$data['mail_send']) |
|
|
962
|
+ ->setMailSend((bool) $data['mail_send']) |
|
963
|
963
|
->setNote($data['note']) |
|
964
|
964
|
->setToken($data['token']); |
|
965
|
965
|
|
|
966
|
966
|
$shareTime = new \DateTime(); |
|
967
|
|
- $shareTime->setTimestamp((int)$data['stime']); |
|
|
967
|
+ $shareTime->setTimestamp((int) $data['stime']); |
|
968
|
968
|
$share->setShareTime($shareTime); |
|
969
|
969
|
$share->setSharedWith($data['share_with']); |
|
970
|
970
|
$share->setPassword($data['password']); |
|
971
|
|
- $share->setSendPasswordByTalk((bool)$data['password_by_talk']); |
|
972
|
|
- $share->setHideDownload((bool)$data['hide_download']); |
|
|
971
|
+ $share->setSendPasswordByTalk((bool) $data['password_by_talk']); |
|
|
972
|
+ $share->setHideDownload((bool) $data['hide_download']); |
|
973
|
973
|
|
|
974
|
974
|
if ($data['uid_initiator'] !== null) { |
|
975
|
975
|
$share->setShareOwner($data['uid_owner']); |
|
@@ -977,7 +977,7 @@ discard block |
|
|
block discarded – undo |
|
977
|
977
|
} else { |
|
978
|
978
|
//OLD SHARE |
|
979
|
979
|
$share->setSharedBy($data['uid_owner']); |
|
980
|
|
- $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']); |
|
|
980
|
+ $path = $this->getNode($share->getSharedBy(), (int) $data['file_source']); |
|
981
|
981
|
|
|
982
|
982
|
$owner = $path->getOwner(); |
|
983
|
983
|
$share->setShareOwner($owner->getUID()); |
|
@@ -990,7 +990,7 @@ discard block |
|
|
block discarded – undo |
|
990
|
990
|
} |
|
991
|
991
|
} |
|
992
|
992
|
|
|
993
|
|
- $share->setNodeId((int)$data['file_source']); |
|
|
993
|
+ $share->setNodeId((int) $data['file_source']); |
|
994
|
994
|
$share->setNodeType($data['item_type']); |
|
995
|
995
|
|
|
996
|
996
|
$share->setProviderId($this->identifier()); |
|
@@ -1107,7 +1107,7 @@ discard block |
|
|
block discarded – undo |
|
1107
|
1107
|
); |
|
1108
|
1108
|
} |
|
1109
|
1109
|
|
|
1110
|
|
- $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid')); |
|
|
1110
|
+ $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid')); |
|
1111
|
1111
|
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId()))); |
|
1112
|
1112
|
|
|
1113
|
1113
|
$qb->orderBy('id'); |