diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 96d45536125d8bde222bd23ae24a4a4271a10963..f25a036f113d683530f88d3b50aa3349dc4d83cf 100644 (file)
<?php
<?php
+
class group extends plugin
{
/* CLI vars */
class group extends plugin
{
/* CLI vars */
var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID");
var $objectclasses= array("top", "posixGroup");
var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID");
var $objectclasses= array("top", "posixGroup");
- function group ($config, $dn= NULL)
+ function group ($config, $dn= NULL, $parent= NULL)
{
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
- /* remove Release Tag if we have release management enabled
- */
- $tmp = search_config($config->data,"faiManagement","CLASS");
- if(!empty($tmp)){
- $this->description = preg_replace("/\(.*\)$/","",$this->description);
- }
-
/* Load attributes depending on the samba version */
$this->samba3= ($config->current['SAMBAVERSION'] == 3);
$this->orig_dn= $dn;
/* Load attributes depending on the samba version */
$this->samba3= ($config->current['SAMBAVERSION'] == 3);
$this->orig_dn= $dn;
}
}
if(!empty($filter)){
}
}
if(!empty($filter)){
+ $ldap->cd($this->config->current['BASE']);
$ldap->search("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(|".$filter."))",array("uid","sn","givenName"));
while($attrs = $ldap->fetch()){
$this->members[$attrs['uid'][0]] = $this->createResultName($attrs);
$ldap->search("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(|".$filter."))",array("uid","sn","givenName"));
while($attrs = $ldap->fetch()){
$this->members[$attrs['uid'][0]] = $this->createResultName($attrs);
/* Create display list of users matching regex & filter
*/
$this->displayUsers = array();
/* Create display list of users matching regex & filter
*/
$this->displayUsers = array();
- $filter = "(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$))(|(uid=".$regex.")(sn=".$regex.")(givenName=".$regex.")))";
+
+ /* Set tag attribute if we've tagging activated */
+ $tag= "";
+ $ui= get_userinfo();
+ if ($ui->gosaUnitTag != "" && isset($this->config->current['STRICT_UNITS']) &&
+ preg_match('/TRUE/i', $this->config->current['STRICT_UNITS'])){
+ $tag= "(gosaUnitTag=".$ui->gosaUnitTag.")";
+ }
+
+ $filter = "(&(objectClass=gosaAccount)$tag(!(objectClass=gosaUserTemplate))(!(uid=*$))(|(uid=".$regex.")(sn=".$regex.")(givenName=".$regex.")))";
/* Search in current tree or within subtrees depending on the checkbox from filter section */
if($gufilter['SubSearchGroup']){
/* Search in current tree or within subtrees depending on the checkbox from filter section */
if($gufilter['SubSearchGroup']){
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing group failed"));
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
/* Delete references to object groups */
$ldap->cd ($this->config->current['BASE']);
}
}
}
}
- /* If release management is enabled ....
- Append release name to description tag ..
- #FIXME release name within description is a very bad solution, use ldap attribute instead
- */
- $tmp = search_config($this->config->data,"faiManagement","CLASS");
- if(!empty($tmp)){
- if(isset($this->parent)){
- if(isset($this->parent->by_object['appgroup'])){
- $baseObj = $this->parent->by_object['appgroup'];
- if($baseObj->is_account){
- if(isset($baseObj->Release)){
- $this->description .= " (".trim($baseObj->Release).")";
- }
- }
- }
- }
- }
-
plugin::save();
/* Remove objectClass for samba/phone support */
plugin::save();
/* Remove objectClass for samba/phone support */
/* Save data. Using 'modify' implies that the entry is already present, use 'add' for
new entries. So do a check first... */
/* Save data. Using 'modify' implies that the entry is already present, use 'add' for
new entries. So do a check first... */
- $ldap->cat ($this->dn);
+ $ldap->cat ($this->dn, array('dn'));
if ($ldap->fetch()){
/* Modify needs array() to remove values :-( */
if (!count ($this->memberUid)){
if ($ldap->fetch()){
/* Modify needs array() to remove values :-( */
if (!count ($this->memberUid)){
$ldap->$mode($this->attrs);
$ret= 0;
$ldap->$mode($this->attrs);
$ret= 0;
- if (show_ldap_error($ldap->get_error())){
+ if (show_ldap_error($ldap->get_error(), _("Saving group failed"))){
$ret= 1;
}
$ret= 1;
}
$ldap= $this->config->get_ldap_link();
if(($this->cn != $this->orig_cn) || ($this->orig_dn == "new")){
$ldap->cd("ou=groups,".$this->base);
$ldap= $this->config->get_ldap_link();
if(($this->cn != $this->orig_cn) || ($this->orig_dn == "new")){
$ldap->cd("ou=groups,".$this->base);
- //FIXME: hardcoded ou=groups,
- $ldap->ls("(&(|(objectClass=gosaGroupOfNames)(objectClass=posixGroup))(cn=$this->cn))","ou=groups,".$this->base,array("cn"));
+ $ldap->ls("(&(|(objectClass=gosaGroupOfNames)(objectClass=posixGroup))(cn=$this->cn))",get_groups_ou().$this->base,array("cn"));
if ($ldap->count() != 0){
$message[]= _("Value specified as 'Name' is already used.");
}
if ($ldap->count() != 0){
$message[]= _("Value specified as 'Name' is already used.");
}