[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 031b9f7b4ffc3138ad4362665ad623ae897e0eed
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 031b9f7b4ffc3138ad4362665ad623ae897e0eed (commit) via 1e23f7cf48b0c087602486460a93b77248ded92a (commit) via 1554e8a3d3ae7a7dd0b3ecc0aa0410e3f301b4a7 (commit) from 81daa02876b36868a6c96a57dd0e07e787910c61 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 031b9f7b4ffc3138ad4362665ad623ae897e0eed Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 28 14:50:44 2015 +0200
core91: Ship changed dhcp.cgi
commit 1e23f7cf48b0c087602486460a93b77248ded92a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 28 14:50:16 2015 +0200
Update translations
commit 1554e8a3d3ae7a7dd0b3ecc0aa0410e3f301b4a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 28 14:49:41 2015 +0200
DHCP: Add search box for static leases
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/91/filelists/files | 1 + doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 4 ++++ html/cgi-bin/dhcp.cgi | 26 +++++++++++++++++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 14 files changed, 48 insertions(+), 1 deletion(-)
Difference in files: diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index 409e5fe..f1a51e6 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -1,2 +1,3 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/dhcp.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index 1ccc654..90accb3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -423,6 +423,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log diff --git a/doc/language_issues.en b/doc/language_issues.en index b7be862..1f1c78d 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -450,6 +450,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log diff --git a/doc/language_issues.es b/doc/language_issues.es index 086dfbd..fe8b726 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 47ee3fb..fee481d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -390,6 +390,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -984,6 +985,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.it b/doc/language_issues.it index 098f440..2f61cb6 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@ -713,6 +714,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 602441d..fadc792 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -443,6 +443,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -755,6 +756,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 086dfbd..fe8b726 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 94724d4..a9e9001 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -384,6 +384,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -967,6 +968,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 6f846c7..d94953a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines 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 changed WARNING: untranslated string: routing table +WARNING: untranslated string: search WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_missings b/doc/language_missings index 9fdc0d2..03a9e3f 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -447,6 +447,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address @@ -1032,6 +1033,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < Set time on boot < show dh @@ -1581,6 +1583,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address @@ -2133,6 +2136,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 9a7d983..e75207a 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -857,12 +857,31 @@ print <<END </tr> </table> </form> +<hr /> END ; #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 -<hr /> <table width='100%' class='tbl'> <tr> <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'}; }
+ # 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) { print "<tr>"; $col="bgcolor='${Header::colouryellow}'"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index defb632..8adefdf 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1950,6 +1950,7 @@ 'save settings' => 'Einstellungen speichern', 'save-adv-options' => 'Erweiterte Optionen speichern', 'script name' => 'Skriptname:', +'search' => 'Suchen', 'secondary dns' => 'Sekundärer DNS:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundäre WINS-Server Adresse', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 80c0552..43601c8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1982,6 +1982,7 @@ 'save settings' => 'Save settings', 'save-adv-options' => 'Save advanced options', 'script name' => 'Script name:', +'search' => 'Search', 'secondary dns' => 'Secondary DNS:', 'secondary ntp server' => 'Secondary NTP server', 'secondary wins server address' => 'Secondary WINS server address',
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org