mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Merge remote-tracking branch 'origin/master' into next
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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") {
|
||||
|
||||
Reference in New Issue
Block a user