From 18e7e5eb66ccab8f8c7220d8f3a85bb078db1407 Mon Sep 17 00:00:00 2001 From: Retro_Guy Date: Wed, 3 Jan 2024 05:49:16 -0700 Subject: [PATCH] Reverts most of 8231373c801c9f93571d0d2112a2525c6aab0f43 until I can fix that issue properly. --- Rocksolid_Light/rocksolid/lib/thread.inc.php | 13 +------------ Rocksolid_Light/rslight/scripts/spoolnews.php | 4 ---- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Rocksolid_Light/rocksolid/lib/thread.inc.php b/Rocksolid_Light/rocksolid/lib/thread.inc.php index 27a384c..f8adfbe 100644 --- a/Rocksolid_Light/rocksolid/lib/thread.inc.php +++ b/Rocksolid_Light/rocksolid/lib/thread.inc.php @@ -301,18 +301,7 @@ function thread_load_newsserver(&$ns, $groupname, $poll) $logfile = $logdir . '/newsportal.log'; $maxfetch = 0; $idstring = "0.36," . $server . "," . $compress_spoolfiles . "," . $maxarticles . "," . $maxarticles_extra . "," . $maxfetch . "," . $initialfetch . "," . $www_charset . ',' . $iconv_enable . ',' . $thread_show["replies"]; - if ($CONFIG['enable_nntp'] == '1') { - $overviewfmt = array( - "Subject:", - "From:", - "Date:", - "Message-ID:", - "References:", - "Bytes:" - ); - } else { - $overviewformat = thread_overview_read($ns); - } + $overviewformat = thread_overview_read($ns); $spoolfilename = $spooldir . '/' . $groupname . '-data.db3'; fputs($ns, "GROUP $groupname\r\n"); // select a group $groupinfo = explode(" ", line_read($ns)); diff --git a/Rocksolid_Light/rslight/scripts/spoolnews.php b/Rocksolid_Light/rslight/scripts/spoolnews.php index 2710250..cec42c4 100644 --- a/Rocksolid_Light/rslight/scripts/spoolnews.php +++ b/Rocksolid_Light/rslight/scripts/spoolnews.php @@ -24,10 +24,6 @@ include "config.inc.php"; include ("$file_newsportal"); include $config_dir . '/gpg.conf'; -set_error_handler(function (int $number, string $message) { - echo "Handler captured error $number: '$message'" . PHP_EOL; -}); - if ($CONFIG['remote_server'] != '') { $remote_groupfile = $spooldir . "/" . $config_name . "/" . $CONFIG['remote_server'] . ":" . $CONFIG['remote_port'] . ".txt"; }