webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Matthias Fischer
2015-05-28 21:16:06 +02:00
parent f3194f517b 031b9f7b4f
commit 256dcf08cf
14 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/91/filelists/files
View File

@@ -1,2 +1,3 @@
etc/system-release etc/system-release
etc/issue etc/issue
srv/web/ipfire/cgi-bin/dhcp.cgi

1
doc/language_issues.de
View File

@@ -423,6 +423,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log

1
doc/language_issues.en
View File

@@ -450,6 +450,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log

2
doc/language_issues.es
View File

@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fastio
@@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: server restart WARNING: untranslated string: server restart
WARNING: untranslated string: show dh WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key WARNING: untranslated string: show tls-auth key

2
doc/language_issues.fr
View File

@@ -390,6 +390,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fastio
@@ -984,6 +985,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: server restart WARNING: untranslated string: server restart
WARNING: untranslated string: show dh WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key WARNING: untranslated string: show tls-auth key

2
doc/language_issues.it
View File

@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
@@ -713,6 +714,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: uncheck all WARNING: untranslated string: uncheck all
WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistic rw

2
doc/language_issues.nl
View File

@@ -443,6 +443,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fastio
@@ -755,6 +756,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: show dh WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key WARNING: untranslated string: show tls-auth key
WARNING: untranslated string: software version WARNING: untranslated string: software version

2
doc/language_issues.pl
View File

@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fastio
@@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: server restart WARNING: untranslated string: server restart
WARNING: untranslated string: show dh WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key WARNING: untranslated string: show tls-auth key

2
doc/language_issues.ru
View File

@@ -384,6 +384,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fastio
@@ -967,6 +968,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join a domain
WARNING: untranslated string: samba join domain WARNING: untranslated string: samba join domain
WARNING: untranslated string: search
WARNING: untranslated string: server restart WARNING: untranslated string: server restart
WARNING: untranslated string: show dh WARNING: untranslated string: show dh
WARNING: untranslated string: show tls-auth key WARNING: untranslated string: show tls-auth key

2
doc/language_issues.tr
View File

@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: outgoing firewall warning
WARNING: translation string unused: override mtu WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn log
@@ -690,6 +691,7 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table WARNING: untranslated string: routing table
WARNING: untranslated string: search
WARNING: untranslated string: uncheck all WARNING: untranslated string: uncheck all
WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic n2n
WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistic rw

4
doc/language_missings
View File

@@ -447,6 +447,7 @@
< red1 < red1
< samba join a domain < samba join a domain
< samba join domain < samba join domain
< search
< server restart < server restart
< show dh < show dh
< snat new source ip address < snat new source ip address
@@ -1032,6 +1033,7 @@
< red1 < red1
< samba join a domain < samba join a domain
< samba join domain < samba join domain
< search
< server restart < server restart
< Set time on boot < Set time on boot
< show dh < show dh
@@ -1581,6 +1583,7 @@
< red1 < red1
< samba join a domain < samba join a domain
< samba join domain < samba join domain
< search
< server restart < server restart
< show dh < show dh
< snat new source ip address < snat new source ip address
@@ -2133,6 +2136,7 @@
< red1 < red1
< samba join a domain < samba join a domain
< samba join domain < samba join domain
< search
< server restart < server restart
< show dh < show dh
< snat new source ip address < snat new source ip address

26
html/cgi-bin/dhcp.cgi
View File

@@ -857,12 +857,31 @@ print <<END
</tr> </tr>
</table> </table>
</form> </form>
<hr />
END END
; ;
#Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order' #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order'
# Search for static leases
my $search_query = $dhcpsettings{'q'};
if (scalar @current2 >= 10) {
print <<END;
<form method="POST" action="#search">
<a name="search"></a>
<table width='100%'>
<tr>
<td>
<input type="text" name="q" value="$search_query">
<input type="submit" value="$Lang::tr{'search'}">
</td>
</tr>
</table>
</form>
END
}
print <<END print <<END
<hr />
<table width='100%' class='tbl'> <table width='100%' class='tbl'>
<tr> <tr>
<th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
@@ -918,6 +937,11 @@ foreach my $line (@current2) {
$gdesc = $Lang::tr{'click to enable'}; $gdesc = $Lang::tr{'click to enable'};
} }
# Skip all entries that do not match the search query
if ($search_query ne "") {
next if (!grep(/$search_query/, @temp));
}
if ($dhcpsettings{'KEY2'} eq $key) { if ($dhcpsettings{'KEY2'} eq $key) {
print "<tr>"; print "<tr>";
$col="bgcolor='${Header::colouryellow}'"; $col="bgcolor='${Header::colouryellow}'";

1
langs/de/cgi-bin/de.pl
View File

@@ -1950,6 +1950,7 @@
'save settings' => 'Einstellungen speichern', 'save settings' => 'Einstellungen speichern',
'save-adv-options' => 'Erweiterte Optionen speichern', 'save-adv-options' => 'Erweiterte Optionen speichern',
'script name' => 'Skriptname:', 'script name' => 'Skriptname:',
'search' => 'Suchen',
'secondary dns' => 'Sekundärer DNS:', 'secondary dns' => 'Sekundärer DNS:',
'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary ntp server' => 'Sekundärer NTP-Server',
'secondary wins server address' => 'Sekundäre WINS-Server Adresse', 'secondary wins server address' => 'Sekundäre WINS-Server Adresse',

1
langs/en/cgi-bin/en.pl
View File

@@ -1982,6 +1982,7 @@
'save settings' => 'Save settings', 'save settings' => 'Save settings',
'save-adv-options' => 'Save advanced options', 'save-adv-options' => 'Save advanced options',
'script name' => 'Script name:', 'script name' => 'Script name:',
'search' => 'Search',
'secondary dns' => 'Secondary DNS:', 'secondary dns' => 'Secondary DNS:',
'secondary ntp server' => 'Secondary NTP server', 'secondary ntp server' => 'Secondary NTP server',
'secondary wins server address' => 'Secondary WINS server address', 'secondary wins server address' => 'Secondary WINS server address',