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

php 8 compat fixes for commenting in frontend

Browse Source
This commit is contained in:
onli
2021-05-13 15:03:23 +02:00
parent d28b15381c
commit cbca20a535
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+1 -1
View File
@@ -557,7 +557,7 @@ function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NUL
} }
} }
if ($serendipity['dumpMail']) { if ($serendipity['dumpMail'] ?? false) {
$fp = fopen($serendipity['serendipityPath'] . '/templates_c/mail.log', 'a'); $fp = fopen($serendipity['serendipityPath'] . '/templates_c/mail.log', 'a');
fwrite($fp, date('Y-m-d H:i') . "\n" . print_r($maildata, true)); fwrite($fp, date('Y-m-d H:i') . "\n" . print_r($maildata, true));
fclose($fp); fclose($fp);
include/functions_comments.inc.php
+10 -7
View File
@@ -702,6 +702,9 @@ function serendipity_approveComment($cid, $entry_id, $force = false, $moderate =
AND (type = 'TRACKBACK' or type = 'PINGBACK') AND (type = 'TRACKBACK' or type = 'PINGBACK')
AND entry_id = " . (int)$entry_id . " AND entry_id = " . (int)$entry_id . "
GROUP BY entry_id", true); GROUP BY entry_id", true);
if (! is_array($counter_tb)) {
$counter_tb = ['counter' => 0];
}
$query = "UPDATE {$serendipity['dbPrefix']}entries $query = "UPDATE {$serendipity['dbPrefix']}entries
SET comments = " . (int)$counter_comments['counter'] . ", SET comments = " . (int)$counter_comments['counter'] . ",
@@ -869,7 +872,7 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
$query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed, status, referer)"; $query = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed, status, referer)";
$query .= " VALUES ('". (int)$id ."', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$dbstatus', '$referer')"; $query .= " VALUES ('". (int)$id ."', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$dbstatus', '$referer')";
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
$fp = fopen('trackback2.log', 'a'); $fp = fopen('trackback2.log', 'a');
fwrite($fp, '[' . date('d.m.Y H:i') . '] SQL: ' . $query . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] SQL: ' . $query . "\n");
} }
@@ -887,16 +890,16 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
} }
// Approve with force, if moderation is disabled // Approve with force, if moderation is disabled
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
fwrite($fp, '[' . date('d.m.Y H:i') . '] status: ' . $status . ', moderate: ' . $ca['moderate_comments'] . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] status: ' . $status . ', moderate: ' . $ca['moderate_comments'] . "\n");
} }
if ($status != 'confirm' && (empty($ca['moderate_comments']) || serendipity_db_bool($ca['moderate_comments']) == false)) { if ($status != 'confirm' && (empty($ca['moderate_comments']) || serendipity_db_bool($ca['moderate_comments']) == false)) {
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
fwrite($fp, '[' . date('d.m.Y H:i') . '] Approving...' . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] Approving...' . "\n");
} }
serendipity_approveComment($cid, $id, true); serendipity_approveComment($cid, $id, true);
} elseif ($GLOBALS['tb_logging']) { } elseif ($GLOBALS['tb_logging'] ?? false) {
fwrite($fp, '[' . date('d.m.Y H:i') . '] No need to approve...' . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] No need to approve...' . "\n");
} }
@@ -941,7 +944,7 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
} }
} }
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
fclose($fp); fclose($fp);
} }
serendipity_cleanCache(); serendipity_cleanCache();
@@ -1010,7 +1013,7 @@ function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL', $source =
serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo); serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);
if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) { if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) {
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
$fp = fopen('trackback2.log', 'a'); $fp = fopen('trackback2.log', 'a');
fwrite($fp, '[' . date('d.m.Y H:i') . '] insert comment into DB' . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] insert comment into DB' . "\n");
fclose($fp); fclose($fp);
@@ -1021,7 +1024,7 @@ function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL', $source =
serendipity_plugin_api::hook_event('frontend_saveComment_finish', $ca, $commentInfo); serendipity_plugin_api::hook_event('frontend_saveComment_finish', $ca, $commentInfo);
return true; return true;
} else { } else {
if ($GLOBALS['tb_logging']) { if ($GLOBALS['tb_logging'] ?? false) {
$fp = fopen('trackback2.log', 'a'); $fp = fopen('trackback2.log', 'a');
fwrite($fp, '[' . date('d.m.Y H:i') . '] discarding comment from DB' . "\n"); fwrite($fp, '[' . date('d.m.Y H:i') . '] discarding comment from DB' . "\n");
fclose($fp); fclose($fp);
include/functions_routing.inc.php
+1 -1
View File
@@ -350,7 +350,7 @@ function serveEntry($matches) {
$comment['comment'] = (is_string($serendipity['POST']['comment']) ? trim($serendipity['POST']['comment']) : ''); $comment['comment'] = (is_string($serendipity['POST']['comment']) ? trim($serendipity['POST']['comment']) : '');
$comment['name'] = $serendipity['POST']['name']; $comment['name'] = $serendipity['POST']['name'];
$comment['email'] = $serendipity['POST']['email']; $comment['email'] = $serendipity['POST']['email'];
$comment['subscribe'] = $serendipity['POST']['subscribe']; $comment['subscribe'] = $serendipity['POST']['subscribe'] ?? false;
$comment['parent_id'] = $serendipity['POST']['replyTo']; $comment['parent_id'] = $serendipity['POST']['replyTo'];
if (!empty($comment['comment'])) { if (!empty($comment['comment'])) {