1
0
mirror of https://github.com/e107inc/e107.git synced 2025-05-30 23:59:54 +02:00

Merge pull request #3618 from arunshekher/enhancement/forum-report-event-data-enrichment

Enhance 'user_forum_post_report' event data set and Fix 'user_forum_post_report' notification email not sent bug.
This commit is contained in:
Cameron 2019-01-16 10:02:13 -08:00 committed by GitHub
commit b8b1727774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

View File

@ -358,10 +358,11 @@ class forum_notify extends notify
}
else
{
$message = $data;
$message = $data['notify_message'];
}
$this->send('forum_post_rep', LAN_FORUM_NT_11, $message);
$this->send('user_forum_post_report', LAN_FORUM_NT_11, $message);
return true;
}
}

View File

@ -314,10 +314,18 @@ class forum_post_handler
$report = LAN_FORUM_2018." ".SITENAME." : ".$link . "\n
".LAN_FORUM_2019.": ".USERNAME. "\n" . $report_add;
//$subject = LAN_FORUM_2020." ". SITENAME;
//e107::getNotify()->send('forum_post_rep', $subject, $report);
e107::getEvent()->trigger('user_forum_post_report', $report);
$eventData = array(
'reporter_id' => USERID,
'reporter_name' => USERNAME,
'report_time' => $insert['gen_datestamp'],
'thread_id' => $insert['gen_intdata'],
'thread_name' => $insert['gen_ip'],
'report_message' => $report_add,
'notify_message' => $report
);
e107::getEvent()->trigger('user_forum_post_report', $eventData);
e107::getRender()->tablerender(LAN_FORUM_2023, $text, 'forum-post-report');
}