DNS Blacklist minor wording change, uninstall adjumestment removed config_lock();

3 files changed, 7 insertions, 10 deletions

diff --git a/config/dnsblacklist/dnsblacklist.inc b/config/dnsblacklist/dnsblacklist.inc
index 8b957776..4ef0a1d6 100644
--- a/config/dnsblacklist/dnsblacklist.inc
+++ b/config/dnsblacklist/dnsblacklist.inc
@@ -69,7 +69,6 @@ function phpservice_sync_package_php()
 function php_sync_package() 
 {
 	global $config;
-	phpservice_sync_package_php();
 }
 
 
@@ -119,17 +118,15 @@ function php_install_command()
 }
 
 
-function deinstall_command() 
+function php_deinstall_command() 
 {
 	conf_mount_rw();
-	config_lock();
 	$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");
+	exec("rm -R /usr/local/www/packages/dnsblacklist/blacklists");
 	exec("rm -R /usr/local/www/packages/dnsblacklist");
 	conf_mount_ro();
-	config_unlock();
 }
 
 ?>
\ No newline at end of file
diff --git a/config/dnsblacklist/dnsblacklist.tmp b/config/dnsblacklist/dnsblacklist.tmp
index 69ace333..a6d67bb1 100644
--- a/config/dnsblacklist/dnsblacklist.tmp
+++ b/config/dnsblacklist/dnsblacklist.tmp
@@ -143,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> category is 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.)</i>

 <br><br><br>

 

 

diff --git a/config/dnsblacklist/dnsblacklist.xml b/config/dnsblacklist/dnsblacklist.xml
index 9082191c..1a51e1d4 100644
--- a/config/dnsblacklist/dnsblacklist.xml
+++ b/config/dnsblacklist/dnsblacklist.xml
@@ -7,7 +7,7 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-	phpservice.xml
+	dnsblacklist.xml
 	Copyright (C) 2009 Mark J Crane
 	All rights reserved.
                                                                               */
@@ -41,12 +41,12 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>DNS Blacklist Settings</name>
-	<version>0.2</version>
+	<version>0.2.2</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/dnsblacklist.inc</include_file>
 	<menu>
 		<name>DNS Blacklist</name>
-		<tooltiptext>PHP Service settings.</tooltiptext>
+		<tooltiptext>DNS Blacklist settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>dnsblacklist.xml</configfile>
 		<url>/packages/dnsblacklist/dnsblacklist.php</url>
@@ -105,6 +105,6 @@
 		php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		deinstall_command();
+		php_deinstall_command();
 	</custom_php_deinstall_command>
 </packagegui>
\ No newline at end of file