X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=8c44e056590cb0e5832c4ab3281c1f79a79b3a71;hb=af67320b296a7ebc59fcbe227efc2b0362c0a13d;hp=bb1f741bd39505f458d5ead5cb6d04f798b9f489;hpb=f79954caa064990f19788089b412b502369675de;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index bb1f741..8c44e05 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -250,7 +250,7 @@ sub points : Local { my ( $self, $c, $order ) = @_; my $dbh = $c->model; - if ($order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){ + if ($order && $order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){ $order = "$1 DESC"; }else{ $order = 'total_points DESC'; @@ -417,7 +417,7 @@ sub postconfirmation : Local { }); my @missions; $dbh->begin_work; - while ($missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+) + while ($missions && $missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+) \s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins?\s+ (Attack|Defend|Return|Fake\ Attack|Fake\ Defend) (.*?)