Fix for perl 5.24

[ndwebbie.git] / lib / NDWeb / Controller / Members.pm

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index caa9489217247af5ace2ad2bed6ecb8654315774..2e9c97722a7f5c90db6793dff0def6b55675fd79 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -353,7 +353,7 @@ sub insertintel : Private {
                });
        my @scans;
        my $intel = $c->req->param('message');
-       while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){
+       while ($intel =~ m{https?://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){
                my $groupscan = (defined $1 && $1 eq '_grp') || 0;
                my %scan;
                $scan{id} = $2;
@@ -593,7 +593,7 @@ sub parseconfirmations {
        my $etare = qr/(Galaxy:\d+Universe:\d+(?:Alliance:\d+)?
                |$missionetare
                |$returnetare)\s*/x;
-       my $missre = qr/((?:Fake\ )?\w+)\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>.+?)
@@ -607,7 +607,7 @@ sub parseconfirmations {
                my @targets = split /\s+/, $+{targets};
                my @lts = split /\s+/, $+{lts};
                my @etas;
-               my $_ = $+{etas};
+               local $_ = $+{etas};
                while(/$etare/sxg){
                        push @etas, $1;
                }
@@ -629,6 +629,12 @@ sub parseconfirmations {
                                next;
                        }
 
+                       if ($missions[0] eq 'Alliance Standby'){
+                               shift @missions;
+                               push @slots,\%mission;
+                               next;
+                       }
+
                        given(shift @etas){
                                when(/$missionetare/sx){
                                        $mission{tick} = $3;
@@ -645,7 +651,7 @@ sub parseconfirmations {
                                        $mission{target} = shift @targets;
                                        $mission{lt} = shift @lts;
                                        $mission{mission} = shift @missions;
-                                       die 'Did you forget some at the end?' if $mission{mission} ne 'Return';
+                                       die "Did you forget some at the end? '$mission{mission}'" if $mission{mission} ne 'Return';
                                }
                        }
                        push @slots,\%mission;