| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| | |
from services_dhcp.
This looks like it is wanting curlies to put all clear_subsytem_dirty inside the "if".
|
|\ \ |
|
| |/ |
|
|\ \
| |/
|/| |
|
|/ |
|
|
|
|
| |
There are many more possible flags, documented on the wiki: https://doc.pfsense.org/index.php/Wireless_Status
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way.
b) But if usecolspan2 is NOT in effect, then we want the combined fields to still run "together" but vertically under each other. In this case we want each field to be in its own "tr" tag.
This change makes (b) happen.
If combinedfields is not set, then each of the "if" tests here still follows the same path it did previously, so there should be no effect on the HTML output for any ordinary package fields.
These are changes for master that correspond to https://github.com/pfsense/pfsense/pull/1672 on RELENG_2_2.
|
|\ \ |
|
| |/ |
|
|\ \
| |/
|/| |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To start with just `.php` files. According to the [Developer Style Guide](https://doc.pfsense.org/index.php/Developer_Style_Guide):
- Use tabs for indentation (not spaces or a mixture of both)
- Use a tab stop of 8, rather than 4
- Ensure there is NO trailing whitespace at the end of a line, for example spaces or tabs when there is no more text afterward
- Ensure there is NO whitespace on empty lines. For example, a line must not contain only spaces or only tabs
Additionally, I've added:
- UTF-8 character encoding
- LF line endings
- Final newline
Proposed `.editorconfig` file (`.php` files for now):
```ini
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org
root = true
[*.php]
indent_style = tab
tab_width = 8
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
```
GitHub will also read and apply this style to the repo.
See #1664.
|
| |
|
| |
|
|\ |
|
|/
|
|
|
|
|
| |
Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields.
That allows usecolspan2 to work.
In the previous change I had made it enclose every field in its own "tr" tag-pair That caused usecolspan2 to be ineffective at spreading the combined fields across the display.
Also colspan needs to be initialised each time around the loop - it was getting applied to all fields further down the page after the first one it was used in.
This is the version for master.
|
|\ |
|
|/
|
|
|
| |
When specifying combinedfields begin and end in a package XML file, IE reports some unexpected start tag messages. This is because some "td" tags are not enclosed in "tr" tags in these cases, both at the begin and end of the combinedfields table that is generated. Firefox seems to be forgiving of this.
This has been investigated because BBscan177 who is developing pfBlockerNG is trying to use the combinedfields feature and it was not working so well. I will ask him to try these changes for RELENG_2_2 and confirm that they work.
When combinedfields is not set, then the code path with this change results in the same HTML being output as previously, so it should not change the HTML generated for packages that do not use combinedfields - i.e. I claim not to have broken anything else :)
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
IPsec/IKEv2 PSK currently generates an invalid strongswan ipsec.conf file.
The local IKE ID is not inserted correctly and therefore the all client
authentication attempts will fail.
A typo in the ipsec_find_id() function causes the fault.
Generated output example:
leftid = keyid:
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| | |
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Use brainpool curves as perfect forward security.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Use nist curves as perfect forward security.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Use of ECC Brainpool curves for IKEv2 is define in RFC6954.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Use of Galois/Counter Mode (GCM) during IKE phase-1 is defined in RFC4106.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
There was a small typo the vpn_ipsec_convert_to_modp() function.
Bug introduced in commit 7a747654e9ef5b4cec7184c770a24bd1e184ea6e
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
|
|\ \ |
|
|/ /
| |
| | |
I broke the syntax!
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The syntax of these all seems good. Because the 2.3-DEVELOPMENT master
does not currently have get_pkg_info implemented, the available packages
tab always says "Unable to retrieve package info...".
But I don't think I broke any code.
This is integrated with the little changes for startdisplayingat var in
pkg.php
|
|\ \ \ |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
String replacement:
s/Ermal L.../Ermal Luçi/g
|
| | | |
|
|/ /
| |
| |
| | |
useble in FreeBSD. This should fix hangs reported on some machines wiht pfsync
|
|\ \ |
|
| | | |
|
| | | |
|
|\ \ \ |
|
| |/ / |
|
| | | |
|
|\ \ \
| |/ /
|/| | |
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Even with this fix, the code does not make sense. The first test is:
if ($startingat > -1)
if it gets into the else, then $startingat must be negative. But the test in the "else" tests for >1 ???
Someone who knows what it really is supposed to do could fix it!
|
| |
| |
| |
| | |
a while (credit sbeaver for noticing), and the only thing it tends to accomplish is breaking people's connectivity from the system where they end up duplicating the MAC of their local system.
|
| | |
|
| | |
|
| | |
|