summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2473 from phil-davis/gt5Renato Botelho2016-01-195-68/+145
|\
| * Standardize NAT NPtPhil Davis2016-01-195-68/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give NAT NPt GUI the same sort of interface as NAT 1:1 1) Checkbox to select multiple mappings and then delete selected mappings 2) Tick/cross to enable/disable a mapping 3) Ability to "Add a new mapping based on this one" 4) Double-click to edit an entry 5) Ability to reorder mappings and save the new order - probably nobody cares about that but it is easy to provide it the same as on other forms, and so users can order the entries as they like. Note: It used to try to automagically sort the entries based on ipcmp() of the value of 'external' - that does not work in 2.2.* because 'external' is not a key at all for NPt. So I took that out - seemed more consistent to provide the user drag-drop entry ordering feature. Other bits of text in firewall NAT, 1:1 and Out standardized to make all of them match.
* | Fix browser tab textStephen Beaver2016-01-191-1/+1
| |
* | Restore separator bar delete functionalityStephen Beaver2016-01-191-6/+19
| |
* | Add Javascript htmlchars() equivalent to dynamically created inputsStephen Beaver2016-01-191-2/+14
| | | | | | | | Temporarily remove function that broke action icons
* | Merge pull request #2450 from hexaclock/masterRenato Botelho2016-01-191-5/+29
|\ \
| * | Update auth.incDan Vinakovsky2016-01-181-1/+1
| | | | | | | | | add XXX prefix.
| * | add note about r284483Daniel Vinakovsky2016-01-181-4/+4
| | |
| * | more style fixes. unset old fieldsDaniel Vinakovsky2016-01-181-4/+3
| | |
| * | style fixesDaniel Vinakovsky2016-01-181-4/+2
| | |
| * | Merge remote-tracking branch 'upstream/master'Daniel Vinakovsky2016-01-1666-934/+2919
| |\ \
| * | | compatibility with freebsdDaniel Vinakovsky2016-01-161-0/+9
| | | |
| * | | switched to bcrypt as per #4120daniel2016-01-141-5/+23
| | | | | | | | | | | | | | | | added bcrypt auth as per #4120
* | | | Merge pull request #2475 from phil-davis/patch-2Renato Botelho2016-01-191-4/+4
|\ \ \ \
| * | | | Fixup firewall rules schedule status imagesPhil Davis2016-01-191-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | 1) $iconfn is not the var that contains the 'type' of block or reject. 2) In the bottom if-else of the diff "times-circle" was repeated twice. 3) It seemed odd to me that wen the schedule was out of its time that the icons would always be in "text-danger" color. My suggestion, make them "text-warning" which distinguishes them from the green or red that is shown when the schedule is active.
* | | | Merge pull request #2476 from phil-davis/patch-3Renato Botelho2016-01-191-6/+6
|\ \ \ \
| * | | | Remove obsolete L7 text from messagesPhil Davis2016-01-191-6/+6
| |/ / / | | | | | | | | | | | | The layer7 condition in the if test for this block was removed when layer7 support was removed in master. The text of these input error strings also needs to be modified.
* | | | Update smtp.inc to 2016-01-18Renato Botelho2016-01-191-5/+5
|/ / /
* | | autocapitalize off is deprecated, use none instead. Ticket #5776Chris Buechler2016-01-181-1/+1
| | |
* | | Clarify input validation output. Ticket #5778Chris Buechler2016-01-181-1/+1
| | |
* | | classes/Form/Textarea.class.php, setNoWrap, make it work properly on FireFox ↵PiBa-NL2016-01-181-1/+1
| | | | | | | | | | | | and Chromium
* | | Include the zone in link for display of login page so it shows up correctly.Chris Buechler2016-01-181-2/+2
| | |
* | | Added separator delete iconStephen Beaver2016-01-181-2/+8
| | |
* | | Prototype #5373Stephen Beaver2016-01-182-2/+29
| | |
* | | add missing space between wordsChris Buechler2016-01-181-1/+1
| | |
* | | Merge pull request #2467 from NewEraCracker/widget-tunesStephen Beaver2016-01-181-10/+6
|\ \ \
| * | | Small tunning to all aspects involving widgetsNewEraCracker2016-01-181-10/+6
| | | | | | | | | | | | | | | | 1) Perform exclusion of non .inc files while reading directory. 2) Be more strict when checking for widget title. 3) We are in the PHP 5.5 age. We can convert certain pieces to anonymous functions and overall better coding.
* | | | Changed var name sine label is an HTML reserved name.Stephen Beaver2016-01-181-2/+2
| | | |
* | | | Fixed #5779Stephen Beaver2016-01-181-2/+13
| | | | | | | | | | | | | | | | Save/restore group label on delete row
* | | | Merge pull request #2469 from phil-davis/gt4Renato Botelho2016-01-185-42/+42
|\ \ \ \
| * | | | Internationalize firewall aliases and NATPhil Davis2016-01-195-42/+42
| | | | |
* | | | | Merge pull request #2466 from phil-davis/patch-5Renato Botelho2016-01-181-1/+11
|\ \ \ \ \
| * | | | | Use current interface description for breadcrumbPhil Davis2016-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If you enter invalid stuff in the interface description - e.g. "123" - and press save, then you get a warning about it, but the breadcrumb changes to "Interfaces: 123" - the wrongly entered description (that was not applied). If you enter a valid string for 'descr' then by this point $wancfg has the new value anyway and so the breadcrumb will change correctly if you make a valid entry in 'descr' and save.
| * | | | | Fix #5778 do not save changes if interface description matches an alias namePhil Davis2016-01-181-0/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://redmine.pfsense.org/issues/5778 for details of how to reproduce the problem. Note that similar code to make the "Sorry, an alias with the name XXX already exists" message is also at the top of interfaces.inc - it compares the current interface descr from the config with the currently existing alias names. That check would help warn the user if someone managed to add an alias name that matched the interface name. I guess it was there from some time in the past when the alias edit code did not cross-validate the alias name with the interface descriptions. I have left that check there - it does no harm to have it "just in case". The new code that I added checks the proposed interface description in $_POST against the existing alias names and will give an input_error if there is a match.
* | | | | Merge pull request #2468 from phil-davis/patch-6Renato Botelho2016-01-181-4/+4
|\ \ \ \ \
| * | | | | firewall_nat_1to1 fix save button textPhil Davis2016-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There was no text appearing when hovering over the Save button, and Save did not actually save the changed rule order. Make the code the same sort of stuff as in firewall_nat and it works.
| * | | | | firewall_nat_1to1 config descr and delete buttonPhil Davis2016-01-181-2/+2
| |/ / / / | | | | | | | | | | | | | | | 1) The description written when the config was saved said "Outbound" but should be "1 to 1". gettext() it while here. 2) The Delete button had no text displayed when hovering over it - make it like in firewall_nat.
* | | | | Merge pull request #2464 from phil-davis/patch-3Renato Botelho2016-01-181-25/+37
|\ \ \ \ \
| * | | | | 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
| | | | |
OpenPOWER on IntegriCloud