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

Code cleaning

Browse source
This commit is contained in:
Benjamin Renard 2024-09-25 17:11:14 +02:00
parent ee69cc302c
commit 6cfde7f084
Signed by: bn8
GPG key ID: 3E2E1CE1907115BC
2 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/includes/class/class.LSattr_html_select_object.php
View file

@ -45,11 +45,17 @@ class LSattr_html_select_object extends LSattr_html{
* *
* @return LSformElement|false L'element du formulaire ajouté, ou false * @return LSformElement|false L'element du formulaire ajouté, ou false
*/ */
public function addToForm (&$form,$idForm,$data=NULL) { public function addToForm (&$form, $idForm, $data=NULL) {
$this -> config['attrObject'] = $this; $this -> config['attrObject'] = $this;
$element=$form -> addElement($this -> LSformElement_type, $this -> name, $this -> getLabel(), $this -> config, $this); $element = $form -> addElement(
$this -> LSformElement_type,
$this -> name,
$this -> getLabel(),
$this -> config,
$this
);
if(!$element) { if(!$element) {
LSerror :: addErrorCode('LSform_06',$this -> name); LSerror :: addErrorCode('LSform_06', $this -> name);
return false; return false;
} }
if ($data) { if ($data) {
@ -71,8 +77,8 @@ class LSattr_html_select_object extends LSattr_html{
* *
* @return array La valeur formatée de l'attribut (array('DNs' => 'displayName')) * @return array La valeur formatée de l'attribut (array('DNs' => 'displayName'))
**/ **/
public function refreshForm($data,$fromDNs=false) { public function refreshForm($data, $fromDNs=false) {
return $this -> getFormValues($data,$fromDNs); return $this -> getFormValues($data, $fromDNs);
} }
/** /**

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

@ -1024,37 +1024,40 @@ class LSldapObject extends LSlog_staticLoggerClass {
* *
* @param Net_LDAP2_Filter|string|null $filter LDAP search filter * @param Net_LDAP2_Filter|string|null $filter LDAP search filter
* @param string|null $sbasedn Base DN of the search * @param string|null $sbasedn Base DN of the search
* @param array $sparams Search parameters (as expected by Net_LDAP2::search()) * @param array|null $sparams Search parameters (as expected by Net_LDAP2::search())
* @param string|false $displayFormat LSformat of objects's display name * @param string|false $displayFormat LSformat of objects's display name
* @param bool $cache Enable/disable cache (default: true) * @param bool $cache Enable/disable cache (default: true)
* *
* @return array|false Tableau dn => name correspondant au resultat de la recherche, ou false * @return array|false Tableau dn => name correspondant au resultat de la recherche, ou false
*/ */
public function listObjectsName($filter=NULL,$sbasedn=NULL,$sparams=array(),$displayFormat=false,$cache=true) { public function listObjectsName($filter=NULL, $sbasedn=NULL, $sparams=null, $displayFormat=false, $cache=true) {
if (!LSsession :: loadLSclass('LSsearch')) { if (!LSsession :: loadLSclass('LSsearch')) {
LSerror::addErrorCode('LSsession_05','LSsearch'); LSerror::addErrorCode('LSsession_05', 'LSsearch');
return false; return false;
} }
if (!$displayFormat) { $params = [
$displayFormat = $this -> getDisplayNameFormat(); 'displayFormat' => $displayFormat?$displayFormat:$this -> getDisplayNameFormat(),
}
$params = array(
'displayFormat' => $displayFormat,
'basedn' => $sbasedn, 'basedn' => $sbasedn,
'filter' => $filter 'filter' => $filter
];
$LSsearch = new LSsearch(
$this -> type_name,
'LSldapObject::listObjectsName',
(
is_array($sparams)?
$params = array_merge($sparams, $params):
$sparams
),
true
); );
if (is_array($sparams)) { return (
$params=array_merge($sparams,$params); $LSsearch -> run($cache)?
} $LSsearch -> listObjectsName():
false
$LSsearch = new LSsearch($this -> type_name,'LSldapObject::listObjectsName',$params,true); );
$LSsearch -> run($cache);
return $LSsearch -> listObjectsName();
} }