X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=Usermgm.pm;h=445a33a9eae1923895ff874507f3ab031a1acc96;hb=a3c33971c0600755b8edaa7d1a675a25b89a3126;hp=63e3187e1531dad9b7b82d5faba1029d07a3181a;hpb=cea731ba773c36cd68227f246ec8268a98a72211;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 63e3187..445a33a 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -141,12 +141,21 @@ sub laston {
 			$min = $2;
 			$min = 0 unless defined $min;
 			$f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
-				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
+				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
+					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
+					,laston FROM users u) u
+					NATURAL JOIN groupmembers
+					NATURAL JOIN groups
+				WHERE flag = ? AND (last >= ? OR last IS NULL)
+				ORDER BY laston
 				});
 			$f->execute($flag,$min);
 		}elsif(defined $msg && $msg =~ /^(\S+)$/){
 			$f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
-				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u WHERE username ILIKE ? ORDER BY lower(username)
+				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
+					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
+					, laston FROM users u) u
+				WHERE username ILIKE ? ORDER BY lower(username)
 				});
 			$f->execute($1);
 		}else{