summaryrefslogtreecommitdiffstats
path: root/usr/local/www
Commit message (Collapse)AuthorAgeFilesLines
* Change the default output of pkg.php lists to be encoded before display. ↵RELENG_2_2jim-p2016-05-061-23/+29
| | | | Preserve the old behavior as an option in case a package needs it
* Encode gateway name and description before printing. Fixes #5876jim-p2016-02-101-2/+2
|
* Make RRD lists global, validate graph name using whitelist of known values ↵jim-p2016-02-102-45/+39
| | | | rather than blacklist of characters, beef up validation and escaping of related values while here. Fixes #5874 for 2.2.x
* Fix #3209 editing unassigned VLAN tag can change an assigned interface - ↵Phil Davis2016-02-091-1/+1
| | | | | RELENG_2_2 Might as well fix this bug in 2.2.* as well, since it is easy and was obviously an error.
* pkg.php consolidate else-if statementPhil Davis2016-01-251-4/+2
|
* Wrap pkg_full_path in htmlspecialchars()Phil Davis2016-01-251-2/+2
| | | Because it contains $xml which is itself wrapped in htmlspecialchars() for display.
* Enhance error output when package file not found - RELENG_2_2Phil Davis2016-01-251-2/+11
| | | | | | | | | | | I had a system that had upgraded but the Notes package had not managed to (re)install. In that situation the Notes item is on the Status menu but there is no notes.xml or other notes code on the the system. When I go to Status->Notes I get: Warning: substr_compare(): The start position cannot exceed initial string length in /usr/local/www/pkg.php on line 56 File not found notes.xml The warning is because realpath() returns false in this case and cannot be used is a parameter to substr_compare(). Handle this case, and make the error message more informative. Note: In RELENG_2_2 print_info_box_np() puts a "Close" button and has no way to stop that. It looks dumb, but that can be cleaned up in 2.3 master. I am just doing this in RELENG_2_2 to avoid the PHP warning.
* Use current interface description for breadcrumb - RELENG_2_2Phil 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 name ↵Phil Davis2016-01-181-0/+10
| | | | - RELENG_2_2
* Rationalize add and delete buttons for limiter GUI RELENG_2_2Phil Davis2016-01-071-12/+14
| | | | | | | | | | This has annoyed me in the past. I noticed it in 2.3-BETA just now and went to look on a 2.2.6 system and realized it is an issue there also. 1) When you click to add a new limiter or new queue, then the "Add new queue" button is displayed down the bottom. That is dumb - you are already adding and actually you need to enter the data and save first before adding something else. 2) When you are adding something (like in (1)) the Delete button is displayed. That is also dumb - there is nothing to delete until you have press save to add it! 3) When clicking on a Limiter at the top of the tree, the Delete button syas "Delete this queue", but it is the top level limiter that is being edited and could be deleted, The $_GET/$_POST that happens sends "pipe" and "queue" both with the name of the top-level limiter. So in the end $queue always exists. So we only want the text "Delete this queue" if $queue exists and the queue name is NOT the same as the pipe name. I am submitting this for RELENG_2_2 because I wanted to sort that out anyway to understand what was wrong and how it should behave. Then I can look at 2.3-BETA and make it work nicely there...
* Fix redmine #5722 DHCP validation for RELENG_2_2Phil Davis2016-01-011-9/+12
| | | Might as well provide the fixes for RELENG_2_2 since it is easy and that is where I first tested. Even if there is never a 2.2.7, at least the fixes are there in GitHub to be seen.
* Take this conditional out, it wasn't enough, and we have a script example ↵jim-p2015-12-231-3/+0
| | | | for how to handle this properly now while respecting CSRF.
* Only disable CSRF on diag_backup.php for the download action where it might ↵jim-p2015-12-211-1/+3
| | | | be scripted. Other actions need its protection.
* Encode hostname before printing; remove some related dead code.jim-p2015-12-216-25/+6
|
* Encode gateway attributes before printing.jim-p2015-12-212-5/+5
|
* Encode DNS servers and their associated gateways before printingjim-p2015-12-211-2/+2
|
* Add range validation to CP IP passthrough. Ticket #5655Chris Buechler2015-12-171-3/+10
|
* add validation to MAC passthrough. Ticket #5655Chris Buechler2015-12-171-2/+10
|
* Wrong source of syntax error. Revert "fix syntax error in ipfw command to ↵Chris Buechler2015-12-171-1/+1
| | | | | | disable on inactive interfaces" This reverts commit 6310eaa2c75424da6a322a956bbf228b36222918.
* fix syntax error in ipfw command to disable on inactive interfacesChris Buechler2015-12-171-1/+1
|
* Change status.php state dump to use -vvss for more verbose info, add kenv ↵jim-p2015-12-171-1/+3
| | | | and pbi_info.
* Merge pull request #2061 from phil-davis/patch-7Chris Buechler2015-12-151-6/+20
|\
| * Limit alias info popup size #5415 RELENG_2_2Phil Davis2015-11-111-6/+20
| | | | | | This is code for RELENG_2_2 pfSense 2.2.5 that will limit the number of rows in the alias info popup to 100.
* | Fix typo, gateway entry in config has a field called monitor, not monitoripRenato Botelho2015-12-111-1/+1
| |
* | Redmine #4279 Package reinstall displayed when shutting down before upgradePhil Davis2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use a different flag file to indicate that a package reinstall is required after a reboot is done first. This avoids the possibility that the user navigates in the webGUI during the time while the shutdown is in progress and is accidentally presented with the reinstall all packages GUI button. Early in rc.bootup switch the flag file to use its ordinary name, so that all subsequent code in boot scripts and webGUI will work as it already does to handle the package reinstall and notifying the user that a package reinstall is about to be done or in progress...
* | Address a potential LFI in pkg.php and wizard.php without breaking the ↵jim-p2015-12-042-4/+18
| | | | | | | | | | | | ability to pass relative paths Restricts them to files under their intended base directories.
* | Remove txtsupport from Unbound. Of limited use, and the back end code was ↵Chris Buechler2015-12-031-17/+1
| | | | | | | | never ported over from the package (and is messy to do so). Ticket #5545
* | Merge pull request #2049 from phil-davis/patch-4Renato Botelho2015-11-191-1/+1
|\ \
| * | Unbound advanced Invoming TCP Buffers validationPhil Davis2015-11-101-1/+1
| | | | | | | | | | | | There is a variable cut-paste error here. Actually it never makes any difference in practice because outgoing_num_tcp and incoming_num_tcp are both set, so the logic comes out the same. I noticed this while reviewing stuff in master for 2.3-ALPHA - might as well back-port stuff like this so that nobody who notices will worry about it in RELENG_2_2.
* | | Merge pull request #2083 from phil-davis/patch-10Renato Botelho2015-11-191-1/+1
|\ \ \
| * | | Make block bogon rule display consistent - RELENG_2_2Phil Davis2015-11-181-1/+1
| | |/ | |/| | | | | | | The block private networks and anti-lockout rules display in the firewall rules display with the schedule column blank. But the block bogon networks has an asterisk. That looks odd. I noticed it just now when looking at firewall rules in 2.3. Might as well fix it here in RELENG_2_2.
* | | Merge pull request #2082 from phil-davis/patch-9Renato Botelho2015-11-191-1/+1
|\ \ \
| * | | Backport fix #5467 to RELENG_2_2Phil Davis2015-11-181-1/+1
| |/ /
* | | Backport Redmine #5440 to RELENG_2_2Phil Davis2015-11-151-0/+8
|/ / | | | | | | The code in RELENG_2_2 for system_usermanager_settings.php seems to work OK in RELENG_2_2 so I did not touch anything there. But diag_authentication.php had nothing about $pconfig on initial page load. This extra code makes it select a reasonable default auth server when the page first loads. After that, each time the user does "Test", the page comes back with the previously selected auth server, user name and password (like it did already) - so that seems good.
* | diag_ipsec.php - show button for child SAs only when some are established. ↵Matt Smith2015-11-101-2/+2
|/ | | | Fix ID used by child SA disconnect button.
* Fix syntaxRenato Botelho2015-11-091-2/+2
|
* Let the code ready for strongswan 5.3.4, where key used to track nat were ↵Renato Botelho2015-11-091-2/+14
| | | | committed with a different name
* Only call pfSense_ipsec_list_sa() when IPsec is enabledRenato Botelho2015-11-032-2/+2
|
* Remove a redundant if and fix indentation accordingly. Fix is_array that ↵Matt Smith2015-10-301-51/+49
| | | | should be an isset on the remote SPI field.
* Update license on diag_ipsec.php. Keep required attributions and referenceMatt Smith2015-10-301-29/+54
| | | | the original m0n0wall BSD 2 clause.
* Remove port information from diag_ipsec.php since it's not available on ↵Renato Botelho2015-10-301-6/+4
| | | | VICI, also use local-nat-t and remote-nat-t to detect when NAT-T is being used
* Rework ipsec widget to use VICIRenato Botelho2015-10-301-17/+7
|
* Remove diag_ipsec_xml.php, not being usedRenato Botelho2015-10-301-82/+0
|
* Make IPsec status page retrieve status with VICI instead of SMPMatt Smith2015-10-301-107/+117
|
* Fix up descriptive text for logging levels. Ticket #5340Chris Buechler2015-10-261-4/+3
|
* Default log level where none is selected should be 3 here. Ticket #5340Chris Buechler2015-10-261-1/+1
|
* Correct available log levels. Ticket #5340Chris Buechler2015-10-261-16/+16
|
* Logging fixes. Ticket #5340Chris Buechler2015-10-261-1/+3
|
* Merge pull request #1986 from phil-davis/patch-6Renato Botelho2015-10-261-2/+2
|\
| * Fix Command Prompt Download and Upload when not in English - Redmine #5343 ↵Phil Davis2015-10-251-2/+2
| | | | | | | | for RELENG_2_2
OpenPOWER on IntegriCloud