webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,235 Commits 2 Branches 1 Tag
697b4f04bf8a007b289e424cf88bfbba7a2df71a
Commit Graph

1708 Commits

Author SHA1 Message Date
Michael Tremer
c0ba8eb200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-06-17 20:40:14 +02:00
Michael Tremer
e353470a8c dhcp.cgi: Count up key when skippingh search entries 
This caused a bug that when the user wanted to edit one
of the static leases and clicked on the edit icon that
an other entry opened up for editing.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-17 14:02:05 +02:00
Michael Tremer
a1468f66f0 dhcp.cgi: Never save the search query 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-17 14:01:40 +02:00
Michael Tremer
905a9dc346 maniac theme: Remove unnecessary Thumbs.db file 
Reported-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-16 17:08:49 +02:00
Michael Tremer
ee299e2ecf connections.cgi: Fix broken NAT rules when there is an empty destination IP address 
Bug introduced with e60cd3a404

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
 2015-06-16 11:33:43 +02:00
Michael Tremer
4b02b4045b ipsec: Allow selection of ESP group type 
If a connection is edited, the IKE group types will be used instead.

Fixes #10860

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Wolfgang Apolinarski <wolfgang.apolinarski@web.de>
 2015-06-15 22:33:28 +02:00
Michael Tremer
1f15cc0993 webaccess.cgi: Fix loading language 
Fixes #10879

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-13 15:22:37 +02:00
Lars Schuhmacher
5b93b50c6d Fix hardcoded strings in pppsetup.cgi 
Some strings for PPTP were hardcoded instead of using i18n features.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-04 18:16:02 +02:00
Lars Schuhmacher
bd767b27c8 ipsec.conf: Include ipsec.user.conf and ipsec.user-post.conf 
Fix bug 10869 as the code has been removed by mistake by the
previous commit dfea4f86c2.
It also includes ipsec.user.conf only when it exists.

Signed-off-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-06-04 17:50:51 +02:00
Michael Tremer
a421b8038b Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-06-01 15:59:33 +02:00
Michael Tremer
91fc30309f dhcp: Enter edit mode after adding a static lease from list 
After a lease has been added from the list of leases it is often
desirable to edit it right away. It appeared that the system
was in edit mode after the lease has been added because the form
had the values of the recently added lease, but hitting the
"Add" button cause an error message that stated that this is
a duplicate entry.

This patch will switch to edit more where the user can change
the values and hit "Update". If he or she chooses to ignore
that the entry is still saved.
 2015-06-01 15:56:46 +02:00
Arne Fitzenreiter
e97d4c9896 Merge branch 'master' into next 
Conflicts:
	lfs/netsnmpd
 2015-05-31 20:08:58 +02:00
Michael Tremer
1554e8a3d3 DHCP: Add search box for static leases 2015-05-28 14:49:41 +02:00
Stefan Schantl
8fba24ec15 country.cgi: Rework script. 
* Introduce new method to get all country codes. In the past just the countries
has been used for which flag icons where available, which is just not what we
want.

* Finish column when the last element in the array has passed and we have an uneven
amount of items

* Improve code style.
 2015-05-12 20:41:35 +02:00
Stefan Schantl
0ee211ee6b geoip-block.cgi: Finish column after last element and uneven amount of items. 2015-05-12 20:39:44 +02:00
Michael Tremer
5f0a2ba104 vpnmain.cgi: Do not use an other DH key exchange in ESP 2015-05-11 12:57:29 +02:00
Michael Tremer
242694089f Merge remote-tracking branch 'stevee/next-cgi-geoip' into next 2015-05-05 12:16:58 +02:00
Stefan Schantl
f28a284c33 Drop old flag icons. 2015-05-03 21:53:03 +02:00
Alexander Marx
382ffe320c Core90: make N2N Graphs higher to them correctly 
Graphs in core 89 where not heigh enough so that they where zoomed which
looked bad
 2015-05-03 05:12:13 +02:00
Stefan Schantl
3ea01fe042 Multiple CGI's: Use &GeoIP::get_flag_icon for getting country flags. 2015-05-02 13:45:50 +02:00
Michael Tremer
2c531c2132 vpnmain.cgi: Fix ECP regex again for Brainpool curves 
The regular expression did not take into account that
there could be characters like "bp" in case of the Brainpool
curves (ecp512bp).
 2015-05-01 16:57:13 +02:00
Michael Tremer
6caea1086d Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-29 11:26:35 +02:00
Michael Tremer
85a6f39c39 Merge remote-tracking branch 'stevee/core-90-ddnsctrl' into next 2015-04-29 11:26:20 +02:00
Michael Tremer
3bcb59ab21 vpnmain.cgi: Fix prefix for elliptic curve algorithms 2015-04-28 13:22:00 +02:00
Jochen Kauz
a24062d12b vpnmain.cgi: dpd_delay/dpd_timeout wrong entry in ipsec.conf 
Fixes #10636
 2015-04-28 11:30:05 +02:00
Stefan Schantl
023919034a ddns.cgi: Use ddnsctrl for instant update. 2015-04-26 16:52:52 +02:00
Stefan Schantl
851a984121 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-22 18:25:25 +02:00
Stefan Schantl
b013822b99 Rename Locale::Country to Locale::Codes::Country in various scripts. 
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
 2015-04-22 18:18:38 +02:00
Michael Tremer
a4d24f9052 vpnmain.cgi: Order ciphers by strength 
strongSwan uses them in the defined order. Hence it makes
much more sense to present them to the user as well in that
order.
 2015-04-22 14:45:10 +02:00
Michael Tremer
78039c1585 vpnmain.cgi: Use integrity functions as PRF for AEAD 2015-04-22 14:44:16 +02:00
Michael Tremer
e8b3bb0edc vpnmain.cgi: Rewrite algorithm generation code 2015-04-22 14:08:41 +02:00
Michael Tremer
db1078ff11 index.cgi: Hide blue and green if not enabled 
Those were shown when a blue or orange interface
was assigned which is not the same as enabled.
 2015-04-22 13:06:52 +02:00
Michael Tremer
a47376207f ipsec: Always enable support for IKE fragmentation 2015-04-21 19:36:40 +02:00
Stefan Schantl
fde9c9dd03 ovpnmain.cgi: Update the certificate revocation list when a connection has been deleted. 
Reference #10554.
 2015-04-19 12:51:44 +02:00
Stefan Schantl
c98b743c09 firewall.cgi: Dynamically show/hide DNAT and SNAT configure elements. 
Fixes #10732.
 2015-04-19 01:19:11 +02:00
Wolfgang Apolinarski
ab2d15486b Added clientAuth to EKU of client certificate. Fixed the comment. 2015-04-18 23:32:14 +02:00
Stefan Schantl
e6c4f090b6 Merge branch 'next-geoip' into core-90-geoip 2015-04-15 17:10:49 +02:00
Arne Fitzenreiter
65f2c9bb39 Merge remote-tracking branch 'origin/master' into next 2015-04-14 17:59:21 +02:00
Alexander Marx
2f075ff8cf vpn-statistic: add URI::escape for openvpn names with special chars 2015-04-14 14:00:47 +02:00
Alexander Marx
7dfcaef067 vpn-statistic: add collectd parameters to imported n2n packages 2015-04-14 13:55:40 +02:00
Arne Fitzenreiter
758d959652 Merge remote-tracking branch 'origin/master' into next 2015-04-13 17:11:41 +02:00
Michael Tremer
b171633c7e Merge remote-tracking branch 'amarx/BUG10796' into next 2015-04-13 12:17:53 +02:00
Michael Tremer
32a5fec71c Merge remote-tracking branch 'amarx/BUG10797' into next 2015-04-13 11:28:57 +02:00
Michael Tremer
5c5b4000b9 vpn-stats: Show daily graph as *all* other graphs do, too 2015-04-13 10:57:09 +02:00
Alexander Marx
39d435690f BUG10797: Fix addontable in services.cgi when using squid-accounting addon 
When squid-accounting addon is installed, it shows up under services.cgi
as "squid" service which is wrong.
 2015-04-13 08:36:00 +02:00
Alexander Marx
212fd689a3 BUG10796: Fix textoutput when doing pakfire update in WebUI 2015-04-13 07:52:25 +02:00
Stefan Schantl
ad50a299c8 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2015-04-12 23:23:40 +02:00
Stefan Schantl
578f23c8e1 ovpnmain.cgi: Fix layout of CA related elements. 
Those elements where displayed out of the main box in the past.
 2015-04-12 23:18:11 +02:00
Arne Fitzenreiter
d4ee6f0813 Merge remote-tracking branch 'origin/master' into next 2015-04-12 22:53:06 +02:00
Michael Tremer
79e7688b69 ovpnmain.cgi: Remove DDEVICE setting 
This was used to select a TUN or TAP device from which TAP
was never supported anyway.
 2015-04-12 22:33:41 +02:00