Commit Graph

24568 Commits

Author SHA1 Message Date
Renato Botelho
0ab1f1078c Fix indent and spaces 2014-12-11 18:55:15 -02:00
Renato Botelho
470b14d8d6 Fix #4099:
- When interface is 'lo0', strpos returns 0, that is erroneously
considered false (boolean) on the test. Be more strict on strpos return
to avoid skiping lo0 ip aliases during sync.
2014-12-11 16:46:48 -02:00
Renato Botelho
79fabc8fac Fix #3790:
- Do not let 2 interfaces to setup the same track6 prefix id
- Show correct prefix id range for each interface
2014-12-11 15:05:11 -02:00
Phil Davis
bf3101899c Change text and color delimiter to carat sign
To match change made in functions.inc.php
2014-12-11 07:40:12 -02:00
Phil Davis
f2d27f9352 Gateway Status Widget keep IP address bold
Forum: https://forum.pfsense.org/index.php?topic=85187.msg467438#msg467438

The bold is specified literally in gateways.widget.php for the gateway IP box, so we need to send it bold from here also when providing an update.
Because this now uses a "/" in the string (to terminate the bold) have to choose another delimiter between the status text and status color - picked "^" because I can't think where it will appear elsewhere in the real data.
This whole string of stuff that is returned by getstats.php back to the browser is a long string with a bunch of delimiters inside delimiters already (vertical bar separated fields, inside that comma-separated fields...) and is already subject to stuff going wrong if any of the real text in the fields contains a vertical bar or comma or... Not about to try to re-engineer all that right now!
2014-12-11 07:40:12 -02:00
Phil Davis
07ab838e3f Improve check if no OpenVPN defined
Alternate version of https://github.com/pfsense/pfsense/pull/1376
This version retains the is_array() checks and then only does the count() if the is_array() is true.
Take whichever version you like.
2014-12-11 07:38:16 -02:00
jim-p
3740e87e49 Setup ddb on all platforms. On full install it will save the dump, on NanoBSD it will print to console and auto-reboot.
This way, a router running NanoBSD won't sit at a db> prompt indefinitely if it crashes.
2014-12-10 11:35:42 -05:00
Phil Davis
e519371d09 Fixup text rule should be route
This code was obviously taken from firewall rules and reused here without changing the word "rule" to "route".
2014-12-10 13:40:13 -02:00
Renato Botelho
59c5e4bd68 Remove spurious '>', fixes #4091 2014-12-10 12:14:52 -02:00
Renato Botelho
52e97bcc62 Make sure this message is only displayed on console 2014-12-10 09:58:21 -02:00
Renato Botelho
c02acef286 get_failover_interface() is already called inside get_interface_ip(v6), no need to call it twice. It should fix #4089 2014-12-10 09:56:08 -02:00
Renato Botelho
e2a319f3dd Use exit instead of return here, otherwise script's return code is always 0 and user with wrong password is authenticated 2014-12-08 19:45:02 -02:00
Phil Davis
34d0323759 Standardise css list padding
for _corporate
2014-12-07 20:32:59 -02:00
Phil Davis
63d41775fd Standardise css list padding
for code-red theme
2014-12-07 20:32:59 -02:00
Phil Davis
40a27d2c37 Standardise css list padding
for metallic theme
2014-12-07 20:32:59 -02:00
Phil Davis
fa367078d0 Standardise css list padding
for nervecenter theme
2014-12-07 20:32:59 -02:00
Phil Davis
ed1457e335 Standardise css list padding
for pfsense-dropdown theme
2014-12-07 20:32:59 -02:00
Phil Davis
ba1ff14861 Standardise css list padding
for pfsense theme
2014-12-07 20:32:58 -02:00
Phil Davis
433f59491d Standardise css list padding
for pfsense_ng_fs theme
2014-12-07 20:32:58 -02:00
Phil Davis
93365bbdfa Standardise css list padding
for the_wall theme
2014-12-07 20:32:58 -02:00
Phil Davis
14bd365aea Provide success return indication from console_configure_dhcpd
Recent commit 9ea554ee5c added testing of the return status of console_configure_dhcpd() - this let a user effectively abort from doing anything if they have answered "y" to prompt_for_enable_dhcp_server() and are being asked for the start and end of the range, and then decide they do not want to proceed.
However, even when they gave good answers, status 0 was being returned. This prevented changes ever being implemented.
Redmine: https://redmine.pfsense.org/issues/4080
The fix is to return 1 at the routine end, when all is good and the code should proceed.
2014-12-07 20:32:58 -02:00
Phil Davis
cd4d0c2904 Standardise css list padding
On Status->Services, the Services Status widget when a service status is down, the red "x" button does not line up with the green "running" button in the column.
This is because listbg has:
padding-right: 16px;
But the normal listr has:
padding-right: 6px;
It seems really odd that listbg as 16 pixels right padding. I expected it to have all the same padding as listr, just with a different color.
listn and listbggrey have the same "feature" of extra padding-right.
listn does not seem to be used anywhere anyway - might as well "fix" it in case something uses it some time.
listbggrey seems to only be used by pkg_mgr_installed.php in the case when an installed package version is in advance of the online version - quite an unusual thing! Changing padding-right from 16px back to 6px is fine for that.
Then the "feature" is lso in listhdr and listhdrr - lots of examples like firewall_aliases.php have the column headings as listhdr or listhdrr, so in theory if the column is not so wide already, it will put 16px on the right after the column heading text. But the actual rows of data underneath use listr and listbg, which only specify 6px right padding. In the end it usually does not make any difference - there is space already and the browser lines it all up anyway. But it seems to me an odd difference in the css.
listtopic also has this 16px right padding thing - but it seems to be used just for text display that is not in columns, so I did not mess with that.
Changing this css fixes the lineup of the red "x" in the services status column and does not seem to break anything else. In theory it could make other things better also.
Someone who knows how the css was intended to be used could comment on this! If I have got the right idea, and these "16px" things were just a mistake from the past, then it should be checked in the css for all themes and corrected appropriately...
I am happy to do that, once someone confirms it is the thing to do.
2014-12-07 13:42:06 -02:00
Phil Davis
e17748e250 Typo CIDR in UPnP GUI page
As reported by johnpoz https://forum.pfsense.org/index.php?topic=84964.0
2014-12-07 13:41:57 -02:00
Chris Buechler
a4e07bafab Disable RC4 ciphers in lighttpd 2014-12-05 15:06:18 -06:00
Renato Botelho
72e79bc758 Call filter_configure_sync() is a better fix for #4066, as pointed by Ermal 2014-12-05 17:04:15 -02:00
Renato Botelho
6a7dae05d3 Fix #4066:
Make sure pf is configured before other services are restarted when WAN
IP changes. The way it was before, 'pass out' rules with route-to still
have old IP set as 'from' and some Dynamic DNS ended up not being
updated.
2014-12-05 16:23:14 -02:00
Renato Botelho
5c3dae1887 Add RELENG_2_2 to gitsync 2014-12-05 11:06:53 -02:00
Phil Davis
a911f2e276 Set text and color of Gateways Widget Status
getstats.php calls functions.inc.php get_stats(), which calls get_gatewaystats().
get_gatewaystats() now returns the text for each field and an optional color separated by "/" - "text/color" e.g. "Online/#90EE90"
Parse the the new format, separating out text and color.
If color is specified, then also set it with jQuery to css.
2014-12-05 11:06:45 -02:00
Phil Davis
3002168fab Explicitly pass gateway status and color
This code was passing a whole load of html to attempt to set various properties of the Gateways Widget Status column so that it would display the new status (Online, Offline...) and in the appropriate color.
Now that I am using class=listr, the css fro listr already specifies white. Setting bgcolor in HTML does not override that.
Pass both the status text and color as ordinary text, separated by "/". The consumer of this output can do their thing with jQuery to set the color as well as text of the element.
2014-12-05 11:06:36 -02:00
Phil Davis
d68be5d67a Use proper listr class for Gateways Widget Status
The Gateways Widget Status was not using the listr class, and so it was missing the borders for the right and bottom of its box.
Use the listr class.
Then use javascript to explicitly set the background-color to match the status, overriding the white that is specified in listr.
2014-12-05 11:06:28 -02:00
Phil Davis
d4337df8c9 Fix gateway widget status update
Redmine #4077
2014-12-05 07:01:02 -02:00
Chris Buechler
04d307d877 dyn.dns.he.net uses a self-signed cert, disable verification for it. 2014-12-04 23:39:13 -06:00
Chris Buechler
514512dd01 Don't try to launch 3gstats unless it's on a valid device. 2014-12-04 23:19:22 -06:00
Chris Buechler
5ed9fab764 Proper CA certificates are in place to validate SSL in these cases where it previously couldn't be, remove disabling of verification. 2014-12-04 23:10:36 -06:00
Chris Buechler
95bd66a0ae replace spaces with tabs 2014-12-04 21:02:01 -06:00
Chris Buechler
590aa3e7b7 After discussion with Ermal, remove this to force consumers to send things
properly. I fixed the scenario in Unbound where it was sending IPs to
these functions rather than an interface, so this has no functional diff.
2014-12-04 21:00:57 -06:00
Jean Cyr
32a8156116 Don't include link-locals as unbound interface candidates
Unbound does not presently support link-local interfaces.
2014-12-04 20:58:32 -06:00
Chris Buechler
0af2fab6b9 The time has come - bump to 2.2-RC 2014-12-04 17:34:48 -06:00
Renato Botelho
d0b5ddce22 Fix update url since now we have RELENG_2_2 2014-12-04 15:52:50 -02:00
Ermal LUÇI
47eb263dd3 Proper fix was put on f658bac
Revert "Can't skip this if booting, ends up breaking config. Ticket #4071"

This reverts commit effb3a3cfe.
2014-12-04 12:35:45 +01:00
Ermal LUÇI
33dc4fbb1c Properly unset booting flags to allow dynamic ipsec tunnels to work correctly 2014-12-04 12:35:39 +01:00
Phil Davis
b8959f3c85 Provide friendly descr in error message in Interfaces Assign
I was doing drastic things testing some stuff, swapping WAN and OPT1 interfaces in Interfaces->Assign. I accidentally pressed Save when I had the same real device selected for both. Thankfully there was input validation! But I noticed that the error message reported just the names WAN and OPT1, but actual I had them named as different things. So the names in the error message did not match the names (friendly descriptions) in the table of interfaces.
This change makes it display both like FRIENDLY_DESC (FRIENDLY_NAME) so there is less room for confusion.
2014-12-04 08:40:06 -02:00
Phil Davis
01b8dbb099 Put -4 in the right place in ntpq clockver command #4074
I had pasted it in here between "-c" and "clockvar", that was not good.
That's all I have for #4074 (I hope)
2014-12-04 08:01:53 -02:00
Phil Davis
9bcb091952 Use IPv4 for ntpq if IPv6 not allowed in widget #4074
Similar code here. Shame it was not in a subroutine called from both places, but not about to re-engineer that now:)
2014-12-04 08:01:43 -02:00
Chris Buechler
e26effd340 change the ordering of dhcpd_configure and unbound_configure here, claims on forum it fixes issue I can't seem to replicate. 2014-12-04 00:23:44 -06:00
Chris Buechler
888dd4949a Merge pull request #1361 from phil-davis/patch-2 2014-12-04 00:12:17 -06:00
Phil Davis
e4a496ae8f Use IPv4 for ntpq if IPv6 not allowed
Forum: https://forum.pfsense.org/index.php?topic=84890.0
2014-12-04 11:26:45 +05:45
Chris Buechler
679c54fcee Merge pull request #1360 from jean-m-cyr/master 2014-12-03 23:07:18 -06:00
Jean Cyr
f302a333af Link local interfaces don't have subnet.. don't create access-control statement
Selecting link local interface for unbound causes invalid access-control
statement in unbound config since link local address doesn't have
subnet.
2014-12-03 22:23:34 -05:00
Chris Buechler
effb3a3cfe Can't skip this if booting, ends up breaking config. Ticket #4071 2014-12-03 20:43:03 -06:00