unread query outside include

[ndwebbie.git] / ND / Include.pm

diff --git a/ND/Include.pm b/ND/Include.pm
index a01a37f6909fbeb0e3e766fce3b65c27655661fd..9bfb05ed39ad6b5e860ccec1390b917e147dea4b 100644 (file)
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -20,48 +20,12 @@
 package ND::Include;
 use strict;
 use warnings FATAL => 'all';
+use CGI qw{:standard};
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/isMember isHC isDC isBC isOfficer isScanner isIntel parseMarkup min max listTargets
-       alliances intelquery/;
-
-sub isMember {
-       return exists $ND::GROUPS{Members};
-}
-
-sub isHC {
-       return exists $ND::GROUPS{HC};
-}
-
-sub isDC {
-       return exists $ND::GROUPS{DC};
-}
-
-sub isBC {
-       return exists $ND::GROUPS{BC};
-}
-
-sub isOfficer {
-       return exists $ND::GROUPS{Officers};
-}
-
-sub isScanner {
-       return exists $ND::GROUPS{Scanners};
-}
-
-sub isIntel {
-       return exists $ND::GROUPS{Intel};
-}
-
-sub parseMarkup {
-       my ($text) = @_;
-
-       $text =~ s{\n}{\n<br/>}g;
-       $text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>};
-       return $text;
-}
+our @EXPORT = qw/min max log_message intel_log unread_query/;
 
 sub min {
     my ($x,$y) = @_;
@@ -73,51 +37,29 @@ sub max {
     return ($x < $y ? $y : $x);
 }
 
-sub listTargets {
-       my $query = $ND::DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
-FROM raid_claims c
-       JOIN raid_targets t ON c.target = t.id
-       JOIN raids r ON t.raid = r.id
-       JOIN current_planet_stats p ON t.planet = p.id
-WHERE c.uid = ? AND r.tick+c.wave > ? AND r.open AND not r.removed
-ORDER BY r.tick+c.wave,x,y,z});
-       $query->execute($ND::UID,$ND::TICK);
-       my @targets;
-       while (my $target = $query->fetchrow_hashref){
-               my $coords = "Target $target->{id}";
-               $coords = $target->{coords} if $target->{released_coords};
-               push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
-                       , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}
-                       , AJAX => $ND::AJAX, JoinName => $target->{joinable} ? 'N' : 'J'
-                       , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'};
-       }
-       my $template = HTML::Template->new(filename => "templates/targetlist.tmpl", cache => 1);
-       $template->param(Targets => \@targets);
-       return $template->output;
+sub log_message {
+       my ($uid, $message) = @_;
+       my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
+               (SELECT ftid FROM users WHERE uid = $1),$1,$2)});
+       $log->execute($uid,$message) or $ND::ERROR .= p($ND::DBH->errstr);
 }
 
-sub alliances {
-       my ($alliance) = @_;
-       my @alliances;
-       push @alliances,{Id => -1, Name => '&nbsp;', Selected => not $alliance};
-       my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name});
-       $query->execute;        
-       while (my $ally = $query->fetchrow_hashref){
-               push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance == $ally->{id}};
-       }
-       return @alliances;
+sub intel_log {
+       my ($uid,$planet, $message) = @_;
+       my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
+               (SELECT ftid FROM planets WHERE id = $3),$1,$2)});
+       $log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
 }
 
-sub intelquery {
-       my ($columns,$where) = @_;
-       return qq{
-SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
-FROM (intel i NATURAL JOIN users u)
-       JOIN current_planet_stats t ON i.target = t.id
-       JOIN current_planet_stats o ON i.sender = o.id
-WHERE $where 
-GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick
-ORDER BY i.tick DESC, i.mission};
+sub unread_query {
+       return $ND::DBH->prepare_cached(q{
+                       SELECT count(*) AS unread, max(ftv.time) AS last_vist
+FROM forum_boards fb NATURAL JOIN forum_threads ft 
+       JOIN forum_posts fp USING (ftid) LEFT OUTER JOIN 
+               (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
+WHERE (ftv.time IS NULL OR fp.time > ftv.time) AND fbid > 0 AND
+       fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
+               });
 }
 
 1;