* 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, 76 insertions, 68 deletions

diff --git a/packages/freenas/www/services_afp.php b/packages/freenas/www/services_afp.php
index 07410ded..2487c6f7 100644
--- a/packages/freenas/www/services_afp.php
+++ b/packages/freenas/www/services_afp.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.
-*/
+    services_afp.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("Services"),
                  gettext("AFP"));
@@ -41,7 +49,7 @@ require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
 if (!is_array($freenas_config['afp'])) {
-	$freenas_config['afp'] = array();	
+  $freenas_config['afp'] = array();	
 }
 
 
@@ -57,26 +65,26 @@ if (! empty($_POST))
   /* simple error list */
   unset($input_errors);
   $pconfig = $_POST;
-
+  
   /* input validation */
   $reqdfields = split(" ", "afpname");
   $reqdfieldsn = split(",", "Afpname");
-
+  
   do_input_validation_new($_POST, $reqdfields, $reqdfieldsn, &$error_bucket);
-
-	if ($_POST['enable'] && !$_POST['guest'])
-	{
-		if (!$_POST['local'])
+  
+  if ($_POST['enable'] && !$_POST['guest'])
+  {
+    if (!$_POST['local'])
       $error_bucket[] = array("error" => gettext("You must select at least one authentication method."),
                               "field" => "local");
-	}
-	if ($_POST['enable'] && !$_POST['local'])
-	{
-		if (!$_POST['guest'])
+  }
+  if ($_POST['enable'] && !$_POST['local'])
+  {
+    if (!$_POST['guest'])
       $error_bucket[] = array("error" => gettext("You must select at least one authentication method."),
                               "field" => "name");
-	}
-
+  }
+  
   if (is_array($error_bucket))
     foreach($error_bucket as $elem)
       $input_errors[] =& $elem["error"];
@@ -87,27 +95,27 @@ if (! empty($_POST))
       exit;   
   }
   
-	if (!$input_errors)
-	{
-		$freenas_config['afp']['enable'] = $_POST['enable'] ? true : false;
-		$freenas_config['afp']['guest'] = $_POST['guest'] ? true : false;
-		$freenas_config['afp']['local'] = $_POST['local'] ? true : false;
-		$freenas_config['afp']['afpname'] = $_POST['afpname'];
-		
-		write_config();
-		
-		$retval = 0;
-		if (!file_exists($d_sysrebootreqd_path))
-		{
-			/* nuke the cache file */
-			config_lock();
-			services_afpd_configure();
-			services_zeroconf_configure();
-			config_unlock();
-		}
+  if (!$input_errors)
+  {
+    $freenas_config['afp']['enable'] = $_POST['enable'] ? true : false;
+    $freenas_config['afp']['guest'] = $_POST['guest'] ? true : false;
+    $freenas_config['afp']['local'] = $_POST['local'] ? true : false;
+    $freenas_config['afp']['afpname'] = $_POST['afpname'];
+    
+    write_config();
     
-		$savemsg = get_std_save_message($retval);
-	}
+    $retval = 0;
+    if (!file_exists($d_sysrebootreqd_path))
+    {
+      /* nuke the cache file */
+      config_lock();
+      services_afpd_configure();
+      services_zeroconf_configure();
+      config_unlock();
+    }
+    
+    $savemsg = get_std_save_message($retval);
+  }
 }
 
 include("head.inc");
@@ -118,13 +126,13 @@ $jscriptstr = <<<EOD
 <script type="text/javascript">
 <!--
 function enable_change(enable_change) {
-	var endis;
-	
-	endis = !(document.iform.enable.checked || enable_change);
+  var endis;
+  
+  endis = !(document.iform.enable.checked || enable_change);
   endis ? color = '#D4D0C8' : color = '#FFFFFF';
   
-	document.iform.guest.disabled = endis;
-	document.iform.local.disabled = endis;
+  document.iform.guest.disabled = endis;
+  document.iform.local.disabled = endis;
   document.iform.afpname.disabled = endis;
   /* color adjustments */
   document.iform.guest.style.backgroundColor = color;