From 665e3d339a7a310a9fe2ebc90b30ef4da7f72293 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 19 Dec 2024 12:13:04 +0100 Subject: [PATCH] post.php: use LogDriver --- post.php | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/post.php b/post.php index d3ba4728..27a45413 100644 --- a/post.php +++ b/post.php @@ -9,7 +9,6 @@ use Vichan\Data\Driver\LogDriver; require_once 'inc/bootstrap.php'; - /** * Utility functions */ @@ -356,7 +355,7 @@ function db_select_ban_appeals($ban_id) $dropped_post = false; -function handle_nntpchan() +function handle_nntpchan(Context $ctx) { global $config; if ($_SERVER['REMOTE_ADDR'] != $config['nntpchan']['trusted_peer']) { @@ -435,7 +434,7 @@ function handle_nntpchan() if ($ct == 'text/plain') { $content = file_get_contents("php://input"); } elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') { - _syslog(LOG_INFO, "MM: Files: " . print_r($GLOBALS, true)); // Debug + $ctx->get(LogDriver::class)->log(LogDriver::DEBUG, 'MM: Files: ' . print_r($GLOBALS, true)); $content = ''; @@ -612,8 +611,8 @@ function handle_delete(Context $ctx) modLog("User at $ip deleted his own post #$id"); } - _syslog( - LOG_INFO, + $ctx->get(LogDriver::class)->log( + LogDriver::INFO, 'Deleted post: ' . '/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '') ); @@ -701,9 +700,7 @@ function handle_report(Context $ctx) foreach ($report as $id) { $post = db_select_post_minimal($board['uri'], $id); if ($post === false) { - if ($config['syslog']) { - _syslog(LOG_INFO, "Failed to report non-existing post #{$id} in {$board['dir']}"); - } + $ctx->get(LogDriver::class)->log(LogDriver::INFO, "Failed to report non-existing post #{$id} in {$board['dir']}"); error($config['error']['nopost']); } @@ -718,13 +715,12 @@ function handle_report(Context $ctx) error($error); } - if ($config['syslog']) - _syslog( - LOG_INFO, - 'Reported post: ' . - '/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') . - ' for "' . $reason . '"' - ); + $ctx->get(LogDriver::class)->log( + LogDriver::INFO, + 'Reported post: ' . + '/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '') . + ' for "' . $reason . '"' + ); $report_queries->add($_SERVER['REMOTE_ADDR'], $board['uri'], $id, $reason); @@ -1785,10 +1781,10 @@ function handle_post(Context $ctx) buildThread($post['op'] ? $id : $post['thread']); - if ($config['syslog']) { - _syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] . - link_for($post) . (!$post['op'] ? '#' . $id : '')); - } + $ctx->get(LogDriver::class)->log( + LogDriver::INFO, + 'New post: /' . $board['dir'] . $config['dir']['res'] . link_for($post) . (!$post['op'] ? '#' . $id : '') + ); if (!$post['mod']) { header('X-Associated-Content: "' . $redirect . '"'); @@ -1881,17 +1877,17 @@ function handle_appeal(Context $ctx) displayBan($ban); } +$ctx = Vichan\build_context($config); + // Is it a post coming from NNTP? Let's extract it and pretend it's a normal post. if (isset($_GET['Newsgroups'])) { if ($config['nntpchan']['enabled']) { - handle_nntpchan(); + handle_nntpchan($ctx); } else { error("NNTPChan: NNTPChan support is disabled"); } } -$ctx = Vichan\build_context($config); - if (isset($_POST['delete'])) { handle_delete($ctx); } elseif (isset($_POST['report'])) {