From 0c6242438cc218a6a6980c961484b8c74d547eee Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Thu, 14 Dec 2006 19:15:57 +0000 Subject: [PATCH] intel and minor things --- include.pl | 4 +- intel.pl | 170 ++++++++++++++++++++++++++++++++++++++++++ templates/intel.tmpl | 118 +++++++++++++++++++++++++++++ templates/top100.tmpl | 2 +- 4 files changed, 290 insertions(+), 4 deletions(-) create mode 100644 intel.pl create mode 100644 templates/intel.tmpl diff --git a/include.pl b/include.pl index ad9fd06..07bb985 100644 --- a/include.pl +++ b/include.pl @@ -106,10 +106,8 @@ SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i 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 - LEFT OUTER JOIN alliances ta ON t.alliance_id = ta.id - LEFT OUTER JOIN alliances oa ON o.alliance_id = oa.id WHERE $where -GROUP BY t.x,t.y,t.z,o.x,o.y,o.z,i.mission,i.tick,i.amount,i.ingal,u.username,ta.name,oa.name +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 ORDER BY i.tick DESC, i.mission}; } diff --git a/intel.pl b/intel.pl new file mode 100644 index 0000000..2b33c5e --- /dev/null +++ b/intel.pl @@ -0,0 +1,170 @@ +#************************************************************************** +# Copyright (C) 2006 by Michael Andreen * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU General Public License as published by * +# the Free Software Foundation; either version 2 of the License, or * +# (at your option) any later version. * +# * +# This program is distributed in the hope that it will be useful, * +# but WITHOUT ANY WARRANTY; without even the implied warranty of * +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# GNU General Public License for more details. * +# * +# You should have received a copy of the GNU General Public License * +# along with this program; if not, write to the * +# Free Software Foundation, Inc., * +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * +#**************************************************************************/ + +use strict; +use POSIX; +our $BODY; +our $DBH; +our $LOG; + +$ND::TEMPLATE->param(TITLE => 'Intel'); + +die "You don't have access" unless isIntel() || isHC(); + +my $planet; +if (param('coords') =~ /(\d+)(?: |:)(\d+)(?: |:)(\d+)/){ + my $query = $DBH->prepare(q{SELECT x,y,z,coords(x,y,z),id, nick, alliance,alliance_id, planet_status,channel FROM current_planet_stats +WHERE x = ? AND y = ? AND z = ?}); + $planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3); +} + +my $showticks = 'AND (i.tick - i.eta) > (tick() - 48)'; +if (param('show') eq 'all'){ + $showticks = ''; +}elsif (param('show') =~ /^(\d+)$/){ + $showticks = "AND (i.tick - i.eta) > tick() - $1"; +} + +if ($planet){ + if (param('cmd') eq 'change'){ + $DBH->begin_work; + if (param('cnick')){ + my $value = escapeHTML(param('nick')); + if ($DBH->do(q{UPDATE planets SET nick = ? WHERE id =?} + ,undef,$value,$planet->{id})){ + $planet->{nick} = $value; + }else{ + print "

Something went wrong: ".$DBH->errstr."

"; + } + } + if (param('cchannel')){ + my $value = escapeHTML(param('channel')); + if ($DBH->do(q{UPDATE planets SET channel = ? WHERE id =?} + ,undef,$value,$planet->{id})){ + $planet->{channel} = $value; + }else{ + print "

Something went wrong: ".$DBH->errstr."

"; + } + } + if (param('cstatus')){ + my $value = escapeHTML(param('status')); + if ($DBH->do(q{UPDATE planets SET planet_status = ? WHERE id =?} + ,undef,$value,$planet->{id})){ + $planet->{planet_status} = $value; + }else{ + print "

Something went wrong: ".$DBH->errstr."

"; + } + } + if (param('calliance')){ + if ($DBH->do(q{UPDATE planets SET alliance_id = NULLIF(?,-1) WHERE id =?} + ,undef,param('alliance'),$planet->{id})){ + $planet->{alliance_id} = param('alliance'); + }else{ + print "

Something went wrong: ".$DBH->errstr."

"; + } + } + $DBH->commit or print "

Something went wrong: ".$DBH->errstr."

"; + } +} + +if (param('coords')){ + my $channel = param('coords'); + $channel = $planet->{channel} if ($planet); + my $findchannel = $DBH->prepare('SELECT coords(x,y,z),alliance,nick,channel FROM current_planet_stats WHERE channel ILIKE ? '); + $findchannel->execute($channel); + my @channelusers; + while (my $user = $findchannel->fetchrow_hashref){ + push @channelusers,$user; + } + $BODY->param(ChannelUsers => \@channelusers); +} + +if ($planet){ + $BODY->param(Coords => $planet->{coords}); + $BODY->param(Planet => $planet->{id}); + $BODY->param(Nick => $planet->{nick}); + $BODY->param(Channel => $planet->{channel}); + my @status; + for my $status (" ","Friendly", "NAP", "Hostile"){ + push @status,{Status => $status, Selected => $status eq $planet->{planet_status}} + } + $BODY->param(PlanetStatus => \@status); + my @alliances = alliances($planet->{alliance_id}); + $BODY->param(Alliances => \@alliances); + + my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin',"t.id = ? $showticks")); + $query->execute($planet->{id}) or print $DBH->errstr; + my @intellists; + my @intel; + while (my $intel = $query->fetchrow_hashref){ + if ($intel->{ingal}){ + $intel->{missionclass} = 'ingal'; + }else{ + $intel->{missionclass} = $intel->{mission}; + } + push @intel,$intel; + } + push @intellists,{Message => 'Incoming fleets', Intel => \@intel, Origin => 1}; + + my $query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks")); + $query->execute($planet->{id}) or print $DBH->errstr; + my @intel; + while (my $intel = $query->fetchrow_hashref){ + if ($intel->{ingal}){ + $intel->{missionclass} = 'ingal'; + }else{ + $intel->{missionclass} = $intel->{mission}; + } + push @intel,$intel; + } + push @intellists,{Message => 'Outgoing Fleets', Intel => \@intel, Target => 1}; + + $BODY->param(IntelLIsts => \@intellists); + +}elsif(!param('coords')){ + my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',qq{not ingal + AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL) AND i.mission != 'Attack') + OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack')) + AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL) + $showticks})); + + my @intellists; + my @intel; + while (my $intel = $query->fetchrow_hashref){ + if ($intel->{ingal}){ + $intel->{missionclass} = 'ingal'; + }else{ + $intel->{missionclass} = $intel->{mission}; + } + push @intel,$intel; + } + push @intellists,{Message => q{Missions where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1}; + $BODY->param(IntelLIsts => \@intellists); +} +my $query = $DBH->prepare(q{SELECT i.id, u.username, i.message, report_date FROM intel_messages i + JOIN users u ON u.uid = i.uid + WHERE NOT handled ORDER BY report_date}); +$query->execute; +my @messages; +while (my $message = $query->fetchrow_hashref){ + $message->{message} = parseMarkup($message->{message}); + push @messages,$message; +} +$BODY->param(IntelMessages => \@messages); +1; diff --git a/templates/intel.tmpl b/templates/intel.tmpl new file mode 100644 index 0000000..e6df411 --- /dev/null +++ b/templates/intel.tmpl @@ -0,0 +1,118 @@ +

+ + + +

+
+

Show all ticks

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
ValueChange?
Nick
Channel
Planet status
Alliance
+

+

+
+ + +

Planets sharing this channel

+ + + + + + + + + + +
CoordsAllianceNickChannel
+ + + +

 + + + + + + + + + + + + + + + + + + + + + + + + + +
AllianceSenderMissionLanding tickETAAmountTargetAllianceIngalReported by
+ + + + + + + + + + + + + + + + + +
Reported byReport timeMessage
remove
+ +
Coords +

Paste a list of coords here

+ + + +
+
diff --git a/templates/top100.tmpl b/templates/top100.tmpl index f723dd0..6e6848b 100644 --- a/templates/top100.tmpl +++ b/templates/top100.tmpl @@ -22,7 +22,7 @@ - + -- 2.39.2