diff options
Diffstat (limited to 'config/pf-blocker')
| -rwxr-xr-x | config/pf-blocker/pfblocker.inc | 7 | ||||
| -rwxr-xr-x | config/pf-blocker/pfblocker.xml | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/config/pf-blocker/pfblocker.inc b/config/pf-blocker/pfblocker.inc index c0ea4982..95642d62 100755 --- a/config/pf-blocker/pfblocker.inc +++ b/config/pf-blocker/pfblocker.inc @@ -436,7 +436,7 @@ function sync_package_pfblocker() { } } #include all rules that is not from pfBlocker - if (!preg_match("/pfBlocker.*rule/",$rule['descr']) && $rule['interface'] != "") + if (!preg_match("/pfBlocker.*rule/",$rule['descr']) && ($rule['interface'] != "" || $rule['floating']=="yes")) $new_rules[]=$rule; } $config['filter']['rule']=$new_rules; @@ -472,7 +472,10 @@ function sync_package_pfblocker() { #update pfctrl tables foreach ($aliases_list as $table) exec("/sbin/pfctl -t " . escapeshellarg($table) . " -T kill 2>&1", $result_pfb); - + + #uncheck donation and credits check box + $config['installedpackages']['pfblocker']['config'][0]['donation']=""; + $config['installedpackages']['pfblocker']['config'][0]['credits']=""; #write config write_config(); diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml index 3485cf6f..2a092963 100755 --- a/config/pf-blocker/pfblocker.xml +++ b/config/pf-blocker/pfblocker.xml @@ -214,7 +214,25 @@ <option><name>Block</name><value>block</value></option> </options> </field> - + <field> + <name>About pfBlocker</name> + <type>listtopic</type> + </field> + <field> + <fielddescr>Credits</fielddescr> + <fieldname>credits</fieldname> + <type>checkbox</type> + <description><![CDATA[Continent Lists are provided by <a target=_new href='http://www.countryipblocks.net/'>countryipblocks.net</a>.<br> + Dynamic rules can be found in <a target=_new href='http://www.iblocklist.com/'>I-Blocklist.com</a>.</br> + Created by <a target=_new href='http://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a> and <a target=_new href='http://www.tomschaefer.org/pfsense'>TomSchaefer</a>.<br>]]></description> + </field> + <field> + <fielddescr>Donation</fielddescr> + <fieldname>donation</fieldname> + <type>checkbox</type> + <description><![CDATA[If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br> + If you want that your donation goes to these package developers, make a note on donation forwarding it to us.<br>]]></description> + </field> </fields> <custom_php_install_command> pfblocker_php_install_command(); |