Skip to content

Commit

Permalink
Fix typos and unused return values
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
  • Loading branch information
ChristophWurst authored and Backportbot committed Jan 30, 2019
1 parent 41de36b commit a7c897b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/private/Share20/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -692,29 +692,32 @@ public function createShare(\OCP\Share\IShare $share) {
$emailAddress,
$share->getExpirationDate()
);
$this->logger->debug('Send share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
} else {
$this->logger->debug('Share notification not send to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
}
} else {
$this->logger->debug('Share notification not send to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
}
} else {
$this->logger->debug('Share notification not send because mailsend is false.', ['app' => 'share']);
$this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
}
}

return $share;
}

/**
* Send mail notifications
*
* This method will catch and log mail transmission errors
*
* @param IL10N $l Language of the recipient
* @param string $filename file/folder name
* @param string $link link to the file/folder
* @param string $initiator user ID of share sender
* @param string $shareWith email address of share receiver
* @param \DateTime|null $expiration
* @return bool
*/
protected function sendMailNotification(IL10N $l,
$filename,
Expand Down Expand Up @@ -777,14 +780,11 @@ protected function sendMailNotification(IL10N $l,
$failedRecipients = $this->mailer->send($message);
if(!empty($failedRecipients)) {
$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
return false;
return;
}
} catch (\Exception $e) {
$this->logger->logException($e, ['message' => 'Share notification mail could not be sent']);
return false;
}

return true;
}

/**
Expand Down

0 comments on commit a7c897b

Please sign in to comment.