X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-core%2Fplugins%2Fadmin%2Fogroups%2Fclass_ogroup.inc;h=5c51363c5701aa5c4d97fe80e5319ea3b654dd83;hb=2274d64c94b69218e890419926ba10548cc2d098;hp=761b4d9fabaa9d6aa895040c73067610a21ced55;hpb=e1b170490c61df9cdc32629e6dfcd2c59946337a;p=gosa.git diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index 761b4d9fa..5c51363c5 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -50,14 +50,15 @@ class ogroup extends plugin var $orig_dn= ""; var $orig_cn= ""; var $orig_base= ""; - var $group_dialog= FALSE; + var $objectSelect= FALSE; var $view_logged = FALSE; var $accessTo= array(); var $trustModel= ""; - var $show_ws_dialog = FALSE; + var $trustSelect = FALSE; var $was_trust_account= FALSE; + var $baseSelector; /* Already assigned Workstations. Will be hidden in selection. */ @@ -124,7 +125,7 @@ class ogroup extends plugin if ($this->dn == "new"){ $this->base = session::get('CurrentMainBase'); } else { - $this->base= preg_replace("/^[^,]+,".normalizePreg(get_ou("ogroupRDN"))."/","",$this->dn); + $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("ogroupRDN"), '/')."/i","",$this->dn); /* Is this account a trustAccount? */ if ($this->is_account && isset($this->attrs['trustModel'])){ @@ -149,19 +150,19 @@ class ogroup extends plugin - Check() will complain if such a system is assigned to this object group. */ $base = $this->config->current['BASE']; - $res = get_list("(objectClass=gotoWorkstation)","none" , + $res = get_list("(|(objectClass=gotoWorkstation)(objectClass=gotoTerminal))","none" , $base, array("dn"),GL_NO_ACL_CHECK|GL_SUBSEARCH); $ws_dns = array(); foreach($res as $data){ $ws_dns[] = $data['dn']; } $res=get_list("(&(member=*)(objectClass=gosaGroupOfNames))","none", - $base, array("dn","member"),GL_NO_ACL_CHECK|GL_SUBSEARCH); + $base, array("dn","member", "gosaGroupObjects"),GL_NO_ACL_CHECK|GL_SUBSEARCH); $this->used_workstations = array(); foreach($res as $og){ if($og['dn'] == $this->dn) continue; $test = array_intersect($ws_dns,$og['member']); - if(count($test)){ + if(($og['gosaGroupObjects'] == "[W]" || $og['gosaGroupObjects'] == "[T]") && count($test)){ $this->used_workstations = array_merge($this->used_workstations,$test); } } @@ -178,7 +179,12 @@ class ogroup extends plugin session::set("sysfilter", $sysfilter); } - /* Load member data */ + /* Instanciate base selector */ + $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base); + $this->baseSelector->setSubmitButton(false); + $this->baseSelector->setHeight(300); + $this->baseSelector->update(true); + $this->reload(); } @@ -208,22 +214,37 @@ class ogroup extends plugin } /* Add objects to group */ - if (isset($_POST['add_object_finish']) && isset($_POST['objects'])){ - - $tmp = ""; - foreach($this->memberList as $obj){ - $tmp .= $obj['type']; - } + if (isset($_POST['objectSelect_save']) && $this->objectSelect instanceOf objectSelect){ + $objects = $this->objectSelect->save(); $skipped = FALSE; - foreach ($_POST['objects'] as $value){ - if(preg_match("/T/",$tmp) && $this->objects[$value]['type'] == "W"){ + foreach($objects as $object){ + + $tmp = ""; + foreach($this->memberList as $obj){ + $tmp .= $obj['type']; + } + + $type = $this->getObjectType($object); + $name= $this->getObjectName($object); + $dn = $object['dn']; + + /* Fill array */ + if (isset($object["description"][0])){ + $object= array("text" => "$name [".$object["description"][0]."]", "type" => "$type"); + } elseif (isset($object["uid"][0])) { + $object= array("text" => "$name [".$object["uid"][0]."]", "type" => "$type"); + } else { + $object= array("text" => "$name", "type" => "$type"); + } + + if(preg_match("/T/",$tmp) && $type == "W"){ $skipped =TRUE; - }elseif(preg_match("/W/",$tmp) && $this->objects[$value]['type'] == "T"){ + }elseif(preg_match("/W/",$tmp) && $type == "T"){ $skipped =TRUE; }else{ - $this->memberList["$value"]= $this->objects[$value]; - $this->member["$value"]= $value; - unset ($this->objects[$value]); + + $this->memberList["$dn"]= $object; + $this->member["$dn"]= $dn; uasort ($this->memberList, 'sort_list'); reset ($this->memberList); } @@ -231,7 +252,8 @@ class ogroup extends plugin if($skipped){ msg_dialog::display(_("Information"), _("You cannot combine terminals and workstations in one object group!"), INFO_DIALOG); } - $this->reload(); + $this->objectSelect= FALSE; + $this->dialog= FALSE; } } } @@ -257,41 +279,41 @@ class ogroup extends plugin /* Load templating engine */ $smarty= get_smarty(); + $smarty->assign("usePrototype", "true"); $tmp = $this->plInfo(); foreach($tmp['plProvidedAcls'] as $name => $translation){ $smarty->assign($name."ACL",$this->getacl($name)); } - /* Base select dialog */ - $once = true; - foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){ - $once = false; - $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases()); - $this->dialog->setCurrentBase($this->base); - } - } - /*********** * Trusts ***********/ /* Add user workstation? */ if (isset($_POST["add_ws"])){ - $this->show_ws_dialog= TRUE; + $this->trustSelect= new trustSelect($this->config,get_userinfo()); $this->dialog= TRUE; } - /* Add user workstation? */ - if (isset($_POST["add_ws_finish"]) && isset($_POST['wslist'])){ - foreach($_POST['wslist'] as $ws){ - $this->accessTo[$ws]= $ws; + // Add selected machines to trusted ones. + if (isset($_POST["add_ws_finish"]) && $this->trustSelect){ + $trusts = $this->trustSelect->detectPostActions(); + if(isset($trusts['targets'])){ + + $headpage = $this->trustSelect->getHeadpage(); + foreach($trusts['targets'] as $id){ + $attrs = $headpage->getEntry($id); + $this->accessTo[$attrs['cn'][0]]= $attrs['cn'][0]; + } + ksort($this->accessTo); + $this->is_modified= TRUE; } - ksort($this->accessTo); - $this->is_modified= TRUE; + $this->trustSelect= NULL; + $this->dialog= FALSE; } + /* Remove user workstations? */ if (isset($_POST["delete_ws"]) && isset($_POST['workstation_list'])){ foreach($_POST['workstation_list'] as $name){ @@ -301,63 +323,17 @@ class ogroup extends plugin } /* Add user workstation finished? */ - if (isset($_POST["add_ws_finish"]) || isset($_POST["add_ws_cancel"])){ - $this->show_ws_dialog= FALSE; + if (isset($_POST["add_ws_cancel"])){ + $this->trustSelect= NULL; $this->dialog= FALSE; } /* Show ws dialog */ - if ($this->show_ws_dialog){ - /* Save data */ - $sysfilter= session::get("sysfilter"); - foreach( array("depselect", "regex") as $type){ - if (isset($_POST[$type])){ - $sysfilter[$type]= $_POST[$type]; - } - } - if (isset($_GET['search'])){ - $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*"; - if ($s == "**"){ - $s= "*"; - } - $sysfilter['regex']= $s; - } - session::set("sysfilter", $sysfilter); - - /* Get workstation list */ - $exclude= ""; - foreach($this->accessTo as $ws){ - $exclude.= "(cn=$ws)"; - } - if ($exclude != ""){ - $exclude= "(!(|$exclude))"; - } - $regex= $sysfilter['regex']; - $filter= "(&(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))$exclude(cn=*)(cn=$regex))"; - - $deps_a = array(get_ou("serverRDN"), - get_ou("terminalRDN"), - get_ou("workstationRDN")); - $res= get_sub_list($filter, array("terminal","server","workstation"), $deps_a, get_ou("systemRDN").$sysfilter['depselect'], - array("cn"), GL_SUBSEARCH | GL_SIZELIMIT); - $wslist= array(); - foreach ($res as $attrs){ - $wslist[]= preg_replace('/\$/', '', $attrs['cn'][0]); - } - asort($wslist); - $smarty->assign("search_image", get_template_path('images/lists/search.png')); - $smarty->assign("launchimage", get_template_path('images/lists/action.png')); - $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png')); - $smarty->assign("deplist", $this->config->idepartments); - $smarty->assign("alphabet", generate_alphabet()); - foreach( array("depselect", "regex") as $type){ - $smarty->assign("$type", $sysfilter[$type]); - } - $smarty->assign("hint", print_sizelimit_warning()); - $smarty->assign("wslist", $wslist); - $smarty->assign("apply", apply_filter()); - $display= $smarty->fetch (get_template_path('trust_machines.tpl', TRUE, dirname(__FILE__))); - return ($display); + if ($this->trustSelect){ + + // Build up blocklist + session::set('filterBlacklist', array('cn' => array_values($this->accessTo))); + return($this->trustSelect->execute()); } /*********** @@ -387,111 +363,20 @@ class ogroup extends plugin /* Add objects? */ if (isset($_POST["edit_membership"])){ - $this->group_dialog= TRUE; + $this->objectSelect= new objectSelect($this->config, get_userinfo()); $this->dialog= TRUE; } /* Add objects finished? */ - if (isset($_POST["add_object_finish"]) || isset($_POST["add_object_cancel"])){ - $this->group_dialog= FALSE; + if (isset($_POST["objectSelect_cancel"])){ + $this->objectSelect= FALSE; $this->dialog= FALSE; } /* Manage object add dialog */ - if ($this->group_dialog){ - - /* Save data */ - $ogfilter= session::get("ogfilter"); - foreach( array("dselect", "regex") as $type){ - if (isset($_POST[$type])){ - $ogfilter[$type]= $_POST[$type]; - } - } - if (isset($_POST['dselect'])){ - foreach( array("accounts", "groups", "applications", "departments", - "servers", "workstations", "winstations", "terminals", "printers","subtrees", - "phones") as $type){ - - if (isset($_POST[$type])) { - $ogfilter[$type]= "checked"; - } else { - $ogfilter[$type]= ""; - } - } - } - if (isset($_GET['search'])){ - $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*"; - if ($s == "**"){ - $s= "*"; - } - $ogfilter['regex']= $s; - } - session::set("ogfilter", $ogfilter); - $this->reload(); - - /* Calculate actual groups */ - $smarty->assign("objects", $this->convert_list($this->objects)); - - /* Show dialog */ - $smarty->assign("search_image", get_template_path('images/lists/search.png')); - $smarty->assign("launchimage", get_template_path('images/lists/action.png')); - $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png')); - $smarty->assign("deplist", $this->config->idepartments); - $smarty->assign("alphabet", generate_alphabet()); - foreach( array("dselect", "regex", "subtrees") as $type){ - $smarty->assign("$type", $ogfilter[$type]); - } - $smarty->assign("hint", print_sizelimit_warning()); - $smarty->assign("apply", apply_filter()); - - /* Build up checkboxes - */ - $ar = array( - "departments" => array( - "T" => msgPool::selectToView(_("departments")), - "C" => (isset($ogfilter['departments']) && ($ogfilter['departments'])), - "L" => sprintf(_("Show %s"),_("departments"))), - "accounts" => array( - "T" => msgPool::selectToView(_("people")), - "C" => (isset($ogfilter['accounts']) && ($ogfilter['accounts'])), - "L" => sprintf(_("Show %s"),_("people"))), - "groups"=> array( - "T" => msgPool::selectToView(_("groups")), - "C" => (isset($ogfilter['groups']) && ($ogfilter['groups'])), - "L" => sprintf(_("Show %s"),_("groups"))), - "servers"=> array( - "T" => msgPool::selectToView(_("servers")), - "C" => (isset($ogfilter['servers']) && ($ogfilter['servers'])), - "L" => sprintf(_("Show %s"),_("servers"))), - "workstations"=> array( - "T" => msgPool::selectToView(_("workstations")), - "C" => (isset($ogfilter['workstations']) && ($ogfilter['workstations'])), - "L" => sprintf(_("Show %s"),_("workstations"))), - "terminals"=> array( - "T" => msgPool::selectToView(_("terminals")), - "C" => (isset($ogfilter['terminals']) && ($ogfilter['terminals'])), - "L" => sprintf(_("Show %s"),_("terminals"))), - "printers"=> array( - "T" => msgPool::selectToView(_("printer")), - "C" => (isset($ogfilter['printers']) && ($ogfilter['printers'])), - "L" => sprintf(_("Show %s"),_("printers"))), - "phones"=> array( - "T" => msgPool::selectToView(_("phones")), - "C" => (isset($ogfilter['phones']) && ($ogfilter['phones'])), - "L" => sprintf(_("Show %s"),_("phones")))); - - /* Allow selecting applications if we are having a non - release managed application storage */ - if(!$this->IsReleaseManagementActivated()){ - $ar["applications"] = array( - "T" => msgPool::selectToView(_("applications")), - "C" => (isset($ogfilter['applications']) && ($ogfilter['applications'])), - "L" => sprintf(_("Show %s"),_("applications"))); - } - - $smarty->assign("checkboxes",$ar); - $display= $smarty->fetch (get_template_path('ogroup_objects.tpl', TRUE, dirname(__FILE__))); - return ($display); + if ($this->objectSelect){ + session::set('filterBlacklist', array('dn'=> $this->member)); + return($this->objectSelect->execute()); } /* Bases / Departments */ @@ -529,8 +414,7 @@ class ogroup extends plugin } /* Assign variables */ - $smarty->assign("bases", $this->get_allowed_bases()); - $smarty->assign("base_select", $this->base); + $smarty->assign("base", $this->baseSelector->render()); $smarty->assign("department", $this->department); $smarty->assign("members", $this->convert_list($this->memberList)); @@ -582,6 +466,17 @@ class ogroup extends plugin /* Save data to object */ function save_object() { + /* Refresh base */ + if ($this->acl_is_moveable($this->base)){ + if (!$this->baseSelector->update()) { + msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG); + } + if ($this->base != $this->baseSelector->getBase()) { + $this->base= $this->baseSelector->getBase(); + $this->is_modified= TRUE; + } + } + /* Save additional values for possible next step */ if (isset($_POST['ogroupedit'])){ @@ -614,14 +509,6 @@ class ogroup extends plugin $base_tmp = $this->base; plugin::save_object(); $this->base = $base_tmp; - - /* Save base, since this is no LDAP attribute */ - $tmp = $this->get_allowed_bases(); - if(isset($_POST['base'])){ - if(isset($tmp[$_POST['base']])){ - $this->base= $_POST['base']; - } - } } } @@ -705,8 +592,10 @@ class ogroup extends plugin /* Skip workstations which are already assigned to an object group. */ - if(in_array($attrs['dn'],$this->used_workstations)){ - continue; + if ($this->gosaGroupObjects == "[W]" || $this->gosaGroupObjects == "[T]"){ + if(in_array($attrs['dn'],$this->used_workstations)){ + continue; + } } $type= $this->getObjectType($attrs); @@ -744,7 +633,7 @@ class ogroup extends plugin /* It has failed, add entry with type flag I (Invalid)*/ if (!$ldap->success()){ - $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".@LDAP::fix($dn),"type" => "I"); + $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".LDAP::fix($dn),"type" => "I"); } else { @@ -810,6 +699,7 @@ class ogroup extends plugin { $temp= ""; $conv= array( + "Y" => "plugins/users/images/select_template.png", "U" => "plugins/generic/images/head.png", "G" => "plugins/groups/images/groups.png", "A" => "plugins/ogroups/images/application.png", @@ -819,8 +709,8 @@ class ogroup extends plugin "O" => "plugins/ogroups/images/winstation.png", "T" => "plugins/ogroups/images/terminal.png", "F" => "plugins/ogroups/images/phone.png", - "I" => "images/lists/flag.png", - "P" => "plugins/ogroups/images/printer.png"); + "P" => "plugins/ogroups/images/printer.png", + "I" => "images/false.png"); foreach ($input as $key => $value){ /* Generate output */ @@ -835,7 +725,9 @@ class ogroup extends plugin { $type= "I"; - foreach(array( "U" => "gosaAccount", + foreach(array( + "Y" => "gosaUserTemplate", + "U" => "gosaAccount", "G" => "posixGroup", "A" => "gosaApplication", "D" => "gosaDepartment", @@ -890,25 +782,20 @@ class ogroup extends plugin } /* Check if we have workstations assigned, that are already assigned to - another object group. - */ - $test =array_intersect($this->used_workstations,$this->member); - if(count($test)){ - $str = ""; - $cnt = 0; - foreach($test as $dn){ - $str .= $dn.", "; - $cnt ++; - if($cnt > 2){ - $str .= "..."; - break; + another object group. */ + if ($this->gosaGroupObjects == "[W]" || $this->gosaGroupObjects == "[T]" ) { + $test =array_intersect($this->used_workstations,$this->member); + if(count($test)){ + $str = ""; + foreach($test as $dn){ + $str .= "