From e6debb6d8640267ee85dae38823241c882f39f26 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 21 Apr 2011 08:59:40 +0200 Subject: fix Bug #1423 --- config/countryblock/countryblock.xml | 400 +++++++++++++++---------------- config/open-vm-tools_2/open-vm-tools.inc | 4 +- 2 files changed, 202 insertions(+), 202 deletions(-) (limited to 'config') diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index 57751376..6db76830 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -1,200 +1,200 @@ - - - - - - - - Country Block - Active Internet - http://forum.pfsense.org/index.php/topic,25732.0.html - Country Block Settings - 0.2.1 - Settings - /usr/local/pkg/countryblock.inc - - Country Block - Country Block settings -
Firewall
- countryblock.xml - /packages/countryblock/countryblock.php -
- - - Settings - /packages/countryblock/countryblock.php - - - - installedpackages->package->$packagename->configuration->countryblock - - /usr/local/pkg/ - 0755 - http://www.pfsense.org/packages/config/countryblock/countryblock.xml - - - /usr/local/pkg/ - 0755 - http://www.pfsense.org/packages/config/countryblock/countryblock.inc - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/interfaces.txt - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/countryblock.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/execute.sh - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/countryblock.sh - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/index.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/ddaccordion.js - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/jquery.min.js - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/public_smo_scripts.js - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/titlebar.png - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/titlebar-active.png - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/purge.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/whitelist.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/countryblock_if.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/firewall_shaper.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/help.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/settings.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/class.phpmailer.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/class.smtp.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/email.tmp - - - /tmp/ - 0755 - http://www.pfsense.org/packages/config/countryblock/CIDR.tar.gz - - - - Variable One - var1 - Enter the variable one here. - input - - - Variable Two - var1 - Enter the variable one here. - input - - - - - - php_sync_package_cb(); - - - php_sync_package_cb(); - - - php_install_command_cb(); - - - deinstall_command_cb(); - -
+ + + + + + + + Country Block + Active Internet + http://forum.pfsense.org/index.php/topic,25732.0.html + Country Block Settings + 0.2.1 + Settings + /usr/local/pkg/countryblock.inc + + Country Block + Country Block settings +
Firewall
+ countryblock.xml + /packages/countryblock/countryblock.php +
+ + + Settings + /packages/countryblock/countryblock.php + + + + installedpackages->package->$packagename->configuration->countryblock + + /usr/local/pkg/ + 0755 + http://www.pfsense.org/packages/config/countryblock/countryblock.xml + + + /usr/local/pkg/ + 0755 + http://www.pfsense.org/packages/config/countryblock/countryblock.inc + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/interfaces.txt + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/countryblock.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/execute.sh + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/countryblock.sh + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/index.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/ddaccordion.js + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/jquery.min.js + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/public_smo_scripts.js + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/titlebar.png + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/titlebar-active.png + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/purge.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/whitelist.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/countryblock_if.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/firewall_shaper.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/help.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/settings.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/class.phpmailer.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/class.smtp.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/email.tmp + + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/countryblock/CIDR.tar.gz + + + + Variable One + var1 + Enter the variable one here. + input + + + Variable Two + var1 + Enter the variable one here. + input + + + + + + php_sync_package_cb(); + + + php_sync_package_cb(); + + + php_install_command_cb(); + + + deinstall_command_cb(); + +
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 74adec26..80c464f7 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -10,12 +10,12 @@ function open_vm_tools_install() { touch("/boot/loader.conf"); $load_conf = file_get_contents("/boot/loader.conf"); if(!strstr("vmxnet")) { - $load_conf .= <<