X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=b88574505f2f2e677794889564e97c268fbc7c3b;hb=9519c80241167db071e44cbdd1e1843daad6e305;hp=19f7a2d128d784baefc8697a24310df0ff0d450d;hpb=539c51827d7c3f5a1ed3fbdf09e1e44c21d334cb;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 19f7a2d..b885745 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -163,7 +163,7 @@ sub postowncoords : Local {
 		$c->flash(error => $c->req->param('planet') . " are not valid coords.");
 	}
 
-	$c->res->redirect($c->uri_for(''));
+	$c->res->redirect($c->uri_for('/'.$c->session->{referrer}));
 }
 
 sub postfleetsupdates : Local {
@@ -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;
@@ -595,7 +595,7 @@ sub parseconfirmations {
 		|$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*
@@ -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;
 		}
@@ -664,7 +664,7 @@ sub parseconfirmations {
 			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;