From 29d231cd995e16b0a0b31ecbe355a068b4139360 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 16 Sep 2005 09:00:51 +0000
Subject: [PATCH] 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
---
 plugins/gofon/conference/class_phoneConferenceGeneric.inc   | 6 ++++++
 plugins/gofon/conference/class_phoneConferenceManagment.inc | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 4a79d946f..7d1dfedae 100644
--- 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 112e54223..ee70b9fa4 100644
--- 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();
-- 
2.30.2