From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 14 Jan 2009 14:25:52 +0000 (+0000)
Subject: Updated samba tab
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cbaeaf9f2cf9d13e77ba3b27fe4bfa4847084fcd;p=gosa.git

Updated samba tab
-fixed minor probmlems


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13351 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 56ebe58d9..bd3b56686 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -76,6 +76,7 @@ class sambaAccount extends plugin
   var $mungedObject;
 
   /* Helper */
+  var $cache = array();
   var $show_ws_dialog= FALSE;
   var $logon_time_set= 0;
   var $logoff_time_set= 0;
@@ -806,14 +807,10 @@ class sambaAccount extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
     if(!empty($this->sambaDomainName) && isset($this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName])){
-      $cfg = $this->config->data['SERVERS']['SAMBA'][$this->sambaDomainName];
-      $ldap->search("(&(objectClass=sambaDomain)(sambaSID=".$cfg['SID']."))",array("*"));
-      if($ldap->count() >= 1){
-        $attrs = $ldap->fetch();
-        foreach($domain_attributes as $attr){
-          if(isset($attrs[$attr])){
-            $$attr = $attrs[$attr][0];
-          }
+      $attrs = $this->get_domain_info();
+      foreach($domain_attributes as $attr){
+        if(isset($attrs[$attr])){
+          $$attr = $attrs[$attr][0];
         }
       }
     }
diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index 3561a2083..816b75fa1 100644
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -27,7 +27,7 @@
      <td>
 {render acl=$sambaDomainNameACL  checkbox=$multiple_support checked=$use_sambaDomainName}
       <select id="sambaDomainName" size="1" name="sambaDomainName"
-       {if $display_information} onChange="document.mainform.submit();" {/if}>
+       onChange="document.mainform.submit();">
        {html_options values=$domains output=$domains selected=$sambaDomainName}
       </select>
 {/render}