Displaying 1 50 of 27,934 commits (0.056s)

pfSense

Update zoneinfo from FreeBSD 10.1-REL. Ticket #4459

pfSense

Update zoneinfo from FreeBSD 10.1-REL. Ticket #4459

pfSense — usr/local/www interfaces.php

Correct descriptions on Key Rotation and Master Key Regeneration for wireless.
Delta File
+2 -2 usr/local/www/interfaces.php
+2 -2 1 file

pfSense — usr/local/www interfaces.php

Correct descriptions on Key Rotation and Master Key Regeneration for wireless.
Delta File
+2 -2 usr/local/www/interfaces.php
+2 -2 1 file

pfSense — usr/local/www pkg_edit.php

Merge pull request #1670 from phil-davis/patch-1
∈ Renato Botelho - 51c26808 - 2015-05-20 18:34:08
Merge pull request #1671 from phil-davis/patch-2
∈ Phil Davis - 26d785bb - 2015-05-20 18:11:50
    More combinedfields and usecolspan2 fixes
    
    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.
Delta File
+12 -4 usr/local/www/pkg_edit.php
+12 -4 1 file

pfSense — usr/local/www pkg_edit.php

    More combinedfields and usecolspan2 fixes
    
    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 2.2.*
Delta File
+12 -4 usr/local/www/pkg_edit.php
+12 -4 1 file

pfSense — usr/local/www pkg_edit.php

Merge pull request #1668 from phil-davis/patch-1
∈ Renato Botelho - 67e7ae85 - 2015-05-20 13:39:41
Merge pull request #1669 from phil-davis/patch-2
∈ Phil Davis - b021e2c6 - 2015-05-20 13:20:50
    Fix tr use for combinedfields in pkg xml
    
    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 :)
Delta File
+8 -5 usr/local/www/pkg_edit.php
+8 -5 1 file

pfSense — usr/local/www pkg_edit.php

Fix tr use for combinedfields in pkg xml
Delta File
+8 -5 usr/local/www/pkg_edit.php
+8 -5 1 file

pfSense — usr/local/www pkg_edit.php

Merge pull request #1649 from baxeno/master
∈ Renato Botelho - 2f8d3544 - 2015-05-19 15:50:28
Merge pull request #1667 from phil-davis/patch-1
∈ Phil Davis - 3b1525f9 - 2015-05-19 15:27:34
Too many left curlies in pkg_edit.php

I broke the syntax!
Delta File
+1 -1 usr/local/www/pkg_edit.php
+1 -1 1 file

pfSense — usr/local/www pkg_edit.php

Merge pull request #1667 from phil-davis/patch-1
∈ Phil Davis - 3b1525f9 - 2015-05-19 15:27:34
Too many left curlies in pkg_edit.php

I broke the syntax!
Delta File
+1 -1 usr/local/www/pkg_edit.php
+1 -1 1 file

pfSense — usr/local/www vpn_l2tp.php vpn_l2tp_users_edit.php

Merge pull request #1662 from phil-davis/www-pkg
∈ Renato Botelho - 77f67782 - 2015-05-18 19:30:15
Merge pull request #1665 from phil-davis/www-vpn-l2tp
∈ Renato Botelho - e383f744 - 2015-05-18 19:20:23
Merge pull request #1663 from jlduran/utf8-latin1
∈ Phil Davis - a3e00d53 - 2015-05-18 17:24:55
Code style vpn_l2tp

pfSense — usr/local/www vpn_l2tp.php vpn_l2tp_users_edit.php

Merge pull request #1665 from phil-davis/www-vpn-l2tp
∈ Renato Botelho - e383f744 - 2015-05-18 19:20:23
Merge pull request #1663 from jlduran/utf8-latin1
∈ Phil Davis - a3e00d53 - 2015-05-18 17:24:55
Code style vpn_l2tp

pfSense — etc rc.captiveportal_configure_mac rc.filter_configure_xmlrpc, etc/inc auth.inc captiveportal.inc

Merge pull request #1663 from jlduran/utf8-latin1
∈ Jose Luis Duran - d98a2e6a - 2015-05-16 14:55:15
Remove artifacts from latin1 to utf8 conversions

String replacement:

    s/Ermal L.../Ermal Luçi/g
Delta File
+1 -1 etc/inc/auth.inc
+1 -1 etc/inc/captiveportal.inc
+1 -1 etc/inc/dyndns.class
+1 -1 etc/inc/filter.inc
+1 -1 etc/inc/interfaces.inc
+1 -1 etc/inc/pkg-utils.inc
+14 -14 14 files not shown
+20 -20 20 files

pfSense — etc rc.captiveportal_configure_mac rc.filter_configure_xmlrpc, etc/inc auth.inc captiveportal.inc

Remove artifacts from latin1 to utf8 conversions

String replacement:

    s/Ermal L.../Ermal Luçi/g
Delta File
+1 -1 etc/inc/auth.inc
+1 -1 etc/inc/captiveportal.inc
+1 -1 etc/inc/dyndns.class
+1 -1 etc/inc/filter.inc
+1 -1 etc/inc/interfaces.inc
+1 -1 etc/inc/pkg-utils.inc
+14 -14 14 files not shown
+20 -20 20 files

pfSense — etc rc.embedded

create /var/spool/lock on nano so tip works without hassles. Ticket #4532
Delta File
+2 -1 etc/rc.embedded
+2 -1 1 file

pfSense — etc rc.embedded

create /var/spool/lock on nano so tip works without hassles. Ticket #4532
Delta File
+2 -1 etc/rc.embedded
+2 -1 1 file

pfSense — etc/inc interfaces.inc

    Disable defering in pfsync which is used for active-active deployments not useble in 
FreeBSD. This should fix hangs reported on some machines wiht pfsync
Delta File
+1 -0 etc/inc/interfaces.inc
+1 -0 1 file

pfSense — etc/inc interfaces.inc

    Disable defering in pfsync which is used for active-active deployments not useble in 
FreeBSD. This should fix hangs reported on some machines wiht pfsync
Delta File
+1 -0 etc/inc/interfaces.inc
+1 -0 1 file

pfSense — usr/local/www pkg.php pkg_edit.php

Code style WWW pkg

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

pfSense — usr/local/www status_rrd_graph.php

Merge pull request #1660 from phil-davis/www-status-rrd
∈ Phil Davis - 38145b9b - 2015-05-15 10:57:31
Remove excess tabs status_rrd_graph

pfSense — usr/local/www pkg.php

Merge pull request #1659 from phil-davis/www-status
∈ Renato Botelho - 45e96815 - 2015-05-15 10:41:56
Use correct variable to fix pagination
Delta File
+2 -3 usr/local/www/pkg.php
+2 -3 1 file

pfSense — usr/local/www pkg.php

Use correct variable to fix pagination
Delta File
+2 -3 usr/local/www/pkg.php
+2 -3 1 file

pfSense — usr/local/www pkg.php

Merge pull request #1661 from phil-davis/patch-1
∈ Phil Davis - a5d6bf80 - 2015-05-15 07:12:23
    Fix startingat var name typo in pkp.php
    
    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!
Delta File
+1 -1 usr/local/www/pkg.php
+1 -1 1 file

pfSense — usr/local/www pkg.php

    Fix startingat var name typo in pkp.php
    
    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!
Delta File
+1 -1 usr/local/www/pkg.php
+1 -1 1 file

pfSense — usr/local/www status_rrd_graph.php status_rrd_graph_settings.php

Code style WWW Status RRD

pfSense — usr/local/www status_openvpn.php status_interfaces.php

Code style WWW Status

pfSense — usr/local/www interfaces.php

    Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in 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.
Delta File
+0 -9 usr/local/www/interfaces.php
+0 -9 1 file

pfSense — usr/local/www interfaces.php

    Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in 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.
    
    Conflicts:
            usr/local/www/interfaces.php
Delta File
+0 -9 usr/local/www/interfaces.php
+0 -9 1 file

pfSense — etc/inc services.inc

Add some error checking to avoid warning during boot
Delta File
+6 -1 etc/inc/services.inc
+6 -1 1 file

pfSense — etc/inc services.inc

Add some error checking to avoid warning during boot
Delta File
+5 -0 etc/inc/services.inc
+5 -0 1 file

pfSense — etc/inc pfsense-utils.inc, usr/local/share/locale/pt_BR/LC_MESSAGES pfSense.po

Move pt_BR translation from ISO to UTF-8

pfSense — usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES pfSense.po, usr/local/share/locale/pt_BR/LC_MESSAGES pfSense.po

Move pt_BR directory, it's moving from ISO to UTF-8

pfSense — usr/local/www status_upnp.php

Merge pull request #1658 from phil-davis/patch-4
∈ Phil Davis - db7d66e7 - 2015-05-14 06:33:39
    Cleanup code logic status_upnp
    
    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.
Delta File
+8 -4 usr/local/www/status_upnp.php
+8 -4 1 file

pfSense — usr/local/www firewall_aliases.php firewall_aliases_edit.php

Merge pull request #1657 from phil-davis/patch-3
∈ Renato Botelho - e240d261 - 2015-05-14 11:49:17
Merge pull request #1656 from phil-davis/patch-2
∈ Renato Botelho - 8119bdb3 - 2015-05-14 11:48:49
Merge pull request #1655 from phil-davis/patch-1
∈ Phil Davis - 34f3165b - 2015-05-14 00:57:04
Fix alias rename and delete bug #4701

The old advancedoutbound key in config.xml is now called outbound.

pfSense — usr/local/www status_rrd_graph_img.php

Merge pull request #1654 from phil-davis/nat-outbound-fix
∈ Phil Davis - fa201d63 - 2015-05-14 11:04:43
    Add some curlies in status_rrd_graph_img
    
    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...

pfSense — usr/local/www status_rrd_graph_img.php

    Add some curlies in status_rrd_graph_img
    
    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...

pfSense — usr/local/www status_upnp.php

    Cleanup code logic status_upnp
    
    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.
Delta File
+8 -4 usr/local/www/status_upnp.php
+8 -4 1 file

pfSense — usr/local/www status_lb_pool.php

Remove unused nentries from status_lb_pool
Delta File
+0 -4 usr/local/www/status_lb_pool.php
+0 -4 1 file

pfSense — usr/local/www status_gateways.php

Remove unused var from status_gateways.php

I cannot see where "counter" is used.
Delta File
+0 -2 usr/local/www/status_gateways.php
+0 -2 1 file

pfSense — usr/local/www firewall_aliases.php firewall_aliases_edit.php

Fix alias rename and delete bug #4701

The old advancedoutbound key in config.xml is now called outbound.

pfSense — etc/inc ipsec.inc

ipsec: psk keyid bugfix

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 at gmail.com>
Delta File
+1 -1 etc/inc/ipsec.inc
+1 -1 1 file

pfSense — etc/inc priv.defs.inc, usr/local/www load_balancer_relay_action_edit.php load_balancer_relay_protocol_edit.php

Delete load_balancer_relay*.php, they are not being used

pfSense — usr/local/www load_balancer_pool_edit.php

Merge pull request #1653 from phil-davis/lb-work
∈ Renato Botelho - 4040b302 - 2015-05-13 17:14:23
Merge pull request #1651 from phil-davis/interfaces-other
∈ Renato Botelho - 62a9a5d0 - 2015-05-13 17:13:17
Merge pull request #1650 from phil-davis/interfaces-php
∈ Phil Davis - caa7230e - 2015-05-13 09:42:18
    Slash-select should be inside if in load_balancer_pool_edit
    
    otherwise there is an unbalanced slash-select when the else happens (if there are no 
load-balancer monitors defined)

pfSense — boot loader.conf_wrap, etc/inc pfsense-utils.inc

Merge pull request #1652 from phil-davis/patch-1
∈ Renato Botelho - b45e428c - 2015-05-13 12:18:10
No need to deal with hw.usb.no_pf anymore, it's part of default loader.conf

pfSense — boot loader.conf_wrap, etc/inc pfsense-utils.inc

No need to deal with hw.usb.no_pf anymore, it's part of default loader.conf

pfSense — usr/local/www load_balancer_relay_action_edit.php load_balancer_virtual_server_edit.php

Code style Load Balancer

pfSense — usr/local/www load_balancer_pool_edit.php

    Slash-select should be inside if in load_balancer_pool_edit
    
    otherwise there is an unbalanced slash-select when the else happens (if there are no 
load-balancer monitors defined)

pfSense — usr/local/www load_balancer_pool_edit.php

    Slash-select should be inside if in load_balancer_pool_edit
    
    otherwise there is an unbalanced slash-select when the else happens (if there are no 
load-balancer monitors defined)

pfSense — usr/local/www interfaces_bridge_edit.php interfaces_ppps_edit.php

Code style interfaces miscellaneous files

pfSense — usr/local/www interfaces.php

Code style interfaces.php
Delta File
+687 -455 usr/local/www/interfaces.php
+687 -455 1 file