diff options
| author | mcrane <mctch@yahoo.com> | 2009-10-05 13:54:50 -0600 |
|---|---|---|
| committer | mcrane <mctch@yahoo.com> | 2009-10-05 13:55:40 -0600 |
| commit | 3f477e046068c53d08fbd4db195615727592fcd8 (patch) | |
| tree | bbaed2603b88a2406ceb1bfe9595b6b2cf3cee20 | |
| parent | 21cd1918682363fb7912d632e269a589dd21aad4 (diff) | |
| download | pfsense-packages-3f477e046068c53d08fbd4db195615727592fcd8.tar.gz pfsense-packages-3f477e046068c53d08fbd4db195615727592fcd8.tar.bz2 pfsense-packages-3f477e046068c53d08fbd4db195615727592fcd8.zip | |
DNS Blacklist update wording, improve uninstall.
| -rw-r--r-- | config/dnsblacklist/dnsblacklist.inc | 12 | ||||
| -rw-r--r-- | config/dnsblacklist/dnsblacklist.tmp | 5 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/config/dnsblacklist/dnsblacklist.inc b/config/dnsblacklist/dnsblacklist.inc index 569bcbb8..8b957776 100644 --- a/config/dnsblacklist/dnsblacklist.inc +++ b/config/dnsblacklist/dnsblacklist.inc @@ -59,16 +59,10 @@ function byte_convert( $bytes ) { function phpservice_sync_package_php() { - global $config; - conf_mount_rw(); config_unlock(); - - conf_mount_ro(); - - } @@ -122,7 +116,6 @@ function php_install_command() conf_mount_ro(); config_unlock(); - } @@ -130,12 +123,11 @@ function deinstall_command() { conf_mount_rw(); config_lock(); - exec("rm -R /usr/local/www/packages/dnsblacklist/"); - $handle = popen("/usr/local/etc/rc.d/dnsblacklist.sh stop", "r"); unlink_if_exists("/usr/local/pkg/dnsblacklist.xml"); unlink_if_exists("/usr/local/pkg/dnsblacklist.inc"); - unlink_if_exists("/usr/local/etc/rc.d/dnsblacklist.sh"); + //unlink_if_exists("/usr/local/etc/rc.d/dnsblacklist.sh"); + exec("rm -R /usr/local/www/packages/dnsblacklist"); conf_mount_ro(); config_unlock(); } diff --git a/config/dnsblacklist/dnsblacklist.tmp b/config/dnsblacklist/dnsblacklist.tmp index 4edf4683..69ace333 100644 --- a/config/dnsblacklist/dnsblacklist.tmp +++ b/config/dnsblacklist/dnsblacklist.tmp @@ -26,7 +26,6 @@ $desc_en = trim($line_array[1]);
$category[$name]['desc_en'] = $desc_en;
}
-
}
//get line count for domains list
@@ -120,7 +119,7 @@ if (count($_POST)>0) { write_config();
services_dnsmasq_configure();
sleep(1);
- $savemsg_dnsb = "DNS Blacklist settings have been saved. Restart dnsmasq service under 'Status' then 'Services' to make the settings active.";
+ $savemsg_dnsb = "DNS Blacklist settings have been saved. ";
conf_mount_ro();
}
?>
@@ -144,7 +143,7 @@ else { <?php if ($savemsg_dnsb) print_info_box($savemsg_dnsb); ?>
Below is a scroll-box filled with categories you can select to be added to your blacklist. <br><br> Each category has a list of known domains/sites that will be denied access by users of this network.
-<br><br><i>(Note: Using all categories at once will require 300Mb of free memory. The <b>adult</b> and <b>porn</b> categories are rather memory intensive, requiring 200Mb together.)</i>
+<br><br><i>(Note: Using all categories at once will require 300Mb of free memory. The <b>adult</b> category is rather memory intensive, requiring 200Mb together.)</i>
<br><br><br>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 108bf9d2..7c239972 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -239,7 +239,7 @@ <pkginfolink></pkginfolink> <config_file>http://www.pfsense.com/packages/config/dnsblacklist/dnsblacklist.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2</version> + <version>0.2.1</version> <status>Beta</status> <required_version>1.2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> |