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

- LSldapObject :

Browse source 
-> Ajout de paramètres de configuration pour définir les attributs devant
		 être utilisés pour passer un pattern recherchés.
	-> Ajout de la méthode getPatternFilter()
	-> Utilisation de la méthode getPatternFilter() dans getSelectArray()
- view.php & select.php : Utilisation de getPatternFilter()
This commit is contained in:
Benjamin Renard 2009-01-25 17:43:30 +00:00
parent 4ec62d0694
commit eb00496153
4 changed files with 50 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
View file

@ -106,6 +106,16 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
) // fin Layout
), // fin LSform
'LSsearch' => array (
'attrs' => array (
'givenName',
'sn',
'cn',
'uid',
'mail'
)
),
// Attributes
'attrs' => array (

55
trunk/includes/class/class.LSldapObject.php
View file

@ -628,6 +628,43 @@ class LSldapObject {
return $filter;
}
/**
* Retourne le filtre correpondants au pattern passé
*
* @author Benjamin Renard <brenard@easter-eggs.com>
*
* @param[in] $pattern string Le mot clé recherché
* @param[in] $approx booléen Booléen activant ou non la recherche approximative
*
* @retval string le filtre ldap correspondant
*/
function getPatternFilter($pattern=null,$approx=null) {
if ($pattern!=NULL) {
if (is_array($GLOBALS['LSobjects'][$this -> getType()]['LSsearch']['attrs'])) {
$attrs=$GLOBALS['LSobjects'][$this -> getType()]['LSsearch']['attrs'];
}
else {
$attrs=array($GLOBALS['LSobjects'][$this -> getType()]['rdn']);
}
$pfilter='(|';
if ($approx) {
foreach ($attrs as $attr_name) {
$pfilter.='('.$attr_name.'~='.$pattern.')';
}
}
else {
foreach ($attrs as $attr_name) {
$pfilter.='('.$attr_name.'=*'.$pattern.'*)';
}
}
$pfilter.=')';
return $pfilter;
}
else {
return NULL;
}
}
/**
* Retourne une liste d'objet du même type.
*
@ -961,23 +998,7 @@ class LSldapObject {
* @retval array('dn' => 'display')
*/
function getSelectArray($pattern=NULL,$topDn=NULL,$displayFormat=NULL,$approx=false) {
if ($pattern!=NULL) {
$filter='(|';
if ($approx) {
foreach ($this -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'~='.$pattern.')';
}
}
else {
foreach ($this -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'=*'.$pattern.'*)';
}
}
$filter.=')';
}
else {
$filter=NULL;
}
$filter=$this -> getPatternFilter($pattern,$approx);
return $this -> listObjectsName($filter,$topDn,array(),$displayFormat);
}

13
trunk/select.php
View file

@ -79,18 +79,7 @@ if(LSsession :: startLSsession()) {
$approx = (isset($_REQUEST['LSview_approx']));
if ($pattern && $pattern!='') {
$filter='(|';
if ($approx) {
foreach ($object -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'~='.$pattern.')';
}
}
else {
foreach ($object -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'=*'.$pattern.'*)';
}
}
$filter.=')';
$filter=$object -> getPatternFilter($pattern,$approx);
}
else {
$filter = NULL;

13
trunk/view.php
View file

@ -210,18 +210,7 @@ if(LSsession :: startLSsession()) {
$approx = (isset($_REQUEST['LSview_approx']));
if ($pattern && $pattern!='') {
$filter='(|';
if ($approx) {
foreach ($object -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'~='.$pattern.')';
}
}
else {
foreach ($object -> attrs as $attr_name => $attr_val) {
$filter.='('.$attr_name.'=*'.$pattern.'*)';
}
}
$filter.=')';
$filter=$object -> getPatternFilter($pattern,$approx);
}
else {
$filter = NULL;