Added schema updated - homeServer for conferences

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

diff --git a/contrib/openldap/gofon.schema b/contrib/openldap/gofon.schema
index e8d9f65ab182d8e1c9e41e9c35edcf86927621c0..ca0767455ffc275af2adee7e33d753b8f8b9fc4f 100644 (file)
--- a/contrib/openldap/gofon.schema
+++ b/contrib/openldap/gofon.schema
@@ -320,5 +320,5 @@ objectclass (1.3.6.1.4.1.10098.1.2.3.16 NAME 'goFonConference' SUP top STRUCTURA
        DESC 'Conference definitions for asterisk machines (v1.0)'
        MUST ( cn ) 
        MAY ( description $ goFonConferenceOption $ goFonConferenceTimeout $ goFonPIN $
-                 goFonConferenceOwner $ telephoneNumber ))
+                 goFonConferenceOwner $ telephoneNumber $ goFonHomeServer))
 

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 2d59b8189c1d73a5b53341770b8fb000c53a185f..ae3872a8d914f7061d42289cd62ad3a2a6795a66 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -285,9 +285,9 @@ class macro extends plugin
       $tmp  = split(",", $s_linestr,3);
 
       /* Check if there are exactly 2 , */ 
-      if(substr_count($s_linestr,",") !=2){
-        return(sprintf(_("More than two ',' given in line : '%s'. Remember that parameters are seperated by '|'."),$i_linenum));
-      }
+#      if(substr_count($s_linestr,",") !=2){
+#        return(sprintf(_("More than two ',' given in line : '%s'. Remember that parameters are seperated by '|'."),$i_linenum));
+#      }
       /* Multiple () are not supproted currently ... */  
       if(substr_count($s_linestr,"(") >1 ){
         return(sprintf(_("More than one '(' is currently not supported. Line : '%s'."),$i_linenum));

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 642f0147551d488e055af3df261a52d9947fd198..56347c7032c1533f3b9b7ec08f93b2cda2585ab3 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -1173,7 +1173,10 @@ class phoneAccount extends plugin
 
     $this->attrs['goFonForwarding']=array();
 
-    $this->generate_mysql_entension_entries(true);
+    $str = $this->generate_mysql_entension_entries(true);
+    if(empty($str)){
+      print_red($str);
+    }
 
     if($this->attrs['goFonMacro']==""){
       $this->attrs['goFonMacro']=array();