From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 12 Aug 2005 13:41:49 +0000 (+0000)
Subject: When email extension was removed, the email in Voicemail table wasn't deleted
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=517caddce3de1e5286c6fb933490681a9211f04e;p=gosa.git

When email extension was removed, the email in Voicemail table wasn't deleted


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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 852abc524..2232b0983 100644
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -359,7 +359,7 @@ class phoneAccount extends plugin
       $sip_entry['callerid']  =$this->phoneNumbers[$i_new_key];
       $sip_entry['mailbox']   =$this->phoneNumbers[$i_new_key];
 
-      if(isset($this->parent->by_object['mailAccount']->mail)){
+      if((isset($this->parent->by_object['mailAccount']->mail))&&($this->parent->by_object['mailAccount']->is_account==true)){
         $s_mail = $this->parent->by_object['mailAccount']->mail;
       }else{
         $s_mail = "";
@@ -1028,7 +1028,7 @@ class phoneAccount extends plugin
 
     /* Just keep one phone number */
     if (count($this->telephoneNumber) && $this->telephoneNumber != ""){
-      $this->attrs['telephoneNumber']= $this->telephoneNumber[0];
+      $this->attrs['telephoneNumber']= $this->telephoneNumber;
     } else {
       $this->attrs['telephoneNumber']= array();
     }