diff options
| -rwxr-xr-x | config/countryblock-dev/countryblock.inc | 11 | ||||
| -rw-r--r-- | config/countryblock-dev/countryblock.php | 7 | ||||
| -rwxr-xr-x | config/countryblock-dev/countryblock.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/config/countryblock-dev/countryblock.inc b/config/countryblock-dev/countryblock.inc index 68105ec1..7f526895 100755 --- a/config/countryblock-dev/countryblock.inc +++ b/config/countryblock-dev/countryblock.inc @@ -306,10 +306,13 @@ function countryblock_do_xmlrpc_sync($sync_to_ip, $password) { /* xml will hold the sections to sync */ $xml = array(); $xml['countryblock'] = $config['installedpackages']['countryblock']; - $xml['countryblockacl'] = $config['installedpackages']['countryblockacl']; - $xml['countryblockrecipients'] = $config['installedpackages']['countryblockrecipients']; - $xml['countryblockantispam'] = $config['installedpackages']['countryblockantispam']; - + $xml['countryblockafrica'] = $config['installedpackages']['countryblockafrica']; + $xml['countryblockantartica'] = $config['installedpackages']['countryblockantartica']; + $xml['countryblockasia'] = $config['installedpackages']['countryblockasia']; + $xml['countryblockeurope'] = $config['installedpackages']['countryblockeurope']; + $xml['countryblocknorthamerica'] = $config['installedpackages']['countryblocknorthamerica']; + $xml['countryblockoceania'] = $config['installedpackages']['countryblockoceania']; + $xml['countryblocksouthamerica'] = $config['installedpackages']['countryblocksouthamerica']; /* assemble xmlrpc payload */ $params = array( XML_RPC_encode($password), diff --git a/config/countryblock-dev/countryblock.php b/config/countryblock-dev/countryblock.php index 6df5f2bd..96822e12 100644 --- a/config/countryblock-dev/countryblock.php +++ b/config/countryblock-dev/countryblock.php @@ -50,6 +50,7 @@ foreach ($files as $cont => $file){ } } $cont_name= preg_replace("/ /","",$cont); +$cont_name_lower= strtolower($cont_name); #file_put_contents($cdir.'/'.$cont_name.'.txt',$ips,LOCK_EX); $xml= <<<EOF <?xml version="1.0" encoding="utf-8" ?> @@ -95,8 +96,8 @@ $xml= <<<EOF <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <name>countryblock_{$cont_name}</name> - <version>1.0</version> + <name>countryblock{$cont_name_lower}</name> + <version>1.0.1</version> <title>Firewall: Countryblock</title> <include_file>/usr/local/pkg/countryblock.inc</include_file> <menu> @@ -187,8 +188,6 @@ $xml= <<<EOF EOF; file_put_contents('/usr/local/pkg/countryblock_'.$cont_name.'.xml',$xml,LOCK_EX); - #var_dump($ips); - } } diff --git a/config/countryblock-dev/countryblock.xml b/config/countryblock-dev/countryblock.xml index 4bf3bda4..b98cf296 100755 --- a/config/countryblock-dev/countryblock.xml +++ b/config/countryblock-dev/countryblock.xml @@ -47,7 +47,7 @@ <title>Firewall: Countryblock</title> <include_file>/usr/local/pkg/countryblock.inc</include_file> <menu> - <name>Countryblock</name> + <name>Country Block</name> <tooltiptext>Configure Countryblock</tooltiptext> <section>Firewall</section> <url>pkg_edit.php?xml=countryblock.xml&id=0</url> @@ -171,7 +171,6 @@ If you want to create custom inbound rules for blocked countries based on Countryblock firewall alias, leave this list empty.]]></description> <type>interfaces_selection</type> <required/> - <default_value>wan</default_value> <multiple/> </field> <field> @@ -181,7 +180,6 @@ If you want to create custom outbound rules for blocked countries based on Countryblock firewall alias, leave this list empty.]]></description> <type>interfaces_selection</type> <required/> - <default_value>lan</default_value> <multiple/> </field> <field> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 746a3bd4..b4aa88f7 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -66,7 +66,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock-dev/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <version>0.4.0</version> + <version>0.4.1</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 1301413c..ca11e3c2 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -140,7 +140,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock-dev/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.4.0</version> + <version>0.4.1</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> |