diff options
| author | Perry Mason <crazypark2@yahoo.dk> | 2009-02-09 12:41:13 +0100 |
|---|---|---|
| committer | Perry Mason <crazypark2@yahoo.dk> | 2009-02-09 12:41:13 +0100 |
| commit | 6dcf7659b156d598d960d440fa80a5de1756b187 (patch) | |
| tree | 9c1a32d23b586c63ef87bd737a879ccb796eadc2 | |
| parent | ff20b06136e58275d08269c532106a755341cc5e (diff) | |
| parent | b79fa46fc7b32176ce7f925b31b6bd62e51b07d2 (diff) | |
| download | pfsense-packages-6dcf7659b156d598d960d440fa80a5de1756b187.tar.gz pfsense-packages-6dcf7659b156d598d960d440fa80a5de1756b187.tar.bz2 pfsense-packages-6dcf7659b156d598d960d440fa80a5de1756b187.zip | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
| -rw-r--r-- | config/frickin/frickin.inc | 4 | ||||
| -rw-r--r-- | config/frickin/frickin.xml | 2 | ||||
| -rw-r--r-- | config/imspector/imspector.xml | 8 | ||||
| -rw-r--r-- | config/imspector/services_imspector_logs.php | 6 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
5 files changed, 10 insertions, 12 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 +?> 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 @@ <faq>Currently there are no FAQ items provided.</faq> <name>frickin</name> <version>2.0-BETA1</version> - <title>none</title> + <title>Frickin PPTP Proxy</title> <include_file>/usr/local/pkg/frickin.inc</include_file> <menu> <name>Frickin PPTP</name> diff --git a/config/imspector/imspector.xml b/config/imspector/imspector.xml index 076dca13..1c272679 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 <mk@neon1.net>. + Copyright (C) 2007 Ryan Wagoner <rswagoner@gmail.com>. All rights reserved. */ /* ========================================================================== */ @@ -46,7 +42,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>imspector</name> - <version>0.4</version> + <version>0.5</version> <title>Services: IMSpector</title> <savetext>Change</savetext> <aftersaveredirect>/services_imspector_logs.php</aftersaveredirect> 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("<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"); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 5fae3b25..490127e4 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -315,7 +315,7 @@ <website>http://www.imspector.org/</website> <category>Network Management</category> <maintainer>rswagoner@gmail.com</maintainer> - <version>0.4</version> + <version>0.5</version> <required_version>1.0.1</required_version> <status>BETA</status> <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file> |