steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.6, 1.7

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv22246/kolab-webadmin/php/admin/include

Modified Files:
	ldap.class.php 
Log Message:
only talk to master ldap server, ldap escaping bugfix

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ldap.class.php	14 Jul 2004 00:49:06 -0000	1.6
+++ ldap.class.php	15 Jul 2004 01:12:38 -0000	1.7
@@ -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>
  *
@@ -26,7 +26,8 @@
     $this->is_bound = false;
     $this->bind_dn = false;
     $this->search_result = false;
-    $this->connection=ldap_connect($_SESSION['ldap_uri']);
+	// Always connect to master server
+    $this->connection=ldap_connect($_SESSION['ldap_master_uri']);
   }
 
   function close() {
@@ -61,10 +62,10 @@
      value of the encoded character. The case of the two hexadecimal
      digits is not significant.
      */
+    $str = str_replace( '\\', '\\5c', $str );
     $str = str_replace( '*',  '\\2a', $str );
     $str = str_replace( '(',  '\\28', $str );
     $str = str_replace( ')',  '\\29', $str );
-    $str = str_replace( '\\', '\\5c', $str );
     $str = str_replace( '\0', '\\00', $str );
     return $str;
   }