steffen: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer index.php, 1.5, 1.6 maintainer.php, 1.10, 1.11

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
In directory doto:/tmp/cvs-serv16222/kolab-webadmin/www/admin/maintainer

Modified Files:
	index.php maintainer.php 
Log Message:
fix for Issue485 (manager visible under maintainers)

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php	20 Sep 2004 11:54:08 -0000	1.5
+++ index.php	25 Nov 2004 13:02:20 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 KlarÃ��¿½ï¿½Â¤lvdalens Datakonsult AB
+ (c) 2004 Klarälvdalens Datakonsult AB
 
  This program is Free Software under the GNU General Public License (>=v2).
  Read the file COPYING that comes with this packages for details.
@@ -39,7 +39,7 @@
 
   $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' );
 
-  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
+  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
 
   if( $result ) {

Index: maintainer.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- maintainer.php	26 Oct 2004 02:51:09 -0000	1.10
+++ maintainer.php	25 Nov 2004 13:02:20 -0000	1.11
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¤lvdalens Datakonsult AB
+ *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¤lvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -47,7 +47,7 @@
   if( is_unique( 'uid', $value ) ) {
 	return '';
   } else {
-	return _('User with this email address already exists');
+	return _('User with this uid address already exists');
   }
 }