From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 12 May 2010 13:15:46 +0000 (+0000)
Subject: Updated gofon handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ae9f5fe2ab1ad45c35c0fc750234b4eb266cd61;p=gosa.git

Updated gofon handling
-Some extension applications are outdated and hat to be replaced


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

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
index 1895d9c0c..d3fb0dcb1 100644
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceGeneric.inc
@@ -500,7 +500,7 @@ class conference extends plugin
       $EXT[$i]['context'] = $context;
       $EXT[$i]['priority']= $i;
       $EXT[$i]['app']     ="Set";
-      $EXT[$i]['appdata'] ="LANGUAGE()=".$this->language;
+      $EXT[$i]['appdata'] ="CHANNEL(language)=".$this->language;
       $i++;      
 
       // Recordingformat for conference
@@ -508,7 +508,7 @@ class conference extends plugin
         $EXT[$i]['exten']   =$this->telephoneNumber;
         $EXT[$i]['context'] =$context;
         $EXT[$i]['priority']= $i;
-        $EXT[$i]['app']     ="Setvar";
+        $EXT[$i]['app']     ="Set";
         $EXT[$i]['appdata'] ="MEETME_RECORDINGFORMAT=".$this->goFonConferenceOptionFormat;
         $i++;      
       }
@@ -549,7 +549,7 @@ class conference extends plugin
       }
       $i++; 
 
-      // Hanup command
+      // Hangup command
       $EXT[$i]['exten']   =$this->telephoneNumber;
       $EXT[$i]['context'] =$context;
       $EXT[$i]['priority']=$i;
@@ -558,12 +558,13 @@ class conference extends plugin
       $i++;      
 
       // Map name to number 
-      $EXT[$i]['exten']   =$this->cn;
-      $EXT[$i]['context'] =$context;
-      $EXT[$i]['priority']=1;
-      $EXT[$i]['app']     ="Goto";
-      $EXT[$i]['appdata'] =$this->telephoneNumber."|1";
-
+      if($this->cn != $this->telephoneNumber){
+          $EXT[$i]['exten']   =$this->cn;
+          $EXT[$i]['context'] =$context;
+          $EXT[$i]['priority']=1;
+          $EXT[$i]['app']     ="Goto";
+          $EXT[$i]['appdata'] =$this->telephoneNumber."|1";
+      }        
 
       foreach($EXT as $keytop => $valtop){
         $s_keys = "";
@@ -577,8 +578,6 @@ class conference extends plugin
         $SQL[]="INSERT INTO ".$cfg_Current['EXT_TABLE']." (".$s_keys.") VALUES (".$s_values.");"; 
       }
 
-
-
       /* Start transaction, to be able to rollback
        */
       @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Updating/Inserting entries---</b>","");