From: Michael Andreen <harv@ruin.nu>
Date: Wed, 13 Aug 2008 09:09:43 +0000 (+0200)
Subject: Merge branch 'master' of whale@ruin.nu:git/NDIRC
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=ccb4338b25220a94114da1bdf5d5d0345c885b06;hp=a1d98bc55c2ea2df2f2be3ff78386542b096c4dc;p=NDIRC.git

Merge branch 'master' of whale@ruin.nu:git/NDIRC
---

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/Scans.pm b/Scans.pm
index ccdc1f3..76c1e05 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -28,7 +28,7 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/addScan addScanGroup sendScan/;
 
 sub addScan {
-	my ($id,$verbose) = @_;
+	my ($id,$verbose, $quiet) = @_;
 	if (1){
 		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = ? AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
@@ -38,7 +38,12 @@ sub addScan {
 				if (@user){
 					$ND::DBH->do('UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? ',undef,$user[0]);
 					$user[2] += 1;
-					$ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
+					if ($quiet){
+						$ND::server->command("msg $ND::target Added scan, points now $user[2]");
+					}
+					else{
+						$ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
+					}
 				}elsif ($verbose){
 					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
 				}
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{