Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2023-12-22 10:41:54 +00:00
3 changed files with 4 additions and 2 deletions

View File

@@ -253,6 +253,7 @@ lib/firmware/rtw89/rtw8851b_fw.bin
lib/firmware/rtw89/rtw8852b_fw-1.bin
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/tor.cgi
usr/lib/libgcc_s.so.1
usr/lib/libstdc++.so.6

View File

@@ -79,8 +79,8 @@ Timo Eissler,
Ben Schweikert,
Daniel Weismüller,
Peter Pfeiffer,
Daniel Glanzmann,
Robin Roevens,
Daniel Glanzmann,
Heiner Schmeling,
Stephan Feddersen,
Stéphane Pautrel,
@@ -118,6 +118,7 @@ Jakub Ratajczak,
Jorrit de Jonge,
Przemek Zdroik,
Roberto Peña,
Sebastien GISLAIN,
Alexander Rudolf Gruber,
Andrew Bellows,
Axel Gembe,

View File

@@ -74,7 +74,7 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus();
if ( -e "/var/ipfire/main/gpl-accepted" ) {
if ( -e "/var/ipfire/main/gpl_accepted" ) {
if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
$refresh = "<meta http-equiv='refresh' content='5;'>";
}elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {