Skip to content

Commit

Permalink
Version 0.6.3.4
Browse files Browse the repository at this point in the history
- Type individuel pour l'ENS
- Fix sur bind4lookup() dans les deux méthodes LDAP GetUsersList() et
GetGroups()
  • Loading branch information
tpayen committed Oct 7, 2022
1 parent f2158bd commit 2fb2a2d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
ORM M2 - 0.6.3.4
------
- Type individuel pour l'ENS
- Fix sur bind4lookup() dans les deux méthodes LDAP GetUsersList() et GetGroups()

ORM M2 - 0.6.3.3
------
- Adaptations API ENS
Expand Down
6 changes: 3 additions & 3 deletions Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ class Version {
/**
* Numéro de version
*/
const VERSION = '0.6.3.3';
const VERSION = '0.6.3.4';

/**
* Numéro de version normalisé
*/
const NORMALIZED_VERSION = '0.6.3.3';
const NORMALIZED_VERSION = '0.6.3.4';

/**
* Build
*/
const BUILD = '20221006182252';
const BUILD = '20221007100352';

}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name" : "messagerie-melanie2/orm-m2",
"version" : "0.6.3.3",
"version_normalized" : "0.6.3.3",
"version" : "0.6.3.4",
"version_normalized" : "0.6.3.4",
"description" : "ORM pour l'accès aux données Mél",
"keywords" : [
"ORM",
Expand Down
8 changes: 7 additions & 1 deletion src/Api/Ens/Users/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,10 @@
* @subpackage API/Ens
* @api
*/
class Type extends Defaut\Users\Type {}
class Type extends Defaut\Users\Type {
// *** Type de boite
/**
* Boite individuelle
*/
const INDIVIDUELLE = 'ENSL';
}
8 changes: 4 additions & 4 deletions src/Ldap/Ldap.php
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ public static function GetUsersList($filter , $ldap_attr = null, $server = null)
$keycache = "GetUsersList:$server:" . md5($filter) . ":" . md5(serialize($ldap_attr)) . ":$filter";
$infos = $ldap->getCache($keycache);
if (!isset($infos)) {
// Connexion anonymous pour lire les données
if ($ldap->anonymous()) {
// Connexion pour lire les données
if ($ldap->bind4lookup()) {
// Base de recherche ?
$base_dn = $ldap->getConfig("personne_base_dn");
if (!isset($base_dn)) {
Expand Down Expand Up @@ -729,8 +729,8 @@ public static function GetGroups($filter, $ldap_attr = null, $sizelimit = 0, $se
$keycache = "GetGroups:$server:" . md5($filter) . ":" . md5(serialize($ldap_attr));
$infos = $ldap->getCache($keycache);
if (!isset($infos)) {
// Connexion anonymous pour lire les données
if ($ldap->anonymous()) {
// Connexion pour lire les données
if ($ldap->bind4lookup()) {
// Lancement de la recherche
$sr = $ldap->search($ldap->getConfig("base_dn"), $filter, $ldap_attr,0, $sizelimit);
if ($sr && $ldap->count_entries($sr) > 0) {
Expand Down

0 comments on commit 2fb2a2d

Please sign in to comment.