Fixed FAI

[gosa.git] / plugins / admin / groups / class_groupManagement.inc

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index fe9c5119cb4f63dc1a5724ef522fe641e6cc9bc1..f5c96f2e7566ab5ecefd9974430ff838c2493388 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -373,7 +373,8 @@ class groupManagement extends plugin
     $mailimg  = "<img src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
     $sambaimg = "<img src='images/select_winstation.png'  alt='S'  title='"._("Samba")  ."'>";
     $applimg  = "<img src='images/select_application.png' alt='A'  title='"._("Application")."'>"; 
-    $phoneimg  = "<img src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
+    $phoneimg = "<img src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
+    $envimg   = "<img src='images/network.png'      alt='E' title='"._("Environment")  ."'>"; 
     // Space
     $empty    = "<img src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
@@ -382,7 +383,7 @@ class groupManagement extends plugin
     $divlist->SetHeader(array(
           array("string" => "&nbsp;"),
           array("string" => _("Groupname")." / "._("Department")),
-          array("string" => _("Properties"), "attach" => "style='width:100px;'"),
+          array("string" => _("Properties"), "attach" => "style='width:116px;'"),
           array("string" => _("Actions")    ,"attach" => "style='border:none'")
           ));
 
@@ -421,6 +422,7 @@ class groupManagement extends plugin
         if(in_array("sambaGroupMapping",    $val['objectClass']))   $samba = $sambaimg;   else $samba   = $empty;
         if(in_array("gosaApplicationGroup", $val['objectClass']))   $appl  = $applimg;    else $appl    = $empty;
         if(in_array("goFonPickupGroup",     $val['objectClass']))   $phone = $phoneimg;   else $phone   = $empty;
+        if(in_array("gotoEnvironment",      $val['objectClass']))   $enviro= $envimg;     else $enviro  = $empty;
       }else{
         $posix=$mail=$samba=$appl=$phone=$empty;
       }
@@ -434,7 +436,7 @@ class groupManagement extends plugin
       }      
       $field1 = array("string" => sprintf($userimg,$val['dn']),"attach"=>"style='width:20px;align:middle;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title);
-      $field3 = array("string" => $posix."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone);  
+      $field3 = array("string" => $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone);  
       $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none;width:32px;'");
       
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));    
@@ -607,7 +609,7 @@ class groupManagement extends plugin
     $primaries= array();
     $ldap= $this->config->get_ldap_link(TRUE);
     $ldap->cd($base);
-    $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
+    $ldap->ls("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
     $error= $ldap->error;
     while ($attrs= $ldap->fetch()){
       $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0];
@@ -647,7 +649,7 @@ class groupManagement extends plugin
     if ($groupfilter['functionalgroups'] == "checked"){
       $ldap->cd($base);
       $ldap->set_size_limit($_SESSION['size_limit']);
-      $ldap->search("(&(cn=$regex)(objectClass=posixGroup)(!(|(objectClass=gosaMailAccount)(objectClass=gosaApplicationGroup)$sfilter)))", array("cn", "gidNumber", "description"));
+      $ldap->ls("(&(cn=$regex)(objectClass=posixGroup)(!(|(objectClass=gosaMailAccount)(objectClass=gosaApplicationGroup)$sfilter)))", array("cn", "gidNumber", "description"));
       $error2= $ldap->error;
       while ($attrs= $ldap->fetch()){
         if (!isset($primaries[$attrs['gidNumber'][0]])){
@@ -696,7 +698,6 @@ class groupManagement extends plugin
       $_SESSION['limit_exceeded']= TRUE;
     }
 
-    $this->grouplist = array();  
     foreach ($res as $value){
       $this->grouplist[$value['gidNumber'][0]]= $value;
     }