summaryrefslogtreecommitdiffstats
path: root/usr/local/www
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #1984 from phil-davis/patch-4Renato Botelho2015-10-261-1/+1
|\ \
| * | Fix multi-lingual save of NAT mode Redmine # for RELENG_2_2Phil Davis2015-10-251-1/+1
| |/ | | | | and forum https://forum.pfsense.org/index.php?topic=101276.0
* | Use 1-6 rather than 0-5 for IPsec logging levels, to stay away from ↵Chris Buechler2015-10-261-2/+8
|/ | | | complications of 0 due to PHP stupidity. Upgrade config to add 1 to any configured log levels. Default to 1 as log level where none is configured by the user. Ticket #5340
* interfaces_assign tab_array numberingPhil Davis2015-10-231-4/+4
| | | | | This was fixed in master for 2.3 by https://github.com/pfsense/pfsense/commit/50e6c063e6ec148917ff0bcb0bce8b0a08df5792 - in master all of these $tab_array entries, in each file that they appear in, had been modified to just use the $tab_array[] = form. But in RELENG_2_2 that has not happened. So it seems nicer to just fix the numbering here to match what is already in the other interfaces_*.php files in RELENG_2_2. Note that the code works OK without this "fix" - display_top_tabs() just loops through the existing array keys anyhow and so did not notice the missing number.
* Merge pull request #1971 from doktornotor/patch-5Chris Buechler2015-10-201-0/+1
|\
| * Point people to 'Clear Package Lock' if the reinstall of packages got stuck ↵doktornotor2015-10-201-0/+1
| | | | | | | | (RELENG_2_2)
* | Limit the auth methods where "My Certificate Authority" is displayed/saved forMatt Smith2015-10-201-12/+7
|/ | | | mobile clients. Fixes #5323.
* Validate that the Mobile Client settings have a valid RADIUS server selectedMatt Smith2015-10-191-0/+11
| | | | | as the source for user authentication when EAP-RADIUS is selected as the phase 1 authentication method for mobile IPsec. Fixes #5219.
* Auto-add firewall rules for DHCP Relay, same as is done for DHCP Server. Add ↵Chris Buechler2015-10-141-0/+2
| | | | filter reload to DHCP Relay config so rules are immediately added/removed. Ticket #4558
* set enabled/disabled status accordingly on initial page load. Ticket #5284Chris Buechler2015-10-131-0/+1
|
* clean up empty linesChris Buechler2015-10-131-2/+0
|
* Add all remaining log types to status.php. Ticket #5304Chris Buechler2015-10-131-6/+30
|
* Merge pull request #1958 from phil-davis/patch-11Renato Botelho2015-10-121-8/+18
|\
| * Redmine #5294 Do not delete a system groupPhil Davis2015-10-111-8/+18
| | | | | | | | This code checks if the user has somehow posted a group deletion for a group that has "system" scope. If so, then the delete is not done and an input error is displayed. Note that in normal use the group manager page does not display a delete button for "system" groups, so normally this does not happen - only if the user manually messes with the $POST variables.
* | Redmine #5294 Do not delete a system userPhil Davis2015-10-111-8/+18
|/ | | | This code checks if the user has somehow posted a user deletion for a user that has "system" scope. If so, then the delete iscnot done and an input error is displayed. Note that in normal use the user manager page does not display a delete button for "system" users, so normally this does not happen - only if the user manually messes with the $POST variables.
* Merge pull request #1953 from phil-davis/patch-10Chris Buechler2015-10-071-1/+1
|\
| * Wording of alias_info_popup tipPhil Davis2015-10-081-1/+1
| | | | | | | | | | | | I noticed this while comparing alias popup behavior between 2.2.5-DEVELOPMENT and 2.3 Might as well fix the grammar here for 2.2.5 This tip does not exist in 2.3 because the popup works more nicely there and so this text is not needed. Therefore this change does not need to be ported forward to master.
* | correct htmlentities unintentionally removed by earlier commitChris Buechler2015-10-071-1/+1
|/
* Add support for an IPv6 pool for mobile clients.Matt Smith2015-10-071-1/+59
|
* Don't enforce the use of only IPv4 or IPv6 when using IKEv2 since it works ↵jim-p2015-10-071-1/+1
| | | | fine with IKEv2
* Specify %any where identifier is "any", so the note on these pagesChris Buechler2015-10-012-2/+2
| | | | actually works.
* Fix up IKE auto modeChris Buechler2015-09-292-3/+3
|
* Correctly show v1/v2/auto on vpn_ipsec.phpChris Buechler2015-09-291-2/+5
|
* Bring this back, I'll fix issues afterwards. Revert "Remove "auto", it's ↵Chris Buechler2015-09-291-3/+3
| | | | | | just a synonym for IKEv2. Ticket #4873" This reverts commit 47f802694a1e1dfbbd011d7ec431c0948358b5c3.
* Do a service reload of dyndns when changing gateways in case something hasChris Buechler2015-09-291-0/+2
| | | | changed. Ticket #5214
* Ensure this only contains a partial name, not a path, before attempting to ↵jim-p2015-09-281-0/+1
| | | | craft a full name and read the file. Fixes #5203.
* Reset the value of a package field before this test in case it has no ↵jim-p2015-09-241-0/+1
| | | | default. Fixes #5199
* Redmine #5196 Remove incorrect text about DNS servers - RELENG_2_2Phil Davis2015-09-241-10/+14
| | | | The correct text is already displayed under the DNS server boxes at line 892. This should also be done to master once the conversion of services_dhcp.php to bootstrap is stable.
* Redmine #4568 Preserve MLPPP settings when saving interface settings ↵Phil Davis2015-09-221-14/+27
| | | | | | RELENG_2_2 Vagain with errors fixed. Supersedes https://github.com/pfsense/pfsense/pull/1781
* Merge pull request #1907 from doktornotor/patch-5Renato Botelho2015-09-211-3/+6
|\
| * pkg_edit.php - fix issue where default value was not being populated for ↵doktornotor2015-09-191-3/+6
| | | | | | | | | | | | | | newly added fields Backport from PR #1906 / PR #1787 for RELENG_2_2. Check if the actual $fieldname element is present in the $a_pkg[$id] array before trying to assign its value. Do same with default_value. Fixes issue where default value was not being populated for newly added fields.
OpenPOWER on IntegriCloud