Udpated ogroup tab priority && fixed list entry generation

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

diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index ce860169c94e70dc69ab0c9da857ce516b4ec99f..769b913cf4193170f7bb0a6a862065c0996f2980 100644 (file)
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -168,7 +168,7 @@ class mailogroup extends plugin
           "plDescription" => _("Mail group"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 4,
           "plSection"     => array("administration"),
           "plCategory"    => array("ogroups"),
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index f7aab468e45399a62e739102b0f2cd775f3a808e..6093ef128bfd083668dbfe237288d5758f8329d9 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -357,7 +357,6 @@ class ogroup extends plugin
     $ogfilter               = get_global("ogfilter");
     $regex                  = $ogfilter['regex'];
 
-    /* Get ldap connection */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd ($ogfilter['dselect']);
 
@@ -366,75 +365,47 @@ class ogroup extends plugin
       Generate Filter 
       ###########*/
 
-    /* Assemble filter */
-    if ($ogfilter['accounts'] == "checked"){
-      $filter.= "(objectClass=gosaAccount)";
-      $objectClasses["gosaAccount"]     = get_people_ou();
-    }
-    if ($ogfilter['groups'] == "checked"){
-      $filter.= "(objectClass=posixGroup)";
-      $objectClasses["posixGroup"]      = get_groups_ou();
-    }
-    if ($ogfilter['applications'] == "checked"){
-      $filter.= "(objectClass=gosaApplication)";
-      $objectClasses["gosaApplication"] = "ou=apps,";
-    }
-    if ($ogfilter['departments'] == "checked"){
-      $filter.= "(objectClass=gosaDepartment)";
-      $objectClasses["gosaDepartment"]  = "";
-    }
-    if ($ogfilter['servers'] == "checked"){
-      $filter.= "(objectClass=goServer)";
-      $objectClasses["goServer"]        = "ou=servers,ou=systems,";
-    }
-    if ($ogfilter['workstations'] == "checked"){
-      $filter.= "(objectClass=gotoWorkstation)";
-      $objectClasses["gotoWorkstation"] = "ou=workstations,ou=systems,";
-    }
-    if ($ogfilter['terminals'] == "checked"){
-      $filter.= "(objectClass=gotoTerminal)";
-      $objectClasses["gotoTerminal"]    = "ou=terminals,ou=systems,";
-    }
-    if ($ogfilter['printers'] == "checked"){
-      $filter.= "(objectClass=gotoPrinter)";
-
-      $objectClasses["gotoPrinter"]     = "ou=printers,ou=systems,";
-    }
-    if ($ogfilter['phones'] == "checked"){
-      $filter.= "(objectClass=goFonHardware)";
-      $objectClasses["goFonHardware"]   = "ou=phones,ou=systems,";
-    }
+    $p_f= array("accounts"        => array("CLASS"=>"gosaAccount"    ,"DN"=> get_people_ou()                  ,"ACL" => "users"), 
+                "groups"          => array("CLASS"=>"posixGroup"     ,"DN"=> get_groups_ou()                  ,"ACL" => "groups"), 
+                "applications"    => array("CLASS"=>"gosaApplication","DN"=> "ou=apps,"                       ,"ACL" => "application"), 
+                "departments"     => array("CLASS"=>"gosaDepartment" ,"DN"=> ""                               ,"ACL" => "department"), 
+                "servers"         => array("CLASS"=>"goServer"       ,"DN"=> "ou=servers,ou=systems,"         ,"ACL" => "server"),
+                "workstations"    => array("CLASS"=>"gotoWorkstation","DN"=> "ou=workstations,ou=systems,"    ,"ACL" => "workstation"),
+                "terminals"       => array("CLASS"=>"gotoTerminal"   ,"DN"=> "ou=terminals,ou=systems,"       ,"ACL" => "terminal"),
+                "printers"        => array("CLASS"=>"gotoPrinter"    ,"DN"=> "ou=printers,ou=systems,"        ,"ACL" => "printer"),
+                "phones"          => array("CLASS"=>"goFonHardware"  ,"DN"=> "ou=phones,ou=systems,"          ,"ACL" => "phone"));
 
 
     /*###########
       Perform search for selected objectClasses & regex to fill list with objects   
       ###########*/
 
-    /* Perform search for selected objectClasses */
-    foreach($objectClasses as $class=> $basedn){
+    $Get_list_flags = 0;
+    if($ogfilter['subtrees'] == "checked"){
+      $Get_list_flags |= GL_SUBSEARCH;
+    }    
 
-      if($ogfilter['subtrees'] == "checked"){
-        $ldap->cd($ogfilter['dselect']);
-        $ldap->search("(&(objectClass=".$class.")(|(uid=$regex)(cn=$regex)(ou=$regex)))",
-            array("dn", "cn", "description", "objectClass", "sn", "givenName", "uid","ou"));
-      }else{
-        $ldap->ls("(&(objectClass=".$class.")(|(uid=$regex)(cn=$regex)(ou=$regex)))",$basedn.$ogfilter['dselect'] ,
-            array("dn", "cn", "description", "objectClass", "sn", "givenName", "uid","ou"));
-      }
-      
-      /* fetch results and append them to the list */
-      while($attrs = $ldap->fetch()){
+    foreach($p_f as $post_name => $data){
 
-        $type= $this->getObjectType($attrs);
-        $name= $this->getObjectName($attrs);
+      if($ogfilter[$post_name] == "checked"){
+        $filter = "(&(objectClass=".$data['CLASS'].")(|(uid=$regex)(cn=$regex)(ou=$regex)))";
+        $res    = get_list($filter, $data['ACL']  , $data['DN'].$ogfilter['dselect'], 
+                    array("description", "objectClass", "sn", "givenName", "uid","ou","cn"));
 
-        /* Fill array */
-        if (isset($attrs["description"][0])){
-          $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-        } elseif (isset($attrs["uid"][0])) {
-          $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
-        } else {
-          $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+        /* fetch results and append them to the list */
+        foreach($res as $attrs){
+
+          $type= $this->getObjectType($attrs);
+          $name= $this->getObjectName($attrs);
+
+          /* Fill array */
+          if (isset($attrs["description"][0])){
+            $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+          } elseif (isset($attrs["uid"][0])) {
+            $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+          } else {
+            $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+          }
         }
       }
     }
@@ -715,7 +686,7 @@ class ogroup extends plugin
           "plDescription" => _("Object group generic"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 1,
           "plSection"     => array("administration"),
           "plCategory"    => array("ogroups" => array("description"  => _("Object groups"),
                                                       "objectClass"  => "gosaGroupOfNames")),

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 07ab713d35716059d4fd17a3edcba63a9f21a41b..0b3ec303e9e235a4f5fbdcedfd276ba11ebea2db 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -719,7 +719,7 @@ class phonequeue extends plugin
           "plDescription" => _("Phone group"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 3,
           "plSection"     => array("administration"),
           "plCategory"    => array("ogroups"), 
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc
index ffd6eb115ceea23242a810c5b56e6382b0046d4a..eb152e1e12b1b3a573493ba9660cf041cf0af979 100644 (file)
--- a/plugins/admin/ogroups/class_termgroup.inc
+++ b/plugins/admin/ogroups/class_termgroup.inc
@@ -383,7 +383,7 @@ class termgroup extends plugin
           "plDescription" => _("System group"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 5,
           "plSection"     => array("administration"),
           "plCategory"    => array("ogroups"),
           "plProvidedAcls"=> array(