From e7f232d7ac2f7e5ad8211c02cb064bd19a662af1 Mon Sep 17 00:00:00 2001 From: Retro_Guy Date: Wed, 2 Feb 2022 02:43:56 +0000 Subject: [PATCH] Move (new) in overboard for subscribed groups --- Rocksolid_Light/rocksolid/newsportal.php | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Rocksolid_Light/rocksolid/newsportal.php b/Rocksolid_Light/rocksolid/newsportal.php index 85e59cd..6515e88 100644 --- a/Rocksolid_Light/rocksolid/newsportal.php +++ b/Rocksolid_Light/rocksolid/newsportal.php @@ -612,7 +612,19 @@ function groups_show($gruppen) { $groupdisplay.='href="'.$file_thread.'?group='._rawurlencode($g->name).'">'.group_display_name($g->name)."\n"; if($g->description!="-") $groupdisplay.='

'.$g->description.'

'; - +// Subscribed features + $filename = $spooldir."/".$g->name."-lastarticleinfo.dat"; + if($file=@fopen($filename,"r")) { + $lastarticleinfo=unserialize(fread($file,filesize($filename))); + fclose($file); + } else { + $lastarticleinfo->date = 0; + } + if(isset($userdata[$g->name])) { + if($userdata[$g->name] < $lastarticleinfo->date) { + $groupdisplay.='

(new)

'; + } + } /* Display article count */ $groupdisplay.=''; if($gl_age) @@ -626,13 +638,7 @@ function groups_show($gruppen) { /* Display latest article info */ $groupdisplay.='
'; - $filename = $spooldir."/".$g->name."-lastarticleinfo.dat"; - if($file=@fopen($filename,"r")) { - $lastarticleinfo=unserialize(fread($file,filesize($filename))); - fclose($file); - } else { - $lastarticleinfo->date = 0; - } + // Handle newsportal errors in lastarticleinfo.dat if($lastarticleinfo->date == 0) { $database = $spooldir.'/articles-overview.db3'; @@ -666,11 +672,6 @@ function groups_show($gruppen) { } } } - if(isset($userdata[$g->name])) { - if($userdata[$g->name] < $lastarticleinfo->date) { - $groupdisplay.='(new) '; - } - } $groupdisplay.=get_date_interval(date("D, j M Y H:i T",$lastarticleinfo->date)); $groupdisplay.='
'; $groupdisplay.='by: ';