summaryrefslogtreecommitdiffstats
path: root/src/usr
Commit message (Collapse)AuthorAgeFilesLines
* fix colspan background on dark themeJared Dillard2017-02-141-0/+4
|
* Add "required field" highlightingSteve Beaver2017-02-141-0/+8
|
* Only save valid widget locations in configPhil Davis2017-02-141-1/+6
| | | | | | | | | | Some widgets create extra panels, e.g. the widgets that now have the filter functionality. Those panels are processed in the ".each" at line 424. They do not have an id in the form "widget-*" and when the old code tries to find the "*" part it gets "undefined". This results in the layout being saved like: ``` <sequence>interface_statistics:col1:open,undefined:col1:close,system_information:col2:open,undefined:col2:close,picture:col3:open,rss:col3:open,ntp_status:col2:open</sequence> ``` This PR puts extra checks in place so that the "undefined" stuff does not get written into the widget sequence string. (cherry picked from commit 621dd53615f14f5732a347346b4b8444e81ea97f)
* Allow 5 dashboard columns to workPhil Davis2017-02-141-1/+1
| | | | | | Selecting 1,2,3,4 or 6 dashboards columns results in an exact integer result here and all is good. But 5 columns results in "2.4" and "col-sm-2.4" is not a thing in bootstrap. We need just the best int we can choose here, which is one that is just the int part of the division. That ensures that the 5 columns extend over less than the standard bootstrap total of 12 "units" wide. (cherry picked from commit d86cff7f61af51ee2bd9df9df309576b11d7ecc6)
* Fix saving Hybrid RSA + Xauth. Fixes #7258jim-p2017-02-131-1/+2
|
* Revert "Add privs to control display of notices"Renato Botelho2017-02-131-20/+4
| | | | | | Fix #7051 This reverts commit 04665e78537906f7375668ca665cba17f95a4864.
* IPv4 Tunnel Network is required for OpenVPN serverPhil Davis2017-02-131-1/+1
| | | | (cherry picked from commit e4488e51cf424907e06ef7cc73370aa0657e5e25)
* Add foot.inc back to status.phpjim-p2017-02-101-0/+2
|
* It's time to 2.3.3-RCRenato Botelho2017-02-101-1/+1
|
* 4th attempt!lukehamburg2017-02-101-1/+1
| | | | | | - Reworked based on recent comments from @rbgarga (cherry picked from commit c516cb287a78f7b05459e7fcba410f443d8eb8af)
* 3rd try!lukehamburg2017-02-101-2/+0
| | | | | | - incorporate suggestions from @rbgarga with slight modification (cherry picked from commit 6c2f093000b05285546e81dd1a578fc9b573b72b)
* 2nd try. . .lukehamburg2017-02-101-12/+4
| | | | | | | | | | | /etc/inc/util.inc: - arp_get_mac_by_ip() updated to support IPv6 - attempt at code streamline /usr/local/www/services_dhcp_edit.php: - streamline code, now just a simple call to arp_get_mac_by_ip() (cherry picked from commit dd83f869b79a858bd74c7a8bb4adcd49217445b0)
* enhancements to services_dhcp_edit.phplukehamburg2017-02-101-5/+16
| | | | | | | | | - added ndp call to get MAC addr if remote client is connected via IPv6 - automatically hide `Copy MAC` button if arp/ndp returns null - switch to exec() instead of backticks for calls to arp - uses builtin is_ipaddr() function from util.inc (cherry picked from commit 478e89190a295b48d221ddf2f683cac6f02d7012)
* Sync up status.php with master, but keep the 2.3/10.3-specific parts. Fixes ↵jim-p2017-02-101-81/+160
| | | | #7246
* Do not output PHP shell starup message unless it is run interactively. Fixes ↵jim-p2017-02-101-6/+15
| | | | #7045
* Fix for bug 6966 https://redmine.pfsense.org/issues/6966Graham Collinson2017-02-101-1/+7
| | | | | Change-Id: I9471c2bbd8941e70965a86d369c8de87be9a4417 (cherry picked from commit 109a304e154a179bd340b06880ce95baec4dab03)
* Revert "Fixed #6753"jim-p2017-02-101-4/+1
| | | | | User feedback suggests the sorted menu was better, despite the lack of consistency elsewhere. This reverts commit 96ff627ff95e0fcadf8c15dbd6fe681309cb0fd8.
* Mark missing parameter as required. It got lost during backport from master ↵Renato Botelho2017-02-101-1/+1
| | | | as spotted by @phil-davis
* Required fields - Alias TypePhil Davis2017-02-101-1/+1
| | | | | should be a required field. And this 1-char change can also be backported to RELENG_2_3. I noticed this while looking at GUI pages in 2.3.3 (cherry picked from commit 8ea10c11441b5aed0b10eb14038aa8f8adbfb3de)
* Fix #7157Renato Botelho2017-02-101-2/+9
| | | | | | | | trafficgraph: Don't update the on screen visual graph while invisible, which avoids creating a large queue of pending timer objects waiting for the next requestAnimationFrame to happen. Submitted by: PiBa-NL at https://github.com/pfsense/pfsense/pull/3450
* Ticket #7157: Backport upstream fix from ↵Renato Botelho2017-02-101-1/+3
| | | | https://github.com/novus/nvd3/commit/305cbad96e94f61a3c0bae02d16c28e09249fbc0
* Example of setting required itemsPhil Davis2017-02-101-3/+12
| | | | (cherry picked from commit 32a85c63c9411463c98a0605772b3e2c01702971)
* Revise setHelpText to accommodate required fieldsSteve Beaver2017-02-103-9/+5
|
* Provide Javascript set_Required functionSteve Beaver2017-02-101-0/+8
|
* Provide CSS for required fieldsSteve Beaver2017-02-101-1/+9
|
* Add "Required field" capability to Groups.class.phpSteve Beaver2017-02-101-0/+9
|
* status_upnp remove nested getext()Phil Davis2017-02-091-1/+1
| | | | | I don't think this does anything useful. (cherry picked from commit 3224663a3759935b47406c789b9f5cea3eb88136)
* Part fix #7233 keep correct staticmap_array_indexPhil Davis2017-02-081-4/+2
| | | | | The index needs to be incremented even for entries that were skipped for display because they (for whatever reason) have no MAC or CID set. So use the key directly from the array. (cherry picked from commit 9aa3c5e84984958caa19ac76ecba849b94a8b360)
* Part Fix #7233 Allow deletion of empty static map entriesPhil Davis2017-02-081-1/+1
| | | | (cherry picked from commit 2ea70e1a474fd871a007c76841f2a33f34082c58)
* diag_backup do not use button text for comparisonsPhil Davis2017-02-071-8/+8
| | | | (cherry picked from commit 9a7e1c9580c5779c86bc97d6d82c43401c7a4b12)
* Rather than setting the value directly, minimize exposure to eval() in ↵jim-p2017-02-071-2/+5
| | | | update_config_field() from wizard.php by constructing a variable reference, then set the value using the reference rather than passing user input through eval(). Fixes #7230
* Convert easyrule.php to use a confirmation landing page so that the ↵jim-p2017-02-072-22/+67
| | | | | | parameters can be submitted via POST. Also, remove the JavaScript confirmation box since it is now redundant. Fixes #7228 The confirmation page displays the submitted parameters for an extra user sanity check. Also fixed a bunch of page formatting issues that were not apparent because users rarely if ever saw output from the page.
* interfaces_ppps_edit fixes that will work on 2.3.3 alsoPhil Davis2017-02-071-22/+27
| | | | | | | | | 1) Make "The MTU is too big" message actually come out. The code around line 300 was rubbish (maybe from before bootstrap?). 2) Show friendly description rather than 'wan' 'lan' opt1' in interface link list. 3) If any specific link parameters are set, then open the advanced section on page load. I tested on a 2.4 system, then applied these diff on a 2.3.3 system and it worked there also. So this should backport fine. (cherry picked from commit 3cc22ff255bbc980786fca4723b01cc9524e1cf5)
* Fix #7226 Package installation message is incompletePhil Davis2017-02-071-0/+1
| | | | | This makes it remember pkgname after the install finishes and the form is re-submitted. (cherry picked from commit d12bc864ceb5d656fc094bde7cf5ec96e24bdde9)
* pkg_mgr_install remove embedded HTML from result stringsPhil Davis2017-02-071-9/+11
| | | | (cherry picked from commit 682008ff758b942d85ed007b485e0b2fa8e3a11c)
* Encode the contents of pkg_filter before output. Fixes #7227jim-p2017-02-071-1/+1
|
* Encode 'from' and 'to' before output on pkg_mgr_install.php. Fixes #7225jim-p2017-02-071-1/+1
|
* Revert "setHelp formatting for interfaces.php"Renato Botelho2017-02-071-45/+45
| | | | This reverts commit e6068596baf4307fe3eb9866072800e4c23b6840.
* setHelp formatting for interfaces.phpPhil Davis2017-02-071-45/+45
| | | | | | | | There was a fair bit of it, so I have put this in its own pull request. 1) Gets HTML out of the strings that go for translation. 2) Line 3365 - the words here about "hexadecimal" now go in the text directly in the setHelp so the translators will get access to them. 3) Line 2213 - a couple of backslash that were attempts at escaping the next char were not actually needed, and were displaying literally in the GUI. (cherry picked from commit 4d0c9c5946aeecad851511521d0310075ab4ebdd)
* fbegin.inc and fend.inc are no longer usedPhil Davis2017-02-072-4/+0
| | | | (cherry picked from commit c09188a21938f7b1d19fd845fa7e5b0712dd4a83)
* Internationalization graph.phpPhil Davis2017-02-071-4/+6
| | | | | | | 1) A few extra strings to be translated. 2) The scale_type code values 'up' and 'follow' need to be kept as those strings in the JS scale_type variable. The text to be translated needs to be in a different variable that can be in translated form for display. Otherwise things go wrong when in a different language. e.g. switch to Brazilian Portuguese, then the Autoscale. The first times it switches then gets "stuck". (cherry picked from commit 678f11313b31b28d12d806032b6359a00d6b89a1)
* Update help message for Zone ID for new region requirementJason D. McCormick2017-02-071-1/+1
| | | | (cherry picked from commit 49f90f17bfaf2422d56160ad06ef5e2513beb1ba)
* certificatemanager, don't show information from previous certificate if no ↵PiBa-NL2017-02-061-1/+8
| | | | | | cert or csr is present in the cert (cherry picked from commit 1048585a08ac824057eea35c57fe359b9e6a48fe)
* Use unique var names in Input.class.phpPhil Davis2017-02-061-2/+2
| | | | (cherry picked from commit a66177645191359e5ce854d733e9be40ada3535b)
* Add to NTP GPS processing of PGRMF sentencejskyboo2017-02-033-0/+42
| | | | (cherry picked from commit 6924a2bf34a70cd33284a28ca3575f33f9834375)
* Provide info on services_checkip.php about what the server must return, and ↵jim-p2017-02-021-3/+24
| | | | provide two examples of server-side code to return the client address. Fixes #6374
* diag_reseststate sourcetablehelp escape of double-quotes not neededPhil Davis2017-02-011-1/+1
| | | | | The backslash escaping of the double-quotes here displays the backslashes literal on the GUI. Escaping is not needed in this single-quoted string. (cherry picked from commit 4ede308c615508a7b70074f56a3ca77cae7b68f1)
* Redmine #7173 Do not allow pkg_ for If, IfGroup, AliasPhil Davis2017-02-013-4/+22
| | | | (cherry picked from commit c9d93b62b0cc559d1ed4326212b6385cae2eb398)
* Fix #7183 Do not allow Interface Groups with the same namePhil Davis2017-02-011-5/+3
| | | | | I should stop trying bad stuff, there seem to be so many holes to find in the validation :) (cherry picked from commit 89ac71d38a4c49e1537e4afe2b34b2457d9817a7)
* vpn_openvpn_server: fix missing parameterNewEraCracker2017-01-311-0/+1
|
OpenPOWER on IntegriCloud