From c0cd28c7227255ccb9222d5133c0553a8ffc4328 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 21 Dec 2009 11:45:45 +0000 Subject: [PATCH] Try to fix --- htdocs/lib/ldap.lib.php | 10 ++++++---- htdocs/usergroup.class.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php index ed1bf3a9f71..b7329ace642 100644 --- a/htdocs/lib/ldap.lib.php +++ b/htdocs/lib/ldap.lib.php @@ -131,17 +131,18 @@ function show_ldap_content($result,$level,$count,$var,$hide=0) if ("$key" == "dn") continue; if ("$val" == "objectclass") continue; - if ("$val" == $lastkey[$level]) continue; + //if ("$val" == $lastkey[$level]) continue; $lastkey[$level]=$key; if (is_array($val)) - { + { $hide=0; if (! is_numeric($key)) { $var=!$var; - print ''; + print ''; + print ''; print $key; print ''; if (strtolower($key) == 'userpassword') $hide=1; @@ -153,8 +154,9 @@ function show_ldap_content($result,$level,$count,$var,$hide=0) $newstring=@htmlentities($val,ENT_COMPAT,'UTF-8'); // Make entity encoding if ($hide) print preg_replace('/./i','*',$newstring); else print $newstring; - print ''; + if ("$val" == $lastkey[$level]) print '
'; } + if ("$val" != $lastkey[$level]) print ''; } return 1; } diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php index 2f89b24b710..493ec65cab1 100644 --- a/htdocs/usergroup.class.php +++ b/htdocs/usergroup.class.php @@ -45,7 +45,7 @@ class UserGroup extends CommonObject var $note; // Note on group var $datec; // Creation date of group var $datem; // Modification date of group - var $members=array(1,2,18); // Array of users + var $members=array(); // Array of users var $oldcopy; // To contains a clone of this when we need to save old properties of object