From: Michael Andreen Date: Wed, 13 Aug 2008 09:05:29 +0000 (+0200) Subject: Updating for new webbie X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=commitdiff_plain;h=a3c33971c0600755b8edaa7d1a675a25b89a3126 Updating for new webbie --- diff --git a/Members.pm b/Members.pm index 40d50bc..027ac7c 100644 --- 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 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{