-removed locks if we abort object removal.

[gosa.git] / gosa-core / include / class_ldap.inc

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 3bcf7f410dca6fad7a1bee1610ebda6c0eaccfa1..743d15bbb991d7ab08fb8e673959be51bb5bf7dc 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -87,12 +87,13 @@ class LDAP{
      \2C => CO
      (   => OB
      )   => CB
-     /   => SL                                                                  */
+     /   => SL                                                                  
+     \22 => DQ                                                                  */
   static function convert($dn)
   {
     if (SPECIALS_OVERRIDE == TRUE){
-      $tmp= preg_replace(array("/\\\\,/", "/\\\\2C/", "/\(/", "/\)/", "/\//"),
-          array("\001CO", "\001CO", "\001OB", "\001CB", "\001SL"),
+      $tmp= preg_replace(array("/\\\\,/", "/\\\\2C/", "/\(/", "/\)/", "/\//", "/\\\\22/", '/\\\\"/'),
+          array("\001CO", "\001CO", "\001OB", "\001CB", "\001SL", "\001DQ", "\001DQ"),
           $dn);
       return (preg_replace('/,\s+/', ',', $tmp));
     } else {
@@ -108,8 +109,8 @@ class LDAP{
   static function fix($dn)
   {
     if (SPECIALS_OVERRIDE == TRUE){
-      return (preg_replace(array("/\001CO/", "/\001OB/", "/\001CB/", "/\001SL/"),
-            array("\,", "(", ")", "/"),
+      return (preg_replace(array("/\001CO/", "/\001OB/", "/\001CB/", "/\001SL/", "/\001DQ/"),
+            array("\,", "(", ")", "/", '\"'),
             $dn));
     } else {
       return ($dn);
@@ -556,6 +557,27 @@ class LDAP{
     }
   }
 
+  function makeReadableErrors($error,$attrs)
+  { 
+    global $config;
+
+    if($this->success()) return("");
+
+    $str = "";
+    if(preg_match("/^objectClass: value #([0-9]*) invalid per syntax$/", $this->get_additional_error())){
+      $oc = preg_replace("/^objectClass: value #([0-9]*) invalid per syntax$/","\\1", $this->get_additional_error());
+      if(isset($attrs['objectClass'][$oc])){
+        $str.= " - <b>objectClass: ".$attrs['objectClass'][$oc]."</b>";
+      }
+    }
+    if($error == "Undefined attribute type"){
+      $str = " - <b>attribute: ".preg_replace("/:.*$/","",$this->get_additional_error())."</b>";
+    } 
+
+    @DEBUG(DEBUG_LDAP,__LINE__,__FUNCTION__,__FILE__,$attrs,"Erroneous data");
+
+    return($str);
+  }
 
   function modify($attrs)
   {
@@ -566,6 +588,9 @@ class LDAP{
       if ($this->reconnect) $this->connect();
       $r = @ldap_modify($this->cid, LDAP::fix($this->basedn), $attrs);
       $this->error = @ldap_error($this->cid);
+      if(!$this->success()){
+        $this->error.= $this->makeReadableErrors($this->error,$attrs);
+      }
       return($r ? $r : 0);
     }else{
       $this->error = "Could not connect to LDAP server";
@@ -579,6 +604,9 @@ class LDAP{
       if ($this->reconnect) $this->connect();
       $r = @ldap_add($this->cid, LDAP::fix($this->basedn), $attrs);
       $this->error = @ldap_error($this->cid);
+      if(!$this->success()){
+        $this->error.= $this->makeReadableErrors($this->error,$attrs);
+      }
       return($r ? $r : 0);
     }else{
       $this->error = "Could not connect to LDAP server";