![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 58cc2d1bc2db89f0a9a45a51e2468f4583a98637..0a3146bf3e8e6b45f32e9c276ed3e8181881f2aa 100644 (file)
var $was_trust_account= FALSE;
+ /* Already assigned Workstations. Will be hidden in selection.
+ */
+ var $used_workstations = array();
+
/* attribute list for save action */
var $attributes= array("cn", "description", "gosaGroupObjects","member","accessTo","trustModel");
var $objectclasses= array("top", "gosaGroupOfNames");
if ($this->dn == "new"){
$this->base = session::get('CurrentMainBase');
} else {
- $this->base= preg_replace("/^[^,]+,".normalizePreg(get_ou("ogroupou"))."/","",$this->dn);
+ $this->base= preg_replace("/^[^,]+,".preg_quote(get_ou("ogroupRDN"))."/","",$this->dn);
/* Is this account a trustAccount? */
if ($this->is_account && isset($this->attrs['trustModel'])){
}
}
+ /* Detect all workstations, which are already assigned to an object group
+ - Those objects will be hidden in the add object dialog.
+ - Check() will complain if such a system is assigned to this object group.
+ */
+ $base = $this->config->current['BASE'];
+ $res = get_list("(objectClass=gotoWorkstation)","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);
+ $this->used_workstations = array();
+ foreach($res as $og){
+ if($og['dn'] == $this->dn) continue;
+ $test = array_intersect($ws_dns,$og['member']);
+ if(count($test)){
+ $this->used_workstations = array_merge($this->used_workstations,$test);
+ }
+ }
+
$this->orig_cn = $this->cn;
$this->orig_base = $this->base;
+ /* Get global filter config */
+ if (!session::is_set("sysfilter")){
+ $ui= get_userinfo();
+ $base= get_base_from_people($ui->dn);
+ $sysfilter= array( "depselect" => $base,
+ "regex" => "*");
+ session::set("sysfilter", $sysfilter);
+ }
+
/* Load member data */
$this->reload();
}
$regex= $sysfilter['regex'];
$filter= "(&(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))$exclude(cn=*)(cn=$regex))";
- $deps_a = array(get_ou("serverou"),
- get_ou("terminalou"),
- get_ou("workstationou"));
- $res= get_sub_list($filter, array("terminal","server","workstation"), $deps_a, get_ou("systemsou").$sysfilter['depselect'],
+ $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){
$p_f= array("accounts"=> array("OBJ"=>"user", "CLASS"=>"gosaAccount" ,
"DN"=> get_people_ou() ,"ACL" => "users"),
"groups" => array("OBJ"=>"group", "CLASS"=>"posixGroup" ,
- "DN"=> get_groups_ou('ogroupou') ,"ACL" => "groups"),
+ "DN"=> get_groups_ou('ogroupRDN') ,"ACL" => "groups"),
"departments" => array("OBJ"=>"department", "CLASS"=>"gosaDepartment" ,
"DN"=> "" ,"ACL" => "department"),
"servers" => array("OBJ"=>"servgeneric", "CLASS"=>"goServer" ,
- "DN"=> get_ou('serverou') ,"ACL" => "server"),
+ "DN"=> get_ou('serverRDN') ,"ACL" => "server"),
"workstations" => array("OBJ"=>"workgeneric", "CLASS"=>"gotoWorkstation",
- "DN"=> get_ou('workstationou') ,"ACL" => "workstation"),
+ "DN"=> get_ou('workstationRDN') ,"ACL" => "workstation"),
"winstations" => array("OBJ"=>"wingeneric", "CLASS"=>"opsiClient",
- "DN"=> get_ou('WINSTATIONS') ,"ACL" => "winstation"),
+ "DN"=> get_ou('SAMBAMACHINEACCOUNTRDN') ,"ACL" => "winstation"),
"terminals" => array("OBJ"=>"termgeneric", "CLASS"=>"gotoTerminal" ,
- "DN"=> get_ou('terminalou') ,"ACL" => "terminal"),
+ "DN"=> get_ou('terminalRDN') ,"ACL" => "terminal"),
"printers" => array("OBJ"=>"printgeneric", "CLASS"=>"gotoPrinter" ,
- "DN"=> get_ou('printerou') ,"ACL" => "printer"),
+ "DN"=> get_ou('printerRDN') ,"ACL" => "printer"),
"phones" => array("OBJ"=>"phoneGeneric", "CLASS"=>"goFonHardware" ,
- "DN"=> get_ou('phoneou') ,"ACL" => "phone"));
+ "DN"=> get_ou('phoneRDN') ,"ACL" => "phone"));
/* Allow searching for applications, if we are not using release managed applications
*/
if(!$this->IsReleaseManagementActivated()){
$p_f[ "applications"] = array("OBJ"=>"application", "CLASS"=>"gosaApplication",
- "DN"=> get_ou('applicationou') ,"ACL" => "application");
+ "DN"=> get_ou('applicationRDN') ,"ACL" => "application");
}
/*###########
/* fetch results and append them to the list */
foreach($res as $attrs){
+ /* Skip workstations which are already assigned to an object group.
+ */
+ if(in_array($attrs['dn'],$this->used_workstations)){
+ continue;
+ }
+
$type= $this->getObjectType($attrs);
$name= $this->getObjectName($attrs);
/* Permissions for that base? */
if ($this->base != ""){
- $new_dn= 'cn='.$this->cn.','.get_ou('ogroupou').$this->base;
+ $new_dn= 'cn='.$this->cn.','.get_ou('ogroupRDN').$this->base;
} else {
$new_dn= $this->dn;
}
+ /* 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;
+ }
+ }
+# $message[] = sprintf(_("The following workstations are already member in another object group and can not be added: '%s'"),$str);
+ }
$ldap = $this->config->get_ldap_link();
if($this->dn != $new_dn){
/* New accounts need proper 'dn', propagate it to remaining objects */
if ($this->dn == 'new'){
- $this->dn= 'cn='.$this->cn.','.get_ou('ogroupou').$this->base;
+ $this->dn= 'cn='.$this->cn.','.get_ou('ogroupRDN').$this->base;
}
/* Save data. Using 'modify' implies that the entry is already present, use 'add' for
"cn" => _("Name"),
"base" => _("Base"),
"description" => _("Description"),
+ "trustModel" => _("Sytem trust"),
"member" => _("Member"))
));
}