mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-23 06:44:38 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#725 where fallback email for comment notifications not working if hostname had port number

Browse Source
This commit is contained in:
Ryan Cramer
2018-11-29 13:31:05 -05:00
parent e6213c23b3
commit 009dec332c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wire/modules/Fieldtype/FieldtypeComments/CommentNotifications.php
View File

@@ -44,14 +44,14 @@ class CommentNotifications extends Wire {
*/ */
protected function ___sendAdminNotificationEmail(Comment $comment) { protected function ___sendAdminNotificationEmail(Comment $comment) {
if(!$this->field->notificationEmail) return false; if(!$this->field->get('notificationEmail')) return false;
$field = $this->field; $field = $this->field;
$page = $this->page; $page = $this->page;
$actionURL = $page->httpUrl . "?field=$field->name&page_id=$page->id&code=$comment->code&comment_success="; $actionURL = $page->httpUrl . "?field=$field->name&page_id=$page->id&code=$comment->code&comment_success=";
// skip notification when spam // skip notification when spam
if($comment->status == Comment::statusSpam && !$field->notifySpam) return 0; if($comment->status == Comment::statusSpam && !$field->get('notifySpam')) return 0;
if($comment->status == Comment::statusPending) { if($comment->status == Comment::statusPending) {
$status = $this->_("Pending Approval"); $status = $this->_("Pending Approval");
@@ -62,7 +62,7 @@ class CommentNotifications extends Wire {
$actionURL .= "spam"; $actionURL .= "spam";
$actionLabel = $this->_('Mark as SPAM'); $actionLabel = $this->_('Mark as SPAM');
} else if($comment->status == Comment::statusSpam) { } else if($comment->status == Comment::statusSpam) {
$status = sprintf($this->_("SPAM - will be deleted automatically after %d days"), $field->deleteSpamDays); $status = sprintf($this->_("SPAM - will be deleted automatically after %d days"), $field->get('deleteSpamDays'));
$actionURL .= "approve"; $actionURL .= "approve";
$actionLabel = $this->_('Not SPAM: Approve Now'); $actionLabel = $this->_('Not SPAM: Approve Now');
} else { } else {
@@ -142,7 +142,7 @@ class CommentNotifications extends Wire {
$bodyHTML .= "</table></body></html>\n\n"; $bodyHTML .= "</table></body></html>\n\n";
$emails = $this->parseEmails($field->notificationEmail); $emails = $this->parseEmails($field->get('notificationEmail'));
if(count($emails)) { if(count($emails)) {
$mail = $this->wire('mail')->new(); $mail = $this->wire('mail')->new();
foreach($emails as $email) $mail->to($email); foreach($emails as $email) $mail->to($email);
@@ -156,10 +156,11 @@ class CommentNotifications extends Wire {
} }
protected function getFromEmail() { protected function getFromEmail() {
if($this->field->fromEmail) { $fromEmail = $this->field->get('fromEmail');
$fromEmail = $this->field->fromEmail; if(empty($fromEmail)) {
} else { $host = $this->wire('config')->httpHost;
$fromEmail = $this->_x('processwire', 'email-from-name') . '@' . $this->wire('config')->httpHost; if(strpos($host, ':') !== false) list($host, /*port*/) = explode(':', $host, 2);
$fromEmail = $this->_x('processwire', 'email-from-name') . '@' . $host;
} }
return $fromEmail; return $fromEmail;
} }