summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1658 from phil-davis/patch-4Renato Botelho2015-05-141-3/+5
|\ \
| * | Add some curlies in status_rrd_graph_imgPhil Davis2015-05-141-3/+5
| | | | | | | | | | | | 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...
* | | Merge pull request #1657 from phil-davis/patch-3Renato Botelho2015-05-141-4/+8
|\ \ \
| * | | Cleanup code logic status_upnpPhil Davis2015-05-141-4/+8
| |/ / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #1656 from phil-davis/patch-2Renato Botelho2015-05-141-4/+0
|\ \ \
| * | | Remove unused nentries from status_lb_poolPhil Davis2015-05-141-4/+0
| |/ /
* | | Merge pull request #1655 from phil-davis/patch-1Renato Botelho2015-05-141-2/+0
|\ \ \
| * | | Remove unused var from status_gateways.phpPhil Davis2015-05-141-2/+0
| |/ / | | | | | | I cannot see where "counter" is used.
* | | Merge pull request #1654 from phil-davis/nat-outbound-fixRenato Botelho2015-05-142-10/+10
|\ \ \ | |/ / |/| |
| * | Fix alias rename and delete bug #4701Phil Davis2015-05-142-10/+10
|/ / | | | | | | The old advancedoutbound key in config.xml is now called outbound.
* | Delete load_balancer_relay*.php, they are not being usedRenato Botelho2015-05-135-1209/+0
| |
* | Merge pull request #1653 from phil-davis/lb-workRenato Botelho2015-05-1311-688/+748
|\ \
| * | Code style Load BalancerPhil Davis2015-05-1311-688/+748
| |/
* | Merge pull request #1651 from phil-davis/interfaces-otherRenato Botelho2015-05-1319-1779/+2221
|\ \
| * | Code style interfaces miscellaneous filesPhil Davis2015-05-1319-1779/+2221
| |/
* | Merge pull request #1650 from phil-davis/interfaces-phpRenato Botelho2015-05-131-449/+681
|\ \
| * | Code style interfaces.phpPhil Davis2015-05-131-449/+681
| |/
* | Merge pull request #1652 from phil-davis/patch-1Renato Botelho2015-05-131-1/+1
|\ \
| * | Slash-select should be inside if in load_balancer_pool_editPhil Davis2015-05-131-1/+1
| |/ | | | | otherwise there is an unbalanced slash-select when the else happens (if there are no load-balancer monitors defined)
* | No need to deal with hw.usb.no_pf anymore, it's part of default loader.confRenato Botelho2015-05-132-4/+1
|/
* Merge pull request #1648 from phil-davis/floating-tabRenato Botelho2015-05-111-1/+8
|\
| * Handle extra column on floating rules tabPhil Davis2015-05-111-1/+8
|/ | | | | when there are no floating rules to display. The box needs to span 11 columns.
* Merge pull request #1646 from phil-davis/firewall-rulesRenato Botelho2015-05-112-713/+944
|\
| * Merge with masterPhil Davis2015-05-112-4/+69
| |\
| * | Code style Firewall RulesPhil Davis2015-05-112-681/+907
| | |
* | | Merge pull request #1647 from phil-davis/firewall-shaperRenato Botelho2015-05-115-748/+822
|\ \ \ | |_|/ |/| |
| * | Code style firewall shaperPhil Davis2015-05-115-748/+822
| |/
* | Merge pull request #1637 from alex-berger/dhcp-staticleases-unique-checkRenato Botelho2015-05-111-3/+7
|\ \
| * | fixed indent according to the style guide.Berger Alexander2015-05-111-12/+12
| | |
| * | Currently pfsense enforces unique unqualified hostnames for static dhcp ↵Berger Alexander2015-05-071-9/+13
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #1616 from Robert-Nelson/floating-interfacesRenato Botelho2015-05-111-1/+57
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into floating-interfacesRobert Nelson2015-04-2512-112/+75
| |\ \
| * | | Add Interfaces column to Floating RulesRobert Nelson2015-04-161-1/+57
| | | |
* | | | Merge pull request #1645 from phil-davis/wizardRenato Botelho2015-05-111-183/+270
|\ \ \ \
| * | | | Code style WizardPhil Davis2015-05-111-183/+270
| | | | |
* | | | | Merge pull request #1644 from phil-davis/firewall-virtual-ipRenato Botelho2015-05-112-421/+484
|\ \ \ \ \
| * | | | | Code style Firewall VIPPhil Davis2015-05-112-421/+484
| |/ / / /
* | | | | Merge pull request #1643 from phil-davis/firewall-scheduleRenato Botelho2015-05-112-813/+786
|\ \ \ \ \
| * | | | | Code style Firewall SchedulePhil Davis2015-05-112-813/+786
| |/ / / /
* | | | | Merge pull request #1642 from phil-davis/firewall-natRenato Botelho2015-05-118-859/+1095
|\ \ \ \ \
| * | | | | Code style Firewall NATPhil Davis2015-05-118-859/+1095
| |/ / / /
* | | | | Merge pull request #1641 from phil-davis/firewall-aliasesRenato Botelho2015-05-113-117/+162
|\ \ \ \ \
| * | | | | Code style firewall_aliasesPhil Davis2015-05-113-117/+162
| |/ / / /
* | | | | Merge pull request #1640 from phil-davis/patch-2Renato Botelho2015-05-111-7/+3
|\ \ \ \ \
| * | | | | Minor changes to firewall_shaper_layer7Phil Davis2015-05-111-7/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tabbing of this code is not so good, so it is difficult to see what is going on. I will format that in a later pull request. These things look unbalanced but actually were not at run time. These changes make it easier to check the code in an editor that can show the balanced "table" "/table", "selected" "/selected". 1) Take the "table" start declaration out of the output form var that has been built up. Put it in-line in the code so it can be seen to match the "/table" now at line 575. $output var is no longer needed. 2) Remove 3 "/select" that were each inside an "if" statement. Put a single "/select" at the end. This makes it easy to see the matching "select" and "/select" and also ensures there will always be a "/select" written. I thought these things were worth doing separate to code-style, as they are "real" changes. The L7 form still works in my testing.
* | | | | Merge pull request #1639 from phil-davis/patch-1Renato Botelho2015-05-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Firewall Rules Edit missing slashPhil Davis2015-05-101-1/+1
|/ / / / | | | | | | | | | | | | 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.
* | | | Merge pull request #1635 from Robert-Nelson/staticmap-bugRenato Botelho2015-05-081-1/+3
|\ \ \ \
| * | | | Call clear_subsystem_dirty('staticmaps') if using UnboundRobert Nelson2015-05-051-1/+3
| | | | |
* | | | | Merge pull request #1636 from phil-davis/patch-1Renato Botelho2015-05-081-0/+1
|\ \ \ \ \
OpenPOWER on IntegriCloud