Displaying 1 50 of 27,375 commits (0.059s)

pfSense — usr/local/www services_unbound.php

allow enabling Unbound when dnsmasq is enabled, if they're using diff
ports. Ticket #4332

pfSense — usr/local/www services_unbound.php

allow enabling Unbound when dnsmasq is enabled, if they're using diff
ports. Ticket #4332

pfSense — etc/inc filter.inc util.inc

Skip any numeric-only aliases in the ruleset to prevent errors from those
who configured them on previous versions where that was allowed. Ticket
Delta File
+5 -0 etc/inc/filter.inc
+4 -0 etc/inc/util.inc
+9 -0 2 files

pfSense — etc/inc filter.inc util.inc

Skip any numeric-only aliases in the ruleset to prevent errors from those
who configured them on previous versions where that was allowed. Ticket
Delta File
+5 -0 etc/inc/filter.inc
+4 -0 etc/inc/util.inc
+9 -0 2 files

pfSense — etc/inc globals.inc

Add missing comma. Fixes #4485
Delta File
+1 -1 etc/inc/globals.inc
+1 -1 1 file

pfSense — etc/inc globals.inc

Add missing comma. Fixes #4485
Delta File
+1 -1 etc/inc/globals.inc
+1 -1 1 file

pfSense — etc/inc services.inc

Enable UnicastOnly in radvd for ovpn* interfaces. Ticket #4455
Delta File
+3 -0 etc/inc/services.inc
+3 -0 1 file

pfSense — etc/inc services.inc

Enable UnicastOnly in radvd for ovpn* interfaces. Ticket #4455
Delta File
+3 -0 etc/inc/services.inc
+3 -0 1 file

pfSense — etc/inc globals.inc

    Tweak the carp demotion factors slightly to avoid CARP transitions that are most 
likely unnecessary.
Delta File
+2 -0 etc/inc/globals.inc
+2 -0 1 file

pfSense — etc/inc globals.inc

    Tweak the carp demotion factors slightly to avoid CARP transitions that are most 
likely unnecessary.
Delta File
+2 -0 etc/inc/globals.inc
+2 -0 1 file

pfSense — usr/local/www system_groupmanager.php

Merge pull request #1539 from phil-davis/patch-7
∈ Phil Davis - 6cf3278f - 2015-03-03 06:53:40
  system_groupmanager edit cancel button looks small

It looks smaller and different to the Save button. This makes it the same.

pfSense — usr/local/www system_usermanager.php

Merge pull request #1538 from phil-davis/patch-6
∈ Phil Davis - f636bc12 - 2015-03-03 06:45:04
system_usermanager edit cancel button looks small

It looks smaller and different to the Save button. This makes it the same.

pfSense — usr/local/www system_advanced_misc.php

Merge pull request #1537 from phil-davis/patch-5
∈ Phil Davis - 1626b5ad - 2015-03-03 07:12:03
    Make the Power Mode selection boxes line up
    
    by putting the text and selection boxes into a 2-column table so that it can be 
rendered with the boxes lined up vertically.
Delta File
+35 -23 usr/local/www/system_advanced_misc.php
+35 -23 1 file

pfSense — usr/local/www services_dhcp_edit.php

Merge pull request #1536 from phil-davis/patch-4
∈ Phil Davis - bd5a8268 - 2015-03-03 05:56:37
    Add missing BR tags and fix display with pfsense_ng_fs theme
    
    Fixes #4481
    Similar issue to commit 
https://github.com/pfsense/pfsense/commit/5cfd948144741ba0d6981f89b2e40257cb9ef2b1
    Note: services_dhcpv6_edit.php - these fields are not present so nothing to edit/fix.

pfSense — etc/inc zeromq.inc

Merge pull request #1535 from phil-davis/patch-3
∈ Renato Botelho - adbbd4f9 - 2015-03-03 11:03:57
Merge pull request #1533 from phil-davis/Code-Style-etc-inc-u
∈ Renato Botelho - 52886a07 - 2015-03-03 11:02:23
Merge pull request #1532 from phil-davis/Code-Style-etc-inc-r-s
∈ Phil Davis - 603a97cb - 2015-03-02 17:03:59
    Be safe use require_once in zeromq
    
    I was testing code and just doing stuff like:
    require_once("zeromq.inc");
    in Diagnostics->Command Prompt, PHP Execute
    That brings an error because underneath that PHP Execute code it has already included 
auth.inc
    I guess zeromq.inc is used quite separately to the rest of the system, and must be OK 
just having a "require" here. But it seems safer to always use require_once, just in case 
it gets called in a new way/sequence.
    Comments welcome.
Delta File
+1 -1 etc/inc/zeromq.inc
+1 -1 1 file

pfSense — usr/local/www services_dhcp.php

Merge pull request #1531 from phil-davis/patch-2
∈ Phil Davis - ec67423b - 2015-03-03 10:48:56
    Make the DHCP network booting options line up
    
    by putting the text and selection boxes into a 2-column table so that it can be 
rendered with the boxes lined up vertically.
Delta File
+34 -8 usr/local/www/services_dhcp.php
+34 -8 1 file

pfSense — usr/local/www services_dhcp.php

    Make the DHCP network booting options line up
    
    by putting the text and selection boxes into a 2-column table so that it can be 
rendered with the boxes lined up vertically.
Delta File
+34 -8 usr/local/www/services_dhcp.php
+34 -8 1 file

pfSense — usr/local/www system_advanced_misc.php

    Make the Power Mode selection boxes line up
    
    by putting the text and selection boxes into a 2-column table so that it can be 
rendered with the boxes lined up vertically.
Delta File
+35 -23 usr/local/www/system_advanced_misc.php
+35 -23 1 file

pfSense — usr/local/www system_groupmanager.php

  system_groupmanager edit cancel button looks small

It looks smaller and different to the Save button. This makes it the same.

pfSense — usr/local/www system_usermanager.php

system_usermanager edit cancel button looks small

It looks smaller and different to the Save button. This makes it the same.

pfSense — usr/local/www system_advanced_misc.php

    Standardise power mode selection boxes
    
    I noticed that this looked a little odd, the boxes for AC and Battery Power Mode are 1 
after the other on the same line, then the 3rd box for unknown power mode is on a new 
line.
    Maybe make them all on their own line, like this?

pfSense — usr/local/www system_advanced_misc.php

    Standardise power mode selection boxes
    
    I noticed that this looked a little odd, the boxes for AC and Battery Power Mode are 1 
after the other on the same line, then the 3rd box for unknown power mode is on a new 
line.
    Maybe make them all on their own line, like this?

pfSense — etc/inc vpn.inc, usr/local/www vpn_ipsec_settings.php

    Remove "Prefer old SA" option, and ignore it in all existing configurations. Breaks 
things in many cases with strongSwan. For the very rare circumstances where this is 
actually desirable, it's just a sysctl that can be set in tunables.

pfSense — etc/inc vpn.inc, usr/local/www vpn_ipsec_settings.php

    Remove "Prefer old SA" option, and ignore it in all existing configurations. Breaks 
things in many cases with strongSwan. For the very rare circumstances where this is 
actually desirable, it's just a sysctl that can be set in tunables.

pfSense — etc/inc upgrade_config.inc

Merge pull request #1529 from phil-davis/Code-Style-pkg-utils
∈ Renato Botelho - 0f6a1db1 - 2015-03-02 12:08:31
Merge pull request #1528 from phil-davis/Code-Style-putil
∈ Renato Botelho - 76de1b3f - 2015-03-02 11:55:03
Merge pull request #1526 from phil-davis/Code-Style-openvpn
∈ Renato Botelho - 969a5793 - 2015-03-02 11:51:08
Merge pull request #1525 from phil-davis/Code-Style-etc-inc-i-to-p
∈ Phil Davis - c8703520 - 2015-03-01 15:46:48
    Ancient bug on upgrade_014_to_015
    
    This code looked silly the way it was, with the construct:
    $var = $var;
    unset($var);
    
    Seems it was accidentally changed to this way many years ago by 
https://github.com/pfsense/pfsense/commit/588a183b0e58f09932ffef35cc0003cca2313aba
    IMHO we want to do the conversion to $config['system']['gateway'] here so that later 
config conversion will then process it as expected.
    Note that in a current (2.2) config there is not $config['system']['gateway'] but that 
is switched over later in upgrade_021_to_022 - which switches back to 
$config['interfaces']['wan']['gateway'] and then later config conversions do their thing 
with that.
    I guess this will only effect people who upgrade from some really old config (or 
monowall?)
Delta File
+1 -1 etc/inc/upgrade_config.inc
+1 -1 1 file

pfSense — etc/inc upgrade_config.inc

Merge pull request #1525 from phil-davis/Code-Style-etc-inc-i-to-p
∈ Phil Davis - c8703520 - 2015-03-01 15:46:48
    Ancient bug on upgrade_014_to_015
    
    This code looked silly the way it was, with the construct:
    $var = $var;
    unset($var);
    
    Seems it was accidentally changed to this way many years ago by 
https://github.com/pfsense/pfsense/commit/588a183b0e58f09932ffef35cc0003cca2313aba
    IMHO we want to do the conversion to $config['system']['gateway'] here so that later 
config conversion will then process it as expected.
    Note that in a current (2.2) config there is not $config['system']['gateway'] but that 
is switched over later in upgrade_021_to_022 - which switches back to 
$config['interfaces']['wan']['gateway'] and then later config conversions do their thing 
with that.
    I guess this will only effect people who upgrade from some really old config (or 
monowall?)
Delta File
+1 -1 etc/inc/upgrade_config.inc
+1 -1 1 file

pfSense — etc/inc upgrade_config.inc

Merge pull request #1530 from phil-davis/patch-2
∈ Phil Davis - 839966e3 - 2015-03-01 15:46:48
    Ancient bug on upgrade_014_to_015
    
    This code looked silly the way it was, with the construct:
    $var = $var;
    unset($var);
    
    Seems it was accidentally changed to this way many years ago by 
https://github.com/pfsense/pfsense/commit/588a183b0e58f09932ffef35cc0003cca2313aba
    IMHO we want to do the conversion to $config['system']['gateway'] here so that later 
config conversion will then process it as expected.
    Note that in a current (2.2) config there is not $config['system']['gateway'] but that 
is switched over later in upgrade_021_to_022 - which switches back to 
$config['interfaces']['wan']['gateway'] and then later config conversions do their thing 
with that.
    I guess this will only effect people who upgrade from some really old config (or 
monowall?)
Delta File
+1 -1 etc/inc/upgrade_config.inc
+1 -1 1 file

pfSense — etc/inc upgrade_config.inc

    Ancient bug on upgrade_014_to_015
    
    This code looked silly the way it was, with the construct:
    $var = $var;
    unset($var);
    
    Seems it was accidentally changed to this way many years ago by 
https://github.com/pfsense/pfsense/commit/588a183b0e58f09932ffef35cc0003cca2313aba
    IMHO we want to do the conversion to $config['system']['gateway'] here so that later 
config conversion will then process it as expected.
    Note that in a current (2.2) config there is not $config['system']['gateway'] but that 
is switched over later in upgrade_021_to_022 - which switches back to 
$config['interfaces']['wan']['gateway'] and then later config conversions do their thing 
with that.
    I guess this will only effect people who upgrade from some really old config (or 
monowall?)
Delta File
+1 -1 etc/inc/upgrade_config.inc
+1 -1 1 file

pfSense — etc/inc pkg-utils.inc

Code style for pkg-utils
Delta File
+403 -296 etc/inc/pkg-utils.inc
+403 -296 1 file

pfSense — etc/inc pfsense-utils.inc

Code style for pfsense-utils
Delta File
+623 -468 etc/inc/pfsense-utils.inc
+623 -468 1 file

pfSense — etc/inc dyndns.class

Merge pull request #1527 from phil-davis/patch-2
∈ Phil Davis - 472da675 - 2015-02-28 12:56:39
Semi-colon went AWOL in dyndns.class

after putting it back the code runs much better :)
Delta File
+1 -1 etc/inc/dyndns.class
+1 -1 1 file

pfSense — etc/inc openvpn.inc

Code style openvpn.inc
Delta File
+286 -165 etc/inc/openvpn.inc
+286 -165 1 file

pfSense — etc/inc ipsec.inc notices.inc

Code style for etc inc i to p
Delta File
+156 -124 etc/inc/ipsec.inc
+109 -86 etc/inc/notices.inc
+92 -49 etc/inc/priv.inc
+41 -41 etc/inc/IPv6.inc
+42 -33 etc/inc/openvpn.auth-user.php
+45 -30 etc/inc/openvpn.attributes.php
+163 -122 10 files not shown
+648 -485 16 files

pfSense — etc/inc interfaces.inc

Merge pull request #1524 from phil-davis/Code-Style-Guide-Interfaces-inc
∈ Renato Botelho - e59410d5 - 2015-02-27 13:57:54
Merge pull request #1523 from phil-davis/patch-2
∈ Renato Botelho - fd74eeea - 2015-02-27 13:36:49
Merge pull request #1522 from phil-davis/Code-Style-Guide-etc-inc-f-to-g
∈ Phil Davis - cf73302f - 2015-02-27 05:28:45
Code style guide interfaces.inc

This is another big file that has many diffs so Github refuses to
display them. I thought it best to keep doing individual commit-pull for
ones like this.
Delta File
+1,487 -1,051 etc/inc/interfaces.inc
+1,487 -1,051 1 file

pfSense — etc/inc gwlb.inc filter_log.inc

Merge pull request #1523 from phil-davis/patch-2
∈ Renato Botelho - fd74eeea - 2015-02-27 13:36:49
Merge pull request #1522 from phil-davis/Code-Style-Guide-etc-inc-f-to-g
∈ Phil Davis - 918bdf0d - 2015-02-26 16:39:00
More style guide changes

In gwlb.inc at line 676 and 779 I added an extra set of brackets. In the
"if" clause as a whole there were a mix of && and || used that were
relying on the PHP standard that && has precedence over ||
In actual fact the original code should have been working fine, the
extra brackets make sure that the intention is clear.
Delta File
+12 -6 etc/inc/gwlb.inc
+1 -1 etc/inc/filter_log.inc
+13 -7 2 files

pfSense — etc/inc gwlb.inc filter_log.inc

Merge pull request #1522 from phil-davis/Code-Style-Guide-etc-inc-f-to-g
∈ Phil Davis - 918bdf0d - 2015-02-26 16:39:00
More style guide changes

In gwlb.inc at line 676 and 779 I added an extra set of brackets. In the
"if" clause as a whole there were a mix of && and || used that were
relying on the PHP standard that && has precedence over ||
In actual fact the original code should have been working fine, the
extra brackets make sure that the intention is clear.
Delta File
+12 -6 etc/inc/gwlb.inc
+1 -1 etc/inc/filter_log.inc
+13 -7 2 files

pfSense — etc/inc gwlb.inc filter_log.inc

More style guide changes

In gwlb.inc at line 676 and 779 I added an extra set of brackets. In the
"if" clause as a whole there were a mix of && and || used that were
relying on the PHP standard that && has precedence over ||
In actual fact the original code should have been working fine, the
extra brackets make sure that the intention is clear.
Delta File
+12 -6 etc/inc/gwlb.inc
+1 -1 etc/inc/filter_log.inc
+13 -7 2 files

pfSense — etc/inc filter.inc

    Code style guide changes for filter.inc 2nd version
    
    This is the changes to filter.inc as per the commits in 
https://github.com/pfsense/pfsense/pull/1521 but done in just 1 clean commit.
Delta File
+1,096 -758 etc/inc/filter.inc
+1,096 -758 1 file

pfSense — usr/local/www interfaces.php

Fix track6 prefix id range in error message, reported on Pull Request #1517
Delta File
+2 -1 usr/local/www/interfaces.php
+2 -1 1 file

pfSense — usr/local/www interfaces.php

Fix track6 prefix id range in error message, reported on Pull Request #1517
Delta File
+2 -1 usr/local/www/interfaces.php
+2 -1 1 file

pfSense — etc/inc vpn.inc

Fix type (trime->trim)
Delta File
+1 -1 etc/inc/vpn.inc
+1 -1 1 file

pfSense — etc/inc vpn.inc

Fix type (trime->trim)
Delta File
+1 -1 etc/inc/vpn.inc
+1 -1 1 file

pfSense — etc/inc certs.inc auth.inc

Fix indent and remove some unecessary ()

pfSense — usr/local/www services_ntpd.php

Merge pull request #1520 from phil-davis/Code-Style-Guide-etc-inc-a-to-e
∈ Renato Botelho - 9c8e788c - 2015-02-26 12:37:47
Merge pull request #1519 from phil-davis/Code-style-etc-misc
∈ k-paulius - e607009a - 2015-02-26 02:44:50
    Check if variables are set before trying to pass them to function substr_count to 
avoid generating PHP alerts.
Delta File
+2 -2 usr/local/www/services_ntpd.php
+2 -2 1 file

pfSense — etc/inc interfaces.inc

Merge pull request #1518 from k-paulius/fix-ntpd-unset-vars
∈ Phil Davis - 2798bb68 - 2015-02-25 17:21:32
    interface_netgraph_needed can miss setting found equals true
    
    This routine seems to go looking to see if the passed-in interface is PPP-style. At 
the end, if it is not PPP-style then it calls pfsense_ngctl_detach.
    This foreach loop in its current state will always exit after the first iteration that 
is not mode "server". But it looks like it should look through all the 'pppoe' entries 
until it finds the interface or gets to the end.
    In theory the code will sometimes miss setting $found = true when it should have. And 
thus pfsense_ngctl_detach would get called later for a PPP-style interface.
    I noticed this while reviewing for code style guide - it is an example where the 
indenting shows the intention but there are no curlies to implement it.
Delta File
+2 -1 etc/inc/interfaces.inc
+2 -1 1 file

pfSense — etc/inc filter.inc

Merge pull request #1516 from phil-davis/patch-2
∈ Renato Botelho - 7136682e - 2015-02-26 12:25:41
Merge pull request #1515 from phil-davis/Style-updates
∈ Chris Buechler - 777291a2 - 2015-02-26 07:36:12
remove unused legacy code
Delta File
+0 -6 etc/inc/filter.inc
+0 -6 1 file

pfSense — etc/inc filter.inc

remove unused legacy code
Delta File
+0 -6 etc/inc/filter.inc
+0 -6 1 file

pfSense — etc/inc filter.inc

remove unused legacy code
Delta File
+0 -6 etc/inc/filter.inc
+0 -6 1 file

pfSense — etc/inc interfaces.inc

Log ifconfig commands used to setup wireless interfaces
Delta File
+7 -0 etc/inc/interfaces.inc
+7 -0 1 file

pfSense — etc/inc interfaces.inc

Log ifconfig commands used to setup wireless interfaces
Delta File
+7 -0 etc/inc/interfaces.inc
+7 -0 1 file