Merge branch...

Merge branch '5799-when-we-rename-a-department-foreignkeys-on-subobjects-dn-are-not-updated' into '1.3-dev'

Resolve "When we rename a department foreignKeys on subobjects DN are not updated"

See merge request fusiondirectory/fd!339

include/simpleplugin/class_simplePlugin.inc

@@ -136,6 +136,8 @@ class simplePlugin
    */
   protected $entryCSN = '';
 
+  private $hadSubobjects = FALSE;
+
   /*! \brief constructor
    *
    *  \param string $dn The dn of this instance
@@ -1404,7 +1406,16 @@ class simplePlugin
    */
   function handle_pre_events($mode, array $addAttrs = array())
   {
+    global $config;
+
     $this->ldap_error = '';
+    if ($this->mainTab && ($mode == 'remove')) {
+      /* Store information if there was subobjects before deletion */
+      $ldap = $config->get_ldap_link();
+      $ldap->cd($this->dn);
+      $ldap->search('(objectClass=*)', array('dn'), 'one');
+      $this->hadSubobjects = ($ldap->count() > 0);
+    }
     return $this->handle_hooks('PRE', $mode, $addAttrs);
   }
 
@@ -1543,11 +1554,15 @@ class simplePlugin
       $olddn    = $param1;
       $newdn    = $param2;
       $classes  = array(get_class($this));
-      if ($olddn != $newdn) {
-        $ldap = $config->get_ldap_link();
-        $ldap->cd($newdn);
-        $ldap->search('(objectClass=*)', array('dn'), 'one');
-        $subobjects = ($ldap->count() > 0);
+      if (($olddn != $newdn) && $this->mainTab) {
+        if ($newdn === NULL) {
+          $subobjects = $this->hadSubobjects;
+        } else {
+          $ldap = $config->get_ldap_link();
+          $ldap->cd($newdn);
+          $ldap->search('(objectClass=*)', array('dn'), 'one');
+          $subobjects = ($ldap->count() > 0);
+        }
       }
     } elseif ($mode == 'references') {
       $classes = array_keys($this->parent->by_object);