mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

more php 8 compat fixes for receiving trackacks

Browse Source 
Also includes a code-cleanup by introducing log_trackback, a less code heavy way to log the trackback flow
This commit is contained in:
onli
2021-05-26 00:08:32 +02:00
parent 730f4c080a
commit bd6c9e79c9
4 changed files with 35 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/functions_comments.inc.php
View File

@ -799,7 +799,7 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
$commentInfo['status'] = $ca['status'];
}
if ($serendipity['serendipityAuthedUser']) {
if ($serendipity['serendipityAuthedUser'] ?? false) {
$authorReply = true;
$authorEmail = $serendipity['serendipityEmail'];
}
@ -887,7 +887,7 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
if ($status != 'confirm' && (serendipity_db_bool($ca['moderate_comments'])
|| ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
|| (($type == 'TRACKBACK' || $type == 'PINGBACK') && serendipity_db_bool($row['mail_trackbacks'])))) {
if (! ($authorReply && $authorEmail == $row['email'])) {
if (! (($authorReply ?? false) && $authorEmail == $row['email'])) {
serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($ca['moderate_comments']), $referer);
}
}
@ -1016,22 +1016,14 @@ function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL', $source =
serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);
if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) {
if ($GLOBALS['tb_logging'] ?? false) {
$fp = fopen('trackback2.log', 'a');
fwrite($fp, '[' . date('d.m.Y H:i') . '] insert comment into DB' . "\n");
fclose($fp);
}
log_trackback('insert comment into DB');
$commentInfo['comment_cid'] = serendipity_insertComment($id, $commentInfo, $type, $source, $ca);
$commentInfo['comment_id'] = $id;
serendipity_plugin_api::hook_event('frontend_saveComment_finish', $ca, $commentInfo);
return true;
} else {
if ($GLOBALS['tb_logging'] ?? false) {
$fp = fopen('trackback2.log', 'a');
fwrite($fp, '[' . date('d.m.Y H:i') . '] discarding comment from DB' . "\n");
fclose($fp);
}
log_trackback('discarding comment from DB');
return false;
}