Don not't reset server settings, if gosa.conf was modified

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

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 0476bb71fe1f9d60c28aae0c45b03e3dde3ca1b7..1c57be2cc96bd77e92e8edd950d568e6db171e58 100644 (file)
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -153,7 +153,7 @@ class plugin
     /* Check if this entry was opened in read only mode */
     if(isset($_POST['open_readonly'])){
       if(session::global_is_set("LOCK_CACHE")){
-        $cache = &session::global_get("LOCK_CACHE");
+        $cache = &session::get("LOCK_CACHE");
         if(isset($cache['READ_ONLY'][$this->dn])){
           $this->read_only = TRUE;
         }
@@ -262,8 +262,8 @@ class plugin
     session::global_set('current_class_for_help',get_class($this));
 
     /* Reset Lock message POST/GET check array, to prevent perg_match errors*/
-    session::global_set('LOCK_VARS_TO_USE',array());
-    session::global_set('LOCK_VARS_USED',array());
+    session::set('LOCK_VARS_TO_USE',array());
+    session::set('LOCK_VARS_USED',array());
   }
 
   /*! \brief execute plugin
@@ -925,7 +925,10 @@ class plugin
     $ldap->cd($this->config->current['BASE']);
     $ldap->create_missing_trees(preg_replace("/^[^,]+,/","",$dst_dn));
     if (!$ldap->rename_dn($src_dn,$dst_dn)){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class()));
+#      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class()));
+      new log("debug","Ldap Protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn  -- TO: $dst_dn",array(),$ldap->get_error());
+      @DEBUG(DEBUG_LDAP,__LINE__,__FUNCTION__,__FILE__,"Rename failed FROM: $src_dn  -- TO:  $dst_dn", 
+          "Ldap Protocol v3 implementation error, falling back to maunal method.");
       return(FALSE);
     }
 
@@ -1878,8 +1881,8 @@ class plugin
     session::global_set('current_class_for_help',get_class($this));
 
     /* Reset Lock message POST/GET check array, to prevent perg_match errors*/
-    session::global_set('LOCK_VARS_TO_USE',array());
-    session::global_set('LOCK_VARS_USED',array());
+    session::set('LOCK_VARS_TO_USE',array());
+    session::set('LOCK_VARS_USED',array());
     
     return("Multiple edit is currently not implemented for this plugin.");
   }