Fixed, problem: a new conference appeared 2 times in extensions table.

If it was edited it only appeared once

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1373 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 4a79d946fd8fe8c0e3e1cb36c107c75cf44ae1d2..7d1dfedae2a82746023c9dc8c03827c971f8edc0 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -147,6 +147,8 @@ class conference extends plugin
 
   function remove_from_parent()
   {
+     $this->SQL_remove_me(true); 
+
     $ldap= $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->recursive_remove();
@@ -412,6 +414,10 @@ class conference extends plugin
 
     plugin::save();
 
+    if(empty($this->old_tele_number)){
+      $this->old_tele_number= $this->telephoneNumber;
+    }
+
     $this->SQL_remove_me(true);
     $this->SQL_add_me(true);
 

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 112e54223eb37e1fb152aacbb80c0360bafd0262..ee70b9fa4b15aeceefc5180869cb059102827f0b 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -248,12 +248,14 @@ class phoneConferenceManagment extends plugin
         }
 
         $this->conftab->save ();
+        del_lock ($this->conftab->dn);;
         unset ($this->conftab);
         $this->conftab= NULL;
         unset ($_SESSION['objectinfo']);
       } else {
         show_errors($message);
       }
+      
       $this->reload();
     }
 
@@ -435,6 +437,8 @@ class phoneConferenceManagment extends plugin
 
   function remove_from_parent()
   {
+    $cfg = new conference($this->config, $this->dn);
+    $cfg->remove_from_parent();
     $ldap= $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->recursive_remove();