imspector-dev - fix report template bugs and missing file

3 files changed, 329 insertions, 12 deletions

diff --git a/config/imspector-dev/imspector.inc b/config/imspector-dev/imspector.inc
index a4af7771..52c7ae1b 100644
--- a/config/imspector-dev/imspector.inc
+++ b/config/imspector-dev/imspector.inc
@@ -101,11 +101,12 @@
 	function deinstall_package_imspector() {
 		imspector_action('stop');
 
-		@unlink(IMSPECTOR_RCFILE);
-		@unlink(IMSPECTOR_CONFIG);
-		@unlink(IMSPECTOR_ETC . '/badwords_custom.txt');
-		@unlink(IMSPECTOR_ETC . '/acl_blacklist.txt');
-		@unlink(IMSPECTOR_ETC . '/acl_whitelist.txt');
+		unlink_if_exists(IMSPECTOR_RCFILE);
+		unlink_if_exists(IMSPECTOR_CONFIG);
+		unlink_if_exists(IMSPECTOR_ETC . '/badwords_custom.txt');
+		unlink_if_exists(IMSPECTOR_ETC . '/acl_blacklist.txt');
+		unlink_if_exists(IMSPECTOR_ETC . '/acl_whitelist.txt');
+		unlink_if_exists('/usr/local/www/imspector_logs.php');
 
 		//exec('pkg_delete imspector-0.4');
 	}
@@ -346,10 +347,11 @@
 					$template="services_imspector_logs.php";
 				else
 					$template=$ims_config['template'];
-					
-				if (file_exists("/usr/local/www/{$template}"))
-					$log_file=file_get_contents("/usr/local/www/{$template}");
-				file_put_contents("/usr/local/www/imspector_logs.php",$log_file,LOCK_EX);
+
+				/*link template file*/
+				$link="/usr/local/www/imspector_logs.php";
+				unlink_if_exists($link);
+				symlink("/usr/local/www/{$template}", $link);
 					
 				/* generate rc file start and stop */
 				$stop = <<<EOD
diff --git a/config/imspector-dev/imspector.xml b/config/imspector-dev/imspector.xml
index 3bf53f04..c68fc70e 100644
--- a/config/imspector-dev/imspector.xml
+++ b/config/imspector-dev/imspector.xml
@@ -105,6 +105,11 @@
 	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/imspector-dev/imspector_logs.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/www/</prefix>
+		<chmod>0755</chmod>
 		<item>http://www.pfsense.org/packages/config/imspector-dev/services_imspector_logs.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
@@ -186,8 +191,8 @@
 		</field>
 		<field>
 			<fielddescr>Report limit</fielddescr>
-			<fieldname>limit</fieldname>
-			<description>Max entries to fetch from log dir. Default is 1000</description>
+			<fieldname>reportlimit</fieldname>
+			<description>Max entries to fetch from log dir(s). Default is 50</description>
 			<type>input</type>
 			<size>10</size>
 		</field>
@@ -200,7 +205,6 @@
  			<options>
  				<option><name>Default Template</name><value>services_imspector_logs.php</value></option>
  				<option><name>0guzcan Template</name><value>services_imspector_logs2.php</value></option>
- 				<option><name>Mysql template (working in progress...)</name><value>services_imspector_mysql.php</value></option>
 			</options>
 		</field>
 		<field>
diff --git a/config/imspector-dev/imspector_logs.php b/config/imspector-dev/imspector_logs.php
new file mode 100644
index 00000000..e44ef35f
--- /dev/null
+++ b/config/imspector-dev/imspector_logs.php
@@ -0,0 +1,311 @@
+<?php
+/*
+	services_imspector_logs.php
+	part of pfSense (http://www.pfsense.com/)
+
+	JavaScript Code is GPL Licensed from SmoothWall Express.
+
+	Copyright (C) 2007 Ryan Wagoner <rswagoner@gmail.com>.
+	Copyright (C) 2012 Marcello Coutinho
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+/* variables */
+$log_dir = '/var/imspector';
+$imspector_config = $config['installedpackages']['imspector']['config'][0];
+
+$border_color			= '#c0c0c0';
+$default_bgcolor		= '#eeeeee';
+
+$list_protocol_color	= '#000000';
+$list_local_color 		= '#000000';
+$list_remote_color 		= '#000000';
+$list_convo_color		= '#000000';
+
+$list_protocol_bgcolor	= '#cccccc';
+$list_local_bgcolor		= '#dddddd';
+$list_remote_bgcolor	= '#eeeeee';
+$list_end_bgcolor		= '#bbbbbb';
+
+$convo_title_color		= 'black';
+$convo_local_color		= 'blue';
+$convo_remote_color		= 'red';
+
+$convo_title_bgcolor	= '#cccccc';
+$convo_local_bgcolor	= '#dddddd';
+$convo_remote_bgcolor	= '#eeeeee';
+
+/* functions */
+
+function convert_dir_list ($topdir) {
+	global $config;
+	if (!is_dir($topdir)) 
+		return;
+	$imspector_config = $config['installedpackages']['imspector']['config'][0];
+	$limit=(preg_match("/\d+/",$imspector_config['reportlimit'])?$imspector_config['reportlimit']:"50");
+	file_put_contents("/tmp/teste.txt",$limit." teste",LOCK_EX);
+	$count=0;
+	if ($dh = opendir($topdir)) {
+		while (($file = readdir($dh)) !== false) {
+			if(!preg_match('/^\./', $file) == 0)
+				continue;
+			if (is_dir("$topdir/$file"))
+				$list .= convert_dir_list("$topdir/$file");
+			else
+				$list .= "$topdir/$file\n";
+			$count ++;
+		 	if($count >= $limit){
+		 		closedir($dh);
+		 		return $list;
+		 		}
+			}
+		closedir($dh);
+		}
+	return $list;
+	}
+
+/* ajax response */
+if ($_POST['mode'] == "render") {
+
+	/* user list */
+	print(str_replace(array($log_dir,'/'),array('','|'),convert_dir_list($log_dir)));
+	print("--END--\n");
+
+	/* log files */
+	if ($_POST['section'] != "none") {
+		$section = explode('|',$_POST['section']);
+		$protocol = $section[0];	
+		$localuser = $section[1];
+		$remoteuser = $section[2];
+		$conversation = $section[3];
+
+		/* conversation title */
+		print(implode(', ', $section)."\n");
+		print("--END--\n");
+
+		/* conversation content */
+		$filename = $log_dir.'/'.implode('/', $section);
+		if($fd = fopen($filename, 'r')) {
+			print("<table width='100%' border='0' cellpadding='2' cellspacing='0'>\n");
+			while (!feof($fd)) {
+				$line = fgets($fd);
+				if(feof($fd)) continue;
+				$new_format = '([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(.*)';
+				$old_format = '([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(.*)';
+				preg_match("/${new_format}|${old_format}/", $line, $matches);
+				$address = $matches[1];
+				$timestamp = $matches[2];
+				$direction = $matches[3];
+				$type = $matches[4];
+				$filtered = $matches[5];
+				if(count($matches) == 8) {
+					$category = $matches[6];
+					$data = $matches[7];
+				} else {
+					$category = "";
+					$data = $matches[6];
+				}
+
+				if($direction == '0') {
+					$bgcolor = $convo_remote_bgcolor;
+					$user = "&lt;<span style='color: $convo_remote_color;'>$remoteuser</span>&gt;";
+				}
+				if($direction == '1') {
+					$bgcolor = $convo_local_bgcolor;	
+					$user = "&lt;<span style='color: $convo_local_color;'>$localuser</span>&gt;";
+				}
+
+				$time = strftime("%H:%M:%S", $timestamp);
+
+				print("<tr bgcolor='$bgcolor'><td style='width: 30px; vertical-align: top;'>[$time]</td>\n
+						<td style=' width: 60px; vertical-align: top;'>$user</td>\n
+						<td style=' width: 60px; vertical-align: top;'>$category</td>\n
+						<td style='vertical-align: top;'>$data</td></tr>\n");
+			}
+			print("</table>\n");
+			fclose($fd);
+		}
+	}
+	exit;
+}
+/* defaults to this page but if no settings are present, redirect to setup page */
+if(!$imspector_config["enable"] || !$imspector_config["iface_array"] || !$imspector_config["proto_array"])
+	Header("Location: /pkg_edit.php?xml=imspector.xml&id=0");
+
+$pgtitle = "Services: IMSpector Log Viewer";
+include("head.inc");
+/* put your custom HTML head content here        */
+/* using some of the $pfSenseHead function calls */
+//$pfSenseHead->addMeta("<meta http-equiv=\"refresh\" content=\"120;url={$_SERVER['SCRIPT_NAME']}\" />");
+//echo $pfSenseHead->getHTML();
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<?php
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings "), false, "/pkg_edit.php?xml=imspector.xml&id=0");
+	$tab_array[] = array(gettext("Replacements "), false, "/pkg_edit.php?xml=imspector_replacements.xml&id=0");
+	$tab_array[] = array(gettext("Access Lists "), false, "/pkg.php?xml=imspector_acls.xml");
+	$tab_array[] = array(gettext("Log "), true, "/imspector_logs.php");
+	$tab_array[] = array(gettext("Sync "), false, "/pkg_edit.php?xml=imspector_sync.xml&id=0");
+	
+	display_top_tabs($tab_array);
+?>
+</table>
+
+<?php
+$zz = <<<EOD
+<script type="text/javascript">
+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', '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);
+	}
+
+	document.getElementById('im_status').style.display = "inline";
+	self.xmlHttpReq.send("mode=render&section=" + section);
+}
+
+function updatepage(str)
+{
+	/* update the list of conversations ( if we need to ) */
+	var parts = str.split("--END--\\n");
+	var lines = parts[0].split("\\n");
+			
+	for (var line = 0 ; line < lines.length ; line ++) {
+		var a = lines[line].split("|");
+
+		if (!a[1] || !a[2] || !a[3]) continue;
+
+		/* create titling information if needed */
+		if (!document.getElementById(a[1])) {
+			document.getElementById('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])) {
+			var imageref = "";
+			if (a[0]) imageref = "<img src='" + a[0] + "' alt='" + a[1] + "'/>";
+			document.getElementById(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 += 
+				"<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 += 
+				"<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>";
+		}
+	}
+
+	/* 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 ] +
+		"</span> and <span style='color: $convo_remote_color;'>" + details[2] + "</span>";
+	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);
+	var absheight = parseInt( bottom + bottom2 );
+	if (absheight == document.getElementById('im_content').scrollHeight) {
+		moveit = 1;
+	} else {
+		moveit = 0;
+	}
+	document.getElementById('im_content').innerHTML = parts[2];
+	if (moveit == 1) {
+		document.getElementById('im_content').scrollTop = 0;
+		document.getElementById('im_content').scrollTop = document.getElementById('im_content').scrollHeight;
+	}
+	document.getElementById('im_content_title').innerHTML = title;
+	the_timeout = setTimeout( "xmlhttpPost();", 5000 );
+}
+
+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;
+}
+</script>
+EOD;
+print($zz);
+?>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td class="tabcont">
+      <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="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>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<script type="text/javascript">xmlhttpPost();</script>
+
+</div>
+<?php include("fend.inc"); ?>
+</body>
+</html>