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

Integrate nocem into overboard so deleted articles are removed immediately from recent message lists

This commit is contained in:
Retro_Guy 2021-12-23 03:30:59 +00:00
parent 7436e723c2
commit 4d927dcdc4
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Rocksolid_Light/rocksolid/overboard.php
View File

@ -158,6 +158,9 @@ krsort($files);
echo '<table cellspacing="0" width="100%" class="np_results_table">'; echo '<table cellspacing="0" width="100%" class="np_results_table">';
foreach($files as $article) { foreach($files as $article) {
if(!isset($cachedate)) {
$cachedate = time();
}
if($CONFIG['article_database'] == '1') { if($CONFIG['article_database'] == '1') {
$data = explode(':', $article); $data = explode(':', $article);
$articledata = np_get_db_article($data[1], $data[0], 0); $articledata = np_get_db_article($data[1], $data[0], 0);
@ -200,9 +203,6 @@ foreach($files as $article) {
if(($thisdate > time()) || ($thisdate < $oldest)) { if(($thisdate > time()) || ($thisdate < $oldest)) {
continue; continue;
} }
if(!isset($cachedate)) {
$cachedate = time();
}
$local_poster=false; $local_poster=false;
if(preg_match('/X-Rslight-Site:.*/', $header, $site)) { if(preg_match('/X-Rslight-Site:.*/', $header, $site)) {
$site_match = explode("X-Rslight-Site: ", $site[0]); $site_match = explode("X-Rslight-Site: ", $site[0]);
@ -215,6 +215,10 @@ foreach($files as $article) {
} }
} }
preg_match('/Message-ID:.*/i', $header, $articleid);
$getid = explode(": ", $articleid[0]);
$thismsgid = hash('crc32', serialize($getid[1]));
preg_match('/Content-Transfer-Encoding:.*/', $header, $te); preg_match('/Content-Transfer-Encoding:.*/', $header, $te);
$content_transfer_encoding = explode("Content-Transfer-Encoding: ", $te[0]); $content_transfer_encoding = explode("Content-Transfer-Encoding: ", $te[0]);
@ -252,13 +256,11 @@ foreach($files as $article) {
} else { } else {
$this_output = '<tr class="np_result_line2"><td class="np_result_line2" style="word-wrap:break-word";>'; $this_output = '<tr class="np_result_line2"><td class="np_result_line2" style="word-wrap:break-word";>';
} }
$this_output = '<p class=np_ob_subject>'; $this_output = '<p class=np_ob_subject>';
$this_output.= '<b><a href="'.$url.'">'.mb_decode_mimeheader($output[1])."</a></b>\r\n"; $this_output.= '<b><a href="'.$url.'">'.mb_decode_mimeheader($output[1])."</a></b>\r\n";
$this_output.= '</p><p class=np_ob_group>'; $this_output.= '</p><p class=np_ob_group>';
$this_output.= '<a href="'.$groupurl.'"><span class="visited">'.$groupname.'</span></a>'; $this_output.= '<a href="'.$groupurl.'"><span class="visited">'.$groupname.'</span></a>';
$this_output.= '</p>'; $this_output.= '</p>';
if((isset($CONFIG['hide_email']) && $CONFIG['hide_email'] == true) && (strpos($fromoutput[0], '@') !== false)) { if((isset($CONFIG['hide_email']) && $CONFIG['hide_email'] == true) && (strpos($fromoutput[0], '@') !== false)) {
$poster_name = truncate_email($fromoutput[0]); $poster_name = truncate_email($fromoutput[0]);
} else { } else {
@ -294,7 +296,8 @@ foreach($files as $article) {
} }
$this_output.= "<p class=np_ob_body>".htmlspecialchars($mysnippet, ENT_QUOTES)."</p>\r\n"; $this_output.= "<p class=np_ob_body>".htmlspecialchars($mysnippet, ENT_QUOTES)."</p>\r\n";
$this_output.= '</td></tr>'; $this_output.= '</td></tr>';
$this_overboard[] = $this_output; $this_overboard[$thismsgid] = $this_output;
if($results++ > ($maxdisplay - 2)) if($results++ > ($maxdisplay - 2))
break; break;
} }

22
Rocksolid_Light/rslight/scripts/nocem.php
View File

@ -137,6 +137,28 @@ function delete_message($messageid, $group) {
rename($out_overview, $this_overview); rename($out_overview, $this_overview);
chown($this_overview, $CONFIG['webserver_user']); chown($this_overview, $CONFIG['webserver_user']);
chgrp($this_overview, $webserver_group); chgrp($this_overview, $webserver_group);
delete_message_from_overboard($config_name, $group, $messageid);
return; return;
} }
function delete_message_from_overboard($config_name, $group, $messageid) {
GLOBAL $spooldir;
$delkey = hash('crc32', serialize($messageid));
$cachefile=$spooldir."/".$config_name."-overboard.dat";
if(is_file($cachefile)) {
$cached_overboard = unserialize(file_get_contents($cachefile));
if(isset($cached_overboard[$delkey])) {
unset($cached_overboard[$delkey]);
file_put_contents($cachefile, serialize($cached_overboard));
}
}
$cachefile=$spooldir."/".$group."-overboard.dat";
if(is_file($cachefile)) {
$cached_overboard = unserialize(file_get_contents($cachefile));
if(isset($cached_overboard[$delkey])) {
unset($cached_overboard[$delkey]);
file_put_contents($cachefile, serialize($cached_overboard));
}
}
}
?> ?>