X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_ogroup.inc;h=bfdd15e7d193f4affbbecc40f33909a8e1e19e7c;hb=fe2072bc84f9e0e3d434d00b456e9c366e45aa50;hp=25b10247ce7f05e04420c8d4533451a25156b952;hpb=3082209baacc737659b444a6de4ed6ef5588faaf;p=gosa.git

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 25b10247c..bfdd15e7d 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -32,7 +32,7 @@ class ogroup extends plugin
   var $group_dialog= FALSE;
 
   /* attribute list for save action */
-  var $attributes= array("cn", "description", "gosaGroupObjects");
+  var $attributes= array("cn", "description", "gosaGroupObjects","member");
   var $objectclasses= array("top", "gosaGroupOfNames");
 
   function ogroup ($config, $dn= NULL)
@@ -40,6 +40,8 @@ class ogroup extends plugin
     plugin::plugin ($config, $dn);
     $this->orig_dn= $dn;
 
+    $this->member = array();
+
     /* Load member objects */
     if (isset($this->attrs['member'])){
       foreach ($this->attrs['member'] as $key => $value){
@@ -83,33 +85,49 @@ class ogroup extends plugin
      $this->base = $_SESSION['ogroupfilter']['depselect'];
     }
 
+     /* set permissions */
+    $ui= get_userinfo();
+    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+    $this->acl= get_module_permission($acl, "ogroup", $ui->dn);
+
+
     /* Load member data */
     $this->reload();
   }
 
-  function AddDelMembership(){
-     /* Delete objects from group */
-    if (isset($_POST['delete_membership']) && isset($_POST['members'])){
-      foreach ($_POST['members'] as $value){
-        $this->objects["$value"]= $this->memberList[$value];
-        unset ($this->memberList["$value"]);
-        unset ($this->member["$value"]);
-        uasort ($this->objects, 'sort_list');
-        reset ($this->objects);
-      }
+  function AddDelMembership($NewMember = false){
+
+    if($NewMember){
+      $this->memberList[$NewMember]= $this->allobjects[$NewMember];
+      $this->member[$NewMember]= $NewMember;
+      unset ($this->objects[$NewMember]);
+      uasort ($this->memberList, 'sort_list');
+      reset ($this->memberList);
       $this->reload();
-    }
+    }else{
+      /* Delete objects from group */
+      if (isset($_POST['delete_membership']) && isset($_POST['members'])){
+        foreach ($_POST['members'] as $value){
+          $this->objects["$value"]= $this->memberList[$value];
+          unset ($this->memberList["$value"]);
+          unset ($this->member["$value"]);
+          uasort ($this->objects, 'sort_list');
+          reset ($this->objects);
+        }
+        $this->reload();
+      }
 
-    /* Add objects to group */
-    if (isset($_POST['add_object_finish']) && isset($_POST['objects'])){
-      foreach ($_POST['objects'] as $value){
-        $this->memberList["$value"]= $this->objects[$value];
-        $this->member["$value"]= $value;
-        unset ($this->objects[$value]);
-        uasort ($this->memberList, 'sort_list');
-        reset ($this->memberList);
+      /* Add objects to group */
+      if (isset($_POST['add_object_finish']) && isset($_POST['objects'])){
+        foreach ($_POST['objects'] as $value){
+          $this->memberList["$value"]= $this->objects[$value];
+          $this->member["$value"]= $value;
+          unset ($this->objects[$value]);
+          uasort ($this->memberList, 'sort_list');
+          reset ($this->memberList);
+        }
+        $this->reload();
       }
-      $this->reload();
     }
   }
 
@@ -117,8 +135,8 @@ class ogroup extends plugin
   {
 	/* Call parent execute */
 	plugin::execute();
-    
-    $this->reload();
+
+//    $this->reload();
 
     /* Do we represent a valid group? */
     if (!$this->is_account){
@@ -299,123 +317,199 @@ class ogroup extends plugin
   /* (Re-)Load objects */
   function reload()
   {
-    /* Generate object list */
-    $this->objects= array();
-    $this->allobjects= array();
+    /*###########
+      Variable initialisation 
+      ###########*/
+
+    $this->objects                = array();
+    $this->ui                     = get_userinfo();
+    $filter                       = "";
+    $objectClasses                = array();
+    
+    $ogfilter               = get_global("ogfilter");
+    $regex                  = $ogfilter['regex'];
+
+    /* Get ldap connection */
     $ldap= $this->config->get_ldap_link();
+    $ldap->cd ($ogfilter['dselect']);
 
-    /* Assemble filter */
-    $ogfilter= get_global("ogfilter");
 
-    $ldap->cd ($ogfilter['dselect']);
+    /*###########
+      Generate Filter 
+      ###########*/
 
-    $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,";
     }
-    $regex= $ogfilter['regex'];
 
-    $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
-    while ($attrs= $ldap->fetch()){
 
-      /* Get type */
-      $type= $this->getObjectType($attrs);
-      $name= $this->getObjectName($attrs);
+    /*###########
+      Perform search for selected objectClasses & regex to fill list with objects   
+      ###########*/
 
-      /* 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");
+    /* Perform search for selected objectClasses */
+    foreach($objectClasses as $class=> $basedn){
+      $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()){
+
+        $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");
+        }
       }
     }
     uasort ($this->objects, 'sort_list');
     reset ($this->objects);
 
-    $ldap->cd ($this->config->current['BASE']);
-    $filter= "(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=gosaApplication)(objectClass=gosaDepartment)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware)";
-    $regex= "*";
-
-    $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
-    while ($attrs= $ldap->fetch()){
-
-      /* Get type */
-      $type= $this->getObjectType($attrs);
-      $name= $this->getObjectName($attrs);
-
-      /* Fill array */
-      if (isset($attrs["description"][0])){
-        $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-      } elseif (isset($attrs["uid"][0])) {
-        $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
-      } else {
-        $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
-      }
-      $this->allobjects[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
-      if(isset($attrs['uid'])){
-        $this->allobjects[$attrs["dn"]]['uid']          = $attrs['uid'];
+    /*###########
+      Get a list with all possible objects, to detect objects which doesn't exists anymore ... 
+      ###########*/
+
+    /* Only do this, if this wasn't already done */
+    if(count($this->allobjects) == 0){
+      $ldap->cd ($this->config->current['BASE']);
+      $filter="(objectClass=gosaAccount)".        
+              "(objectClass=posixGroup)".
+              "(objectClass=gosaApplication)".
+              "(objectClass=gosaDepartment)".
+              "(objectClass=goServer)".
+              "(objectClass=gotoWorkstation)".
+              "(objectClass=gotoTerminal)".
+              "(objectClass=gotoPrinter)".
+              "(objectClass=goFonHardware)";
+      $regex= "*";
+
+      $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
+      while ($attrs= $ldap->fetch()){
+
+        $type= $this->getObjectType($attrs);
+        $name= $this->getObjectName($attrs);
+
+        if (isset($attrs["description"][0])){
+          $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+        } elseif (isset($attrs["uid"][0])) {
+          $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+        } else {
+          $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+        }
+        $this->allobjects[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
+        if(isset($attrs['uid'])){
+          $this->allobjects[$attrs["dn"]]['uid']          = $attrs['uid'];
+        }
       }
-    }
-    uasort ($this->allobjects, 'sort_list');
-    reset ($this->allobjects);
+      uasort ($this->allobjects, 'sort_list');
+      reset ($this->allobjects);
+    }      
+
+    
+    /*###########
+      Build member list and try to detect obsolete entries 
+      ###########*/
 
-    /* Build member list */
-    $this->memberList= array();
+    $this->memberList = array();
+  
+    /* Walk through all single member entry */
     foreach($this->member as $dn){
 
       /* Object in object list? */
       if (isset($this->allobjects[$dn])){
+        
+        /* Add this entry to member list, its dn is in allobjects
+            this means it still exists 
+         */
         $this->memberList[$dn]= $this->allobjects[$dn];
+
+        /* Remove this from selectable entries */
         if (isset ($this->objects[$dn])){
           unset ($this->objects[$dn]);
         }
 
+      
       } else {
 
-        /* No, try to ge informations from LDAP */
+        /* The dn for the current member can't be resolved 
+            it seams that this entry was removed 
+         */ 
+        /* Try to resolv the entry again, if it still fails, display error msg */
         $ldap->cat($dn, array("cn", "sn", "givenName", "ou", "description", "objectClass"));
+
+        /* It has failed, add entry with type flag I (Invalid)*/
         if ($ldap->error != "success"){
-          $this->memberList[$dn]= array('text' => _("Non existing dn: ")."$dn",
-              "type" => "I");
+          $this->memberList[$dn]= array('text' => _("Non existing dn: ")."$dn","type" => "I");
+
         } else {
-          $ldap->cat($dn);
+          
+          /* Append this entry to our all object list */
+    
+          /* Fetch object */
           $attrs= $ldap->fetch();
+
           $type= $this->getObjectType($attrs);
           $name= $this->getObjectName($attrs);
 
+          if (isset($attrs["description"][0])){
+            $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+          } elseif (isset($attrs["uid"][0])) {
+            $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+          } else {
+            $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+          }
+          $this->allobjects[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
+          if(isset($attrs['uid'])){
+            $this->allobjects[$attrs["dn"]]['uid']          = $attrs['uid'];
+          }
+
           /* Fill array */
           if (isset($attrs["description"][0])){
             $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
           } else {
             $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
           }
-
         }
       }
     }
@@ -489,6 +583,7 @@ class ogroup extends plugin
   function getObjectName($attrs)
   {
     /* Person? */
+    $name =""; 
     if (in_array('gosaAccount', $attrs['objectClass'])){
       if(isset($attrs['sn']) && isset($attrs['givenName'])){
         $name= $attrs['sn'][0].", ".$attrs['givenName'][0];
@@ -518,6 +613,16 @@ class ogroup extends plugin
       $new_dn= $this->dn;
     }
 
+
+    $ldap = $this->config->get_ldap_link();
+    if($this->dn != $new_dn){
+      $ldap->cat ($new_dn);
+    }
+    
+    if($ldap->count() !=0){
+      $message[]= _("There is already an object with this cn.");
+    } 
+
     $ui= get_userinfo();
     $acl= get_permissions ($new_dn, $ui->subtreeACL);
     $acl= get_module_permission($acl, "group", $new_dn);
@@ -545,6 +650,7 @@ class ogroup extends plugin
     plugin::save();
 
     /* Move members to target array */
+    $this->attrs['member'] =array();
     foreach ($this->member as $key => $desc){
       $this->attrs['member'][]= $key;
     }
@@ -573,6 +679,7 @@ class ogroup extends plugin
 
     /* Write back to ldap */
     $ldap->cd($this->dn);
+    $this->cleanup();
     $ldap->$mode($this->attrs);
 
     /* Trigger post signal */