Commit Graph

22230 Commits

Author SHA1 Message Date
Renato Botelho
b3cbb07729 Fix some wrong escapeshellarg() calls
Conflicts:
	etc/inc/filter_log.inc
	etc/inc/pkg-utils.inc
2014-02-04 18:38:50 -02:00
Renato Botelho
af7a83737e Simplify logic calling grep less times, as done on mail_reports.inc on 2c6efc9 2014-02-04 17:07:01 -02:00
Renato Botelho
4bdb08e3b0 Use unlink_if_exists or @unlink to avoid PHP errors when file doesn't exist
Conflicts:
	usr/local/www/firewall_aliases_edit.php
2014-02-04 17:02:24 -02:00
Ermal Luçi
4b9011f5c5 Merge pull request #901 from Klaws--/patch-2
Added previously missing DSCP VA (requires kernel patch patch submitted ...
2014-02-04 10:08:40 -08:00
Renato Botelho
1eb03024fe Add escapeshellarg() calls on exec parameters. While I'm here, replace some exec() calls by php functions like symlink, copy, unlink, mkdir
Conflicts:
	usr/local/www/diag_logs_vpn.php
	usr/local/www/firewall_aliases_edit.php
	usr/local/www/guiconfig.inc
2014-02-04 12:47:20 -02:00
Renato Botelho
46b12609e5 Add escapeshellarg() calls on exec parameters. While I'm here, replace some exec() calls by php functions like symlink, copy, unlink, mkdir
Conflicts:
	etc/inc/filter_log.inc
	etc/inc/interfaces.inc
	etc/inc/pfsense-utils.inc
	etc/inc/pkg-utils.inc
2014-02-04 12:43:18 -02:00
Renato Botelho
44f2ef9b48 Fix an obvious typo on var name 2014-02-04 12:36:54 -02:00
Renato Botelho
0ae6d91648 Use php function to get hostname instead of exec() 2014-02-04 12:36:46 -02:00
Renato Botelho
93e350f5d3 Add path for sysctl, also use -n param instead of awk 2014-02-04 12:36:32 -02:00
Renato Botelho
4dc8980318 Simplify logic 2014-02-04 12:36:24 -02:00
Renato Botelho
645018b2ef Use php function to get hostname instead of exec() 2014-02-04 12:35:46 -02:00
Renato Botelho
4744c6e44e Add {} between variables inside quotes 2014-02-04 12:35:36 -02:00
Renato Botelho
7ea30d6050 Use php function to get hostname instead of exec() 2014-02-04 12:35:30 -02:00
Renato Botelho
eda4179204 Add {} between variables inside quotes 2014-02-04 12:35:25 -02:00
Klaws--
7962a55f15 Added previously missing DSCP VA (requires kernel patch patch submitted by me) 2014-02-04 14:31:21 +01:00
jim-p
2b8dfa4e57 Using "limited" for ntp in this way denies client access. Issue #3384 2014-02-03 09:35:33 -05:00
Renato Botelho
cf3189ffa9 Merge pull request #897 from N0YB/RELENG_2_1
XHTML Compliance - Status: System logs: Firewall
2014-02-03 03:17:42 -08:00
Ermal Luçi
511a51b381 Merge pull request #899 from N0YB/patch-12
Update shortcuts.inc
2014-01-31 03:15:34 -08:00
N0YB
472e484cd1 Update shortcuts.inc
XHTML Compliance
Shortcuts edit link - r/&id/&id
2014-01-30 22:16:57 -08:00
N0YB
30a58cf802 Couple style vertical-align corrections 2014-01-30 18:29:12 -08:00
N0YB
d284845398 Include these check boxes. 2014-01-28 16:50:31 -08:00
Renato Botelho
82482a6937 Fix typo on variable name, it fixes #3414 2014-01-28 17:01:10 -02:00
Phil Davis
f70adc8245 Really fix #3376
Thanks to  Grischa Zengel for spotting the semi-colon at the end of the "if" line that was the real cause. Please also back merge this to 2.1 branch.
2014-01-28 07:37:05 -02:00
N0YB
93dcedc1ec XHTML Compliance - Status: System logs: Firewall
An attribute value specification must be an attribute value literal unless SHORTTAG YES is specified
Quote (or escape) the quotes so they show up in the HTML.
Use style where attribute not supported.
Relocate tfoot to supported location and add tbody.
Apply htmlspecialchars to rule name.
Assorted tweaks.
2014-01-27 22:49:32 -08:00
Jim P
886926e0d7 Merge pull request #895 from N0YB/RELENG_2_1
Also make the dialog_output query string option XHTML compliant.
2014-01-27 11:03:26 -08:00
N0YB
4efc1c8df6 Also make the dialog_output query string option XHTML compliant. 2014-01-27 10:59:00 -08:00
Jim P
a43bdc39b7 Merge pull request #894 from N0YB/RELENG_2_1
Make select option XHTML compliant for "Number of lines to display".
2014-01-27 10:58:41 -08:00
N0YB
df5501dcd3 Make select option XHTML compliant for "Number of lines to display".
http://validator.w3.org/check
"SELECTED" is not a member of a group specified for any attribute
<option value="7" SELECTED >7</option>

The name and VI delimiter can be omitted from an attribute specification only if SHORTTAG YES is specified
<option value="7" selected >7</option>

"VI delimiter" is a technical term for the equal sign. This error message means that the name of an attribute and the equal sign cannot be omitted when specifying an attribute. A common cause for this error message is the use of "Attribute Minimization" in document types where it is not allowed, in XHTML for instance.

How to fix: For attributes such as compact, checked or selected, do not write e.g <option selected ... but rather <option selected="selected" ...
2014-01-27 10:45:18 -08:00
Renato Botelho
2704796a21 Merge pull request #893 from N0YB/RELENG_2_1
The service status icon is not always in a table.
2014-01-27 02:10:45 -08:00
N0YB
30469c9b0c Missing a couple table element end tags. 2014-01-26 22:53:04 -08:00
N0YB
cd6173f48c The service status icon (get_service_status_icon) is not always in a table.
So the caller should apply table td element, rather than the function.

Document type does not allow element "td" here <td class="listr" align="center">
The element named above was found in a context where it is not allowed.
2014-01-26 21:58:25 -08:00
Renato Botelho
8467c588e4 Do not list the same CARP ip as an option for Interface 2014-01-23 10:05:23 -02:00
Renato Botelho
505d5c7a5f Fix typo on variable name 2014-01-21 16:40:55 -02:00
Renato Botelho
43045948c8 Revert "Fix #3350. Do not destroy an interface when it's being disabled"
Ermal reported issues when changes are made on VLAN parent interface
with this patch. He did other changes and interface_configure() will now
be able to re-create VLAN interface

This reverts commit f70a140fe1.
2014-01-21 10:38:00 -02:00
Renato Botelho
aefc6bc2f7 Obsolete old ntp binaries 2014-01-20 09:36:02 -02:00
jim-p
93a7954399 Bump version 2014-01-16 09:13:20 -05:00
jim-p
3d54553b87 ports ntp moved to sbin, follow 2014-01-15 12:28:06 -05:00
Chris Buechler
d2dd579401 updates to license.php 2014-01-13 02:56:04 -06:00
jim-p
3e1460899d Use "disable monitor" in NTP config to mitigate CVE-2013-5211. 2014-01-10 11:41:26 -05:00
Chris Buechler
43656206a0 Should to go master, not RELENG_2_1. Revert "Merge pull request #882 from derelict-pf/cp-nohttpsforwards"
This reverts commit f8d1587b6e, reversing
changes made to 51922cb793.
2014-01-09 02:23:13 -06:00
Chris Buechler
f8d1587b6e Merge pull request #882 from derelict-pf/cp-nohttpsforwards
Add checkbox and logic to disable forwarding HTTPS/SSL (Port 443)
2014-01-09 00:18:49 -08:00
Renato Botelho
51922cb793 Add 'limited' to ntpd restrict list to workaround CVE-2013-5211. It fixes #3384 2014-01-07 08:58:48 -02:00
Phil Davis
7c2ea0cc22 Update reserved_keywords checks to match firewall_aliases_edit
firewall_aliases_import should have the same checks for reserved names as firewall_aliases_edit
This code should really be in a function in a common include file, but which one is the appropriate one?
For now I made the checks the same.
2014-01-07 07:41:04 -02:00
jim-p
0959b4d3ac This might also say "icmpv6" here and lead to a bad rule. 2014-01-06 12:08:36 -05:00
Ermal
762b34c472 Do not allocate the same pipe to everyone rather give each person its own! 2014-01-03 15:05:33 +00:00
Ermal
c8d611ed35 Use empty here for testing even if the setting is unset 2014-01-03 14:52:49 +00:00
Phil Davis
44b72c67ec Fix display of CIDR/Update Freq in Alias Edit
Fixes #3376. I have no idea what the "^" characters were meant to do, but removing them makes the CIDR/Update Freq value be displayed correctly when editing. Will there be some other side-effect from removing the "^"?
2013-12-30 09:23:43 +00:00
phildd
d564ed2426 Validate IP address ranges correctly on Alias Bulk Import
The code was there to attempt to validate and implement IP address range lines in Alias Bulk Import e.g.
10.20.0.0-10.21.22.0
should produce a bunch of smaller ranges with appropriate CIDRs.
This fixes the code so IP address ranges actually make it through into the resulting Alias.
2013-12-30 09:23:17 +00:00
Ermal
d68494e6ed Correct the check to what was intended 2013-12-27 21:34:16 +00:00
Ermal
57b02731c1 Remove not needed code 2013-12-27 20:50:01 +00:00