* synced freenas package to current FreeNAS trunk

* unison package file needs to be added to pfsense.com
* rc script needs to be tested

1 files changed, 65 insertions, 56 deletions

diff --git a/packages/freenas/www/diag_fn_logs_daemon.php b/packages/freenas/www/diag_fn_logs_daemon.php
index 2f447b8d..1eaa1f0f 100644
--- a/packages/freenas/www/diag_fn_logs_daemon.php
+++ b/packages/freenas/www/diag_fn_logs_daemon.php
@@ -1,35 +1,44 @@
 <?php
 /* $Id$ */
+/* ========================================================================== */
 /*
-	diag_logs_settings.php
-	Copyright (C) 2004 Scott Ullrich
-	All rights reserved.
+    diag_fn_logs_daemon.php
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2006 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
 
-	originially part of m0n0wall (http://m0n0.ch/wall)
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
+    Based on FreeNAS (http://www.freenas.org)
+    Copyright (C) 2005-2006 Olivier Cochard-Labbé <olivier@freenas.org>.
+    All rights reserved.
 
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    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.
+     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.
+     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.
-*/
+    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.
+                                                                              */
+/* ========================================================================== */
 
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
@@ -46,16 +55,16 @@ if (!$nentries)
 
 if ($_POST['clear'])
 {
-	exec("/usr/sbin/clog -i -s 262144 /var/log/daemon.log");
-	/* redirect to avoid reposting form data on refresh */
-	pfSenseHeader("diag_logs_daemon.php");
-	exit;
+  exec("/usr/sbin/clog -i -s 262144 /var/log/daemon.log");
+  /* redirect to avoid reposting form data on refresh */
+  pfSenseHeader("diag_fn_logs_daemon.php");
+  exit;
 }
 
 /* if ajax is calling, give them an update message */
 if(isAjax())
-	print_info_box_np($savemsg);
-			
+  print_info_box_np($savemsg);
+
 include("head.inc");
 /* put your custom HTML head content here        */
 /* using some of the $pfSenseHead function calls */
@@ -71,36 +80,36 @@ echo $pfSenseHead->getHTML();
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
 <?php
-	$tab_array = array();
-	$tab_array[] = array(gettext("Samba"),    false, "diag_fn_logs_samba.php");
-	$tab_array[] = array(gettext("FTP"),      false, "diag_fn_logs_ftp.php");
-	$tab_array[] = array(gettext("RSYNCD"),   false, "diag_fn_logs_rsyncd.php");
+  $tab_array = array();
+  $tab_array[] = array(gettext("Samba"),    false, "diag_fn_logs_samba.php");
+  $tab_array[] = array(gettext("FTP"),      false, "diag_fn_logs_ftp.php");
+  $tab_array[] = array(gettext("RSYNCD"),   false, "diag_fn_logs_rsyncd.php");
   $tab_array[] = array(gettext("SSHD"),     false, "diag_fn_logs_sshd.php");
-	$tab_array[] = array(gettext("SMARTD"),   false, "diag_fn_logs_smartd.php");
-	$tab_array[] = array(gettext("Daemon"),   true,  "diag_fn_logs_daemon.php");
-	$tab_array[] = array(gettext("Settings"), false, "diag_fn_logs_settings.php");
-	display_top_tabs($tab_array);?>
+  $tab_array[] = array(gettext("SMARTD"),   false, "diag_fn_logs_smartd.php");
+  $tab_array[] = array(gettext("Daemon"),   true,  "diag_fn_logs_daemon.php");
+  $tab_array[] = array(gettext("Settings"), false, "diag_fn_logs_settings.php");
+  display_top_tabs($tab_array);?>
   </td></tr>
   <tr>
     <td>
-	<div id="mainarea">
-	  <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-      <tr> 
-			  <td class="listtopic"> 
-			    Last <?=$nentries;?> Daemon log entries
-        </td>
-		  </tr>
-      <?php dump_clog("/var/log/daemon.log", $nentries); ?>
-      <tr>
-        <td align="left" valign="top" height="12">&nbsp;</td>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          <input name="clear" type="submit" class="formbtn" value="Clear log" />
-        </td>
-      </tr>
-    </table>
-	</div>
+    <div id="mainarea">
+      <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+        <tr> 
+          <td class="listtopic"> 
+            Last <?=$nentries;?> Daemon log entries
+          </td>
+        </tr>
+        <?php dump_clog("/var/log/daemon.log", $nentries); ?>
+        <tr>
+          <td align="left" valign="top" height="12">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="left" valign="top">
+            <input name="clear" type="submit" class="formbtn" value="Clear log" />
+          </td>
+        </tr>
+      </table>
+    </div>
     </td>
   </tr>
 </table>