X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=52bcb4c0f2a251304b6e7da4cebfb7e16e9b092e;hb=HEAD;hp=d0d7e314b32366273d399f1f6535084a879a6192;hpb=8ab709d6aa740c7ab3ebccb37903d8c12ef7b894;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index d0d7e31..52bcb4c 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -34,7 +34,7 @@ sub index : Path : Args(0) { $c->stash(u => $dbh->selectrow_hashref(q{SELECT pid AS planet,defense_points ,attack_points,scan_points,humor_points , (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points - , sms,rank,hostmask,call_if_needed,sms_note,defprio + , rank,defprio FROM users_defprio WHERE uid = ? },undef,$c->user->id) ); @@ -59,14 +59,6 @@ sub index : Path : Args(0) { },undef,$c->user->planet) ); - my $calls = $dbh->prepare(q{ -SELECT * FROM defcalls -WHERE uid = $1 AND landing_tick >= tick() -ORDER BY landing_tick DESC - }); - $calls->execute($c->user->id); - $c->stash(calls => $calls->fetchall_arrayref({}) ); - $c->stash(fleets => member_fleets($dbh, $c->user->id,$c->user->planet)); my $announcements = $dbh->prepare(q{SELECT ft.ftid, u.username,ft.subject, @@ -78,7 +70,7 @@ ORDER BY landing_tick DESC 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 + HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= 1 ORDER BY sticky DESC,last_post DESC }); $announcements->execute($c->user->id); @@ -91,16 +83,6 @@ SELECT array_agg(gid) FROM groupmembers WHERE gid IN ('x','y','z') AND uid = $1 } -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 postattackgroups : Local { my ( $self, $c ) = @_; my $dbh = $c->model; @@ -118,19 +100,6 @@ sub postattackgroups : Local { $c->res->redirect($c->uri_for('')); } -sub postsmsupdate : Local { - my ( $self, $c ) = @_; - my $dbh = $c->model; - - my $callme = $c->req->param('callme') || 0; - $dbh->do(q{ -UPDATE users SET sms = $1, call_if_needed = $2, sms_note = $3 WHERE uid = $4 - },undef, html_escape $c->req->param('sms'),$callme - ,$c->req->param('smsnote'), $c->user->id); - - $c->res->redirect($c->uri_for('')); -} - sub postowncoords : Local { my ( $self, $c ) = @_; my $dbh = $c->model; @@ -160,10 +129,11 @@ sub postowncoords : Local { $c->flash(error => "No planet at coords: $x:$y:$z"); } }else{ - $c->flash(error => $c->req->param('planet') . " are not valid coords."); + my $error = $c->req->param('planet') . " are not valid coords."; + $c->flash(error => $error); } - $c->res->redirect($c->uri_for('')); + $c->res->redirect($c->uri_for('/'.$c->session->{referrer})); } sub postfleetsupdates : Local { @@ -215,17 +185,19 @@ sub postircrequest : Local { my ( $self, $c ) = @_; my $dbh = $c->model; + my $message = $c->req->param('message'); if ($c->req->param('channel')){ my $query = $dbh->prepare(q{ INSERT INTO irc_requests (uid,channel,message) VALUES($1,$2,$3) }); - $query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message')); + my $channel = $c->user->id,$c->req->param('channel'); + $query->execute($channel, $message); $c->signal_bots; - $c->flash(reply => "Msg sent to: ".$c->req->param('channel')); + $c->flash(reply => "Msg sent to: ".$channel); $c->res->redirect($c->uri_for('ircrequest')); }else{ - $c->stash(ircmessage => $c->req->param('message')); + $c->stash(ircmessage => $message); $c->go('ircrequest'); } } @@ -274,7 +246,7 @@ sub stats : Local { my $limit = 'LIMIT 10'; $limit = '' if $c->check_user_roles(qw/members_points_nolimit/); - my ($races) = $dbh->selectrow_array(q{SELECT enum_range(null::race)::text[]}); + my ($races) = $dbh->selectrow_array(q{SELECT array_agg(race ORDER BY race_id) FROM races WHERE race_id >= 0}); $c->stash(races => $races); my $query = $dbh->prepare(q{ SELECT nick @@ -327,7 +299,8 @@ sub postintelmessage : Local { SELECT coords(x,y,z), tick() FROM current_planet_stats WHERE pid = $1 }, undef, $c->user->planet); - $c->req->param(message => "[i]Posted by $coords at tick $tick [/i]\n\n" . $c->req->param('message')); + my $message = "[i]Posted by $coords at tick $tick [/i]\n\n" . $c->req->param('message'); + $c->req->param(message => $message); $c->forward('/forum/insertThread',[12]); $c->forward('/forum/insertPost',[$c->stash->{thread}]); $c->flash(intelmessage => 1); @@ -380,7 +353,7 @@ sub insertintel : Private { }); my @intel; while ($intel =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+) - \*?\s+(A|D)\s+(.+?)\s+(?:(?:Ter|Cat|Xan|Zik|Etd)\s+)?(\d+)\s+(\d+)/gx){ + \*?\s+(A|D)\s+(.+?)\s+(?:(?:\w+)\s+)?(\d+)\s+(\d+)/gx){ my $ingal = ($1 == $4 && $2 == $5) || 0; my $lt = $tick + $10; my $back = ($ingal ? $lt + 4 : undef); @@ -399,77 +372,6 @@ sub insertintel : Private { $c->flash(scans => \@scans); } -sub addincs : Local { - my ( $self, $c ) = @_; - $c->stash(incs => $c->flash->{incs}); - -} - -sub postincs : Local { - my ( $self, $c ) = @_; - my $dbh = $c->model; - - my @incs; - - my $user = $dbh->prepare(q{ -SELECT uid FROM users u -WHERE pid = planetid($1,$2,$3,tick()) - AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M') - }); - my $call = $dbh->prepare(q{ -SELECT call -FROM calls WHERE uid = $1 AND landing_tick = tick() + $2 - }); - my $fleet = $dbh->prepare(q{ -SELECT pid -FROM incomings i -WHERE pid = planetid($1,$2,$3,tick()) AND amount = $4 and fleet = $5 AND call = $6 - }); - my $irc = $dbh->prepare(q{ -INSERT INTO irc_requests (uid,channel,message) VALUES($1,'def',$2) - }); - - my $msg = $c->req->param('message'); - while ($msg =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\*?\s+A\s+(.+?)\s+(Ter|Cat|Xan|Zik|Etd)\s+(\d+)\s+(\d+)/gc - ||$msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc - || $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){ - - my $inc = {message => $&}; - my $amount = $9; - { - $amount =~ s/,//g; - } - try { - my $uid = $dbh->selectrow_array($user,undef,$1,$2,$3); - die 'No user with these coords' unless $uid; - - my $call = $dbh->selectrow_array($call,undef,$uid,$10); - if ($call){ - my $pid = $dbh->selectrow_hashref($fleet,undef,$4,$5,$6,$amount,$7,$call); - die 'Duplicate' if $pid; - - } - - my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10"; - $irc->execute($c->user->id, $message); - $inc->{status} = 'Added'; - - } catch { - when (m(^(.*) at )){ - $inc->{status} = $1; - } - default { - $inc->{status} = $_; - } - }; - push @incs, $inc; - } - - $c->signal_bots if @incs; - $c->flash(incs => \@incs); - $c->res->redirect($c->uri_for('addincs')); -} - sub launchConfirmation : Local { my ( $self, $c ) = @_; @@ -507,7 +409,8 @@ WHERE uid = $1 AND num = $2 AND back > tick() my $fullfleet = $dbh->prepare(q{INSERT INTO full_fleets (fid,uid) VALUES (?,?)}); $dbh->begin_work; - my @missions = parseconfirmations($c->req->param('mission'), $c->stash->{TICK}); + my $mission = $c->req->param('mission'); + my @missions = parseconfirmations($mission, $c->stash->{TICK}); for my $m (@missions){ if ($m->{mission} eq 'Return'){ $c->forward("addReturnFleet", [$m]); @@ -822,7 +725,7 @@ sub member_fleets { ,NULL AS recalled, mission FROM fleets f WHERE pid = $2 AND tick <= tick() AND tick >= tick() - 24 - AND name IN ('Main','Advanced Unit') AND mission = 'Full fleet' + AND name IN ('Main', 'Advanced Unit', 'Military') AND mission = 'Full fleet' ORDER BY mission,name,tick DESC, fid DESC ) UNION ( SELECT fid,name,landing_tick AS tick, eta, amount