From 2dc6436f9282183ebf1be0066ddf0895f42dc809 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Sun, 8 Mar 2009 15:32:02 -0500
Subject: bump imspector package due to package file updates

---
 pkg_config.7.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index ee8ec4e0..ee963dbc 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -332,7 +332,7 @@
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>
       <maintainer>billm@pfsense.org</maintainer>
-      <version>0.8-5</version>
+      <version>0.8-6</version>
       <required_version>1.2.1</required_version>
       <status>BETA</status>
       <pkginfolink>http://doc.pfsense.org/index.php/IMSpector_package</pkginfolink>
-- 
cgit v1.2.3


From f7452a391914883dd7412a64ad2b6166f102937d Mon Sep 17 00:00:00 2001
From: Jim Pingle <jim@pingle.org>
Date: Sun, 8 Mar 2009 16:49:04 -0400
Subject: Fix snort package, rc.d script was being written incorrectly when
 multiple interfaces were selected.

---
 config/snort/snort.inc | 2 +-
 pkg_config.7.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index c1c1a400..8b9d77f7 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -140,7 +140,7 @@ function sync_package_snort()
   /* Note the sleep delay.  Seems to help getting mult interfaces to start -gtm */
   foreach($snortInterfaces as $snortIf)
   {
-  	$start .= ";sleep 8;snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -A fast &";
+  	$start .= "\nsleep 8;snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -A fast &";
   }    
     
 	/* if block offenders is checked, start snort2c */
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index ee963dbc..8132a069 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -147,7 +147,7 @@
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>snort-2.8.2.1.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.8.2.6</version>
+      <version>2.8.2.6_1</version>
       <required_version>1.2</required_version>
       <status>Stable</status>
       <configurationfile>snort.xml</configurationfile>
-- 
cgit v1.2.3


From 5ee52d94c6ffa509d4cca370a707553434ee4685 Mon Sep 17 00:00:00 2001
From: Eirik Oeverby <ltning@anduin.net>
Date: Sun, 8 Mar 2009 21:34:50 +0100
Subject: Create necessary directories, add 'local =' parameter

Ensures stunnel can actually be used after installation.
Add optional 'local =' parameter to a tunnel, to force binding to a particular IP for outgoing connections. Useful for transport mode IPSec, or with VPNs in general.
Known issues: After (re)install, list of tunnels must be saved once to produce proper config file. Not sure why this isn't happening automagically.
---
 config/stunnel.xml | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/config/stunnel.xml b/config/stunnel.xml
index 85e43081..d2f0dd3a 100644
--- a/config/stunnel.xml
+++ b/config/stunnel.xml
@@ -111,6 +111,13 @@
 			<description>Enter the port to redirect to.</description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Outgoing source IP</fielddescr>
+			<fieldname>sourceip</fieldname>
+			<description>Enter the source IP address for outgoing connections.</description>
+			<type>input</type>
+		</field>
+
 	</fields>
 	<service>
 	  <name>stunnel</name>
@@ -128,6 +135,7 @@
 	  fwrite($fout, "setgid = stunnel \n");
 	  foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
 	    fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
+	    if($pkgconfig['sourceip']) fwrite($fout, "local = " . $pkgconfig['sourceip'] . "\n");
 	    fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
 	    fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
 	    fwrite($fout, "TIMEOUTclose = 0\n\n");
@@ -135,7 +143,7 @@
 	  fclose($fout);
 	  conf_mount_ro();
 	  config_unlock();
-	  system("/usr/bin/killall stunnel 2>/dev/null");
+	  system("/usr/local/etc/rc.d/stunnel.sh stop 2>/dev/null");
 	  system("/usr/local/etc/rc.d/stunnel.sh start 2>/dev/null");
 	]]>		
 	</custom_add_php_command_late>
@@ -144,25 +152,38 @@
 	    safe_mkdir("/usr/local/etc/stunnel");
 	    system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
 	    chmod("/usr/local/etc/stunnel/stunnel.pem", 600);
-            system("/bin/mkdir /var/tmp/stunnel");
-	    system("/bin/mkdir /var/tmp/stunnel/var");
-	    system("/bin/mkdir /var/tmp/stunnel/var/tmp");
+	    system("/bin/mkdir -p /var/tmp/stunnel/var/tmp/run/stunnel");
 	    system("/usr/sbin/chown -R stunnel:stunnel /var/tmp/stunnel");
-	    chmod("/var/tmp/stunnel/var/tmp/", 1777);
-	    $fout = fopen("/usr/local/etc/rc.d/stunnel.sh","w");
-	    system("/usr/sbin/chown -R stunnel:stunnel /var/tmp/stunnel/var/stunnel");
-	    fwrite($fout, "#!/bin/sh\n");
-	    fwrite($fout, "# PACKAGE: STunnel\n");
-	    fwrite($fout, "# EXECUTABLE: stunnel\n");
-	    fwrite($fout, "/usr/local/sbin/stunnel /usr/local/etc/stunnel/stunnel.conf\n\n");
-	    fclose($fout);
-	    chmod("/usr/local/etc/rc.d/stunnel.sh", 0555);
+		$_rcfile['file']='stunnel.sh';
+		$_rcfile['start'].="/usr/local/bin/stunnel /usr/local/etc/stunnel/stunnel.conf \n\t";
+		$_rcfile['stop'].="killall stunnel \n\t";
+		write_rcfile($_rcfile);
+		system("rm /usr/local/etc/rc.d/stunnel");
+		
+		conf_mount_rw();
+		config_lock();
+		$fout = fopen("/usr/local/etc/stunnel/stunnel.conf","w");
+		fwrite($fout, "cert = /usr/local/etc/stunnel/stunnel.pem \n");
+		fwrite($fout, "chroot = /var/tmp/stunnel \n");
+		fwrite($fout, "setuid = stunnel \n");
+		fwrite($fout, "setgid = stunnel \n");
+		foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
+			fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
+			if($pkgconfig['sourceip']) fwrite($fout, "local = " . $pkgconfig['sourceip'] . "\n");
+			fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
+			fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
+			fwrite($fout, "TIMEOUTclose = 0\n\n");
+		}
+		fclose($fout);
+		conf_mount_ro();
+		config_unlock();
 	]]>	
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 	<![CDATA[		
 	    rmdir_recursive("/var/tmp/stunnel");
 	    rmdir_recursive("/usr/local/etc/stunnel*");
+	    system("rm /usr/local/etc/rc.d/stunnel.sh");
 	]]>
 	</custom_php_deinstall_command>
 </packagegui>
-- 
cgit v1.2.3


From dff5764a0cfce21dd1e48ed0cdf016efe78aa061 Mon Sep 17 00:00:00 2001
From: Eirik Oeverby <ltning@anduin.net>
Date: Sun, 8 Mar 2009 21:34:50 +0100
Subject: Create necessary directories, add 'local =' parameter

Ensures stunnel can actually be used after installation.
Add optional 'local =' parameter to a tunnel, to force binding to a particular IP for outgoing connections. Useful for transport mode IPSec, or with VPNs in general.
Known issues: After (re)install, list of tunnels must be saved once to produce proper config file. Not sure why this isn't happening automagically.

Signed-off-by: Bill Marquette <bill.marquette@gmail.com>
Minor tweaks to original patch added as part of this commit
---
 config/stunnel.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/stunnel.xml b/config/stunnel.xml
index d2f0dd3a..ef526309 100644
--- a/config/stunnel.xml
+++ b/config/stunnel.xml
@@ -149,16 +149,16 @@
 	</custom_add_php_command_late>
 	<custom_php_install_command>
 	<![CDATA[
-	    safe_mkdir("/usr/local/etc/stunnel");
-	    system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
-	    chmod("/usr/local/etc/stunnel/stunnel.pem", 600);
-	    system("/bin/mkdir -p /var/tmp/stunnel/var/tmp/run/stunnel");
-	    system("/usr/sbin/chown -R stunnel:stunnel /var/tmp/stunnel");
+		safe_mkdir("/usr/local/etc/stunnel");
+		system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
+		chmod("/usr/local/etc/stunnel/stunnel.pem", 600);
+		make_dirs("/var/tmp/stunnel/var/tmp/run/stunnel");
+		system("/usr/sbin/chown -R stunnel:stunnel /var/tmp/stunnel");
 		$_rcfile['file']='stunnel.sh';
 		$_rcfile['start'].="/usr/local/bin/stunnel /usr/local/etc/stunnel/stunnel.conf \n\t";
 		$_rcfile['stop'].="killall stunnel \n\t";
 		write_rcfile($_rcfile);
-		system("rm /usr/local/etc/rc.d/stunnel");
+		unlink_if_exists("/usr/local/etc/rc.d/stunnel");
 		
 		conf_mount_rw();
 		config_lock();
@@ -183,7 +183,7 @@
 	<![CDATA[		
 	    rmdir_recursive("/var/tmp/stunnel");
 	    rmdir_recursive("/usr/local/etc/stunnel*");
-	    system("rm /usr/local/etc/rc.d/stunnel.sh");
+	    unlink_if_exists("/usr/local/etc/rc.d/stunnel.sh");
 	]]>
 	</custom_php_deinstall_command>
 </packagegui>
-- 
cgit v1.2.3


From 78512e0364d6e8d2f797ee2dc32c2867b2f427de Mon Sep 17 00:00:00 2001
From: rob iscool <robrob2626@yahoo.com>
Date: Sun, 1 Mar 2009 04:02:38 -0800
Subject: Updates to Snort.inc and Snort.xml 03-01-09

Signed-off-by: Bill Marquette <bill.marquette@gmail.com>
Comments: Removed openvpn-client related changes from merge request
---
 config/snort/snort.inc | 4 ++--
 config/snort/snort.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 8b9d77f7..20a03f93 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -140,12 +140,12 @@ function sync_package_snort()
   /* Note the sleep delay.  Seems to help getting mult interfaces to start -gtm */
   foreach($snortInterfaces as $snortIf)
   {
-  	$start .= "\nsleep 8;snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -A fast &";
+  	$start .= ";sleep 8;snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -A fast -q";
   }    
     
 	/* if block offenders is checked, start snort2c */
 	if($_POST['blockoffenders'])
-		$start .= ";sleep 8;snort2c -w /var/db/whitelist -a /var/log/snort/alert";
+		$start .= "\nsleep 8;snort2c -w /var/db/whitelist -a /var/log/snort/alert";
     
 	$sample_before = "\nBEFORE_MEM=`top | grep Free | grep Wired | awk '{print \$10}'`\n";
 	$sample_after = "\nAFTER_MEM=`top | grep Free | grep Wired | awk '{print \$10}'`\n";
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 6ba362c0..22b8e874 100644
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -46,7 +46,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
-	<version>2.8.2.2</version>
+	<version>2.8.3.2</version>
 	<title>Services: Snort</title>
 	<include_file>/usr/local/pkg/snort.inc</include_file>
 	<menu>
-- 
cgit v1.2.3


From 5e661a306a1c7236a3253cf9efb7e0d654082679 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Sun, 8 Mar 2009 16:56:22 -0500
Subject: bump stunnel version

---
 pkg_config.7.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 8132a069..d748d158 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -449,7 +449,7 @@
       <category>Network Management</category>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>stunnel-4.25.tbz</depends_on_package>
-      <version>4.25.1</version>
+      <version>4.25.2</version>
       <status>Stable</status>
       <pkginfolink>http://doc.pfsense.org/index.php/Stunnel_package</pkginfolink>
       <required_version>1.2.1</required_version>
-- 
cgit v1.2.3


From 1abeec1834af6befd27ae0f839ccfc1ad8d20714 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Mon, 9 Mar 2009 11:05:14 -0500
Subject: fix imspector dependencies and bump version

---
 pkg_config.7.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index d748d158..f639263c 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -332,7 +332,7 @@
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>
       <maintainer>billm@pfsense.org</maintainer>
-      <version>0.8-6</version>
+      <version>0.8-7</version>
       <required_version>1.2.1</required_version>
       <status>BETA</status>
       <pkginfolink>http://doc.pfsense.org/index.php/IMSpector_package</pkginfolink>
@@ -341,8 +341,8 @@
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>imspector-0.8.tbz</depends_on_package>
       <depends_on_package>libiconv-1.11_1.tbz</depends_on_package>
-      <depends_on_package>mysql-client-5.1.30.tbz</depends_on_package>
-      <depends_on_package>sqlite3-3.5.6.tbz</depends_on_package>
+      <depends_on_package>mysql-client-5.0.77.tbz</depends_on_package>
+      <depends_on_package>sqlite3-3.6.10.tbz</depends_on_package>
     </package>
     <package>
       <name>nut</name>
-- 
cgit v1.2.3


From 89c1e0ed2ba945e2aa4ecbe4b8b9e6d36b68bd4b Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Mon, 9 Mar 2009 12:24:02 -0500
Subject: add package delete to deinstall - who knows, maybe it will work

---
 config/imspector/imspector.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/imspector/imspector.inc b/config/imspector/imspector.inc
index 09974363..1316ea5b 100644
--- a/config/imspector/imspector.inc
+++ b/config/imspector/imspector.inc
@@ -101,7 +101,7 @@
 		@unlink(IMSPECTOR_ETC . '/acl_blacklist.txt');
 		@unlink(IMSPECTOR_ETC . '/acl_whitelist.txt');
 
-		//exec('pkg_delete imspector-0.4');
+		exec('pkg_delete imspector-0.8');
 	}
 
 	function sync_package_imspector() {
-- 
cgit v1.2.3


From 8eff152d4aacf8f89c0388d571b44ca5360657aa Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Mon, 9 Mar 2009 12:27:13 -0500
Subject: Revert "add package delete to deinstall - who knows, maybe it will
 work"

This reverts commit 98c5f0521ca9a9ee723a0863b8e9c97b59d26077.
---
 config/imspector/imspector.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/imspector/imspector.inc b/config/imspector/imspector.inc
index 1316ea5b..09974363 100644
--- a/config/imspector/imspector.inc
+++ b/config/imspector/imspector.inc
@@ -101,7 +101,7 @@
 		@unlink(IMSPECTOR_ETC . '/acl_blacklist.txt');
 		@unlink(IMSPECTOR_ETC . '/acl_whitelist.txt');
 
-		exec('pkg_delete imspector-0.8');
+		//exec('pkg_delete imspector-0.4');
 	}
 
 	function sync_package_imspector() {
-- 
cgit v1.2.3


From 01c613d4e27d5e8245846ab22ce704422798dd84 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Tue, 10 Mar 2009 00:39:15 -0500
Subject: start migrating javascript to prototype

---
 config/imspector/services_imspector_logs.php | 36 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php
index fce9b892..14881bc6 100644
--- a/config/imspector/services_imspector_logs.php
+++ b/config/imspector/services_imspector_logs.php
@@ -151,6 +151,8 @@ include("head.inc");
 //echo $pfSenseHead->getHTML();
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<script type="text/javascript" language="javascript" src="/javascript/scriptaculous/prototype.js"></script>
+<script type="text/javascript" language="javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
 <?php include("fbegin.inc"); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <div id="mainlevel">
@@ -188,7 +190,7 @@ function xmlhttpPost()
 			updatepage(self.xmlHttpReq.responseText);
 	}
 
-	document.getElementById('im_status').style.display = "inline";
+	$('im_status').style.display = "inline";
 	self.xmlHttpReq.send("mode=render&section=" + section);
 }
 
@@ -204,25 +206,25 @@ function updatepage(str)
 		if (!a[1] || !a[2] || !a[3]) continue;
 
 		/* create titling information if needed */
-		if (!document.getElementById(a[1])) {
-			document.getElementById('im_convos').innerHTML += 
+		if (!$(a[1])) {
+			$('im_convos').innerHTML += 
 				"<div id='" + a[1] + "_t' style='width: 100%; background-color: $list_protocol_bgcolor; color: $list_protocol_color;'>" + a[1] + "</div>" +
 				"<div id='" + a[1] + "' style='width: 100%; background-color: $list_local_bgcolor;'></div>";
 		}
-		if (!document.getElementById(a[1] + "_" + a[2])) {
+		if (!$(a[1] + "_" + a[2])) {
 			var imageref = "";
 			if (a[0]) imageref = "<img src='" + a[0] + "' alt='" + a[1] + "'/>";
-			document.getElementById(a[1]).innerHTML += 
+			$(a[1]).innerHTML += 
 				"<div id='" + a[1] + "_" + a[2] + "_t' style='width: 100%; color: $list_local_color; padding-left: 5px;'>" + imageref + a[2] + "</div>" + 
 				"<div id='" + a[1] + "_" + a[2] + "' style='width: 100%; background-color: $list_remote_bgcolor; border-bottom: solid 1px $list_end_bgcolor;'></div>";
 		}
-		if (!document.getElementById(a[1] + "_" + a[2] + "_" + a[3])) {
-			document.getElementById(a[1] + "_" + a[2]).innerHTML += 
+		if (!$(a[1] + "_" + a[2] + "_" + a[3])) {
+			$(a[1] + "_" + a[2]).innerHTML += 
 				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "_t' style='width: 100%; color: $list_remote_color; padding-left: 10px;'>" + a[3] + "</div>" + 
 				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "' style='width: 100%;'></div>";
 		}
-		if (!document.getElementById(a[1] + "_" + a[2] + "_" + a[3] + "_" + a[4])) {
-			document.getElementById(a[1] + "_" + a[2] + "_" + a[3]).innerHTML += 
+		if (!$(a[1] + "_" + a[2] + "_" + a[3] + "_" + a[4])) {
+			$(a[1] + "_" + a[2] + "_" + a[3]).innerHTML += 
 				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "_" + a[4] + 
 				"' style='width: 100%; color: $list_convo_color; cursor: pointer; padding-left: 15px;' onClick=" + 
 				'"' + "setsection('" + a[1] + "|" + a[2] + "|" + a[3] + "|" + a[4] + "');" + '"' + "' + >&raquo;" + a[4] + "</div>";
@@ -236,21 +238,21 @@ function updatepage(str)
 	if (!details[1]) title = "&nbsp;";
 	if (!parts[2]) parts[2] = "&nbsp;";
 
-	document.getElementById('im_status').style.display = "none";
-	var bottom  = parseInt(document.getElementById('im_content').scrollTop);
-	var bottom2 = parseInt(document.getElementById('im_content').style.height);
+	$('im_status').style.display = "none";
+	var bottom  = parseInt($('im_content').scrollTop);
+	var bottom2 = parseInt($('im_content').style.height);
 	var absheight = parseInt( bottom + bottom2 );
-	if (absheight == document.getElementById('im_content').scrollHeight) {
+	if (absheight == $('im_content').scrollHeight) {
 		moveit = 1;
 	} else {
 		moveit = 0;
 	}
-	document.getElementById('im_content').innerHTML = parts[2];
+	$('im_content').innerHTML = parts[2];
 	if (moveit == 1) {
-		document.getElementById('im_content').scrollTop = 0;
-		document.getElementById('im_content').scrollTop = document.getElementById('im_content').scrollHeight;
+		$('im_content').scrollTop = 0;
+		$('im_content').scrollTop = $('im_content').scrollHeight;
 	}
-	document.getElementById('im_content_title').innerHTML = title;
+	$('im_content_title').update = title;
 	the_timeout = setTimeout( "xmlhttpPost();", 5000 );
 }
 
-- 
cgit v1.2.3


From 6abb9ffd8bbd42c903c31ab5bf6fe68ef1c6f1a7 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Tue, 10 Mar 2009 01:19:23 -0500
Subject: remove home rolled xmlhttpPost crap, use Prototype

---
 config/imspector/services_imspector_logs.php | 44 +++++++++++++---------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php
index 14881bc6..ecb8606f 100644
--- a/config/imspector/services_imspector_logs.php
+++ b/config/imspector/services_imspector_logs.php
@@ -172,26 +172,23 @@ var section = 'none';
 var moveit = 1;
 var the_timeout;
 
-function xmlhttpPost()
-{
-	var xmlHttpReq = false;
-	var self = this;
-
-	if (window.XMLHttpRequest)
-		self.xmlHttpReq = new XMLHttpRequest();
-	else if (window.ActiveXObject)
-		self.xmlHttpReq = new ActiveXObject("Microsoft.XMLHTTP");
-
-	self.xmlHttpReq.open('POST', 'services_imspector_logs.php', true);
-	self.xmlHttpReq.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-
-	self.xmlHttpReq.onreadystatechange = function() {
-		if (self.xmlHttpReq && self.xmlHttpReq.readyState == 4)
-			updatepage(self.xmlHttpReq.responseText);
-	}
-
-	$('im_status').style.display = "inline";
-	self.xmlHttpReq.send("mode=render&section=" + section);
+function xmlhttpPost(){
+	var url = "/services_imspector_logs.php"
+	new Ajax.Request(url, {
+		method: 'post',
+		parameters: {
+			mode: 'render',
+			section: section
+		},
+		onSuccess: function(transport){
+			var response = transport.responseText || "";
+			updatepage(response);
+			$('im_status').style.display = "none";
+		},
+		onLoading: function(){
+			$('im_status').style.display = "inline";
+		}
+	});
 }
 
 function updatepage(str)
@@ -233,12 +230,11 @@ function updatepage(str)
 
 	/* determine the title of this conversation */
 	var details = parts[1].split(",");
-	var title = details[0] + " conversation between <span style='color: $convo_local_color;'>" + details[ 1 ] +
+	var title = details[0] + " conversation between <span style='color: $convo_local_color;'>" + details[1] +
 		"</span> and <span style='color: $convo_remote_color;'>" + details[2] + "</span>";
 	if (!details[1]) title = "&nbsp;";
 	if (!parts[2]) parts[2] = "&nbsp;";
 
-	$('im_status').style.display = "none";
 	var bottom  = parseInt($('im_content').scrollTop);
 	var bottom2 = parseInt($('im_content').style.height);
 	var absheight = parseInt( bottom + bottom2 );
@@ -247,12 +243,12 @@ function updatepage(str)
 	} else {
 		moveit = 0;
 	}
-	$('im_content').innerHTML = parts[2];
+	$('im_content').update(parts[2]);
 	if (moveit == 1) {
 		$('im_content').scrollTop = 0;
 		$('im_content').scrollTop = $('im_content').scrollHeight;
 	}
-	$('im_content_title').update = title;
+	$('im_content_title').update(title);
 	the_timeout = setTimeout( "xmlhttpPost();", 5000 );
 }
 
-- 
cgit v1.2.3


From 34a0c678b48d0e0f8ebe929551c474e0322a65de Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Tue, 10 Mar 2009 01:25:21 -0500
Subject: More Prototype-isms Whitespace cleanup

---
 config/imspector/services_imspector_logs.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php
index ecb8606f..f9e6d902 100644
--- a/config/imspector/services_imspector_logs.php
+++ b/config/imspector/services_imspector_logs.php
@@ -257,9 +257,14 @@ function setsection(value)
 	section = value;
 	clearTimeout(the_timeout);
 	xmlhttpPost();
-	document.getElementById('im_content').scrollTop = 0;
-	document.getElementById('im_content').scrollTop = document.getElementById('im_content').scrollHeight;
+	$('im_content').scrollTop = 0;
+	$('im_content').scrollTop = $('im_content').scrollHeight;
 }
+
+document.observe('dom:loaded', function() {
+	xmlhttpPost();
+});
+
 </script>
 EOD;
 print($zz);
@@ -271,22 +276,19 @@ print($zz);
       <div style='width: 100%; text-align: right;'><span id='im_status' style='display: none;'>Updating</span>&nbsp;</div>
       <table width="100%">
         <tr>
-		<td width="15%" bgcolor="<?=$default_bgcolor?>" style="overflow: auto; border: solid 1px <?=$border_color?>;">
-      	    <div id="im_convos" style="height: 400px; overflow: auto; overflow-x: hidden;"></div>
-      	  </td>
+          <td width="15%" bgcolor="<?=$default_bgcolor?>" style="overflow: auto; border: solid 1px <?=$border_color?>;">
+            <div id="im_convos" style="height: 400px; overflow: auto; overflow-x: hidden;"></div>
+          </td>
           <td width="75%" bgcolor="<?=$default_bgcolor?>" style="border: solid 1px <?=$border_color?>;">
             <div id="im_content_title" style="height: 20px; overflow: auto; vertical-align: top; 
               color: <?=$convo_title_color?>; background-color: <?=$convo_title_bgcolor?>;"></div>
-			<div id="im_content" style="height: 380px; overflow: auto; vertical-align: bottom; overflow-x: hidden;"></div>
+            <div id="im_content" style="height: 380px; overflow: auto; vertical-align: bottom; overflow-x: hidden;"></div>
           </td>
         </tr>
       </table>
     </td>
   </tr>
 </table>
-
-<script type="text/javascript">xmlhttpPost();</script>
-
 </div>
 <?php include("fend.inc"); ?>
 </body>
-- 
cgit v1.2.3


From c6bc45c6182c3d1e0b5745fd228afb77f8a61b35 Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Tue, 10 Mar 2009 01:27:18 -0500
Subject: bump imspector package version

---
 pkg_config.7.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index f639263c..4404c3ac 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -332,7 +332,7 @@
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>
       <maintainer>billm@pfsense.org</maintainer>
-      <version>0.8-7</version>
+      <version>0.8-8</version>
       <required_version>1.2.1</required_version>
       <status>BETA</status>
       <pkginfolink>http://doc.pfsense.org/index.php/IMSpector_package</pkginfolink>
-- 
cgit v1.2.3


From 81d0087fbf73aa9ab05cf8ec1067dbb462fc698c Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Tue, 10 Mar 2009 02:04:30 -0500
Subject: put readable variable names in for a[*] array

---
 config/imspector/services_imspector_logs.php | 40 +++++++++++++++++-----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php
index f9e6d902..8f208e5d 100644
--- a/config/imspector/services_imspector_logs.php
+++ b/config/imspector/services_imspector_logs.php
@@ -202,29 +202,37 @@ function updatepage(str)
 
 		if (!a[1] || !a[2] || !a[3]) continue;
 
+		var image = a[0];
+		var protocol = a[1];
+		var login = a[2];
+		var destination = a[3];
+		var date = a[4];
+		
+
 		/* create titling information if needed */
-		if (!$(a[1])) {
+		if (!$(protocol)) {
 			$('im_convos').innerHTML += 
-				"<div id='" + a[1] + "_t' style='width: 100%; background-color: $list_protocol_bgcolor; color: $list_protocol_color;'>" + a[1] + "</div>" +
-				"<div id='" + a[1] + "' style='width: 100%; background-color: $list_local_bgcolor;'></div>";
+				"<div id='" + protocol + "_t' style='width: 100%; background-color: $list_protocol_bgcolor; color: $list_protocol_color;'>" + protocol + "</div>" +
+				"<div id='" + protocol + "' style='width: 100%; background-color: $list_local_bgcolor;'></div>";
 		}
-		if (!$(a[1] + "_" + a[2])) {
+		if (!$(protocol + "_" + login)) {
 			var imageref = "";
-			if (a[0]) imageref = "<img src='" + a[0] + "' alt='" + a[1] + "'/>";
-			$(a[1]).innerHTML += 
-				"<div id='" + a[1] + "_" + a[2] + "_t' style='width: 100%; color: $list_local_color; padding-left: 5px;'>" + imageref + a[2] + "</div>" + 
-				"<div id='" + a[1] + "_" + a[2] + "' style='width: 100%; background-color: $list_remote_bgcolor; border-bottom: solid 1px $list_end_bgcolor;'></div>";
+			if (image) imageref = "<img src='" + image + "' alt='" + protocol + "'/>";
+			$(protocol).innerHTML += 
+				"<div id='" + protocol + "_" + login + "_t' style='width: 100%; color: $list_local_color; padding-left: 5px;'>" + imageref + login + "</div>" + 
+				"<div id='" + protocol + "_" + login + "' style='width: 100%; background-color: $list_remote_bgcolor; border-bottom: solid 1px $list_end_bgcolor;'></div>";
 		}
-		if (!$(a[1] + "_" + a[2] + "_" + a[3])) {
-			$(a[1] + "_" + a[2]).innerHTML += 
-				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "_t' style='width: 100%; color: $list_remote_color; padding-left: 10px;'>" + a[3] + "</div>" + 
-				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "' style='width: 100%;'></div>";
+		if (!$(protocol + "_" + login + "_" + destination)) {
+			$(protocol + "_" + login).innerHTML += 
+				"<div id='" + protocol + "_" + login + "_" + destination + "_t' style='width: 100%; color: $list_remote_color; padding-left: 10px;'>" + destination + "</div>" + 
+				"<div id='" + protocol + "_" + login + "_" + destination + "' style='width: 100%;'></div>";
 		}
-		if (!$(a[1] + "_" + a[2] + "_" + a[3] + "_" + a[4])) {
-			$(a[1] + "_" + a[2] + "_" + a[3]).innerHTML += 
-				"<div id='" + a[1] + "_" + a[2] + "_" + a[3] + "_" + a[4] + 
+		if (!$(protocol + "_" + login + "_" + destination + "_" + date)) {
+			/* XXX: use observer instead of onclick */
+			$(protocol + "_" + login + "_" + destination).innerHTML += 
+				"<div id='" + protocol + "_" + login + "_" + destination + "_" + date + 
 				"' style='width: 100%; color: $list_convo_color; cursor: pointer; padding-left: 15px;' onClick=" + 
-				'"' + "setsection('" + a[1] + "|" + a[2] + "|" + a[3] + "|" + a[4] + "');" + '"' + "' + >&raquo;" + a[4] + "</div>";
+				'"' + "setsection('" + protocol + "|" + login + "|" + destination + "|" + date + "');" + '"' + "' + >&raquo;" + date + "</div>";
 		}
 	}
 
-- 
cgit v1.2.3