From 2c69d5fa71e2b4ddf7c9f5fa1880a9c69f70e43a Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 16 Jul 2008 03:57:47 +0200 Subject: [PATCH] Converted main page --- NDWeb/Pages/Main.pm | 265 -------------------------------- lib/NDWeb/Controller/Members.pm | 205 ++++++++++++++++++++++++ root/lib/site/leftbar.tt2 | 2 +- root/src/index.tt2 | 4 - root/src/members/index.tt2 | 148 ++++++++++++++++++ root/static/default.css | 8 + templates/main.tmpl | 142 ----------------- 7 files changed, 362 insertions(+), 412 deletions(-) delete mode 100644 NDWeb/Pages/Main.pm create mode 100644 root/src/members/index.tt2 delete mode 100644 templates/main.tmpl diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm deleted file mode 100644 index 083b96d..0000000 --- a/NDWeb/Pages/Main.pm +++ /dev/null @@ -1,265 +0,0 @@ -#************************************************************************** -# 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. * -#**************************************************************************/ - -package NDWeb::Pages::Main; -use strict; -use warnings; -use CGI qw/:standard/; -use ND::Include; -use NDWeb::Include; - -use base qw/NDWeb::XMLPage/; - -$NDWeb::Page::PAGES{main} = 'NDWeb::Pages::Main'; - -sub render_body { - my $self = shift; - my ($BODY) = @_; - $self->{TITLE} = 'Main Page'; - my $DBH = $self->{DBH}; - - if (defined param('cmd')){ - if (param('cmd') eq 'fleet'){ - my $fleet = param('fleet'); - $fleet =~ s/,//g; - my $amount = 0; - my @ships; - while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+(\d+)/g){ - $amount += $2; - push @ships, [$1,$2]; - } - if ($amount){ - $DBH->begin_work; - eval{ - my $insert = $DBH->prepare(q{INSERT INTO fleets - (uid,sender,name,mission,tick,amount) - VALUES (?,?,'Main','Full fleet',tick(),?) RETURNING id}); - my ($id) = $DBH->selectrow_array($insert,undef,$self->{UID} - ,$self->{PLANET},$amount) or die $DBH->errstr; - $insert = $DBH->prepare('INSERT INTO fleet_ships - (id,ship,amount) VALUES (?,?,?)'); - for my $s (@ships){ - unshift @{$s},$id; - $insert->execute(@{$s}) or die $DBH->errstr; - } - }; - if ($@){ - warn $@; - $DBH->rollback; - }else{ - $DBH->commit; - $self->{RETURN} = 'REDIRECT'; - $self->{REDIR_LOCATION} = "/main"; - return; - } - }else{ - warn 'Fleet does not contain any ships'; - } - }elsif (param('cmd') eq 'Recall Fleets'){ - $DBH->begin_work; - my $updatefleets = $DBH->prepare('UPDATE fleets SET back = tick() + (tick() - (tick - eta)) WHERE uid = ? AND id = ?'); - - for my $param (param()){ - if ($param =~ /^change:(\d+)$/){ - if($updatefleets->execute($ND::UID,$1)){ - log_message $ND::UID,"Member recalled fleet $1"; - }else{ - warn $DBH->errstr; - } - } - } - $DBH->commit or warn $DBH->errstr; - }elsif (param('cmd') eq 'Change Fleets'){ - $DBH->begin_work; - my $updatefleets = $DBH->prepare('UPDATE fleets SET back = ? WHERE uid = ? AND id = ?'); - for my $param (param()){ - if ($param =~ /^change:(\d+)$/){ - if($updatefleets->execute(param("back:$1"),$ND::UID,$1)){ - log_message $ND::UID,"Member set fleet $1 to be back tick: ".param("back:$1"); - }else{ - warn $DBH->errstr; - } - } - } - $DBH->commit or warn $DBH->errstr; - } - } - if (param('sms')){ - my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?'); - $query->execute(escapeHTML(param('sms')),$ND::UID); - } - if (param('hostname')){ - my $query = $DBH->prepare('UPDATE users SET hostmask = ? WHERE uid = ?'); - $query->execute(escapeHTML(param('hostname')),$ND::UID); - } - if ($self->isMember() && !$self->{PLANET} && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){ - my $query = $DBH->prepare(q{ - UPDATE users SET planet = - (SELECT id from current_planet_stats where x = ? AND y = ? AND z = ?) - WHERE uid = ? }); - $query->execute($1,$2,$3,$ND::UID); - } - - $BODY->param(isMember => $self->isMember()); - my @groups = map {name => $_}, sort keys %{$self->{GROUPS}}; - $BODY->param(Groups => \@groups); - - - my $query = $DBH->prepare(q{SELECT planet,defense_points,attack_points,scan_points,humor_points, (attack_points+defense_points+scan_points/20) as total_points, sms,rank,hostmask FROM users WHERE uid = ?}); - - my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank,$hostname) = $DBH->selectrow_array($query,undef,$ND::UID); - - $self->{PLANET} = $planet unless $self->{PLANET}; - - $BODY->param(NDRank => $rank); - $BODY->param(DefensePoints => $defense_points); - $BODY->param(AttackPoints => $attack_points); - $BODY->param(ScanPoints => $scan_points); - $BODY->param(HumorPoints => $humor_points); - $BODY->param(TotalPoints => $total_points); - - $BODY->param(Planet => $planet); - - my $calls = $DBH->prepare(qq{ - SELECT id,landing_tick,dc,curreta,covered, - TRIM('/' FROM concat(DISTINCT race||' /')) AS race, TRIM('/' FROM concat(amount||' /')) AS amount, - TRIM('/' FROM concat(DISTINCT eta||' /')) AS eta, TRIM('/' FROM concat(DISTINCT shiptype||' /')) AS shiptype, - TRIM('/' FROM concat(coords||' /')) AS attackers - FROM (SELECT c.id,p.x,p.y,p.z, u.defense_points, c.landing_tick, dc.username AS dc,covered, - (c.landing_tick - tick()) AS curreta,p2.race, i.amount, i.eta, i.shiptype, p2.alliance, - coords(p2.x,p2.y,p2.z), COUNT(DISTINCT f.id) AS fleets - FROM calls c - JOIN incomings i ON i.call = c.id - JOIN users u ON c.member = u.uid - JOIN current_planet_stats p ON u.planet = p.id - JOIN current_planet_stats p2 ON i.sender = p2.id - LEFT OUTER JOIN users dc ON c.dc = dc.uid - LEFT OUTER JOIN fleets f ON f.target = u.planet AND f.tick = c.landing_tick AND f.back = f.tick + f.eta - 1 - WHERE u.uid = ? AND c.landing_tick >= tick() - GROUP BY c.id, p.x,p.y,p.z, c.landing_tick, u.defense_points,dc.username,covered,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z) a - GROUP BY id, x,y,z,landing_tick, defense_points,dc,covered,curreta,fleets - ORDER BY landing_tick DESC - })or warn $DBH->errstr; - $calls->execute($ND::UID) or warn $DBH->errstr; - - my @calls; - while (my $call = $calls->fetchrow_hashref){ - $call->{attackers} =~ s{(\d+:\d+:\d+)}{$1}g; - unless(defined $call->{dc}){ - $call->{activedc} = 'Hostile'; - $call->{dc} = 'none'; - } - if($call->{covered}){ - $call->{covered} = 'Friendly'; - }else{ - $call->{covered} = 'Hostile'; - } - $call->{shiptype} = $call->{shiptype}; - push @calls, $call; - } - $BODY->param(Calls => \@calls); - - my $planetstats= $DBH->selectrow_hashref(q{SELECT x,y,z, ((ruler || ' OF ') || p.planet) as planet,race, - size, size_gain, size_gain_day, - score,score_gain,score_gain_day, - value,value_gain,value_gain_day, - xp,xp_gain,xp_gain_day, - sizerank,sizerank_gain,sizerank_gain_day, - scorerank,scorerank_gain,scorerank_gain_day, - valuerank,valuerank_gain,valuerank_gain_day, - xprank,xprank_gain,xprank_gain_day - from current_planet_stats_full p - WHERE id = ?},undef,$planet) if $planet; - if ($planetstats){ - my $planet = $planetstats; - for my $type (qw/size score value xp/){ - $planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000 - $planet->{"${type}img"} = 'stay'; - $planet->{"${type}img"} = 'up' if $planet->{"${type}_gain_day"} > 0; - $planet->{"${type}img"} = 'down' if $planet->{"${type}_gain_day"} < 0; - $planet->{"${type}rankimg"} = 'stay'; - $planet->{"${type}rankimg"} = 'up' if $planet->{"${type}rank_gain_day"} < 0; - $planet->{"${type}rankimg"} = 'down' if $planet->{"${type}rank_gain_day"} > 0; - for my $type ($type,"${type}_gain","${type}_gain_day"){ - $planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000 - } - } - $BODY->param(Planets => [$planet]); - $BODY->param(PlanetCoords => "$planet->{x}:$planet->{y}:$planet->{z}"); - } - - - $query = $DBH->prepare(q{SELECT f.id, coords(x,y,z) AS target, mission - , f.amount, tick, back -FROM fleets f -LEFT OUTER JOIN current_planet_stats p ON f.target = p.id -WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND - (back >= ? OR (tick >= tick() - 24 AND name = 'Main')) -GROUP BY f.id, x,y,z, mission, tick,back,f.amount -ORDER BY x,y,z,mission,tick - }); - - my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships - WHERe id = ? ORDER BY num - }); - - $query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr; - my @fleets; - while (my $fleet = $query->fetchrow_hashref){ - my @ships; - $ships->execute($fleet->{id}); - while (my $ship = $ships->fetchrow_hashref){ - push @ships,$ship; - } - $fleet->{ships} = \@ships; - push @fleets,$fleet; - } - $BODY->param(Fleets => \@fleets); - - $BODY->param(SMS => $sms); - $BODY->param(Hostname => $hostname); - - if ($self->isMember()){ - my $announcements = $DBH->prepare(q{SELECT ft.ftid AS id,u.username,ft.subject, - count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts, - date_trunc('seconds',max(fp.time)::timestamp) as last_post, - min(fp.time)::date as posting_date, ft.sticky - FROM forum_threads ft JOIN forum_posts fp USING (ftid) - JOIN users u ON u.uid = ft.uid - LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid - WHERE ft.fbid = 1 - GROUP BY ft.ftid, ft.subject,ft.sticky,u.username - HAVING count(NULLIF(COALESCE(ft.sticky OR fp.time > ftv.time,TRUE),FALSE)) >= $2 - ORDER BY sticky DESC,last_post DESC - }); - $announcements->execute($ND::UID,1) or warn $DBH->errstr; - my @threads; - while (my $thread = $announcements->fetchrow_hashref){ - push @threads,$thread; - } - $BODY->param(Announcements => \@threads); - } - - - return $BODY; -} - - -1; - diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index 78bbe80..9373b8f 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -4,6 +4,8 @@ use strict; use warnings; use parent 'Catalyst::Controller'; +use NDWeb::Include; + =head1 NAME NDWeb::Controller::Members - Catalyst Controller @@ -21,6 +23,209 @@ Catalyst Controller. =cut +sub index : Path : Args(0) { + my ( $self, $c, $order ) = @_; + my $dbh = $c->model; + + $c->stash(error => $c->flash->{error}); + + $c->stash(comma => \&comma_value); + $c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points + ,attack_points,scan_points,humor_points + , (attack_points+defense_points+scan_points/20) as total_points + , sms,rank,hostmask FROM users WHERE uid = ? + },undef,$c->user->id) + ); + + $c->stash(groups => $dbh->selectrow_array(q{SELECT array_accum(groupname) + FROM groups g NATURAL JOIN groupmembers gm + WHERE uid = $1 + },undef,$c->user->id) + ); + + $c->stash(p => $dbh->selectrow_hashref(q{SELECT id,x,y,z, ruler, planet,race, + size, size_gain, size_gain_day, + score,score_gain,score_gain_day, + value,value_gain,value_gain_day, + xp,xp_gain,xp_gain_day, + sizerank,sizerank_gain,sizerank_gain_day, + scorerank,scorerank_gain,scorerank_gain_day, + valuerank,valuerank_gain,valuerank_gain_day, + xprank,xprank_gain,xprank_gain_day + from current_planet_stats_full p + WHERE id = ? + },undef,$c->user->planet) + ); + + my $calls = $dbh->prepare(q{ + SELECT id,landing_tick,dc,curreta + ,array_accum(race::text) AS race + ,array_accum(amount) AS amount + ,array_accum(eta) AS eta + ,array_accum(shiptype) AS shiptype + ,array_accum(coords) AS attackers + FROM (SELECT c.id, c.landing_tick + ,dc.username AS dc, (c.landing_tick - tick()) AS curreta + ,p2.race, i.amount, i.eta, i.shiptype, p2.alliance + ,coords(p2.x,p2.y,p2.z) + FROM calls c + LEFT OUTER JOIN incomings i ON i.call = c.id + LEFT OUTER JOIN current_planet_stats p2 ON i.sender = p2.id + LEFT OUTER JOIN users dc ON c.dc = dc.uid + WHERE c.member = $1 AND c.landing_tick >= tick() + GROUP BY c.id, c.landing_tick, dc.username + ,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z + ) c + GROUP BY id, landing_tick,dc,curreta + }); + + $calls->execute($c->user->id); + $c->stash(calls => $calls->fetchall_arrayref({}) ); + + my $query = $dbh->prepare(q{SELECT f.id, coords(x,y,z), target, mission + , f.amount, tick, back +FROM fleets f +LEFT OUTER JOIN current_planet_stats p ON f.target = p.id +WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND + (back >= ? OR (tick >= tick() - 24 AND name = 'Main')) +GROUP BY f.id, x,y,z, mission, tick,back,f.amount,f.target +ORDER BY x,y,z,mission,tick + }); + + my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships + WHERe id = ? ORDER BY num + }); + + $query->execute($c->user->id,$c->user->planet,$c->stash->{TICK}); + my @fleets; + while (my $fleet = $query->fetchrow_hashref){ + my @ships; + $ships->execute($fleet->{id}); + while (my $ship = $ships->fetchrow_hashref){ + push @ships,$ship; + } + $fleet->{ships} = \@ships; + push @fleets,$fleet; + } + $c->stash(fleets => \@fleets); + + my $announcements = $dbh->prepare(q{SELECT ft.ftid, u.username,ft.subject, + count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts, + date_trunc('seconds',max(fp.time)::timestamp) as last_post, + min(fp.time)::date as posting_date, ft.sticky + FROM forum_threads ft JOIN forum_posts fp USING (ftid) + JOIN users u ON u.uid = ft.uid + LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid + WHERE ft.fbid = 1 + GROUP BY ft.ftid, ft.subject,ft.sticky,u.username + HAVING count(NULLIF(COALESCE(ft.sticky OR fp.time > ftv.time,TRUE),FALSE)) >= 1 + ORDER BY sticky DESC,last_post DESC + }); + $announcements->execute($c->user->id); + $c->stash(announcements => $announcements->fetchall_arrayref({}) ); +} + +sub posthostupdate : Local { + my ( $self, $c ) = @_; + my $dbh = $c->model; + + $dbh->do(q{UPDATE users SET hostmask = ? WHERE uid = ? + },undef, html_escape $c->req->param('hostname'), $c->user->id); + + $c->res->redirect($c->uri_for('')); +} + +sub postsmsupdate : Local { + my ( $self, $c ) = @_; + my $dbh = $c->model; + + $dbh->do(q{UPDATE users SET sms = ? WHERE uid = ? + },undef, html_escape $c->req->param('sms'), $c->user->id); + + $c->res->redirect($c->uri_for('')); +} + +sub postfleetupdate : Local { + my ( $self, $c ) = @_; + my $dbh = $c->model; + + my $fleet = $c->req->param('fleet'); + $fleet =~ s/,//g; + my $amount = 0; + my @ships; + while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+(\d+)/g){ + $amount += $2; + push @ships, [$1,$2]; + } + if ($amount){ + $dbh->begin_work; + eval{ + my $insert = $dbh->prepare(q{INSERT INTO fleets + (uid,sender,name,mission,tick,amount) + VALUES (?,?,'Main','Full fleet',tick(),?) RETURNING id}); + my ($id) = $dbh->selectrow_array($insert,undef,$c->user->id + ,$c->user->planet,$amount); + $insert = $dbh->prepare(q{INSERT INTO fleet_ships + (id,ship,amount) VALUES (?,?,?)}); + for my $s (@ships){ + unshift @{$s},$id; + $insert->execute(@{$s}); + } + $dbh->commit; + }; + if ($@){ + if ($@ =~ m/insert or update on table "fleet_ships" violates foreign key constraint "fleet_ships_ship_fkey"\s+DETAIL:\s+Key \(ship\)=\(([^)]+)\)/){ + $c->flash( error => "'$1' is NOT a valid ship"); + }else{ + $c->flash( error => $@); + } + $dbh->rollback; + } + }else{ + $c->flash( error => 'Fleet does not contain any ships'); + } + + $c->res->redirect($c->uri_for('')); +} + +sub postfleetsupdates : Local { + my ( $self, $c ) = @_; + my $dbh = $c->model; + + my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message) VALUES( + (SELECT ftid FROM users WHERE uid = $1),$1,$2) + }); + $dbh->begin_work; + if ($c->req->param('cmd') eq 'Recall Fleets'){ + my $updatefleets = $dbh->prepare(q{UPDATE fleets + SET back = tick() + (tick() - (tick - eta)) + WHERE uid = ? AND id = ? AND back > tick()+eta + }); + + for my $param ($c->req->param()){ + if ($param =~ /^change:(\d+)$/){ + $updatefleets->execute($c->user->id,$1); + $log->execute($c->user->id,"Member recalled fleet $1"); + } + } + }elsif ($c->req->param('cmd') eq 'Change Fleets'){ + my $updatefleets = $dbh->prepare(q{UPDATE fleets + SET back = ? WHERE uid = ? AND id = ?}); + + for my $param ($c->req->param()){ + if ($param =~ /^change:(\d+)$/){ + my $back = $c->req->param("back:$1"); + $updatefleets->execute($back,$c->user->id,$1); + $log->execute($c->user->id,"Member set fleet $1 to be back tick: $back"); + } + } + } + $dbh->commit; + + $c->res->redirect($c->uri_for('')); +} + + sub points : Local { my ( $self, $c, $order ) = @_; my $dbh = $c->model; diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2 index 32d0561..3d134e4 100644 --- a/root/lib/site/leftbar.tt2 +++ b/root/lib/site/leftbar.tt2 @@ -1,5 +1,5 @@