summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Remove tab embedded in text - firewall_aliases_editPhil Davis2016-01-181-1/+1
| | | | | |
| * | | | | Internationalize firewall_aliases_editPhil Davis2016-01-181-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Wrap all the various arrays of text that are displayed to the user in gettext() 2) Give the possibility to translate the singular of words like "host", "network" that get substituted into message strings. 3) Where there are multiple %s in an sprintf() use %$1s %s2s to be really sure, even though it seems to be a case where the order of substitution will never be swapped.
* | | | | | Bring text to current realityRenato Botelho2016-01-181-1/+1
| | | | | |
* | | | | | Add "GoTo line #" controlStephen Beaver2016-01-181-0/+55
| |/ / / / |/| | | |
* | | | | Merge pull request #2421 from stilez/patch-8Renato Botelho2016-01-181-23/+31
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | should be min($bits1, $bits2) for 'largest subnet'stilez2016-01-181-2/+2
| | | | |
| * | | | 5 or 6stilez2016-01-131-1/+1
| | | | |
| * | | | fix $subnet1 should be $subnet2, thanks rbgarbastilez2016-01-131-2/+2
| | | | |
| * | | | fix 4 should be 6 (thanks, good catch)stilez2016-01-131-3/+3
| | | | |
| * | | | Fix logic for subnet overlap check + canonical for IPv6stilez2016-01-131-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subnet overlap functions came up as a concern while fixing redmine 5702. Specifically - The "canonical" function check_subnets_overlap() doesn't handle IPv6 (util.inc has standardised on v4/v6/agnostic versions, but this doesn't fit). Fixed by adding transparent detection of v4/v6 and a specific IPv4-only version The IPv6 version is wrong (if sub1 *contains* sub2 then neither of sub1's endpoints will be detected as "inrange" of sub2 and result will be incorrect: this logic error has been fixed recently in other code too) Bad data isn't detected - this still isn't detected for compatibility and is tagged "FIXME" instead to look at in future. Reason - not to break anything, at present always returns "overlap = true/false", not "true/false/invalid input". because CIDR overlap implies containment, the IPv4 version uses a very efficient logic, namely calculates largest size subnet and checks this is same for both. Adopting this for both, and simplifying, makes these functions far "neater" The old v4 version allowed for non-numeric $bits which doesn't make sense and I've omitted. Cannot think of a single situation where we would provide empty or bad data when we actually mean a /32 single IP. Solution in this commit - a canonical "overlap" test (IPv4/IPv6 agnostic), IPv4/v6 "overlap" versions that actually do the work, in each case using the same logic as the old v4 (identify largest bit size and test if subnets created are valid and identical), and tag lack of "bad data" detection as fixme for now, returning FALSE instead to avoid breaking anything until fixed. Should be transparent from outside.
* | | | | Improved widget sorting (case insensitive)Stephen Beaver2016-01-181-4/+5
| | | | |
* | | | | Respect smtp debug settingRenato Botelho2016-01-181-2/+4
| | | | |
* | | | | Display existing updatefreqPhil Davis2016-01-181-1/+7
| |/ / / |/| | | | | | | | | | | when user is editing an alias type that uses the subnet CIDR field as the URL table update frequency. Forum: https://forum.pfsense.org/index.php?topic=105457.0
* | | | Firewall / Aliases / Edit - PatternNOYB2016-01-181-1/+20
| | | | | | | | | | | | | | | | Address field is used for a wide variety of input types. Including URLs which require a much greater character set acceptance.
* | | | Merge pull request #2454 from phil-davis/patch-2Renato Botelho2016-01-181-22/+24
|\ \ \ \
| * | | | diag_testport change some tabs to spacePhil Davis2016-01-181-2/+2
| | | | |
| * | | | diag_testport alert message logic re-factoringPhil Davis2016-01-181-21/+20
| | | | | | | | | | | | | | | as suggested by @rbgarga
| * | | | Rationalize message display on diag_testportPhil Davis2016-01-171-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) The logic of the various tests that determined which messages were displayed was all a bit odd, and there were ways that things could happen and no message was displayed. Now it displays the "warning" information message the first time, and 1 of the 4 possible result messages depending on the result status and if showtest was on. 2) Internationalize - put the gettext() into calls with full sentences and sprintf() wrappers as necessary. Now I can get each of the 4 possible result messages, and always get a result message.
* | | | | Merge pull request #2456 from phil-davis/gt2Renato Botelho2016-01-183-5/+5
|\ \ \ \ \
| * | | | | Internationalize remaining diag* codePhil Davis2016-01-173-5/+5
| | | | | |
* | | | | | Merge pull request #2458 from phil-davis/gt3Renato Botelho2016-01-182-8/+8
|\ \ \ \ \ \
| * | | | | | Internationalize edit and execPhil Davis2016-01-172-8/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Note: in the end, edit.php has only whitespace format changes.
* | | | | | Merge pull request #2460 from NOYB/Firewall_/_Schedules_/_Edit_-_Add_Minutes_45Renato Botelho2016-01-181-2/+2
|\ \ \ \ \ \
| * | | | | | Firewall / Schedules / Edit - Add Minutes 45NOYB2016-01-181-2/+2
| | | | | | |
* | | | | | | Merge pull request #2461 from NewEraCracker/php-standardsRenato Botelho2016-01-181-7/+9
|\ \ \ \ \ \ \
| * | | | | | | Minor corrections to guiconfig.incNewEraCracker2016-01-181-7/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Set logarr as array() per default, default invert to empty string, improve variable representation within strings
* | | | | | | Merge pull request #2462 from NOYB/Alias_Name_ConsistencyRenato Botelho2016-01-182-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix typoNOYB2016-01-181-1/+1
| | | | | | | |
| * | | | | | | s/schedule/aliasNOYB2016-01-181-1/+1
| | | | | | | |
| * | | | | | | Alias name consistency in Firewall alias edit and schedules edit.NOYB2016-01-182-3/+3
| |/ / / / / /
* | | | | | | Revert "add all of /usr/local/lib/lighttpd to obsoletedfiles"Renato Botelho2016-01-181-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pfBlockerNG is going to use lighttpd This reverts commit c74719cde73c8ce19465e1887f8c519c4818147c.
* | | | | | | Revert "Add more lighttpd pieces to obsoletedfiles list"Renato Botelho2016-01-181-5/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pfBlockerNG is going to use lighttpd This reverts commit 4bebb56a23658eac8791df7c1a44927e66c6d51c.
* | | | | | Show interface description in traffic graph widget settingsPhil Davis2016-01-181-1/+1
| | | | | | | | | | | | | | | | | | Forum: https://forum.pfsense.org/index.php?topic=105448.0
* | | | | | Test for an array here to avoid an error if the var isn't an arrayjim-p2016-01-171-0/+3
| | | | | |
* | | | | | Put this htmlspecialchars back, I found a better workaround for the ↵jim-p2016-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | inconsistent handling of checkboxes in packages.
* | | | | | Merge pull request #2458 from phil-davis/patch-5Stephen Beaver2016-01-171-13/+16
|\ \ \ \ \ \
| * | | | | | Fix easyrule fbegin.inc echoed textPhil Davis2016-01-171-13/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you manually navigate directly to easyrule.php you get a bit of rubbish text displayed before the actual message about "This is the Easy Rule status page...". That is due to having too many closing PHP tags. Also, fbegin.inc does not need to be included anyway. I also changed the message to be in a print_info_box() warning and sorted the internationalization a bit more. There could be a bit more formatting done here after this - the page has a help icon that looks a bit lonely without the other usual panel-heading panel-title stuff.
* | | | | | Cleanup of diag_traceroutePhil Davis2016-01-171-35/+34
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Internationalize 2) If there was a problem, then display it with print_info_box() up the top of the page. 3) Redisplay the user-selected IP protocol and source IP after a test. Previously those user selections always got reset to IPv4, any. 4) Remove some useless code that unset($do_traceroute) when it had happily been set to false a little earlier. 5) Remove some useless code that set $host when it had already been set a little earlier.
* | | | | Merge pull request #2451 from ↵Stephen Beaver2016-01-171-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | NOYB/Status_/_System_Logs_-_Raw_Mode_Search_Inversion
| * | | | | Status / System Logs - Raw Mode Search InversionNOYB2016-01-171-2/+10
| |/ / / / | | | | | | | | | | | | | | | Add search inversion to dump_clog and dump_clog_no_table functions for raw mode logs filter.
* | | | | Merge pull request #2452 from heper/patch-1Stephen Beaver2016-01-171-1/+1
|\ \ \ \ \
| * | | | | fix Bug #5776heper2016-01-171-1/+1
| |/ / / /
* | | | | Fix inconsistencies in Form_InputSjon Hortensius2016-01-172-4/+4
|/ / / / | | | | | | | | | | | | | | | | renamed get_type to getType fix capitalisation in getTagName
* | | | Fix dns test for localhost inclusion, when saving now the port value can be ↵jim-p2016-01-161-2/+2
| | | | | | | | | | | | | | | | set but empty. Fixes #5775
* | | | Final Fixd #5774Stephen Beaver2016-01-161-5/+3
| | | |
* | | | Temporarily fixed #5774Stephen Beaver2016-01-161-1/+1
| | | |
* | | | Don't run the checkbox label through htmlspecialchars, it breaks several ↵jim-p2016-01-161-1/+1
| | | | | | | | | | | | | | | | packages.
* | | | Don't automatically run strings that are too long through gettext here.jim-p2016-01-161-1/+6
| | | |
* | | | Allow /31 to be used for CARP IPs. Ticket #5533Chris Buechler2016-01-151-1/+1
| |_|/ |/| |
* | | Reverting change of label. It broke the displayStephen Beaver2016-01-151-3/+3
| | |
OpenPOWER on IntegriCloud