Updating for new webbie

diff --git a/Members.pm b/Members.pm
index 40d50bc8284fd897d66b0b7f4cc2c377cf156f0c..027ac7c0c611bbd04a86f438cc03974875e26475 100644 (file)
--- a/Members.pm
+++ b/Members.pm
@@ -66,7 +66,7 @@ SQL
                $f->execute();
                my $calls = "";
                while (my ($raid) = $f->fetchrow()){
-                       $calls .= " http://nd.ruin.nu/raids?raid=$raid |"
+                       $calls .= " https://nd.ruin.nu/raids/view/$raid |"
                }
                $calls = "No open future raids" if ($f->rows == 0);
                chop($calls);

diff --git a/Usermgm.pm b/Usermgm.pm
index 63e3187e1531dad9b7b82d5faba1029d07a3181a..445a33a9eae1923895ff874507f3ab031a1acc96 100644 (file)
--- 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{