X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=2ab6f2759baf2e66e53ffe7e6cf58968f9833d13;hb=fcd1ee7b280d01a082b3a868a56145f970251f5d;hp=59becdfbb62b770f4e9c40fa829994fc4703f419;hpb=be99623fcecb41431020f1cd46a2dca56f9c467a;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index 59becdf..2ab6f27 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -322,17 +322,17 @@ sub insertintel : Private { $dbh->begin_work; my $findscan = $dbh->prepare(q{SELECT scan_id FROM scans - WHERE scan_id = ? AND tick >= tick() - 168 AND groupscan = ? + WHERE scan_id = LOWER(?) AND tick >= tick() - 168 AND groupscan = ? }); my $addscan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid,groupscan) - VALUES (?,tick(),?,?) + VALUES (LOWER(?),tick(),?,?) }); my $addpoint = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? }); my @scans; my $intel = $c->req->param('message'); - while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\d+)}g){ + while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){ my $groupscan = (defined $1 && $1 eq '_grp') || 0; my %scan; $scan{id} = $2; @@ -527,7 +527,7 @@ sub defenders : Local { my $defenders = $dbh->prepare(q{ SELECT uid,u.planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time - ,sms_note, call_if_needed, race + ,sms_note, call_if_needed, race, timezone FROM users u JOIN current_planet_stats p ON p.id = u.planet WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)