},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,
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);
my ( $self, $c ) = @_;
my $dbh = $c->model;
+ my $hostname = html_escape $c->req->param('hostname');
$dbh->do(q{UPDATE users SET hostmask = ? WHERE uid = ?
- },undef, html_escape $c->req->param('hostname'), $c->user->id);
+ },undef, $hostname, $c->user->id);
$c->res->redirect($c->uri_for(''));
}
my $dbh = $c->model;
my $callme = $c->req->param('callme') || 0;
+ my $sms = html_escape $c->req->param('sms');
+ my $smsnote = $c->req->param('smsnote');
$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);
+ },undef, $sms, $callme, $smsnote, $c->user->id);
$c->res->redirect($c->uri_for(''));
}
$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 {
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');
}
}
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);
});
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);
$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 '<i>No user with these coords</i>' 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 '<i>Duplicate</i>' if $pid;
-
- }
-
- my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10";
- $irc->execute($c->user->id, $message);
- $inc->{status} = '<b>Added</b>';
-
- } catch {
- when (m(^(<i>.*</i>) 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 ) = @_;
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]);
|$returnetare)\s*/x;
my $missre = qr/((?:Alliance\ Standby)|(?:(?:Fake\ )?\w+))\s*/x;
if ($missions =~ m/
- Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ Base \s+ \(i\) \s (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ TOTAL \s+
+ Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ ETA \s+ Base \s+ \(i\) \s (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ TOTAL \s+
(?<ships>.+?)
\QTotal Ships in Fleet\E \s+ (\d+) \s+ (?<amount>\d+) \s+ (?<amount>\d+) \s+ (?<amount>\d+) \s+
Mission: \s* (?<missions>(?:$missre)*) \s*
my @targets = split /\s+/, $+{targets};
my @lts = split /\s+/, $+{lts};
my @etas;
- my $_ = $+{etas};
+ local $_ = $+{etas};
while(/$etare/sxg){
push @etas, $1;
}
amount => 0,
ships => []
};
- while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){
+ while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS|--)[^\d]+\d+\s+((?:\d+\s*){5})/g){
my $ship = $1;
my @amounts = split /\D+/, $3;
my $base = shift @amounts;
projects / ndwebbie.git / blobdiff