Commit Graph

4292 Commits

Author SHA1 Message Date
Renato Botelho
3167e8f021 Merge pull request #2970 from NOYB/Status_/_Interfaces_-_DNS_Servers 2016-05-20 11:30:41 -03:00
Renato Botelho
c5af3a3068 Merge pull request #2972 from NOYB/Status_/_Services_-_Status_Indicator 2016-05-20 11:28:52 -03:00
Renato Botelho
ed285109ac Merge pull request #2932 from SilvioGiunge/remover_global_vars 2016-05-20 11:27:07 -03:00
Renato Botelho
bbdbf3d3a8 Merge pull request #2969 from marianamorim/add_function_gettext 2016-05-20 11:25:47 -03:00
Renato Botelho
54b21bab94 Merge pull request #2973 from jlduran/pass-block-icons-cp 2016-05-20 11:24:36 -03:00
Jose Luis Duran
22b5054137 Fix closing tbody tag in Captive Portal's MACs 2016-05-20 09:43:23 -03:00
Jose Luis Duran
96abde901f Fix Captive Portal's MACs icons
Standardize pass/block icons with the rest of the system
2016-05-20 09:34:11 -03:00
Stephen Beaver
788c3cf58c Fixed #6872 Restored missing proxy port setting
(cherry picked from commit 6b43692408)
2016-05-20 08:04:55 -04:00
NOYB
e7161dc3b6 Status / Services - Status Indicator
Use font awesome icons instead of text.
Universal recognition eliminates need of text translation.
2016-05-20 01:01:04 -07:00
jim-p
335f1a8977 Fix up diag_smart e-mail handling, and the backend config code was broken/making false assumption about the config file as well. Fixes #6371 2016-05-19 17:12:13 -04:00
Renato Botelho
b530335ec4 Update pfSense.pot 2016-05-19 09:30:16 -03:00
NOYB
78869d5e82 Status / Interfaces - DNS Servers
The DNS servers are not necessarily ISP provided.
2016-05-19 00:13:31 -07:00
marianamorim
8d0b16a11c Add the function gettext 2016-05-18 16:40:37 -03:00
Stephen Beaver
1168634b3d Merge pull request #2968 from NewEraCracker/patch-gettext-maxlen 2016-05-18 09:29:11 -04:00
NewEraCracker
95f46512d9 Reduce maximum length of string to gettext()
This limit is set at 4096 on PHP 5.6: http://lxr.php.net/xref/PHP_5_6/ext/gettext/gettext.c#139

Bug report on forum: https://forum.pfsense.org/index.php?topic=110088.0
2016-05-17 21:38:49 +01:00
Phil Davis
49701df38e Initialize output var in firewall_shaper_queues
To clear any previous use of the var elsewhere in included files.
Forum: https://forum.pfsense.org/index.php?topic=111852.0
2016-05-17 10:54:18 +09:30
Stephen Beaver
d736d86167 Merge pull request #2965 from NOYB/Miscellaneous_Textual_Corrections_-_System_/_Advanced_/_Firewall_&_NAT 2016-05-16 07:41:23 -04:00
Stephen Beaver
890bd15301 Merge pull request #2964 from phil-davis/patch-3 2016-05-16 07:39:56 -04:00
Stephen Beaver
973a2d45e7 Merge pull request #2963 from phil-davis/patch-2 2016-05-16 07:38:59 -04:00
Stephen Beaver
5543a46057 Merge pull request #2961 from NOYB/Miscellaneous_Textual_Corrections_-_System_/_Advanced_/_Networking 2016-05-16 07:37:49 -04:00
Stephen Beaver
8185eabc14 Merge pull request #2960 from NOYB/Miscellaneous_Textual_Corrections_-_System_/_User_Manager_/_Settings 2016-05-16 07:36:56 -04:00
Stephen Beaver
2c6faa055c Merge pull request #2954 from NewEraCracker/textual-corrections 2016-05-16 07:35:42 -04:00
Chris Buechler
e4710ed5d5 Sanitize notice output here as well. Ticket #6154 2016-05-16 13:23:23 +02:00
Chris Buechler
c2b51a45de Correct force updates when chosen. Ticket #6359 2016-05-16 08:01:32 +02:00
Chris Buechler
92674d7f73 Fix script name in error log 2016-05-15 20:33:46 -05:00
Chris Buechler
38edc49000 Fix misspellings. 2016-05-15 20:31:56 -05:00
NOYB
5414794c12 Miscellaneous Textual Corrections - System / Advanced / Firewall & NAT
Section panel header title.
2016-05-15 15:48:55 -07:00
Phil Davis
a79dfdaa43 Make limiters info box work same as By Interface
The info box displayed on Firewall->Shaper, By Interface come down the bottom with and info icon and can be shown/hidden by the user.
The similar info box on Firewall->Shaper, Limiters sits in the main body with no info icon and cannot be shown/hidden, but can be dismissed.
Make the info box on Firewall->Shaper, Limiters dispaly and owrk the same as on "By Interface".
2016-05-15 14:55:21 +09:30
Phil Davis
aadc135856 Customize limiter info message
The $dn_default_shaper_msg is what is displayed on the Limiters tab. It needs to talk about "limiter" rather than "queue".
This code builds up each message using the same base template sentences, inserting "queue" or "limiter" in the appropriate place.
2016-05-15 14:34:57 +09:30
NOYB
542d14be06 Miscellaneous Textual Corrections - System / Advanced / Networking 2016-05-14 14:38:27 -07:00
NOYB
850211423b Miscellaneous Textual Corrections - System / User Manager / Settings 2016-05-13 13:02:05 -07:00
Chris Buechler
c7759e4efa Disable ipcomp regardless of config setting to avoid problem. Ticket #6167 2016-05-13 08:21:33 -05:00
Chris Buechler
a8872fdba4 Silence mwexec output. Now that the groupdel actually works, it spams the log when group isn't found. Ticket #6352 2016-05-13 07:04:36 -05:00
Phil Davis
7e752d728a Make rule_columns_with_alias end params optional
Stops PHP warnings like reported in forum https://forum.pfsense.org/index.php?topic=111768.0
2016-05-13 16:46:36 +09:30
Chris Buechler
6d64213797 Merge pull request #2958 from k-paulius/patch-16 2016-05-13 01:30:44 -05:00
Chris Buechler
a4b55d111c Fix scope for IPv6 link local gateway IPs. Ticket #6353 2016-05-13 00:43:07 -05:00
Chris Buechler
ea940381fa Handle link local IPv6 gateways and default gateway switching correctly. Ticket #6258 2016-05-13 00:34:41 -05:00
k-paulius
1a444f88e5 Unbound and dnsmasq can both be enabled so restart both if need be 2016-05-12 23:24:13 -05:00
Chris Buechler
e02a275617 Merge pull request #2957 from NOYB/Miscellaneous_Textual_Corrections_-_System_Advanced 2016-05-12 22:52:05 -05:00
Chris Buechler
ce25267416 Merge pull request #2956 from NOYB/Miscellaneous_Textual_Corrections_-_Services_NTP_PPS 2016-05-12 22:50:17 -05:00
Chris Buechler
6d4fd80b3d Don't start unbound in track6 config if system is booting. Add dnsmasq here as well. Based on PR 2943. Ticket #6186 2016-05-12 22:39:52 -05:00
Chris Buechler
34d58bad91 Use -g with groupdel when passing a GID. Ticket #6352 2016-05-12 22:20:24 -05:00
Stephen Beaver
22f9e40f61 Fixed #6349
(cherry picked from commit c032a89a89)
2016-05-12 20:35:10 -04:00
NOYB
b0ef6b970d Miscellaneous Textual Corrections - System Advanced 2016-05-12 12:00:32 -07:00
jim-p
da249a00a3 Use proper IPsec enable test. Fixes #6351 2016-05-12 13:02:48 -04:00
Stephen Beaver
474e70a2d1 Add alias display to target host and target port columns 2016-05-12 11:41:05 -04:00
Renato Botelho
7949eac754 Add a safebelt to makesure $cpzone is always in lowercase. Ticket #6278 2016-05-12 07:51:39 -03:00
Renato Botelho
0c388fefae Fix #6278
$cpzone is always in lowercase, it's used as the array key used in
config.xml. Use it in two cases where the $cp['zone'] was being wrongly
used:

- To find out zoneid
- To replace PORTAL_ACTION url
2016-05-12 07:48:09 -03:00
Chris Buechler
e392cc2bdb Store notices safely to prevent potential XSS when notices are displayed locally or by remote systems where they're shipped. Ticket #6154 2016-05-12 04:29:32 -05:00
Chris Buechler
7b31a03050 Fix package_reinstall_all post-upgrade when packages have been removed in pre_upgrade. Ticket #6137 2016-05-12 02:14:06 -05:00