Commit Graph

12687 Commits

Author SHA1 Message Date
Phil Davis
5402c8fcde Fix startingat var name typo in pkp.php
Even with this fix, the code does not make sense. The first test is:
if ($startingat > -1)

if it gets into the else, then $startingat must be negative. But the test in the "else" tests for >1 ???

Someone who knows what it really is supposed to do could fix it!
2015-05-15 07:42:31 -03:00
Chris Buechler
af6649969b Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in a while (credit sbeaver for noticing), and the only thing it tends to accomplish is breaking people's connectivity from the system where they end up duplicating the MAC of their local system.
Conflicts:
	usr/local/www/interfaces.php
2015-05-14 17:32:24 -05:00
Phil Davis
448161bac8 Add some curlies in status_rrd_graph_img
These "if data" tests look like they should apply to all 4 lines below them.
After sorting out this real-looking issue, I can mess with the rest of the formatting...
2015-05-14 08:53:17 -03:00
Phil Davis
db7d66e777 Cleanup code logic status_upnp
1) Variable $i is was set, incremented and not used.
2) "if preg_match" at line 94 had no curlies after it, so it was only applying to the first line after it ($rdr_proto = ...) It really looks like "if preg_match"should apply to the whole code chunk - settings the various "rdr*" vars and then spitting out the "tr" with the various matches values in the row.
Somebody with some various UPnP enabled and running should test this to see if the status page still works with this change.
I think it only makes a difference if $rdr_entries has some lines in it that do not match the regex - in that case the old code might have displayed some rubbish or (almost?) duplicated rows.
2015-05-14 08:50:54 -03:00
Phil Davis
34f3165b54 Fix alias rename and delete bug #4701
The old advancedoutbound key in config.xml is now called outbound.
2015-05-14 08:44:55 -03:00
Phil Davis
caa7230e69 Slash-select should be inside if in load_balancer_pool_edit
otherwise there is an unbalanced slash-select when the else happens (if there are no load-balancer monitors defined)
2015-05-13 14:12:08 -03:00
Berger Alexander
7bf0ce52d9 fixed indent according to the style guide. 2015-05-11 11:36:21 -03:00
Berger Alexander
3274927527 Currently pfsense enforces unique unqualified hostnames for static dhcp leases, which is not correct as only the fully qualified hostname (hostname + domainname) must be unique. With this commit the old validation logic for uniqeness is modified such that hostnames no longer need to be unique and at the same time the fully qualified hostname hast to be unique.
This change makes it possible to have host with identical hostnames in different (sub)domains. For example myhost.sales.acme.com and myhost.support.acme.com will now be possible.
2015-05-11 11:36:15 -03:00
Phil Davis
55395a834f Firewall Rules Edit missing slash
This should be the end of a "tr" here.
Browsers seem to be forgiving of this stuff - I don't see any difference in rendering in Firefox before or after this change.
2015-05-11 09:31:46 -03:00
Phil Davis
801cbbf7e5 Unmatched td in firewall_nat
This file seems to have an unmatched "td" ending. Adding the line here matches the "td" at line 320 and this embraces the little table that has the 4 icons in it in a square that comes at the right hand end of each port-forward entry in the main table.
I can't see any difference in the rendering of the page, at least on Firefox, with and without this fix.
The tabbing of this file is woeful. I am fixing that up with a code-style review. But thought I should do a separate pull request for this kind-of-functional fix.
2015-05-08 17:43:36 -03:00
Robert Nelson
ca9a4e2b58 Call clear_subsystem_dirty('staticmaps') if using Unbound 2015-05-08 17:43:24 -03:00
jim-p
e29271f2fb Encode server name before displaying back to the user. 2015-05-01 16:48:28 -04:00
Ermal LUÇI
3a09e0d96e Fixes #4633 Enable carp packets to flow on the first carp interface creation. This is needed only when the system is booted up without any carp vip configured 2015-05-01 21:44:46 +02:00
Ermal LUÇI
f539af7623 Ticket #4131 before formatting the mac extract the needed statistics from below 2015-05-01 21:32:14 +02:00
Chris Buechler
ee72e2caed Show correct selection for noshuntlan option. Ticket #4655 2015-04-30 01:23:11 -05:00
Phil Davis
cf3aff59ed Add static mapping interface not set when IP in a pool
If the DHCP IP address is in a pool (not in the main DHCP range for the interface) then the interface that corresponds to the IP address is not found. This results in the link to "add static mapping for this MAC address" not having any value for "if=" and thus clicking on the "+" button does not work.
Reported in bug 4649
Process any pools when checking for which interface contains the IP address.
2015-04-27 09:13:48 -03:00
Phil Davis
73bbcaed4d Do not process dhcpd implementation if input errors
If I go to Service->DHCP Server, make some edits that are invalid (e.g. change range start or end to some invalid string) and press Save then the page comes back displaying the input error(s). But it also says:
"The changes have been applied successfully."
Actually, the changes (which were invalid) have not been applied to the config - all is well there - but dhcpd has been stopped and started and dnsmasq or unbound has been kicked... which is all unnecessary processing since the user has not yet provided valid values to save.
2015-04-27 09:03:32 -03:00
Colin Fleming
1fa1a40b84 Tidy up "services_unbound.php" XHTML
Add missing closing TD tag
2015-04-27 09:02:22 -03:00
Colin Fleming
9dded879f0 Tidy up "status_upnp.php" XHTML
Remove double line from table
2015-04-27 09:02:17 -03:00
jim-p
d9e5a9318c Remove the DHCP static lease overlap cleanup and associated function and kill, as it can cause problems with failover scenarios. 2015-04-24 15:56:31 -04:00
Chris Buechler
bc28e0e4b2 Trying to submit a symlink as part of crash reports will cause a failed
submission. Remove symlinks first. Also properly set user agent while
here, consistent with others. Fix some style and whitespace too. Ticket
2015-04-22 15:14:32 -05:00
Ermal LUÇI
868a62be4c Fix #4640 IPsec Auto-exclude LAN address toggles every time save is pressed.
Actually the GUI is displaying the opposite setting to what is in the config. When the user pressed save that opposite setting was saved, but then again it displays the opposite of the opposite...
2015-04-20 20:40:06 +02:00
Ermal LUÇI
1d839e6da6 Implement make bofre break feature avaliable on strongswan 5.3.0 useful for IKEv2. Fixes #4626 2015-04-18 10:35:51 +02:00
Ingo Bauersachs
d09155b684 Add support for EAP-RADIUS to IKEv2 Mobile Clients (Rel. 2.2) 2015-04-15 14:28:54 +02:00
Phil Davis
1d4217237b When deleting a VIP check it is not used by OpenVPN
I noticed this when cleaning up VIPs and OpenVPN server when testing for this forum post https://forum.pfsense.org/index.php?topic=92174.0
The system let me delete my test VIP before I deleted the OpenVPN server using, probably not a good thing.
This is a better version of #1604  - the similar loops for server and client are combined, and the error message shows the description (or IP address:port) of the offending OpenVPN instance so the user has a clue about which OpenVPN instance uses the VIP.
2015-04-14 10:11:28 -03:00
Phil Davis
222e6390e3 Domain override with multiple authoritative DNS servers
Tell users that this is possible in DNS Resolver and how to achieve it. The code in unbound.inc already supports it and works.
I had asked for this in Redmine feature request #4350 and when I went to look at coding to implement it I found code that already did it.
So IMHO it is worth telling users.
2015-04-13 11:07:44 -03:00
Chris Buechler
b0c8f6dead Allow single interface bridges. Useful with span port option, and when shuffling configuration around. 2015-04-08 23:42:31 -05:00
Phil Davis
ed005b2000 Few minor text typos
Note that advertise is spelt with an "s" in other places in the GUI, so
making it consistent in services_ntpd - but maybe Americans do spell it
"advertize" these days?
2015-04-06 09:41:59 -03:00
PiBa-NL
5d7a0701d1 diag_sockets show sockets listening on localhost
this helps pick a free port for services using sockets bound to localhost, and helps determine if the service has at least started and bound the port without needing to go through all 'connected' sockets as well
2015-04-06 09:38:52 -03:00
Chris Buechler
c5292060a4 Fix up Ticket #4504 implementation. Match config style with other areas. Use a config setting to disable, rather than enable, this functionality since it's enabled by default so the tag isn't necessary in the default config. Remove now unnecessary config upgrade code. 2015-04-04 19:52:10 -05:00
Chris Buechler
bc395b180b Remove array_intersect_key here too, definitely not needed. add to obsoletedfiles 2015-04-04 00:23:09 -05:00
Chris Buechler
7dff06c41d There is no longer any need to restrict protocols for IPv4+IPv6 rules, the appropriate ruleset is generated and problem scenarios that would otherwise break here are prevented by other input validation. 2015-04-04 00:06:02 -05:00
Chris Buechler
6986b70344 remove dead code, clean up excess white space a bit. 2015-04-03 23:57:48 -05:00
Ermal LUÇI
9b7ca37d12 Fixes #4504 use correct key index 2015-04-03 20:03:49 +02:00
Ermal LUÇI
534753890c Fixes #4504 Allow the bypass policy for LAN to be enabled and prevent traffic sent to lan ip to go to the ipsec tunnel 2015-04-03 19:59:23 +02:00
Ermal LUÇI
9bbc482102 Fixes #4259 Use proper variable to do calculations 2015-04-03 17:16:15 +02:00
jim-p
d6710783a2 Add SCTP to protocol list for filtering. 2015-03-31 15:05:09 -04:00
Ermal LUÇI
887f2517a3 Merge manually pull request #1593 2015-03-31 18:18:21 +02:00
jim-p
08c1db2dbf Fix encoding issues in Configuration History list. 2015-03-31 09:26:55 -04:00
jim-p
05a463843a Fix a few misc encoding issues in load balancer code. 2015-03-31 09:26:04 -04:00
Philip Hansen
807cdae39e Fixed minor spelling error 2015-03-30 11:50:05 -03:00
Gertjan
96e8a99926 Voucher messages using wrong config field name
https://forum.pfsense.org/index.php?topic=91168.msg505273#msg505273
$config['voucher'][$cpzone]['msgnoaccess']
and
$config['voucher'][$cpzone]['msgexpired']
do not exist.
These should be
$config['voucher'][$cpzone]['descrmsgnoaccess']
and
$config['voucher'][$cpzone]['descrmsgexpired']
2015-03-26 14:51:32 -03:00
Phil Davis
8e2a5adf50 RRD Graph Custom Tab display friendly description
The other tabs of Status:RRD Graphs put the friendly description of each interface into the drop-down list for selection.
This change makes the Custom tab do that also.
2015-03-26 13:28:08 -03:00
Phil Davis
6eb5191b7c Status DHCP Leases handle expire never
Note: We can let the code pass "never" (or any other unexpected stuff)
to adjust_gmt()
adjust_gmt() should anyway handle the case when strtotime() cannot
understand the input string and thus returns false. In that case we
return the input string as-is so it will be displayed as the time. That
way the user will see it and can report easily whatever other unexpected
char data was in the leases file.
It also prevents "false" (zero) being converted to the date-time string
and thus becoming the Unix epoch 1 Jan 1970 on the display.
Latest forum report of this kind of thing:
https://forum.pfsense.org/index.php?topic=90083.0
2015-03-26 11:08:45 -03:00
k-paulius
78317c2562 Use is_numericint() instead of empty() to check if value has been entered because empty() does not allow 0, which is a valid value. 2015-03-23 10:36:14 -03:00
k-paulius
0f7f6aa91f Make sure 'DHCPv6 Prefix Delegation size' is provided if 'Send IPv6 prefix hint' flag is checked to avoid generating invalid dhcp6c configuration file. 2015-03-23 10:36:08 -03:00
Phil Davis
4e34cdf3bf Handle release number in installer
This code just looked wrong. It was considering 10.1-RELEASE-p6 to be release number "1" and comparing it to "9".
These changes to do what it seems to intend. This will make that UFS+J stuff appear, if that is of any consequence.
2015-03-23 08:15:57 -03:00
Chris Buechler
c1ef7cfb41 Add option for wireless standard "auto", to omit "mode" entirely from ifconfig. This shouldn't be necessary, but specifying mode has proven to trigger driver problems that don't exist if it's left unspecified (such as FreeBSD PR 198680). Chosing "auto" fixes ath(4) BSS mode issues otherwise preventing it from connecting. 2015-03-18 23:52:46 -05:00
Jared Dillard
57413f7fd1 change the location of jquery-ui images in each theme's css file 2015-03-18 14:07:43 -05:00
Phil Davis
5372d26d9d Cleanup code path when adding a new user
1) Only attempt to delete the oldusername if it actually was non-empty - at the moment errors are logged in the system log when adding a new user, because the code was trying to delete the user name "".
2) Call local_user_set() first to create (change, whatever) the user record. This makes the user record exist for a new user. Then call local_user_set_groups() to sort out what groups the user should be in or not in. The existing code would fail to add a new user to the specified group/s because local_user_set_groups() was called too early, before the user actually existed.

Typical system log errors from the old code:
Mar 18 17:10:31 	php-fpm[9542]: /system_usermanager.php: Tried to remove user but got user pw instead. Bailing.
Mar 18 17:10:31 	php-fpm[9542]: /system_usermanager.php: The command '/usr/sbin/pw groupmod admins -g 1999 -M '0,2003,2006,2008' 2>&1' returned exit code '67', the output was 'pw: user `2008' does not exist'

From looking at the code history, I think this has been this way for a long time, not a new bug at all.

Discussed in forum: https://forum.pfsense.org/index.php?topic=90700.msg501766#msg501766
2015-03-18 10:58:58 -03:00