| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
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.
|
| |/ |
|
| | |
|
| |
|
|
|
|
|
| |
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 :)
|
| |
|
| |
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
|
| |\ |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |/ |
|
| | | |
|
| |/
|
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| |\ |
|
| | |
| |
| |
| | |
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...
|
| |\ \ |
|
| | |/
| |
| |
| |
| |
| | |
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.
|
| |\ \ |
|
| | |/ |
|
| |\ \ |
|
| | |/
| |
| | |
I cannot see where "counter" is used.
|
| |/
|
|
| |
The old advancedoutbound key in config.xml is now called outbound.
|
| | |
|
| |\ |
|
| | | |
|
| |\ \ |
|
| | |/ |
|
| |\ \ |
|
| | |/ |
|
| |/
|
| |
otherwise there is an unbalanced slash-select when the else happens (if there are no load-balancer monitors defined)
|
| |
|
|
|
| |
when there are no floating rules to display.
The box needs to span 11 columns.
|
| |\ |
|
| | |\ |
|
| | | | |
|
| |\ \ \
| |_|/
|/| | |
|
| | |/ |
|
| |\ \ |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| |_|/
|/| | |
|
