pfBlocker-dev - update files and dir references

6 files changed, 164 insertions, 173 deletions

diff --git a/config/pf-blocker/pfblocker.inc b/config/pf-blocker/pfblocker.inc
index 5844f3d1..7631111a 100755
--- a/config/pf-blocker/pfblocker.inc
+++ b/config/pf-blocker/pfblocker.inc
@@ -1,6 +1,6 @@
 <?php
 /*
-	countryblock.inc
+	pfblocker.inc
 	part of the Postfix package for pfSense
 	Copyright (C) 2010 Erik Fonnesbeck
 	Copyright (C) 2011 Marcello Coutinho
@@ -35,7 +35,7 @@ require_once("pkg-utils.inc");
 require_once("globals.inc");
 require_once("filter.inc");
 	
-function cb_text_area_decode($text){
+function pfb_text_area_decode($text){
 	return preg_replace('/\r\n/', "\n",base64_decode($text));	
 }
 
@@ -47,9 +47,9 @@ function cb_get_real_interface_address($iface) {
 	return array($ip, long2ip(hexdec($netmask)));
 }
 
-function sync_package_countryblock() {
+function sync_package_pfblocker() {
 	global $config;
-	$countryblock_config=$config['installedpackages']['countryblock']['config'][0];
+	$pfblocker_config=$config['installedpackages']['pfblocker']['config'][0];
 	$continents= array("Africa","Antartica","Asia","Europe","North America","Oceania","South America");
 
 	#get local web gui configuration
@@ -61,85 +61,85 @@ function sync_package_countryblock() {
 		else 
 			$port = "443";
     }
-    $web_local .= "://127.0.0.1:".$port.'/countryblock.php';
+    $web_local .= "://127.0.0.1:".$port.'/pfblocker.php';
 	
 	#get all selected countries
-	$countries=$config['installedpackages']['countryblock']['config'][0]['topspammers'].",";
+	$countries=$config['installedpackages']['pfblocker']['config'][0]['topspammers'].",";
 	foreach ($continents as $continent){
-		if (is_array($config['installedpackages']['countryblock'.strtolower(preg_replace('/ /','',$continent))]['config']))
-			$countries.=$config['installedpackages']['countryblock'.strtolower(preg_replace('/ /','',$continent))]['config'][0]['countries'].",";
+		if (is_array($config['installedpackages']['pfblocker'.strtolower(preg_replace('/ /','',$continent))]['config']))
+			$countries.=$config['installedpackages']['pfblocker'.strtolower(preg_replace('/ /','',$continent))]['config'][0]['countries'].",";
 	}
 	$cb_files = explode(",", $countries);
 	$ips="";
     foreach ($cb_files as $iso){
 		if ($iso <> ""){
-			if (file_exists('/usr/local/pkg/countryblock/'.$iso.'.txt'))
-				$ips.=file_get_contents('/usr/local/pkg/countryblock/'.$iso.'.txt');
+			if (file_exists('/usr/local/pkg/pfblocker/'.$iso.'.txt'))
+				$ips.=file_get_contents('/usr/local/pkg/pfblocker/'.$iso.'.txt');
 		}
 	}
-	#create all ip block lists based on gui
+	#create all country block lists based on gui
 	file_put_contents('/usr/local/pkg/cb.txt',$ips, LOCK_EX);
 	
 	#write white_list to filesystem
-	file_put_contents('/usr/local/pkg/cbw.txt',cb_text_area_decode($countryblock_config['whitelist']), LOCK_EX);
+	file_put_contents('/usr/local/pkg/cbw.txt',pfb_text_area_decode($pfblocker_config['whitelist']), LOCK_EX);
 
-	#edit or assign alias "Countryblock" and "CountryblockWL" 
+	#edit or assign alias "pfblocker" and "pfblockerWL" 
 	$aliases=$config['aliases']['alias'];
 	#print "<pre>";
 	$new_aliases=array();
 	if ($ips != ""){
 		#create or reaply alias
-		$new_aliases[]=array("name"=> 'Countryblock',
+		$new_aliases[]=array("name"=> 'pfblocker',
 					  		 "url"=> $web_local.'?cb=1',
 					  		 "updatefreq"=> "7",
 					  		 "address"=>"",
-					  		 "descr"=> "Countryblock deny list",
+					  		 "descr"=> "pfblocker deny list",
 					  		 "type"=> "urltable",
 					  		 "detail"=> "DO NOT EDIT THIS ALIAS");
 		#force alias file update
 		if (! is_dir('/var/db/aliastables/'))
 			mkdir ('/var/db/aliastables/',0755);
-		if (file_exists('/var/db/aliastables/Countryblock.txt'))
-			file_put_contents('/var/db/aliastables/Countryblock.txt',$ips, LOCK_EX);
+		if (file_exists('/var/db/aliastables/pfblocker.txt'))
+			file_put_contents('/var/db/aliastables/pfblocker.txt',$ips, LOCK_EX);
 		}
 	else{
 		#remove previous aliastable if exist
-		if (file_exists('/var/db/aliastables/Countryblock.txt'))
-			unlink('/var/db/aliastables/Countryblock.txt');
+		if (file_exists('/var/db/aliastables/pfblocker.txt'))
+			unlink('/var/db/aliastables/pfblocker.txt');
 	}
 	
-	if (cb_text_area_decode($countryblock_config['whitelist']) != ""){
+	if (pfb_text_area_decode($pfblocker_config['whitelist']) != ""){
 		#create or reaply alias
-		$new_aliases[]=array("name"=> 'CountryblockWL',
+		$new_aliases[]=array("name"=> 'pfblockerWL',
 						  	 "url"=> $web_local.'?cbw=1',
 						  	 "updatefreq"=> "7",
 						  	 "address"=>"",
-						  	 "descr"=> "Countryblock white list",
+						  	 "descr"=> "pfblocker white list",
 						  	 "type"=> "urltable",
 						  	 "detail"=> "DO NOT EDIT THIS ALIAS");
 		#force alias file update
 		if (! is_dir('/var/db/aliastables/'))
 			mkdir ('/var/db/aliastables/',0755);
-		if (file_exists('/var/db/aliastables/CountryblockWL.txt'))
-			file_put_contents('/var/db/aliastables/CountryblockWL.txt',cb_text_area_decode($countryblock_config['whitelist']), LOCK_EX);
+		if (file_exists('/var/db/aliastables/pfblockerWL.txt'))
+			file_put_contents('/var/db/aliastables/pfblockerWL.txt',pfb_text_area_decode($pfblocker_config['whitelist']), LOCK_EX);
 		}
 	else{
 		#remove previous aliastable if exist
-		if (file_exists('/var/db/aliastables/CountryblockWL.txt'))
-			unlink('/var/db/aliastables/CountryblockWL.txt');
+		if (file_exists('/var/db/aliastables/pfblockerWL.txt'))
+			unlink('/var/db/aliastables/pfblockerWL.txt');
 	}
 	
 	if (is_array($aliases))
 	  foreach($aliases as $cbalias){
-		if (! preg_match("/Countryblock.*list/",$cbalias['descr']))
+		if (! preg_match("/pfblocker.*list/",$cbalias['descr']))
 			$new_aliases[]=	$cbalias;
 	}
 	$config['aliases']['alias']=$new_aliases;
 	# check contryblock filter options
 	$rules=$config['filter']['rule'];
-	$ifaces = $countryblock_config['inbound_interface'];
+	$ifaces = $pfblocker_config['inbound_interface'];
     foreach (explode(",", $ifaces) as $i => $iface) {
-    	if (cb_text_area_decode($countryblock_config['whitelist']) != ""){
+    	if (pfb_text_area_decode($pfblocker_config['whitelist']) != ""){
 			${$iface}[0]=array("id" => "",
 					"type"=>"pass",
 					"tag"=>	"",
@@ -152,11 +152,11 @@ function sync_package_countryblock() {
 					"statetimeout"=>"",
 					"statetype"=>"keep state",
 					"os"=> "",
-					"source"=>array("address"=>"CountryblockWL"),
+					"source"=>array("address"=>"pfblockerWL"),
     				"destination"=>array("any"=>""),
-    				"descr"=>"Countryblock inbound whitelist rule");
+    				"descr"=>"pfblocker inbound whitelist rule");
 
-			if ($countryblock_config['enable_log'])
+			if ($pfblocker_config['enable_log'])
 				${$iface}[0]["log"]="";
     	}
 		if ($ips != ""){
@@ -172,17 +172,17 @@ function sync_package_countryblock() {
 							"statetimeout"=>"",
 						    "statetype"=>"keep state",
 							"os"=> "",
-							"source"=>array("address"=>"Countryblock"),
+							"source"=>array("address"=>"pfblocker"),
     						"destination"=>array("any"=>""),
-    						"descr"=>"Countryblock inbound deny rule");
+    						"descr"=>"pfblocker inbound deny rule");
 
-			if ($countryblock_config['enable_log'])
+			if ($pfblocker_config['enable_log'])
 				${$iface}[1]["log"]="";
 		}
 	}
-	$ifaces = $countryblock_config['outbound_interface'];
+	$ifaces = $pfblocker_config['outbound_interface'];
     foreach (explode(",", $ifaces) as $i => $iface) {
-    	if (cb_text_area_decode($countryblock_config['whitelist']) != ""){
+    	if (pfb_text_area_decode($pfblocker_config['whitelist']) != ""){
 			${$iface}[2]=array(	"id" => "",
 							"type"=>"pass",
 							"tag"=>	"",
@@ -196,9 +196,9 @@ function sync_package_countryblock() {
 							"statetype"=>"keep state",
 							"os"=> "",
     						"source"=>array("any"=>""),
-    						"destination"=>array("address"=>"CountryblockWL"),
-    						"descr"=>"Countryblock outbound whitelist rule");
-		if ($countryblock_config['enable_log'])
+    						"destination"=>array("address"=>"pfblockerWL"),
+    						"descr"=>"pfblocker outbound whitelist rule");
+		if ($pfblocker_config['enable_log'])
 				${$iface}[2]["log"]="";			
     	}
 		if ($ips != ""){
@@ -215,9 +215,9 @@ function sync_package_countryblock() {
 							"statetype"=>"keep state",
 							"os"=> "",
     						"source"=>array("any"=>""),
-    						"destination"=>array("address"=>"Countryblock"),
-    						"descr"=>"Countryblock inbound deny rule");
-			if ($countryblock_config['enable_log'])
+    						"destination"=>array("address"=>"pfblocker"),
+    						"descr"=>"pfblocker inbound deny rule");
+			if ($pfblocker_config['enable_log'])
 				${$iface}[3]["log"]="";
 			
 		}
@@ -227,12 +227,12 @@ function sync_package_countryblock() {
 	foreach ($rules as $rule){
 		if ($rule['interface'] <> $last_iface){
 			$last_iface = $rule['interface'];
-			#apply countryblock rules if enabled
-			if ($config['installedpackages']['countryblock']['config'][0]['enable_cb'] == "on" && is_array(${$rule['interface']}))
+			#apply pfblocker rules if enabled
+			if ($config['installedpackages']['pfblocker']['config'][0]['enable_cb'] == "on" && is_array(${$rule['interface']}))
 				foreach (${$rule['interface']} as $cb_rules)
 					$new_rules[]=$cb_rules;
 		}
-		if (!preg_match("/Countryblock.*rule/",$rule['descr']))
+		if (!preg_match("/pfblocker.*rule/",$rule['descr']))
 			$new_rules[]=$rule;	
 	}
 	$config['filter']['rule']=$new_rules;
@@ -241,10 +241,10 @@ function sync_package_countryblock() {
 	write_config();
 	filter_configure();
 		
-	countryblock_sync_on_changes();
+	pfblocker_sync_on_changes();
 }
 
-function countryblock_validate_input($post, &$input_errors) {
+function pfblocker_validate_input($post, &$input_errors) {
 	foreach ($post as $key => $value) {
 		if (empty($value))
 			continue;
@@ -270,39 +270,39 @@ function countryblock_validate_input($post, &$input_errors) {
 	}
 }
 
-function countryblock_php_install_command() {
-	include_once '/usr/local/www/countryblock.php';
-	countryblock_get_countries();
-	sync_package_countryblock();
+function pfblocker_php_install_command() {
+	include_once '/usr/local/www/pfblocker.php';
+	pfblocker_get_countries();
+	sync_package_pfblocker();
 }
 
-function countryblock_php_deinstall_command() {
+function pfblocker_php_deinstall_command() {
 	global $config;
-	$config['installedpackages']['countryblock']['config'][0]['enable_cb']="";
+	$config['installedpackages']['pfblocker']['config'][0]['enable_cb']="";
 	write_config();
-	sync_package_countryblock();
+	sync_package_pfblocker();
 }
 
 /* Uses XMLRPC to synchronize the changes to a remote node */
-function countryblock_sync_on_changes() {
+function pfblocker_sync_on_changes() {
 	global $config, $g;
-	log_error("[countryblock] countryblock_xmlrpc_sync.php is starting.");
-	$synconchanges = $config['installedpackages']['countryblocksync']['config'][0]['synconchanges'];	
+	log_error("[pfblocker] pfblocker_xmlrpc_sync.php is starting.");
+	$synconchanges = $config['installedpackages']['pfblockersync']['config'][0]['synconchanges'];	
 	if(!$synconchanges) 
 		return;
-	foreach ($config['installedpackages']['countryblocksync']['config'] as $rs ){
+	foreach ($config['installedpackages']['pfblockersync']['config'] as $rs ){
 		foreach($rs['row'] as $sh){
 		$sync_to_ip = $sh['ipaddress'];
 		$password   = $sh['password'];
 		if($password && $sync_to_ip)
-			countryblock_do_xmlrpc_sync($sync_to_ip, $password);
+			pfblocker_do_xmlrpc_sync($sync_to_ip, $password);
 		}
 	}
-	log_error("[countryblock] countryblock_xmlrpc_sync.php is ending.");
+	log_error("[pfblocker] pfblocker_xmlrpc_sync.php is ending.");
 }
 
 /* Do the actual XMLRPC sync */
-function countryblock_do_xmlrpc_sync($sync_to_ip, $password) {
+function pfblocker_do_xmlrpc_sync($sync_to_ip, $password) {
 	global $config, $g;
 
 	if(!$password)
@@ -328,14 +328,14 @@ function countryblock_do_xmlrpc_sync($sync_to_ip, $password) {
 
 	/* xml will hold the sections to sync */
 	$xml = array();
-	$xml['countryblock'] = $config['installedpackages']['countryblock'];
-	$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'];
+	$xml['pfblocker'] = $config['installedpackages']['pfblocker'];
+	$xml['pfblockerafrica'] = $config['installedpackages']['pfblockerafrica'];
+	$xml['pfblockerantartica'] = $config['installedpackages']['pfblockerantartica'];
+	$xml['pfblockerasia'] = $config['installedpackages']['pfblockerasia'];
+	$xml['pfblockereurope'] = $config['installedpackages']['pfblockereurope'];
+	$xml['pfblockernorthamerica'] = $config['installedpackages']['pfblockernorthamerica'];
+	$xml['pfblockeroceania'] = $config['installedpackages']['pfblockeroceania'];
+	$xml['pfblockersouthamerica'] = $config['installedpackages']['pfblockersouthamerica'];
 	/* assemble xmlrpc payload */
 	$params = array(
 		XML_RPC_encode($password),
@@ -344,7 +344,7 @@ function countryblock_do_xmlrpc_sync($sync_to_ip, $password) {
 
 	/* set a few variables needed for sync code borrowed from filter.inc */
 	$url = $synchronizetoip;
-	log_error("Beginning countryblock XMLRPC sync to {$url}:{$port}.");
+	log_error("Beginning pfblocker XMLRPC sync to {$url}:{$port}.");
 	$method = 'pfsense.merge_installedpackages_section_xmlrpc';
 	$msg = new XML_RPC_Message($method, $params);
 	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
@@ -354,23 +354,23 @@ function countryblock_do_xmlrpc_sync($sync_to_ip, $password) {
 	/* send our XMLRPC message and timeout after 250 seconds */
 	$resp = $cli->send($msg, "250");
 	if(!$resp) {
-		$error = "A communications error occurred while attempting countryblock XMLRPC sync with {$url}:{$port}.";
+		$error = "A communications error occurred while attempting pfblocker XMLRPC sync with {$url}:{$port}.";
 		log_error($error);
-		file_notice("sync_settings", $error, "countryblock Settings Sync", "");
+		file_notice("sync_settings", $error, "pfblocker Settings Sync", "");
 	} elseif($resp->faultCode()) {
 		$cli->setDebug(1);
 		$resp = $cli->send($msg, "250");
-		$error = "An error code was received while attempting countryblock XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+		$error = "An error code was received while attempting pfblocker XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
 		log_error($error);
-		file_notice("sync_settings", $error, "countryblock Settings Sync", "");
+		file_notice("sync_settings", $error, "pfblocker Settings Sync", "");
 	} else {
-		log_error("countryblock XMLRPC sync successfully completed with {$url}:{$port}.");
+		log_error("pfblocker XMLRPC sync successfully completed with {$url}:{$port}.");
 	}
 	
-	/* tell countryblock to reload our settings on the destionation sync host. */
+	/* tell pfblocker to reload our settings on the destionation sync host. */
 	$method = 'pfsense.exec_php';
-	$execcmd  = "require_once('/usr/local/pkg/countryblock.inc');\n";
-	$execcmd .= "sync_package_countryblock();";
+	$execcmd  = "require_once('/usr/local/pkg/pfblocker.inc');\n";
+	$execcmd .= "sync_package_pfblocker();";
 	
 	/* assemble xmlrpc payload */
 	$params = array(
@@ -378,23 +378,23 @@ function countryblock_do_xmlrpc_sync($sync_to_ip, $password) {
 		XML_RPC_encode($execcmd)
 	);
 
-	log_error("countryblock XMLRPC reload data {$url}:{$port}.");
+	log_error("pfblocker XMLRPC reload data {$url}:{$port}.");
 	$msg = new XML_RPC_Message($method, $params);
 	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
 	$cli->setCredentials('admin', $password);
 	$resp = $cli->send($msg, "250");
 	if(!$resp) {
-		$error = "A communications error occurred while attempting countryblock XMLRPC sync with {$url}:{$port} (pfsense.exec_php).";
+		$error = "A communications error occurred while attempting pfblocker XMLRPC sync with {$url}:{$port} (pfsense.exec_php).";
 		log_error($error);
-		file_notice("sync_settings", $error, "countryblock Settings Sync", "");
+		file_notice("sync_settings", $error, "pfblocker Settings Sync", "");
 	} elseif($resp->faultCode()) {
 		$cli->setDebug(1);
 		$resp = $cli->send($msg, "250");
-		$error = "An error code was received while attempting countryblock XMLRPC exec with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+		$error = "An error code was received while attempting pfblocker XMLRPC exec with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
 		log_error($error);
-		file_notice("sync_settings", $error, "countryblock Settings Sync", "");
+		file_notice("sync_settings", $error, "pfblocker Settings Sync", "");
 	} else {
-		log_error("countryblock XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php).");
+		log_error("pfblocker XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php).");
 	}
 
 }
diff --git a/config/pf-blocker/pfblocker.php b/config/pf-blocker/pfblocker.php
index 5d0f825a..73d3d466 100644
--- a/config/pf-blocker/pfblocker.php
+++ b/config/pf-blocker/pfblocker.php
@@ -15,7 +15,7 @@ if ($_REQUEST['cbw']== 1){# and $_SERVER['REMOTE_ADDR']== '127.0.0.1'){
 	get_networks(2);
 }
 
-function countryblock_get_countries(){
+function pfblocker_get_countries(){
 $files= array (	"Africa" => "/usr/local/pkg/Africa_cidr.txt",
 				"Antartica" => "/usr/local/pkg/Antartica_cidr.txt",
 				"Asia" => "/usr/local/pkg/Asia_cidr.txt",
@@ -23,7 +23,7 @@ $files= array (	"Africa" => "/usr/local/pkg/Africa_cidr.txt",
 				"North America" => "/usr/local/pkg/North_America_cidr.txt",
 				"Oceania" => "/usr/local/pkg/Oceania_cidr.txt",
 				"South America"=>"/usr/local/pkg/South_America_cidr.txt");
-$cdir='/usr/local/pkg/countryblock';
+$cdir='/usr/local/pkg/pfblocker';
 if (! is_dir($cdir))
 	mkdir ($cdir,0755);
 foreach ($files as $cont => $file){
@@ -64,8 +64,8 @@ $xml= <<<EOF
 /* \$Id$ */
 /* ========================================================================== */
 /*
-    countryblock_{$cont_name}.xml
-    part of the Countryblock package for pfSense
+    pfblocker_{$cont_name}.xml
+    part of the pfblocker package for pfSense
     Copyright (C) 2011 Marcello Coutinho
     All rights reserved.            
                                                                   */
@@ -98,62 +98,59 @@ $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_lower}</name>
-	<version>1.0.1</version>
-	<title>Firewall: Countryblock</title>
-	<include_file>/usr/local/pkg/countryblock.inc</include_file>
+	<name>pfblocker{$cont_name_lower}</name>
+	<version>1.0</version>
+	<title>Firewall: pfblocker</title>
+	<include_file>/usr/local/pkg/pfblocker.inc</include_file>
 	<menu>
-		<name>Countryblock</name>
-		<tooltiptext>Configure Countryblock</tooltiptext>
+		<name>pfBlocker</name>
+		<tooltiptext>Configure pfblocker</tooltiptext>
 		<section>Firewall</section>
-		<url>pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+		<url>pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 	</menu>
-	<service>
-		<name>countryblock</name>
-	</service>
 <tabs>
 		<tab>
 			<text>General</text>
-			<url>/pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>Africa</text>
-			<url>/pkg_edit.php?xml=countryblock_Africa.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Africa.xml&amp;id=0</url>
 			{$active['Africa']}
 		</tab>
 		<tab>
 			<text>Antartica</text>
-			<url>/pkg_edit.php?xml=countryblock_Antartica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Antartica.xml&amp;id=0</url>
 			{$active['Antartica']}
 		</tab>
 		<tab>
 			<text>Asia</text>
-			<url>/pkg_edit.php?xml=countryblock_Asia.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Asia.xml&amp;id=0</url>
 			{$active['Asia']}
 		</tab>
 		<tab>
 			<text>Europe</text>
-			<url>/pkg_edit.php?xml=countryblock_Europe.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Europe.xml&amp;id=0</url>
 			{$active['Europe']}
 		</tab>
 		<tab>
 			<text>North America</text>
-			<url>/pkg_edit.php?xml=countryblock_NorthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_NorthAmerica.xml&amp;id=0</url>
 			{$active['North America']}
 		</tab>
 		<tab>
 			<text>Oceania</text>
-			<url>/pkg_edit.php?xml=countryblock_Oceania.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Oceania.xml&amp;id=0</url>
 			{$active['Oceania']}
 		</tab>
 		<tab>
 			<text>South America</text>
-			<url>/pkg_edit.php?xml=countryblock_SouthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_SouthAmerica.xml&amp;id=0</url>
 			{$active['South America']}
 		</tab>
 		<tab>
 			<text>XMLRPC Sync</text>
-			<url>/pkg_edit.php?xml=countryblock_sync.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_sync.xml&amp;id=0</url>
 		</tab>
 </tabs>
 	<fields>
@@ -175,20 +172,20 @@ $xml= <<<EOF
 				<multiple/>
 		</field>	</fields>
 	<custom_php_install_command>
-		countryblock_php_install_command();
+		pfblocker_php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		countryblock_php_deinstall_command();
+		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		countryblock_validate_input(\$_POST, &amp;\$input_errors);
+		pfblocker_validate_input(\$_POST, &amp;\$input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
-		sync_package_countryblock();
+		sync_package_pfblocker();
 	</custom_php_resync_config_command>
 </packagegui>
 EOF;
-	file_put_contents('/usr/local/pkg/countryblock_'.$cont_name.'.xml',$xml,LOCK_EX);
+	file_put_contents('/usr/local/pkg/pfblocker_'.$cont_name.'.xml',$xml,LOCK_EX);
 	
 }
 	
diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml
index 20e34462..b2ec4c50 100755
--- a/config/pf-blocker/pfblocker.xml
+++ b/config/pf-blocker/pfblocker.xml
@@ -7,8 +7,8 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-    Countryblock.xml
-    part of the Countryblock for pfSense
+    pfblocker.xml
+    part of the pfblocker for pfSense
     Copyright (C) 2011 Marcello Coutinho
 
     All rights reserved.            
@@ -42,31 +42,28 @@
 	<description>Describe your package here</description>
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
-	<name>countryblock</name>
+	<name>pfblocker</name>
 	<version>1.0</version>
-	<title>Firewall: Countryblock</title>
-	<include_file>/usr/local/pkg/countryblock.inc</include_file>
+	<title>Firewall: pfBlocker</title>
+	<include_file>/usr/local/pkg/pfblocker.inc</include_file>
 	<menu>
-		<name>Country Block</name>
-		<tooltiptext>Configure Countryblock</tooltiptext>
+		<name>pfBlocker</name>
+		<tooltiptext>Configure pfblocker</tooltiptext>
 		<section>Firewall</section>
-		<url>pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+		<url>pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 	</menu>
-	<service>
-		<name>countryblock</name>
-	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/countryblock-dev/countryblock.inc</item>
+		<item>http://www.pfsense.org/packages/config/pfblocker-dev/pfblocker.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/countryblock-dev/countryblock.php</item>
+		<item>http://www.pfsense.org/packages/config/pfblocker-dev/pfblocker.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/countryblock-dev/countryblock_sync.xml</item>
+		<item>http://www.pfsense.org/packages/config/pfblocker-dev/pfblocker_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
@@ -108,58 +105,58 @@
 <tabs>
 		<tab>
 			<text>General</text>
-			<url>/pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
 			<text>Africa</text>
-			<url>/pkg_edit.php?xml=countryblock_Africa.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Africa.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Antartica</text>
-			<url>/pkg_edit.php?xml=countryblock_Antartica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Antartica.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Asia</text>
-			<url>/pkg_edit.php?xml=countryblock_Asia.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Asia.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Europe</text>
-			<url>/pkg_edit.php?xml=countryblock_Europe.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Europe.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>North America</text>
-			<url>/pkg_edit.php?xml=countryblock_NorthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_NorthAmerica.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>Oceania</text>
-			<url>/pkg_edit.php?xml=countryblock_Oceania.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Oceania.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>South America</text>
-			<url>/pkg_edit.php?xml=countryblock_SouthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_SouthAmerica.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>XMLRPC Sync</text>
-			<url>/pkg_edit.php?xml=countryblock_sync.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_sync.xml&amp;id=0</url>
 		</tab>
 </tabs>
 	<fields>
 		<field>
-			<name>Countryblock General Settings</name>
+			<name>pfBlocker General Settings</name>
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Enable Countryblock  </fielddescr>
+			<fielddescr>Enable pfBlocker</fielddescr>
 			<fieldname>enable_cb</fieldname>
 			<type>checkbox</type>
 			<description></description>
 		</field>
 		<field>
-			<fielddescr>Enable Logging  </fielddescr>
+			<fielddescr>Enable Logging</fielddescr>
 			<fieldname>enable_log</fieldname>
 			<type>checkbox</type>
 			<description></description>
@@ -168,7 +165,7 @@
 			<fielddescr>Inbound Interface(s)</fielddescr>
 			<fieldname>inbound_interface</fieldname>
 			<description><![CDATA[Default: <strong>WAN</strong><br>Select interface(s) that you want to block incoming traffic.<br>
-								If you want to create custom inbound rules for blocked countries based on Countryblock firewall alias, leave this list empty.]]></description>
+								If you want to create custom inbound rules for blocked countries based on pfBlocker firewall alias, leave this list empty.]]></description>
 			<type>interfaces_selection</type>
 			<required/>
 			<multiple/>
@@ -177,7 +174,7 @@
 			<fielddescr>Outbound Interface(s)</fielddescr>
 			<fieldname>outbound_interface</fieldname>
 			<description><![CDATA[Default:<strong>LAN</strong><br>Select interface(s) that you do not want to send outgoing traffic.<br>
-								If you want to create custom outbound rules for blocked countries based on Countryblock firewall alias, leave this list empty.]]></description>
+								If you want to create custom outbound rules for blocked countries based on pfBlocker firewall alias, leave this list empty.]]></description>
 			<type>interfaces_selection</type>
 			<required/>
 			<multiple/>
@@ -220,15 +217,15 @@
 		</field>
 	</fields>
 	<custom_php_install_command>
-		countryblock_php_install_command();
+		pfblocker_php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		countryblock_php_deinstall_command();
+		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		countryblock_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, &amp;$input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
-		sync_package_countryblock();
+		sync_package_pfblocker();
 	</custom_php_resync_config_command>
 </packagegui>
diff --git a/config/pf-blocker/pfblocker_sync.xml b/config/pf-blocker/pfblocker_sync.xml
index e026b636..bc525aa3 100644
--- a/config/pf-blocker/pfblocker_sync.xml
+++ b/config/pf-blocker/pfblocker_sync.xml
@@ -7,8 +7,8 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-    Countryblock_sync.xml
-    part of the Countryblock package for pfSense
+    pfblocker_sync.xml
+    part of the pfblocker package for pfSense
     Copyright (C) 2011 Marcello Coutinho
     All rights reserved.            
                                                                   */
@@ -41,68 +41,65 @@
 	<description>Describe your package here</description>
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
-	<name>countryblock_sync</name>
+	<name>pfblocker_sync</name>
 	<version>1.0</version>
-	<title>Firewall: Countryblock</title>
-	<include_file>/usr/local/pkg/countryblock.inc</include_file>
+	<title>Firewall: pfBlocker</title>
+	<include_file>/usr/local/pkg/pfblocker.inc</include_file>
 	<menu>
-		<name>Countryblock</name>
-		<tooltiptext>Configure Countryblock</tooltiptext>
+		<name>pfBlocker</name>
+		<tooltiptext>Configure pfBlocker</tooltiptext>
 		<section>Services</section>
-		<url>pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+		<url>pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 	</menu>
-	<service>
-		<name>countryblock</name>
-	</service>
 <tabs>
 		<tab>
 			<text>General</text>
-			<url>/pkg_edit.php?xml=countryblock.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>Africa</text>
-			<url>/pkg_edit.php?xml=countryblock_Africa.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Africa.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Antartica</text>
-			<url>/pkg_edit.php?xml=countryblock_Antartica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Antartica.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Asia</text>
-			<url>/pkg_edit.php?xml=countryblock_Asia.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Asia.xml&amp;id=0</url>
 			
 		</tab>
 		<tab>
 			<text>Europe</text>
-			<url>/pkg_edit.php?xml=countryblock_Europe.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Europe.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>North America</text>
-			<url>/pkg_edit.php?xml=countryblock_NorthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_NorthAmerica.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>Oceania</text>
-			<url>/pkg_edit.php?xml=countryblock_Oceania.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_Oceania.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>South America</text>
-			<url>/pkg_edit.php?xml=countryblock_SouthAmerica.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_SouthAmerica.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>XMLRPC Sync</text>
-			<url>/pkg_edit.php?xml=countryblock_sync.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=pfblocker_sync.xml&amp;id=0</url>
 			<active/>
 		</tab>
 </tabs>
 	<fields>
 		<field>
-			<name>countryblock XMLRPC Sync</name>
+			<name>pfBlocker XMLRPC Sync</name>
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Automatically sync countryblock configuration changes</fielddescr>
+			<fielddescr>Automatically sync pfBlocker configuration changes</fielddescr>
 			<fieldname>synconchanges</fieldname>
 			<description>pfSense will automatically sync changes to the hosts defined below.</description>
 			<type>checkbox</type>
@@ -130,15 +127,15 @@
 		</field>
 	</fields>
 	<custom_php_install_command>
-		countryblock_php_install_command();
+		pfblocker_php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		countryblock_php_deinstall_command();
+		pfblocker_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
-		countryblock_validate_input($_POST, &amp;$input_errors);
+		pfblocker_validate_input($_POST, &amp;$input_errors);
 	</custom_php_validation_command>	
 	<custom_php_resync_config_command>
-		sync_package_countryblock();
+		sync_package_pfblocker();
 	</custom_php_resync_config_command>
 </packagegui>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 31c00617..f1d1f8f7 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -59,7 +59,7 @@
 		<configurationfile>countryblock.xml</configurationfile>
 	</package>
 	<package>
-		<name>PF-Blocker-dev</name>
+		<name>pfBlocker-dev</name>
 		<website/>
 		<descr>Block countries and IP ranges. Replaces Countryblock and IPblocklist</descr>
 		<category>Firewall</category>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 586a8473..1095769d 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -133,7 +133,7 @@
 		<configurationfile>countryblock.xml</configurationfile>
 	</package>
 	<package>
-		<name>PF-Blocker</name>
+		<name>pfBlocker-dev</name>
 		<website/>
 		<descr>Block countries and IP ranges. Replaces Countryblock and IPblocklist</descr>
 		<category>Firewall</category>