X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_ogroup.inc;h=3243c58552ffefc85ed3302c160eaa85e2853569;hb=c410b9d1ae522912520874bb30aa1f581753b708;hp=32dba79b58effb0c53484e0c5f72721120256745;hpb=4a0f97a6085292e9f7474b717835cdf57e1fe142;p=gosa.git
diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 32dba79b5..3243c5855 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -32,7 +32,7 @@ class ogroup extends plugin
var $group_dialog= FALSE;
/* attribute list for save action */
- var $attributes= array("cn", "description", "gosaGroupObjects");
+ var $attributes= array("cn", "description", "gosaGroupObjects","member");
var $objectclasses= array("top", "gosaGroupOfNames");
function ogroup ($config, $dn= NULL)
@@ -40,6 +40,8 @@ class ogroup extends plugin
plugin::plugin ($config, $dn);
$this->orig_dn= $dn;
+ $this->member = array();
+
/* Load member objects */
if (isset($this->attrs['member'])){
foreach ($this->attrs['member'] as $key => $value){
@@ -78,30 +80,75 @@ class ogroup extends plugin
}
}
register_global("ogfilter", $ogfilter);
+
+ if(isset($_SESSION['CurrentMainBase'])){
+ $this->base = $_SESSION['CurrentMainBase'];
+ }
/* Load member data */
$this->reload();
}
+ function AddDelMembership($NewMember = false){
+
+ if($NewMember){
+ $this->memberList[$NewMember]= $this->allobjects[$NewMember];
+ $this->member[$NewMember]= $NewMember;
+ unset ($this->objects[$NewMember]);
+ uasort ($this->memberList, 'sort_list');
+ reset ($this->memberList);
+ $this->reload();
+ }else{
+ /* Delete objects from group */
+ if (isset($_POST['delete_membership']) && isset($_POST['members'])){
+ foreach ($_POST['members'] as $value){
+ $this->objects["$value"]= $this->memberList[$value];
+ unset ($this->memberList["$value"]);
+ unset ($this->member["$value"]);
+ uasort ($this->objects, 'sort_list');
+ reset ($this->objects);
+ }
+ $this->reload();
+ }
+
+ /* Add objects to group */
+ if (isset($_POST['add_object_finish']) && isset($_POST['objects'])){
+ foreach ($_POST['objects'] as $value){
+ $this->memberList["$value"]= $this->objects[$value];
+ $this->member["$value"]= $value;
+ unset ($this->objects[$value]);
+ uasort ($this->memberList, 'sort_list');
+ reset ($this->memberList);
+ }
+ $this->reload();
+ }
+ }
+ }
+
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
+// $this->reload();
+
/* Do we represent a valid group? */
if (!$this->is_account){
- $display= "![](\"images/stop.png\")
".
+ $display= " ".
_("This 'dn' is no object group.")."";
return ($display);
}
-
-
/* Delete objects from group */
if (isset($_POST['delete_membership']) && isset($_POST['members'])){
foreach ($_POST['members'] as $value){
- $this->objects["$value"]= $this->memberList[$value];
- unset ($this->memberList["$value"]);
- unset ($this->member["$value"]);
- uasort ($this->objects, 'sort_list');
- reset ($this->objects);
+ if(isset($this->memberList[$value])){
+ $this->objects["$value"]= $this->memberList[$value];
+ unset ($this->memberList["$value"]);
+ unset ($this->member["$value"]);
+ uasort ($this->objects, 'sort_list');
+ reset ($this->objects);
+ }
}
$this->reload();
}
@@ -109,11 +156,13 @@ class ogroup extends plugin
/* Add objects to group */
if (isset($_POST['add_object_finish']) && isset($_POST['objects'])){
foreach ($_POST['objects'] as $value){
- $this->memberList["$value"]= $this->objects[$value];
- $this->member["$value"]= $value;
- unset ($this->objects[$value]);
- uasort ($this->memberList, 'sort_list');
- reset ($this->memberList);
+ if(isset($this->objects[$value])){
+ $this->memberList["$value"]= $this->objects[$value];
+ $this->member["$value"]= $value;
+ unset ($this->objects[$value]);
+ uasort ($this->memberList, 'sort_list');
+ reset ($this->memberList);
+ }
}
$this->reload();
}
@@ -121,6 +170,37 @@ class ogroup extends plugin
/* Load templating engine */
$smarty= get_smarty();
+ $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){
+ $once = false;
+ $this->dialog = new baseSelectDialog($this->config,$this);
+ $this->dialog->setCurrentBase($this->base);
+ }
+ }
+
+ /* Dialog handling */
+ if(is_object($this->dialog)){
+ /* Must be called before save_object */
+ $this->dialog->save_object();
+
+ if($this->dialog->isClosed()){
+ $this->dialog = false;
+ }elseif($this->dialog->isSelected()){
+ $this->base = $this->dialog->isSelected();
+ $this->dialog= false;
+ }else{
+ return($this->dialog->execute());
+ }
+ }
+
/* Add objects? */
if (isset($_POST["edit_membership"])){
$this->group_dialog= TRUE;
@@ -187,16 +267,10 @@ class ogroup extends plugin
}
/* Bases / Departments */
- if ($this->dn == "new"){
- $ui= get_userinfo();
- $this->base= dn2base($ui->dn);
- } else {
+
if (isset($_POST['base'])){
$this->base= $_POST['base'];
- } else {
- $this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
}
- }
/* Assemble combine string */
if ($this->gosaGroupObjects == "[]"){
@@ -238,12 +312,6 @@ class ogroup extends plugin
/* Fields */
foreach ($this->attributes as $val){
$smarty->assign("$val", $this->$val);
- $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
- }
-
- /* Assign ACL's */
- foreach (array("base", "members") as $val){
- $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
}
return ($smarty->fetch (get_template_path('generic.tpl', TRUE)));
@@ -256,11 +324,6 @@ class ogroup extends plugin
/* Save additional values for possible next step */
if (isset($_POST['ogroupedit'])){
plugin::save_object();
-
- if (chkacl ($this->acl, "base") == "" && isset($_POST["base"])){
- $this->base= $_POST["base"];
- }
-
}
}
@@ -268,119 +331,199 @@ class ogroup extends plugin
/* (Re-)Load objects */
function reload()
{
- /* Generate object list */
- $this->objects= array();
- $this->allobjects= array();
+ /*###########
+ Variable initialisation
+ ###########*/
+
+ $this->objects = array();
+ $this->ui = get_userinfo();
+ $filter = "";
+ $objectClasses = array();
+
+ $ogfilter = get_global("ogfilter");
+ $regex = $ogfilter['regex'];
+
+ /* Get ldap connection */
$ldap= $this->config->get_ldap_link();
+ $ldap->cd ($ogfilter['dselect']);
- /* Assemble filter */
- $ogfilter= get_global("ogfilter");
- $ldap->cd ($ogfilter['dselect']);
+ /*###########
+ Generate Filter
+ ###########*/
- $filter= "";
+ /* Assemble filter */
if ($ogfilter['accounts'] == "checked"){
$filter.= "(objectClass=gosaAccount)";
+ $objectClasses["gosaAccount"] = get_people_ou();
}
if ($ogfilter['groups'] == "checked"){
$filter.= "(objectClass=posixGroup)";
+ $objectClasses["posixGroup"] = get_groups_ou();
}
if ($ogfilter['applications'] == "checked"){
$filter.= "(objectClass=gosaApplication)";
+ $objectClasses["gosaApplication"] = "ou=apps,";
}
if ($ogfilter['departments'] == "checked"){
$filter.= "(objectClass=gosaDepartment)";
+ $objectClasses["gosaDepartment"] = "";
}
if ($ogfilter['servers'] == "checked"){
$filter.= "(objectClass=goServer)";
+ $objectClasses["goServer"] = "ou=servers,ou=systems,";
}
if ($ogfilter['workstations'] == "checked"){
$filter.= "(objectClass=gotoWorkstation)";
+ $objectClasses["gotoWorkstation"] = "ou=workstations,ou=systems,";
}
if ($ogfilter['terminals'] == "checked"){
$filter.= "(objectClass=gotoTerminal)";
+ $objectClasses["gotoTerminal"] = "ou=terminals,ou=systems,";
}
if ($ogfilter['printers'] == "checked"){
$filter.= "(objectClass=gotoPrinter)";
+
+ $objectClasses["gotoPrinter"] = "ou=printers,ou=systems,";
}
if ($ogfilter['phones'] == "checked"){
$filter.= "(objectClass=goFonHardware)";
+ $objectClasses["goFonHardware"] = "ou=phones,ou=systems,";
}
- $regex= $ogfilter['regex'];
- $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
- while ($attrs= $ldap->fetch()){
- /* Get type */
- $type= $this->getObjectType($attrs);
- $name= $this->getObjectName($attrs);
+ /*###########
+ Perform search for selected objectClasses & regex to fill list with objects
+ ###########*/
- /* Fill array */
- if (isset($attrs["description"][0])){
- $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
- } elseif (isset($attrs["uid"][0])) {
- $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
- } else {
- $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ /* 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"));
+
+ /* fetch results and append them to the list */
+ while($attrs = $ldap->fetch()){
+
+ $type= $this->getObjectType($attrs);
+ $name= $this->getObjectName($attrs);
+
+ /* Fill array */
+ if (isset($attrs["description"][0])){
+ $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+ } elseif (isset($attrs["uid"][0])) {
+ $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+ } else {
+ $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ }
}
}
uasort ($this->objects, 'sort_list');
reset ($this->objects);
- $ldap->cd ($this->config->current['BASE']);
- $filter= "(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=gosaApplication)(objectClass=gosaDepartment)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware)";
- $regex= "*";
-
- $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
- while ($attrs= $ldap->fetch()){
-
- /* Get type */
- $type= $this->getObjectType($attrs);
- $name= $this->getObjectName($attrs);
-
- /* Fill array */
- if (isset($attrs["description"][0])){
- $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
- } elseif (isset($attrs["uid"][0])) {
- $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
- } else {
- $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ /*###########
+ Get a list with all possible objects, to detect objects which doesn't exists anymore ...
+ ###########*/
+
+ /* Only do this, if this wasn't already done */
+ if(count($this->allobjects) == 0){
+ $ldap->cd ($this->config->current['BASE']);
+ $filter="(objectClass=gosaAccount)".
+ "(objectClass=posixGroup)".
+ "(objectClass=gosaApplication)".
+ "(objectClass=gosaDepartment)".
+ "(objectClass=goServer)".
+ "(objectClass=gotoWorkstation)".
+ "(objectClass=gotoTerminal)".
+ "(objectClass=gotoPrinter)".
+ "(objectClass=goFonHardware)";
+ $regex= "*";
+
+ $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
+ while ($attrs= $ldap->fetch()){
+
+ $type= $this->getObjectType($attrs);
+ $name= $this->getObjectName($attrs);
+
+ if (isset($attrs["description"][0])){
+ $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+ } elseif (isset($attrs["uid"][0])) {
+ $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+ } else {
+ $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ }
+ $this->allobjects[$attrs["dn"]]['objectClass'] = $attrs['objectClass'];
+ if(isset($attrs['uid'])){
+ $this->allobjects[$attrs["dn"]]['uid'] = $attrs['uid'];
+ }
}
- }
- uasort ($this->allobjects, 'sort_list');
- reset ($this->allobjects);
-
- /* Build member list */
- $this->memberList= array();
+ uasort ($this->allobjects, 'sort_list');
+ reset ($this->allobjects);
+ }
+
+
+ /*###########
+ Build member list and try to detect obsolete entries
+ ###########*/
+
+ $this->memberList = array();
+
+ /* Walk through all single member entry */
foreach($this->member as $dn){
/* Object in object list? */
if (isset($this->allobjects[$dn])){
+
+ /* Add this entry to member list, its dn is in allobjects
+ this means it still exists
+ */
$this->memberList[$dn]= $this->allobjects[$dn];
+
+ /* Remove this from selectable entries */
if (isset ($this->objects[$dn])){
unset ($this->objects[$dn]);
}
+
} else {
- /* No, try to ge informations from LDAP */
+ /* 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: ")."$dn",
- "type" => "I");
+ $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".@LDAP::fix($dn),"type" => "I");
+
} else {
- $ldap->cat($dn);
+
+ /* 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->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+ } elseif (isset($attrs["uid"][0])) {
+ $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+ } else {
+ $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ }
+ $this->allobjects[$attrs["dn"]]['objectClass'] = $attrs['objectClass'];
+ if(isset($attrs['uid'])){
+ $this->allobjects[$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");
}
-
}
}
}
@@ -454,6 +597,7 @@ class ogroup extends plugin
function getObjectName($attrs)
{
/* Person? */
+ $name ="";
if (in_array('gosaAccount', $attrs['objectClass'])){
if(isset($attrs['sn']) && isset($attrs['givenName'])){
$name= $attrs['sn'][0].", ".$attrs['givenName'][0];
@@ -474,7 +618,8 @@ class ogroup extends plugin
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
/* Permissions for that base? */
if ($this->base != ""){
@@ -483,23 +628,26 @@ class ogroup extends plugin
$new_dn= $this->dn;
}
- $ui= get_userinfo();
- $acl= get_permissions ($new_dn, $ui->subtreeACL);
- $acl= get_module_permission($acl, "group", $new_dn);
- if (chkacl($acl, "create") != ""){
+
+ $ldap = $this->config->get_ldap_link();
+ if($this->dn != $new_dn){
+ $ldap->cat ($new_dn, array('dn'));
+ }
+
+ if($ldap->count() !=0){
+ $message[]= _("There is already an object with this cn.");
+ }
+
+ print_a($this);
+ if ($this->acl_is_createable()){
$message[]= _("You have no permissions to create a group on this 'Base'.");
}
/* must: cn */
- if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
+ if ($this->cn == "" && $this->acl_is_writeable("cn")){
$message[]= "The required field 'Name' is not set.";
}
- /* Need at least one member */
- if (count($this->member) == 0){
- $message[]= _("Object groups need at least one member!");
- }
-
/* To many different object types? */
if (strlen($this->gosaGroupObjects) > 4){
$message[]= _("You can combine two different object types at maximum only!");
@@ -515,6 +663,7 @@ class ogroup extends plugin
plugin::save();
/* Move members to target array */
+ $this->attrs['member'] =array();
foreach ($this->member as $key => $desc){
$this->attrs['member'][]= $key;
}
@@ -528,7 +677,7 @@ class ogroup extends plugin
/* 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->member)){
@@ -543,13 +692,14 @@ class ogroup extends plugin
/* Write back to ldap */
$ldap->cd($this->dn);
+ $this->cleanup();
$ldap->$mode($this->attrs);
/* Trigger post signal */
$this->handle_post_events($mode);
$ret= 0;
- if (show_ldap_error($ldap->get_error())){
+ if (show_ldap_error($ldap->get_error(), sprintf(_("Saving of object group/generic with dn '%s' failed."),$this->dn))){
$ret= 1;
}
@@ -562,12 +712,46 @@ class ogroup extends plugin
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of object group/generic with dn '%s' failed."),$this->dn));
/* Trigger remove signal */
$this->handle_post_events("remove");
}
+ function getCopyDialog()
+ {
+ $str = "";
+ $str .= _("Group name");
+ $str .= " ";
+ return($str);
+ }
+
+ function saveCopyDialog()
+ {
+ if(isset($_POST['cn'])){
+ $this->cn = $_POST['cn'];
+ }
+ }
+
+
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Generic"),
+ "plDescription" => _("Object group generic"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("ogroups" => array("description" => _("Object groups"),
+ "objectClass" => "gosaGroupOfNames")),
+ "plProvidedAcls"=> array(
+ "cn" => _("Name"),
+ "base" => _("Base"),
+ "description" => _("Description"),
+ "member" => _("Member"))
+ ));
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: