X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fclass_groupGeneric.inc;h=82fed9121cd643897cd8e792d3c03b617c865e1d;hb=ed78890a0b417c288d33f20487d35b57223451ff;hp=d0d192e6f76be43261b361aff62abea11eef62ff;hpb=ea913587127ef8d36101abdca8a755c65763d656;p=gosa.git diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index d0d192e6f..82fed9121 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -35,7 +35,6 @@ class group extends plugin var $fon_group= FALSE; var $smbgroup= FALSE; var $groupType= FALSE; - var $samba3= FALSE; var $sambaSID= ""; var $sambaDomainName= "DEFAULT"; var $SID= ""; @@ -86,7 +85,6 @@ class group extends plugin plugin::plugin ($config, $dn); /* Load attributes depending on the samba version */ - $this->samba3= ($config->get_cfg_value("sambaversion") == 3); $this->orig_dn= $dn; $this->orig_cn= $this->cn; @@ -133,7 +131,7 @@ class group extends plugin } /* Get samba Domain in case of samba 3 */ - if ($this->samba3 && $this->sambaSID != ""){ + if ($this->sambaSID != ""){ $this->SID= preg_replace ("/-[^-]+$/", "", $this->sambaSID); $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); @@ -194,7 +192,7 @@ class group extends plugin } else { /* Get object base */ - $this->base =preg_replace ("/^[^,]+,".preg_quote(get_groups_ou(), '/')."/","",$this->dn); + $this->base =preg_replace ("/^[^,]+,".preg_quote(get_groups_ou(), '/')."/i","",$this->dn); } $this->orig_base = $this->base; @@ -403,13 +401,6 @@ class group extends plugin return ($display); } - /* Assign templating stuff */ - if ($this->samba3){ - $smarty->assign("samba3", "true"); - } else { - $smarty->assign("samba3", ""); - } - if($this->config->search("nagiosaccount", "CLASS",array('menu'))){ $smarty->assign("nagios",true); }else{ @@ -478,26 +469,25 @@ class group extends plugin $smarty->assign("bases", $this->get_allowed_bases()); $smarty->assign("base_select", $this->base); - if ($this->samba3){ - $domains= array(); - foreach($this->config->data['SERVERS']['SAMBA'] as $name => $content){ - $domains[$name]= $name; - } - $smarty->assign("sambaDomains", $domains); - $smarty->assign("sambaDomainName", $this->sambaDomainName); - $groupTypes= array(0 => _("Samba group"), 512 => _("Domain admins"), 513 => _("Domain users"), - 514 => _("Domain guests")); - - /* Don't loose special groups! If not key'ed above, add it to - the combo box... */ - if ($this->groupType >= 500 && $this->groupType <= 553 && !isset($groupTypes[$this->groupType])){ - $groupTypes[$this->groupType]= sprintf(_("Special group (%d)"), $this->groupType); - } + $domains= array(); + foreach($this->config->data['SERVERS']['SAMBA'] as $name => $content){ + $domains[$name]= $name; + } + $smarty->assign("sambaDomains", $domains); + $smarty->assign("sambaDomainName", $this->sambaDomainName); + $groupTypes= array(0 => _("Samba group"), 512 => _("Domain admins"), 513 => _("Domain users"), + 514 => _("Domain guests")); - $smarty->assign("groupTypes", $groupTypes); - $smarty->assign("groupType", $this->groupType); + /* Don't loose special groups! If not key'ed above, add it to + the combo box... */ + if ($this->groupType >= 500 && $this->groupType <= 553 && !isset($groupTypes[$this->groupType])){ + $groupTypes[$this->groupType]= sprintf(_("Special group (%d)"), $this->groupType); } + $smarty->assign("groupTypes", $groupTypes); + $smarty->assign("groupType", $this->groupType); + + /* Members and users */ $smarty->assign("members", $this->members); @@ -814,10 +804,8 @@ class group extends plugin $acl->save(); } - /* Remove ACL dependencies too, - */ - $tmp = new acl($this->config,$this->parent,$this->dn); - $tmp->remove_acl(); + /* Remove ACL dependencies, too */ + acl::remove_acl_for($this->dn); /* Send signal to the world that we've done */ $this->handle_post_events("remove"); @@ -861,7 +849,7 @@ class group extends plugin } /* Save sambaDomain attribute */ - if ($this->acl_is_writeable("sambaDomainName") && $this->samba3 && isset ($_POST['sambaDomainName'])){ + if ($this->acl_is_writeable("sambaDomainName") && isset ($_POST['sambaDomainName'])){ $this->sambaDomainName= $_POST['sambaDomainName']; $this->groupType= $_POST['groupType']; } @@ -914,7 +902,7 @@ class group extends plugin } else { /* Calculate new, lock uids */ $wait= 10; - while (get_lock("uidnumber") != ""){ + while (get_lock("gidnumber") != ""){ sleep (1); /* timed out? */ @@ -922,8 +910,8 @@ class group extends plugin break; } } - add_lock ("uidnumber", "gosa"); - $this->gidNumber= $this->get_next_id("gidNumber", $this->dn); + add_lock ("gidnumber", "gosa"); + $this->gidNumber= get_next_id("gidNumber", $this->dn); } } @@ -970,7 +958,7 @@ class group extends plugin $ldap= $this->config->get_ldap_link(); /* Add samba group functionality */ - if ($this->samba3 && $this->smbgroup){ + if ($this->smbgroup){ /* Fixed undefined index ... */ @@ -1045,7 +1033,10 @@ class group extends plugin $this->attrs['member'] = array(); if (count($this->memberUid)){ foreach($this->attrs['memberUid'] as $uid) { - $this->attrs['member'][]= $this->dnMapping[$uid]; + + if(isset($this->dnMapping[$uid])){ + $this->attrs['member'][]= $this->dnMapping[$uid]; + } } } else { $this->attrs['member'][]= $this->dn; @@ -1060,12 +1051,11 @@ class group extends plugin if (!count ($this->memberUid)){ $this->attrs['memberUid']= array(); } - if ($this->samba3){ - if (!$this->smbgroup){ - $this->attrs['sambaGroupType']= array(); - $this->attrs['sambaSID']= array(); - } + if (!$this->smbgroup){ + $this->attrs['sambaGroupType']= array(); + $this->attrs['sambaSID']= array(); } + $mode= "modify"; } else { $mode= "add"; @@ -1114,7 +1104,7 @@ class group extends plugin } /* Remove uid lock */ - del_lock ("uidnumber"); + del_lock ("gidnumber"); /* Post that we've done*/ $this->handle_post_events($mode); @@ -1211,43 +1201,6 @@ class group extends plugin return ($message); } - function get_next_id($attrib, $dn) - { - $ids= array(); - $ldap= $this->config->get_ldap_link(); - - $ldap->cd ($this->config->current['BASE']); - if (preg_match('/gidNumber/i', $attrib)){ - $oc= "posixGroup"; - } else { - $oc= "posixAccount"; - } - $ldap->search ("(&(objectClass=$oc)($attrib=*))", array("$attrib")); - - /* Get list of ids */ - while ($attrs= $ldap->fetch()){ - $ids[]= (int)$attrs["$attrib"][0]; - } - - /* Find out next free id near to UID_BASE */ - if ($this->config->get_cfg_value("baseIdHook") == ""){ - $base= $this->config->get_cfg_value("uidNumberBase"); - } else { - /* Call base hook */ - $base= get_base_from_hook($dn, $attrib); - } - for ($id= $base; $id++; $id < pow(2,32)){ - if (!in_array($id, $ids)){ - return ($id); - } - } - - /* Check if id reached maximum */ - if ($id >= pow(2,32)){ - msg_dialog::display(_("Error"), _("Cannot allocate a free ID!"), ERROR_DIALOG); - exit; - } - } function getCopyDialog() { @@ -1355,7 +1308,7 @@ class group extends plugin } /* Save sambaDomain attribute */ - if ($this->acl_is_writeable("sambaDomainName") && $this->samba3 && isset ($_POST['sambaDomainName'])){ + if ($this->acl_is_writeable("sambaDomainName") && isset ($_POST['sambaDomainName'])){ $this->sambaDomainName= $_POST['sambaDomainName']; $this->groupType= $_POST['groupType']; }