novabbs
/
rocksolid-light
3
0
Fork 1
Code Issues 22 Pull Requests Releases Wiki Activity

Merge branch 'devel' 0.9.154

This commit is contained in:
Retro_Guy 2024-09-25 03:35:43 -07:00
parent f810eadfb9 d35bd73cdb
commit 161bc9974f
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rocksolid_Light/common/version.txt
View File

@ -1 +1 @@
0.9.153
0.9.154

6
Rocksolid_Light/rocksolid/overboard.php
View File

@ -263,7 +263,8 @@ function expire_overboard($cachefile)
function display_threads($threads, $oldest)
{
global $CONFIG, $OVERRIDES, $thissite, $logfile, $config_dir, $config_name, $spooldir, $config_dir, $snippetlength, $maxdisplay, $this_overboard, $article_age, $newonly;
global $CONFIG, $OVERRIDES, $thissite, $logfile, $config_dir, $config_name, $spooldir, $config_dir;
global $cookie_mail_name, $snippetlength, $maxdisplay, $this_overboard, $article_age, $newonly;
$expireme = time() - ($article_age * 86400);
$display = '<table cellspacing="0" width="100%" class="np_results_table">';
if (! isset($threads)) {
@ -446,7 +447,8 @@ function display_threads($threads, $oldest)
function display_flat($threads, $oldest)
{
global $CONFIG, $OVERRIDES, $thissite, $logfile, $spooldir, $config_name, $config_dir, $snippetlength, $maxdisplay, $this_overboard, $article_age, $newonly;
global $CONFIG, $OVERRIDES, $thissite, $logfile, $spooldir, $config_name, $config_dir;
global $cookie_mail_name, $snippetlength, $maxdisplay, $this_overboard, $article_age, $newonly;
$expireme = time() - ($article_age * 86400);
$display = '<table cellspacing="0" width="100%" class="np_results_table">';
if (! isset($threads)) {

27
Rocksolid_Light/rslight/scripts/send.php
View File

@ -23,12 +23,12 @@
set_time_limit(900);
include "config.inc.php";
include ("$file_newsportal");
include("$file_newsportal");
if ($CONFIG['remote_server'] == '') {
exit();
}
$logfile = $logdir . '/spoolnews.log';
$logfile = $logdir . '/send.log';
@mkdir($spooldir . "/" . $config_name, 0755, 'recursive');
@ -55,19 +55,27 @@ echo "\nSend Done\r\n";
function post_articles($ns, $spooldir)
{
global $logfile, $config_name;
if (! is_dir($spooldir . "/" . $config_name . "/outgoing/")) {
return "No messages to send\r\n";
}
$outgoing_dir = $spooldir . "/" . $config_name . "/outgoing/";
$fail_dir = $outgoing_dir . '/failed/';
if(!is_dir($fail_dir)) {
if (!is_dir($fail_dir)) {
mkdir($fail_dir);
}
if (! is_dir($outgoing_dir)) {
mkdir($outgoing_dir);
return "No messages to send\r\n";
}
$messages = scandir($outgoing_dir);
foreach ($messages as $message) {
if (! is_file($outgoing_dir . $message)) {
continue;
}
if (filemtime($outgoing_dir . $message) < (time() - 14400)) { // Stop trying to send article of over 4 hours old
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " POST Failed: Too many retries, giving up for: " . $message, FILE_APPEND);
rename($outgoing_dir . $message, $fail_dir . $message);
continue;
}
echo "Sending: " . $outgoing_dir . $message . "\r\n";
fputs($ns, "MODE READER\r\n");
$response = line_read($ns);
@ -88,12 +96,10 @@ function post_articles($ns, $spooldir)
fputs($ns, ".\r\n");
fclose($message_fp);
$response = line_read($ns);
if (strcmp(substr($response, 0, 3), "441") == 0) {
// Keep retrying outgoing message for 4 hours in case of temporary issue
if(filemtime($outgoing_dir . $message) < (time() - 14400)) {
if (strcmp(substr($response, 0, 3), "441") == 0) { // Posting failed
if (strcmp(substr($response, 0, 6), "441 43") == 0) { // Article specifically rejected. Move to 'failed'
rename($outgoing_dir . $message, $fail_dir . $message);
}
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " POST Failed: " . $response, FILE_APPEND);
}
if (strcmp(substr($response, 0, 3), "240") == 0) {
$removed = unlink($outgoing_dir . $message);
@ -106,4 +112,3 @@ function post_articles($ns, $spooldir)
prune_dir_by_days($fail_dir, 7);
return "Messages sent\r\n";
}
?>