Fixed Terminal/Workstation -template string in mangement list.

[gosa.git] / plugins / admin / ogroups / class_ogroup.inc

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 9715ac161c635f8d0b15d3358d7e0443d387230e..ed44e8ea46b873609ce008b4eac4352f98b23ce1 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -71,6 +71,7 @@ class ogroup extends plugin
           "W" => "workstations",
           "T" => "terminals",
           "F" => "phones",
+          "_" => "subtrees",
           "P" => "printers") as $key => $val){
 
       if (preg_match("/$key/", $this->gosaGroupObjects)){
@@ -80,24 +81,27 @@ class ogroup extends plugin
       }
     }
     register_global("ogfilter", $ogfilter);
-  
-    if(isset($_SESSION['CurrentMainBase'])){
-     $this->base = $_SESSION['CurrentMainBase'];
+ 
+    /* Set base */
+    if ($this->dn == "new"){
+      $this->base= $_SESSION['CurrentMainBase'];
+    } else {
+      $this->base= preg_replace("/^[^,]+,".get_groups_ou()."/","",$this->dn);
     }
 
-     /* set permissions */
+    /* 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($NewMember = false){
-
+  function AddDelMembership($NewMember = false)
+  {
     if($NewMember){
+      $this->importMember($NewMember);
       $this->memberList[$NewMember]= $this->objcache[$NewMember];
       $this->member[$NewMember]= $NewMember;
       unset ($this->objects[$NewMember]);
@@ -225,7 +229,7 @@ class ogroup extends plugin
       }
       if (isset($_POST['dselect'])){
         foreach( array("accounts", "groups", "applications", "departments",
-              "servers", "workstations", "terminals", "printers",
+              "servers", "workstations", "terminals", "printers","subtrees",
               "phones") as $type){
 
           if (isset($_POST[$type])) {
@@ -255,7 +259,7 @@ class ogroup extends plugin
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
       foreach( array("dselect", "regex", "accounts", "groups", "applications",
-            "departments", "servers", "workstations", "terminals",
+            "departments", "servers", "workstations", "terminals","subtrees",
             "printers", "phones") as $type){
         $smarty->assign("$type", $ogfilter[$type]);
       }
@@ -409,8 +413,15 @@ class ogroup extends plugin
 
     /* 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"));
+
+      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()){
@@ -440,48 +451,7 @@ class ogroup extends plugin
   
     /* Walk through all single member entry */
     foreach($this->member as $dn){
-
-      /* 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:")." ".@LDAP::fix($dn),"type" => "I");
-
-      } else {
-
-        /* 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->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-        } elseif (isset($attrs["uid"][0])) {
-          $this->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
-        } else {
-          $this->objcache[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
-        }
-        $this->objcache[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
-        if(isset($attrs['uid'])){
-          $this->objcache[$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");
-        }
-
-        $this->memberList[$dn]= $this->objects[$attrs["dn"]];
-      }
+      $this->importMember($dn);
     }
     uasort ($this->memberList, 'sort_list');
     reset ($this->memberList);
@@ -504,6 +474,48 @@ class ogroup extends plugin
   }
 
 
+  function importMember($dn)
+  {
+    $ldap= $this->config->get_ldap_link();
+
+    /* 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:")." ".@LDAP::fix($dn),"type" => "I");
+    } else {
+      /* 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->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+      } elseif (isset($attrs["uid"][0])) {
+        $this->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+      } else {
+        $this->objcache[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+      }
+      $this->objcache[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
+      if(isset($attrs['uid'])){
+        $this->objcache[$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");
+      }
+
+      $this->memberList[$dn]= $this->objects[$attrs["dn"]];
+    }
+  }
+
   function convert_list($input)
   {
     $temp= "";
@@ -678,10 +690,15 @@ class ogroup extends plugin
 
   function getCopyDialog()
   {
-    $str  = "";
-    $str .= _("Group name");
-    $str .= "&nbsp;<input type='text' name='cn' value='".$this->cn."'>";
-    return($str);
+    $str = "";
+
+    $smarty = get_smarty();
+    $smarty->assign("cn",     $this->cn);
+    $str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE,dirname(__FILE__)));
+    $ret = array();
+    $ret['string'] = $str;
+    $ret['status'] = "";
+    return($ret);
   }
 
   function saveCopyDialog()