X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=33fdc5cb61243710e476d5822e7fb81faf75135d;hb=48df392b0817ea813443309eecc5949550095155;hp=2e9c97722a7f5c90db6793dff0def6b55675fd79;hpb=9b6fb9b8ad4b3d56ced39af5666fdca54977d61a;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 2e9c977..33fdc5c 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -78,7 +78,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);
@@ -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 {
@@ -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*
@@ -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;