www/admin

[Bogomil Shopov]

 www/admin/addressbook/addr.php |    2 +-
 www/admin/user/index.php       |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 32eb087c8a807dfc4a25ee1ced116ce36667d3af
Author: Bogomil Shopov <shopov at kolabsys.com>
Date:   Wed Apr 20 16:34:04 2011 +0300

    Fixing addressbook problems and LDAP bug: https://bugzilla.kolabsys.com/show_bug.cgi?id=76

diff --git a/www/admin/addressbook/addr.php b/www/admin/addressbook/addr.php
index 66adeab..6cc0ae4 100644
--- a/www/admin/addressbook/addr.php
+++ b/www/admin/addressbook/addr.php
@@ -175,7 +175,7 @@ if( !$errors ) {
 			  unset( $distlists['count'] );
 			  foreach( $distlists as $distlist ) {
 				$dlcn = $distlist['mail'][0];
-				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='" $params['kolab_wui'] . "/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='".$params['kolab_wui']."/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
 			  }
 			  
 			  if( !$errors ) {
diff --git a/www/admin/user/index.php b/www/admin/user/index.php
index 51675ed..1f0b2aa 100644
--- a/www/admin/user/index.php
+++ b/www/admin/user/index.php
@@ -53,10 +53,8 @@ if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
 
-  $privmembers = array_merge( (array)$ldap->groupMembers( "cn=internal,$base_dn", 'admin' ),
-							  (array)$ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' ) );
-
-  $userfilter = "cn=*";
+  
+  $userfilter = "uid=*";
   $filterattr = KolabForm::getRequestVar('filterattr');
   $filtertype = KolabForm::getRequestVar('filtertype');
   $filtervalue = KolabForm::getRequestVar('filtervalue');
@@ -157,7 +155,7 @@ if( !$errors ) {
 		}
 
 		// skip admins and maintainers
-		if( !array_key_exists( $dn, $privmembers ) ) {
+		
 		  $entries[] = array( 'dn' => $dn,
 							  'sn' => $sn,
 							  'fn' => $fn,
@@ -165,7 +163,7 @@ if( !$errors ) {
 							  'mail' => $mail,
 							  'uid' => $uid,
 							  'deleted' => $deleted );
-		}
+		
 		$entry = ldap_next_entry( $ldap->connection,$entry );
 	  }
 	}