From 531356f97c3a0268fbe0ab98c7158f8147bacd66 Mon Sep 17 00:00:00 2001 From: arf20 Date: Wed, 1 May 2024 13:26:26 +0200 Subject: NNTP announce working --- publishannouncement.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'publishannouncement.php') diff --git a/publishannouncement.php b/publishannouncement.php index b9f3351..37bb2dc 100644 --- a/publishannouncement.php +++ b/publishannouncement.php @@ -115,28 +115,31 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { do { $read = fread($fd, 1024); } while (!str_contains($read, "Message-ID")); - $msgidheader = substr($read, strpos($read, "Message-ID"), -1); + /* Assumes CRLF */ + $msgidheader = substr($read, strpos($read, "Message-ID"), -2); $msgidheader = str_replace("Message-ID", "Message-ID:", $msgidheader); - echo $msgidheader; - - fwrite($fd, - $msgidheader."\r\n". + $message = "From: System \r\n". "Reply-To: ".getuserbyid($id)["email"]."\r\n". "Newsgroups: ".ANNOUNCE_NNTPGROUP."\r\n". "Subject: ".$_POST["subject"]."\r\n". "Date: ".date("r")."\r\n". + $msgidheader."\r\n". "Organization: ARFNET\r\n". "User-Agent: ARFNET CSTIMS UAS\r\n\r\n". $_POST["body"]."\r\n". - ".\r\n"); + ".\r\n"; - echo fread($fd, 1024); + $response = fread($fd, 1024); fwrite($fd, "QUIT\r\n"); fclose($fd); + + if (str_contains($response, "240 Article received")) + echo "ok"; + else echo "error $response
"; } die(); -- cgit v1.2.3