need to re-add the binaries as -kb

3 files changed, 158 insertions, 8 deletions

diff --git a/packages/imspector/imspector.badwords b/packages/imspector/imspector.badwords
new file mode 100644
index 00000000..fd5bcd7a
--- /dev/null
+++ b/packages/imspector/imspector.badwords
@@ -0,0 +1,86 @@
+twat
+son-of-a-bitch
+shyty
+shytty
+shyte
+shyt
+shitz
+shity
+shitty
+shitting
+shitter
+shitted
+shiting
+shited
+shit
+sh1tz
+sh1tter
+sh1ts
+sh1ter
+sh1t
+sh!t
+schlong
+poonani
+polak
+polack
+polac
+piss off
+piss
+phuq
+phuks
+phukking
+phukker
+phukked
+phuking
+phuker
+phuked
+phuk
+phuck
+phuc
+kuntz
+kunts
+kunt
+fuks
+fukk
+fukin
+fuker
+fuken
+fukah
+fuk
+fudge packer
+fucks
+fuckme 
+fucking
+fuckin
+fucker
+fucked
+fuck
+cunt
+cock-suck
+cocksuck 
+cock-head
+cockhead
+cntz
+cnts
+bastard
+bassterds
+azzhole
+asswipe
+assholz
+asshole
+assh0le
+assface
+wanker
+wank
+bollock
+nobjockey
+feck
+fack
+beeatch
+mo fo
+fcuk
+shize
+clagnuts
+dickhead
+dickbrain
+kahnt
diff --git a/packages/imspector/imspector.inc b/packages/imspector/imspector.inc
index 15aacbdf..9b81a1a4 100644
--- a/packages/imspector/imspector.inc
+++ b/packages/imspector/imspector.inc
@@ -49,12 +49,6 @@
 		}
 	}
 	
-	function imspector_remove_rules() {
-		$anchor = "imspector";
-		exec("/sbin/pfctl -a " . $anchor . " -Fr"); 
-		exec("/sbin/pfctl -a " . $anchor . " -Fn");
-	}	
-
 	function before_form_imspector($pkg) {
 		global $config;
 		
@@ -73,7 +67,9 @@
 
 		imspector_notice("Syncing package");
 
-		imspector_remove_rules();
+		/* remove existing rules */
+		exec("/sbin/pfctl -a imspector -Fr"); 
+		exec("/sbin/pfctl -a imspector -Fn");
 
 		conf_mount_rw();
 		config_lock();			
@@ -114,8 +110,26 @@
 				exec("echo \"{$pf_rules}\" | /sbin/pfctl -a imspector -f -");
 
 				$configtext = "plugin_dir=/usr/local/lib/imspector\n";
-				if(imspector_config("log_file"))
+				
+				if(imspector_config("proto_msn")) $configtext .= "msn_protocol=on\n";
+				if(imspector_config("proto_icqaim")) $configtext .= "icq_protocol=on\n";
+				if(imspector_config("proto_yahoo")) $configtext .= "yahoo_protocol=on\n";
+				if(imspector_config("proto_irc")) $configtext .= "irc_protocol=on\n";
+					
+				if(imspector_config("log_file")) 
 					$configtext .= "file_logging_dir=/var/log/imspector\n";
+					
+				if(imspector_config("filter_badwords")) 
+					$configtext .= "badwords_filename=/usr/local/etc/imspector.badwords\n";
+					
+				if(imspector_config("log_mysql"))
+				{
+					$configtext .= "mysql_server=".imspector_config("mysql_server")."\n";
+					$configtext .= "mysql_database=".imspector_config("mysql_database")."\n";
+					$configtext .= "mysql_username=".imspector_config("mysql_username")."\n";
+					$configtext .= "mysql_password=".imspector_config("mysql_password")."\n";
+				}
+				
 				write_imspector_config($configfile,$configtext);					
 					
 				$stop = <<<EOD
diff --git a/packages/imspector/imspector.xml b/packages/imspector/imspector.xml
index 1beb085e..d23aab3b 100644
--- a/packages/imspector/imspector.xml
+++ b/packages/imspector/imspector.xml
@@ -23,6 +23,11 @@
 		<item>http://www.pfsense.com/packages/config/imspector/sbin/imspector</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/usr/local/etc/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/imspector/imspector.badwords</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/lib/</prefix>
 		<chmod>0755</chmod>
 		<item>http://www.pfsense.com/packages/config/imspector/lib/libimspector.so</item>
@@ -58,6 +63,21 @@
 		<item>http://www.pfsense.com/packages/config/imspector/lib/yahooprotocolplugin.so</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/usr/local/lib/imspector</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/imspector/lib/badwordscontentplugin.so</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/lib/imspector</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/imspector/lib/mysqlloggingplugin.so</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/lib/imspector</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/imspector/lib/sqliteloggingplugin.so</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/lib</prefix>
 		<chmod>0755</chmod>
 		<item>http://www.pfsense.com/packages/config/imspector/lib/libstdc++.a</item>
@@ -112,9 +132,39 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable filtering of bad words</fielddescr>
+			<fieldname>filter_badwords</fieldname>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable file logging</fielddescr>
 			<fieldname>log_file</fieldname>
 			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Enable MySQL logging</fielddescr>
+			<fieldname>log_mysql</fieldname>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>MySQL Server</fielddescr>
+			<fieldname>mysql_server</fieldname>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>MySQL Database</fielddescr>
+			<fieldname>mysql_database</fieldname>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>MySQL Username</fielddescr>
+			<fieldname>mysql_username</fieldname>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>MySQL Password</fielddescr>
+			<fieldname>mysql_password</fieldname>
+			<type>password</type>
 		</field>	
 	</fields>
 	<custom_php_command_before_form>