From 4534e2848865989fec3c0e1bd5aa8578aa238e65 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 8 Feb 2009 15:06:26 -0500 Subject: Use mwexec_bg() --- config/frickin/frickin.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/frickin/frickin.inc b/config/frickin/frickin.inc index 16bffab8..8b57b8ae 100644 --- a/config/frickin/frickin.inc +++ b/config/frickin/frickin.inc @@ -77,7 +77,7 @@ EOD; mwexec("/usr/bin/killall frickin"); mwexec("chmod a+rx /usr/local/etc/rc.d/frickin.sh"); - mwexec("/usr/local/etc/rc.d/frickin.sh"); + mwexec_bg("/usr/local/etc/rc.d/frickin.sh"); // file_notice("System -> Advanced -> Scrub", "pfSenses scrub option has been disabled. See http://www.openbsd.org/faq/pf/scrub.html for more info.", "Scrub"); // $config['system']['scrubnodf'] = "enabled"; @@ -138,4 +138,4 @@ function frickin_generate_rules($type) { return $rules; } -?> \ No newline at end of file +?> -- cgit v1.2.3 From 06b39fc9943855c9c8eaa8edd5a0f1c09742934d Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 8 Feb 2009 15:09:48 -0500 Subject: Set the package title --- config/frickin/frickin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/frickin/frickin.xml b/config/frickin/frickin.xml index 89d3f2c8..497d4cd3 100644 --- a/config/frickin/frickin.xml +++ b/config/frickin/frickin.xml @@ -47,7 +47,7 @@ Currently there are no FAQ items provided. frickin 2.0-BETA1 - none + Frickin PPTP Proxy /usr/local/pkg/frickin.inc Frickin PPTP -- cgit v1.2.3 From 311f16327b6ecde2f562f68139fffa370874e6d9 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 8 Feb 2009 22:06:17 -0600 Subject: sync package description with what actually gets installed --- 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 6c8e105f..14941abf 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -301,7 +301,7 @@ http://www.imspector.org/ Network Management rswagoner@gmail.com - 0.4 + 0.5 1.0.1 BETA http://www.pfsense.com/packages/config/imspector/imspector.xml -- cgit v1.2.3 From 710f98dd7297fb6fa76c6a2ab827cb242e7528d9 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 8 Feb 2009 22:43:01 -0600 Subject: Fix Ryan's copywrite --- config/imspector/imspector.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/imspector/imspector.xml b/config/imspector/imspector.xml index 076dca13..7e2a12a5 100644 --- a/config/imspector/imspector.xml +++ b/config/imspector/imspector.xml @@ -9,11 +9,7 @@ /* authng.xml part of pfSense (http://www.pfSense.com) - Copyright (C) 2007 to whom it may belong - All rights reserved. - - Based on m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2006 Manuel Kasper . + Copyright (C) 2007 Ryan Wagoner . All rights reserved. */ /* ========================================================================== */ -- cgit v1.2.3 From 6423fb187920c10adf8c22a51d98c27ace2024f1 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 8 Feb 2009 22:45:26 -0600 Subject: imspector is now 0.5 --- config/imspector/imspector.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/imspector/imspector.xml b/config/imspector/imspector.xml index 7e2a12a5..1c272679 100644 --- a/config/imspector/imspector.xml +++ b/config/imspector/imspector.xml @@ -42,7 +42,7 @@ Describe your package requirements here Currently there are no FAQ items provided. imspector - 0.4 + 0.5 Services: IMSpector Change /services_imspector_logs.php -- cgit v1.2.3 From b79fa46fc7b32176ce7f925b31b6bd62e51b07d2 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 8 Feb 2009 23:00:41 -0600 Subject: 6th field is category, let's log and render it correctly --- config/imspector/services_imspector_logs.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php index 616d3dfc..09ba870e 100644 --- a/config/imspector/services_imspector_logs.php +++ b/config/imspector/services_imspector_logs.php @@ -102,13 +102,14 @@ if ($_POST['mode'] == "render") { $line = fgets($fd); if(feof($fd)) continue; - preg_match('/([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(.*)/', $line, $matches); + preg_match('/([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(|.*),(.*)/', $line, $matches); $address = $matches[1]; $timestamp = $matches[2]; $direction = $matches[3]; $type = $matches[4]; $filtered = $matches[5]; - $data = $matches[6]; + $category = $matches[6]; + $data = $matches[7]; if($direction == '0') { $bgcolor = $convo_remote_bgcolor; @@ -123,6 +124,7 @@ if ($_POST['mode'] == "render") { print("[$time]\n $user\n + $category\n $data\n"); } print("\n"); -- cgit v1.2.3