bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-22 18:09:06 +01:00
Code Issues Projects Releases Wiki Activity

LScli relation command: improve -r/--remove autocompletion

Browse source
This commit is contained in:
Benjamin Renard 2020-07-06 10:22:27 +02:00
parent c232a9899d
commit f277528400
1 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/includes/class/class.LSldapObject.php
View file

@ -2638,8 +2638,6 @@ class LSldapObject extends LSlog_staticLoggerClass {
switch ($command_args[$comp_word_num-1]) { switch ($command_args[$comp_word_num-1]) {
case '-a': case '-a':
case '--add': case '--add':
case '-r':
case '-remove':
if (!$objType || !$dn || !$relation_id) if (!$objType || !$dn || !$relation_id)
return array(); return array();
$related_obj_type = LSconfig :: get("LSobjects.$objType.LSrelation.$relation_id.LSobject"); $related_obj_type = LSconfig :: get("LSobjects.$objType.LSrelation.$relation_id.LSobject");
@ -2647,6 +2645,44 @@ class LSldapObject extends LSlog_staticLoggerClass {
if ($related_obj_type) if ($related_obj_type)
return LScli :: autocomplete_LSobject_dn($related_obj_type, $comp_word); return LScli :: autocomplete_LSobject_dn($related_obj_type, $comp_word);
return array(); return array();
case '-r':
case '-remove':
if (!$objType || !$dn || !$relation_id)
return array();
if (!LSsession :: loadLSobject($objType)) {
self :: log_error("Invalid object type $objType");
return array();
}
LScli :: need_ldap_con();
$obj = new $objType();
if (!$obj->loadData($dn)) {
self :: log_error("Fail to load object $dn data from LDAP");
return array();
}
if (!LSsession :: loadLSclass('LSrelation')) {
self :: log_error("Fail to load LSrelation class.");
return array();
}
if (!is_array($obj -> getConfig("LSrelation.$relation_id"))) {
self :: log_error("LSobject $objType have no relation '$relation_id'.");
return array();
}
$relation = new LSrelation($obj, $relation_id);
// List current related objects
$list = $relation -> listRelatedObjects();
$listDns = array();
if (is_array($list)) {
foreach($list as $o) {
$listDns[] = $o -> getDn();
}
}
return LScli :: autocomplete_opts($listDns, $comp_word, false);
} }
// If objType not already choiced (or currently autocomplete), add LSobject types to available options // If objType not already choiced (or currently autocomplete), add LSobject types to available options