From dd38e65e6c05056aa0c0cab058595574068a2ece Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 21 Jul 2010 10:10:24 +0000
Subject: [PATCH] Updated samba handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@19033 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../samba/personal/samba/class_sambaAccount.inc      | 12 +++++++-----
 gosa-plugins/samba/personal/samba/samba3.tpl         |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 1ea64c29e..39695c420 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -1217,13 +1217,15 @@ class sambaAccount extends plugin
             $this->save_object();
             plugin::multiple_save_object();
             foreach(array("allow_pwchange","tslogin","CtxWFHomeDir","CtxWFHomeDirDrive","CtxWFProfilePath",
-                        "inherit","CtxWorkDirectory","CtxInitialProgram","CtxMaxConnectionTimeF","CtxMaxConnectionTime","CtxMaxDisconnectionTimeF",
+                        "inherit","CtxWorkDirectory","CtxInitialProgram","CtxMaxConnectionTimeF",
+                        "CtxMaxConnectionTime","CtxMaxDisconnectionTimeF",
                         "CtxMaxDisconnectionTime","CtxMaxIdleTimeF","CtxMaxIdleTime","connectclientdrives",
                         "onnectclientprinters","defaultprinter","shadow","brokenconn",
-                        "reconn","allow_pwchange","connectclientprinters","no_expiry","no_password_required","temporary_disable",
-                        "password_expires","logon_time_set","logoff_time_set","kickoff_time_set","SetSambaLogonHours",
-                        "workstation_list","enforcePasswordChange","cannotChangePassword") as $attr){
-                if(isset($_POST["use_".$attr])){
+                        "reconn","connectclientprinters","SetSambaLogonHours","workstation_list",
+                        "enforcePasswordChange", "passwordNeverExpires", "noPasswordRequired",
+                        "temporaryDisabled","cannotChangePassword"
+                        ) as $attr){
+                if(isset($_POST["use_".$attr]) || isset($_POST["use_flag_".$attr]) ){
                     $this->multi_boxes[] = $attr;
                 }
             }
diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index f631d7250..750738e54 100644
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -328,7 +328,7 @@
         <tr>
             <td>
                 {render acl=$passwordNeverExpiresACL  checkbox=$multiple_support checked=$use_passwordNeverExpires}
-                <input type='checkbox' value='1 'name="flag_passwordNeverExpires" 
+                <input type='checkbox' value='1' name="flag_passwordNeverExpires" 
                     {if $flag_passwordNeverExpires} checked {/if} id='flag_passwordNeverExpires'>
                 {/render}
             </td>
-- 
2.30.2