* 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, 50 insertions, 42 deletions

diff --git a/packages/freenas/www/status_disks.php b/packages/freenas/www/status_disks.php
index 7ab8bed8..704bc467 100644
--- a/packages/freenas/www/status_disks.php
+++ b/packages/freenas/www/status_disks.php
@@ -1,36 +1,44 @@
 <?php
 /* $Id$ */
+/* ========================================================================== */
 /*
-	disks_manage_edit.php
-	part of FreeNAS (http://www.freenas.org)
-	Copyright (C) 2005-2006 Olivier Cochard-Labbé <olivier@freenas.org>.
-	All rights reserved.
-	
-	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.
-	
-	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.
-*/
+    status_disks.php
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2006 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on FreeNAS (http://www.freenas.org)
+    Copyright (C) 2005-2006 Olivier Cochard-Labbé <olivier@freenas.org>.
+    All rights reserved.
+
+    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.
+
+     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.
+                                                                              */
+/* ========================================================================== */
 
 $pgtitle = array(gettext("Status"),
                  gettext("Disks"));
@@ -40,8 +48,8 @@ require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
 if (!is_array($freenas_config['disks']['disk']))
-	$freenas_config['disks']['disk'] = array();
-	
+  $freenas_config['disks']['disk'] = array();
+
 disks_sort();
 
 $raidstatus=get_sraid_disks_list();
@@ -68,8 +76,8 @@ echo $pfSenseHead->getHTML();
           <td width="5%" class="listhdrr">Size</td>
           <td width="60%" class="listhdrr">Description</td>
           <td width="10%" class="listhdr">Status</td>
-				</tr>
-			  <?php foreach ($a_disk_conf as $disk): ?>
+        </tr>
+        <?php foreach ($a_disk_conf as $disk): ?>
         <tr>
           <td class="listr">
             <?=htmlspecialchars($disk['name']);?>
@@ -85,10 +93,10 @@ echo $pfSenseHead->getHTML();
             $stat=disks_status($disk);
             echo $stat;?>&nbsp;
           </td>
-				</tr>
-			  <?php endforeach; ?>
-			  <?php if (isset($raidstatus)): ?>
-				<?php foreach ($raidstatus as $diskk => $diskv): ?>
+        </tr>
+        <?php endforeach; ?>
+        <?php if (isset($raidstatus)): ?>
+        <?php foreach ($raidstatus as $diskk => $diskv): ?>
         <tr>
           <td class="listr">
             <?=htmlspecialchars($diskk);?>
@@ -103,16 +111,16 @@ echo $pfSenseHead->getHTML();
            <td class="listr">
               <?=htmlspecialchars($diskv['desc']);?>&nbsp;
           </td>
-				</tr>
-				<?php endforeach; ?>
-			  <?php endif; ?>
+        </tr>
+        <?php endforeach; ?>
+        <?php endif; ?>
     </table>
   </form>
 <?php include("fend.inc"); ?>
 <?= checkForInputErrors(); ?>
 <script type="text/javascript">
 <!--
-enable_change(false);
+// enable_change(false);
 //-->
 </script>
 </body>