diff options
| -rwxr-xr-x | config/pf-blocker/pfblocker.inc | 7 | ||||
| -rwxr-xr-x | config/pf-blocker/pfblocker.xml | 20 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 26 insertions, 5 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(); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index f7a5f6b1..2ab0be3f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -69,7 +69,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,42543.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/pf-blocker/pfblocker.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <version>0.1.4.5</version> + <version>0.1.4.6</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org marcellocoutinho@gmail.com</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 87f6d6dd..25aa1849 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -144,7 +144,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,42543.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/pf-blocker/pfblocker.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.1.4.5</version> + <version>0.1.4.6</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org marcellocoutinho@gmail.com</maintainer> |