From 7bcc2b400314dff7235bb635a9968d04d2e7df76 Mon Sep 17 00:00:00 2001 From: Tom Schaefer Date: Sun, 25 Jul 2010 15:08:58 -0400 Subject: Updated countryblock to 1.3 --- config/countryblock/countryblock.inc | 8 +++++-- config/countryblock/countryblock.tmp | 46 ++++++++++++++++++++++++------------ config/countryblock/countryblock.xml | 14 +++++++++-- config/countryblock/execute.sh | 6 ++++- pkg_config.7.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 7 files changed, 57 insertions(+), 23 deletions(-) diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index 39a22243..1f94dff1 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -72,10 +72,14 @@ function php_install_command() unlink_if_exists("/tmp/ddaccordion.js"); exec("cp /tmp/public_smo_scripts.js /usr/local/www/packages/countryblock/public_smo_scripts.js"); unlink_if_exists("/tmp/public_smo_scripts.js"); - exec("cp /tmp/titlebar.png /usr/local/www/packages/countryblock/titlebar.pngs"); + exec("cp /tmp/titlebar.png /usr/local/www/packages/countryblock/titlebar.png"); unlink_if_exists("/tmp/titlebar.png"); exec("cp /tmp/titlebar-active.png /usr/local/www/packages/countryblock/titlebar-active.png"); unlink_if_exists("/tmp/titlebar-active.png"); + exec("cp /tmp/purge.tmp /usr/local/www/packages/countryblock/purge.php"); + unlink_if_exists("/tmp/purge.tmp"); + exec("cp /tmp/whitelist.tmp /usr/local/www/packages/countryblock/whitelist.php"); + unlink_if_exists("/tmp/whitelist.tmp"); @@ -99,4 +103,4 @@ function deinstall_command() conf_mount_ro(); } -?> \ No newline at end of file +?> diff --git a/config/countryblock/countryblock.tmp b/config/countryblock/countryblock.tmp index 6c080c06..dff73e11 100644 --- a/config/countryblock/countryblock.tmp +++ b/config/countryblock/countryblock.tmp @@ -74,8 +74,16 @@ if (count($_POST)>0) { conf_mount_ro(); } ?> - + + +

Firewall: Country Block

@@ -135,7 +143,7 @@ mwexec("touch countries.txt"); } } ?> - + @@ -179,6 +187,8 @@ ddaccordion.init({