Unverified Commit 4f4f2ce9 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

DBF links: support efa and motis backends

parent 46638716

lib/Travelynx.pm

+2 −0
Original line number Diff line number Diff line
@@ -2142,7 +2142,9 @@ sub startup { 
			$ret =~ s{[{]tn[}]}{$opt{tn}}g;

			$ret =~ s{[{]id[}]}{$opt{id}}g;

			$ret =~ s{[{]dbris[}]}{$opt{dbris}}g;

			$ret =~ s{[{]efa[}]}{$opt{efa}}g;

			$ret =~ s{[{]hafas[}]}{$opt{hafas}}g;

			$ret =~ s{[{]motis[}]}{$opt{motis}}g;



			if ( $opt{id} and not $opt{is_iris} ) {

				$ret =~ s{[{]id_or_tttn[}]}{$opt{id}}g;

lib/Travelynx/Model/Users.pm

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ sub get { 
			past_all    => $user->{public_level} & 0x10000 ? 1 : 0,

			email       => $user->{email},

			sb_template =>

'https://dbf.finalrewind.org/{name}?rt=1&dbris={dbris}&hafas={hafas}#{id_or_tttn}',

'https://dbf.finalrewind.org/{name}?dbris={dbris}&efa={efa}&hafas={hafas}&motis={motis}#{id_or_tttn}',

			registered_at => DateTime->from_epoch(

				epoch     => $user->{registered_at_ts},

				time_zone => 'Europe/Berlin'

templates/_checked_in.html.ep

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
						% }

					</div>

					<div style="float: right; text-align: right;">

						<b><a href="<%= resolve_sb_template($user->{sb_template}, name => $journey->{arr_name}, eva => $journey->{arr_eva}, tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id} =~ s{[ #|]}{x}gr, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}, is_iris => $journey->{is_iris}) %>" class="unmarked"><%= $journey->{arr_name} %></a></b><br/>

						<b><a href="<%= resolve_sb_template($user->{sb_template}, name => $journey->{arr_name}, eva => $journey->{arr_eva}, tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id} =~ s{[ #|]}{x}gr, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, efa => $journey->{is_efa} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}, is_iris => $journey->{is_iris}, motis => $journey->{is_motis} ? $journey->{backend_name} : q{}) %>" class="unmarked"><%= $journey->{arr_name} %></a></b><br/>

						% if ($journey->{real_arrival}->epoch) {

							<b><%= $journey->{real_arrival}->strftime('%H:%M') %></b>

							% if ($journey->{real_arrival}->epoch != $journey->{sched_arrival}->epoch) {
@@ -387,7 +387,7 @@ 
						% }

						</span>

					</a>

					<a class="nonflex" href="<%= resolve_sb_template($user->{sb_template}, name => $station->[0], eva => $station->[1], tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id} =~ s{[ #|]}{x}gr, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}, is_iris => $journey->{is_iris}) %>"><i class="material-icons tiny"><%= $journey->{is_hafas} ? 'directions' : 'train' %></i></a>

					<a class="nonflex" href="<%= resolve_sb_template($user->{sb_template}, name => $station->[0], eva => $station->[1], tt => $journey->{train_type} // q{x}, tn => $journey->{train_no}, id => $journey->{train_id} =~ s{[ #|]}{x}gr, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, efa => $journey->{is_efa} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}, is_iris => $journey->{is_iris}, motis => $journey->{is_motis} ? $journey->{backend_name} : q{}) %>"><i class="material-icons tiny"><%= $journey->{is_hafas} ? 'directions' : 'train' %></i></a>

				% }

				</div>

			</div>