![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0cf1229469e609a8d39e7d3eb45a421b43cb751a..ed44e8ea46b873609ce008b4eac4352f98b23ce1 100644 (file)
var $gosaGroupObjects= "";
var $department= "";
var $objects= array();
- var $allobjects= array();
+ var $objcache= array();
var $memberList= array();
var $member= array();
var $orig_dn= "";
"W" => "workstations",
"T" => "terminals",
"F" => "phones",
+ "_" => "subtrees",
"P" => "printers") as $key => $val){
if (preg_match("/$key/", $this->gosaGroupObjects)){
}
}
register_global("ogfilter", $ogfilter);
-
- if(isset($_SESSION['ogroupfilter']['depselect'])){
- $this->base = $_SESSION['ogroupfilter']['depselect'];
+
+ /* Set base */
+ if ($this->dn == "new"){
+ $this->base= $_SESSION['CurrentMainBase'];
+ } else {
+ $this->base= preg_replace("/^[^,]+,".get_groups_ou()."/","",$this->dn);
}
- /* set permissions */
+ /* set permissions */
$ui= get_userinfo();
$acl= get_permissions ($ui->dn, $ui->subtreeACL);
$this->acl= get_module_permission($acl, "ogroup", $ui->dn);
-
/* Load member data */
$this->reload();
}
- function AddDelMembership($NewMember = false){
-
+ function AddDelMembership($NewMember = false)
+ {
if($NewMember){
- $this->memberList[$NewMember]= $this->allobjects[$NewMember];
+ $this->importMember($NewMember);
+ $this->memberList[$NewMember]= $this->objcache[$NewMember];
$this->member[$NewMember]= $NewMember;
unset ($this->objects[$NewMember]);
uasort ($this->memberList, 'sort_list');
}
if (isset($_POST['dselect'])){
foreach( array("accounts", "groups", "applications", "departments",
- "servers", "workstations", "terminals", "printers",
+ "servers", "workstations", "terminals", "printers","subtrees",
"phones") as $type){
if (isset($_POST[$type])) {
$smarty->assign("deplist", $this->config->idepartments);
$smarty->assign("alphabet", generate_alphabet());
foreach( array("dselect", "regex", "accounts", "groups", "applications",
- "departments", "servers", "workstations", "terminals",
+ "departments", "servers", "workstations", "terminals","subtrees",
"printers", "phones") as $type){
$smarty->assign("$type", $ogfilter[$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"));
+
+ if($ogfilter['subtrees'] == "checked"){
+ $ldap->cd($ogfilter['dselect']);
+ $ldap->search("(&(objectClass=".$class.")(|(uid=$regex)(cn=$regex)(ou=$regex)))",
+ array("dn", "cn", "description", "objectClass", "sn", "givenName", "uid","ou"));
+ }else{
+ $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()){
uasort ($this->objects, 'sort_list');
reset ($this->objects);
- /*###########
- 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 and try to detect obsolete entries
/* 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 {
-
- /* 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");
-
- } else {
-
- /* 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");
- }
- }
- }
+ $this->importMember($dn);
}
uasort ($this->memberList, 'sort_list');
reset ($this->memberList);
}
+ function importMember($dn)
+ {
+ $ldap= $this->config->get_ldap_link();
+
+ /* 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:")." ".@LDAP::fix($dn),"type" => "I");
+ } else {
+ /* 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->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+ } elseif (isset($attrs["uid"][0])) {
+ $this->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+ } else {
+ $this->objcache[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+ }
+ $this->objcache[$attrs["dn"]]['objectClass'] = $attrs['objectClass'];
+ if(isset($attrs['uid'])){
+ $this->objcache[$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");
+ }
+
+ $this->memberList[$dn]= $this->objects[$attrs["dn"]];
+ }
+ }
+
function convert_list($input)
{
$temp= "";
$ldap = $this->config->get_ldap_link();
if($this->dn != $new_dn){
- $ldap->cat ($new_dn);
+ $ldap->cat ($new_dn, array('dn'));
}
if($ldap->count() !=0){
/* Move members to target array */
$this->attrs['member'] =array();
foreach ($this->member as $key => $desc){
- $this->attrs['member'][]= $key;
+ $this->attrs['member'][]= @LDAP::fix($key);
}
$ldap= $this->config->get_ldap_link();
/* 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)){
$this->handle_post_events($mode);
$ret= 0;
- if (show_ldap_error($ldap->get_error())){
+ if (show_ldap_error($ldap->get_error(), _("Saving object group failed"))){
$ret= 1;
}
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing object group failed"));
/* Trigger remove signal */
$this->handle_post_events("remove");
function getCopyDialog()
{
- $str = "";
- $str .= _("Group name");
- $str .= " <input type='text' name='cn' value='".$this->cn."'>";
- return($str);
+ $str = "";
+
+ $smarty = get_smarty();
+ $smarty->assign("cn", $this->cn);
+ $str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE,dirname(__FILE__)));
+ $ret = array();
+ $ret['string'] = $str;
+ $ret['status'] = "";
+ return($ret);
}
function saveCopyDialog()