Commit f8f4b9f1 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix HTTP 500 on invalid via RE; improve via handling while at it

parent d1c5aa04

lib/DBInfoscreen/Controller/Stationboard.pm

+18 −2
Original line number Diff line number Diff line
@@ -90,10 +90,26 @@ sub result_has_via { 


	my @route = $result->route_post;



	if ( List::MoreUtils::any { m{$via}i } @route ) {

	my $eq_result = List::MoreUtils::any { lc eq lc($via) } @route;



	if ($eq_result) {

		return 1;

	}

	return 0;



	my ( $re1_result, $re2_result );



	eval {

		$re2_result = List::MoreUtils::any { m{\Q$via\E}i } @route;

	};

	eval {

		$re1_result = List::MoreUtils::any { m{$via}i } @route;

	};



	if ($@) {

		return $re2_result || $eq_result;

	}



	return $re1_result || $re2_result || $eq_result;

}



sub log_api_access {