diff options
| author | Birte Kristina Friesel <derf@finalrewind.org> | 2025-05-17 14:11:07 +0200 |
|---|---|---|
| committer | Birte Kristina Friesel <derf@finalrewind.org> | 2025-05-17 14:11:07 +0200 |
| commit | b1e39d1bf6a97fca54af249245239c8a29d6f73f (patch) | |
| tree | 8d262ecf0dbb45dfa78a112454896edcdbe0a52c | |
| parent | ebb6b76a32d1bb4651ca757a5e5aa8ef7756e8c5 (diff) | |
| -rwxr-xr-x | lib/Travelynx.pm | 7 | ||||
| -rw-r--r-- | lib/Travelynx/Model/Users.pm | 2 | ||||
| -rw-r--r-- | templates/_checked_in.html.ep | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm index 5ccefd4..6ae646d 100755 --- a/lib/Travelynx.pm +++ b/lib/Travelynx.pm @@ -1776,6 +1776,13 @@ sub startup { $ret =~ s{[{]id[}]}{$opt{id}}g; $ret =~ s{[{]dbris[}]}{$opt{dbris}}g; $ret =~ s{[{]hafas[}]}{$opt{hafas}}g; + + if ( $opt{id} and not $opt{is_iris} ) { + $ret =~ s{[{]id_or_tttn[}]}{$opt{id}}g; + } + else { + $ret =~ s{[{]id_or_tttn[}]}{$opt{tt}$opt{tn}}g; + } return $ret; } ); diff --git a/lib/Travelynx/Model/Users.pm b/lib/Travelynx/Model/Users.pm index b6a02f8..750e889 100644 --- a/lib/Travelynx/Model/Users.pm +++ b/lib/Travelynx/Model/Users.pm @@ -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}#{tt}{tn}', +'https://dbf.finalrewind.org/{name}?rt=1&dbris={dbris}&hafas={hafas}#{id_or_tttn}', registered_at => DateTime->from_epoch( epoch => $user->{registered_at_ts}, time_zone => 'Europe/Berlin' diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index cf19f3c..e3c6e33 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -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}, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}) %>" 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{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}, is_iris => $journey->{is_iris}) %>" 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) { @@ -410,7 +410,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}, dbris => $journey->{is_dbris} ? $journey->{backend_name} : q{}, hafas => $journey->{is_hafas} ? $journey->{backend_name} : q{}) %>"><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{}, 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> % } </div> </div> |