Ticket #2695: addprotocols.patch

functions.inc.php

@@ -3 +3 @@
-class core_conf {
-  var $_sip_general    = array();
-  var $_iax_general    = array();
+  var $_h323_general    = array();
+  var $_mgcp_general    = array();
+  var $_skinny_general    = array();
-  var $_featuregeneral = array();
-  var $_featuremap     = array();
-  var $_applicationmap = array();
-  // return an array of filenames to write
-  function get_filename() {
-    $files = array(
+      'zapata_additional.conf',
-      'sip_additional.conf',
-      'sip_registrations.conf',
+      'sip_general_additional.conf',
-      'iax_additional.conf',
-      'iax_registrations.conf',
-      'zapata_additional.conf',
-      'sip_general_additional.conf',
-      'iax_general_additional.conf',
+      'ooh323_additional.conf',
+      'ooh323_registrations.conf',
+      'ooh323_general_additional.conf',
+      'mgcp_additional.conf',
+      'mgcp_registrations.conf',
+      'mgcp_general_additional.conf',
+      'skinny_additional.conf',
+      'skinny_registrations.conf',
+      'skinny_general_additional.conf',
-      'features_general_additional.conf',
-      'features_applicationmap_additional.conf',
-      'features_featuremap_additional.conf',
@@ -46 +58 @@
-      case 'iax_registrations.conf':
-        return $this->generate_iax_registrations($version);
-        break;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return $this->generate_zapata_additional($version);
-        break;
-      case 'features_general_additional.conf':
@@ -91 +130 @@
-    return $output;
-  }
-
+  function addH323General($key, $value) {
+    $this->_h323_general[] = array('key' => $key, 'value' => $value);
+  }
+
+  function generate_h323_general_additional($ast_version) {
+    $output = '';
+
+    if (isset($this->_h323_general) && is_array($this->_h323_general)) {
+      foreach ($this->_h323_general as $values) {
+        $output .= $values['key']."=".$values['value']."\n";
+      }
+    }
+    return $output;
+  }
+
+  function addMgcpGeneral($key, $value) {
+    $this->_mgcp_general[] = array('key' => $key, 'value' => $value);
+  }
+
+  function generate_mgcp_general_additional($ast_version) {
+    $output = '';
+
+    if (isset($this->_mgcp_general) && is_array($this->_mgcp_general)) {
+      foreach ($this->_mgcp_general as $values) {
+        $output .= $values['key']."=".$values['value']."\n";
+      }
+    }
+    return $output;
+  }
+
+  function addSkinnyGeneral($key, $value) {
+    $this->_skinny_general[] = array('key' => $key, 'value' => $value);
+  }
+
+  function generate_skinny_general_additional($ast_version) {
+    $output = '';
+
+    if (isset($this->_skinny_general) && is_array($this->_skinny_general)) {
+      foreach ($this->_skinny_general as $values) {
+        $output .= $values['key']."=".$values['value']."\n";
+      }
+    }
+    return $output;
+  }
+
-  function addFeatureGeneral($key, $value) {
-    $this->_featuregeneral[] = array('key' => $key, 'value' => $value);
-  }
@@ -180 +264 @@
-    if(DB::IsError($results)) {
-      die($results->getMessage());
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    foreach ($results as $result) {
-      $account = $result['data'];
-      $id = $result['id'];
@@ -190 +612 @@
-      $results2 = $db->getAll($sql, DB_FETCHMODE_ASSOC);
-      if(DB::IsError($results2)) {
-        die($results2->getMessage());
-
+  
-      foreach ($results2 as $result2) {
-        $options = explode("&", $result2['data']);
-        if ($ver12) {
@@ -200 +622 @@
-        } else {
-          foreach ($options as $option) {
-            switch ($result2['keyword']) {
+              case 'notransfer':
+                if (strtolower($option) == 'yes') {
+                  $output .= "transfer=no\n";
+                } else if (strtolower($option) == 'no') {
+                  $output .= "transfer=yes\n";
+                } else if (strtolower($option) == 'mediaonly') {
+                  $output .= "transfer=mediaonly\n";
+                } else {
+                  $output .= $result2['keyword']."=$option\n";
+                }
+                break;
-              case 'allow':
-              case 'disallow':
-                if ($option != '')
@@ -211 +644 @@
-          }
-        }
-      }
-      if ($call_limit && (substr($id,0,4) != "9999" | $id < 99990)) {
-
-        $output .= $call_limit;
-      }
-      $output .= $additional."\n";
-    }
-    return $output;
-  }
-
-si
+mgc
-    global $db;
-
-si
+mgc
-    $output = "";
-
-registrations
+the registration
-    //
-    $sql = "SELECT keyword,data from $table_name where id LIKE '9999999%' and keyword <> 'account' and flags <> 1";
-    $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
@@ -241 +670 @@
-    return $output;
-  }
-
-iax
+skinny
-    global $db;
-
-iax
+skinny
-    $additional = "";
-    $output = "";
-
@@ -335 +764 @@
-    return $output;
-  }
-
-iax
+skinny
-    global $db;
-
-iax
+skinny
-    $output = "";
-
-    // items with id like 9999999% get put in the registration file
@@ -598 +1027 @@
-        if (version_compare($version, '1.4', 'ge')) {
-          $core_conf->addIaxGeneral('tos','ef'); // Recommended setting from doc/ip-tos.txt
-        }
+        $core_conf->addH323General('bindport','1720');
+        $core_conf->addH323General('bindaddr','0.0.0.0');
+        $core_conf->addH323General('h225portrange','12030,12230');
+        $core_conf->addH323General('h323id','ObjSysAsterisk');
+        $core_conf->addH323General('gatekeeper','DISABLE');
+        $core_conf->addH323General('faststart','no');
+        $core_conf->addH323General('rtptimeout','10');
+        $core_conf->addH323General('dtmfmode','rfc2833');
+        $core_conf->addH323General('canreinvite','no');
+        $core_conf->addH323General('disallow','all');
+        $core_conf->addH323General('allow','ulaw');
+        $core_conf->addH323General('allow','gsm');
+        $core_conf->addH323General('context','from-internal');
+        $core_conf->addMgcpGeneral('port','2427');
+        $core_conf->addMgcpGeneral('bindaddr','0.0.0.0');
+        $core_conf->addMgcpGeneral('canreinvite','no');
+        $core_conf->addMgcpGeneral('wcardep','*');
+        $core_conf->addSkinnyGeneral('port','2000');
+        $core_conf->addSkinnyGeneral('bindaddr','0.0.0.0');
+        $core_conf->addSkinnyGeneral('dateFormat','D-M-Y');
+        $core_conf->addSkinnyGeneral('keepAlive','120');
-
-        $fcc = new featurecode($modulename, 'blindxfer');
-        $code = $fcc->getCodeActive();
@@ -974 +1424 @@
-            continue;
-          }
-          switch ($trunkprops['tech']) {
+            case 'H323':
-            case 'IAX':
-            case 'IAX2':
+            case 'MGCP':
+            case 'Skinny':
-            case 'SIP':
-              $trunkgroup = $trunkprops['globalvar'];
-              $trunkcontext  = "from-trunk-".strtolower($trunkprops['tech'])."-".$trunkprops['name'];
@@ -1647 +2100 @@
-    case "IAX":
-      $sql .= " WHERE tech = 'iax2'";
-      break;
+    case "H323":
-    case "IAX2":
+    case "MGCP":
-    case "SIP":
+    case "Skinny":
-    case "ZAP":
-      $sql .= " WHERE tech = '".strtolower($tech)."'";
-      break;
@@ -1702 +2158 @@
-  }
-  //unless defined, $dial is TECH/id
-  if ( $dial == '' ) {
- is an exception
+, h323, mgcp & skinny are exceptions
-    if ( strtolower($tech) == "zap" ) {
-      $zapchan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
-      $dial = 'ZAP/'.$zapchan;
+//    } else if ( strtolower($tech) == "h323" ) {
+//      $h323chan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
+//      $dial = 'OOH323/'.$h323id."@".$ip;
+//    } else if ( strtolower($tech) == "mgcp" ) {
+//      $mgcpchan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
+//      $dial = 'MGCP/'.$line."@".$account;
+//    } else if ( strtolower($tech) == "skinny" ) {
+//      $skinnychan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
+//      $dial = 'Skinny/'.$line."@".$account;
-    } else {
-      $dial = strtoupper($tech)."/".$id;
-    }
@@ -1780 +2245 @@
-    exec("/bin/ln -s /var/spool/asterisk/voicemail/".$vmcontext."/".$user."/ /var/spool/asterisk/voicemail/device/".$id);
-  }
-    
-
+/h323/mgcp/skinny
-  $funct = "core_devices_add".strtolower($tech);
-  if(function_exists($funct)){
-    $funct($id);
@@ -1844 +2309 @@
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
-  }
-  
-
+/h323/mgcp/skinny
-  $funct = "core_devices_del".strtolower($devinfo['tech']);
-  if(function_exists($funct)){
-    $funct($account);
@@ -1856 +2321 @@
-  $sql = "SELECT * FROM devices WHERE id = '$account'";
-  $results = sql($sql,"getRow",DB_FETCHMODE_ASSOC);
-  
-
+/h323/mgcp/skinny
-  $funct = "core_devices_get".strtolower($results['tech']);
-  if (!empty($results['tech']) && function_exists($funct)) {
-    $devtech = $funct($account);
@@ -2037 +2502 @@
-    if ( substr($req, 0, 8) == 'devinfo_' ) {
-      $keyword = substr($req, 8);
-      if ( $keyword == 'dial' && $data == '' ) {
-       
+                                
-      } elseif ($keyword == 'mailbox' && $data == '') {
-        $iaxfields[] = array($account,'mailbox',$account.'@device');
-      } else {
@@ -2110 +2575 @@
-  return $results;
-}
-
+//add to h323 table
+function core_devices_addh323($account) {
+  global $db;
+  global $currentFile;
+  
+  foreach ($_REQUEST as $req=>$data) {
+    if ( substr($req, 0, 8) == 'devinfo_' ) {
+      $keyword = substr($req, 8);
+      if ( $keyword == 'dial' && $data == '' ) {
+                                $h323fields[] = array($account, $keyword, 'OOH323/'.$h323id."@".$ip);
+//                                $h323fields[] = array($account, $keyword, 'OOH323/'.$account.'@'.$ip);
+      } elseif ($keyword == 'mailbox' && $data == '') {
+        $h323fields[] = array($account,'mailbox',$account.'@device');
+      } else {
+        $h323fields[] = array($account, $keyword, $data);
+      }
+    }
+  }
+  
+  if ( !is_array($h323fields) ) { // left for compatibilty....lord knows why !
+    $h323fields = array(
+      //array($account,'account',$account),
+      array($account,'type',($_REQUEST['context'])?$_REQUEST['context']:'friend'),
+      array($account,'ip',($_REQUEST['ip'])?$_REQUEST['ip']:''),
+      array($account,'port',($_REQUEST['port'])?$_REQUEST['port']:'1720'),
+      array($account,'h323id',($_REQUEST['h323id'])?$_REQUEST['h323id']:$account),
+      array($account,'rtptimeout',($_REQUEST['rtptimeout'])?$_REQUEST['rtptimeout']:'60'),
+      array($account,'dtmfmode',($_REQUEST['dtmfmode'])?$_REQUEST['dtmfmode']:'rfc2833'),
+      array($account,'context',($_REQUEST['context'])?$_REQUEST['context']:'from-internal'),
+      array($account,'mailbox',($_REQUEST['mailbox'])?$_REQUEST['mailbox']:$account.'@device'),
+      array($account,'amaflags',($_REQUEST['amaflags'])?$_REQUEST['amaflags']:'default'),
+      array($account,'disallow',($_REQUEST['disallow'])?$_REQUEST['disallow']:'all'),
+      array($account,'allow',($_REQUEST['allow'])?$_REQUEST['allow']:'ulaw'),
+      array($account,'accountcode',($_REQUEST['accountcode'])?$_REQUEST['accountcode']:''),
+      array($account,'e164',($_REQUEST['e164'])?$_REQUEST['e164']:''),
+      array($account,'email',($_REQUEST['email'])?$_REQUEST['email']:''),
+      array($account,'url',($_REQUEST['url'])?$_REQUEST['url']:'')
+      //array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand'),
+      //array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand'),
+      //array($account,'callerid',($_REQUEST['description'])?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>')
+    );
+  }
+
+  // Very bad
+  $h323fields[] = array($account,'account',$account); 
+  $h323fields[] = array($account,'callerid',(isset($_REQUEST['description']) && $_REQUEST['description'] != '')?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>');
+  // Asterisk treats no caller ID from an h323 device as 'hide callerid', and ignores the caller ID
+  // set in h323.conf. As we rely on this for pretty much everything, we need to specify the 
+  // callerid as a variable which gets picked up in macro-callerid.
+  // Ref - http://bugs.digium.com/view.php?id=456
+  $h323fields[] = array($account,'setvar',"REALCALLERIDNUM=$account");
+  
+  // Where is this in the interface ??????
+  $h323fields[] = array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand');
+  $h323fields[] = array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand');
+  
+  $compiled = $db->prepare('INSERT INTO h323 (id, keyword, data) values (?,?,?)');
+  $result = $db->executeMultiple($compiled,$h323fields);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage()."<br><br>error adding to h323 table");  
+  }
+}
+
+function core_devices_delh323($account) {
+  global $db;
+  global $currentFile;
+  
+  $sql = "DELETE FROM h323 WHERE id = '$account'";
+  $result = $db->query($sql);
+  
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage().$sql);
+  }
+}
+
+function core_devices_geth323($account) {
+  global $db;
+  $sql = "SELECT keyword,data FROM h323 WHERE id = '$account'";
+  $results = $db->getAssoc($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  
+  return $results;
+}
+
+//add to mgcp table
+function core_devices_addmgcp($account) {
+  global $db;
+  global $currentFile;
+
+  foreach ($_REQUEST as $req=>$data) {
+    if ( substr($req, 0, 8) == 'devinfo_' ) {
+      $keyword = substr($req, 8);
+      if ( $keyword == 'dial' && $data == '' ) {
+        $mgcpfields[] = array($account, $keyword, 'MGCP/'.$line."@".$account);
+//        $mgcpfields[] = array($account, $keyword, 'MGCP/aaln/1/@'.$account);
+      } elseif ($keyword == 'mailbox' && $data == '') {
+        $mgcpfields[] = array($account,'mailbox',$account.'@device');
+      } else {
+        $mgcpfields[] = array($account, $keyword, $data);
+      }
+    }
+  }
+  
+  if ( !is_array($mgcpfields) ) { // left for compatibilty....lord knows why !
+    $mgcpfields = array(
+      //array($account,'account',$account),
+      array($account,'type',($_REQUEST['context'])?$_REQUEST['context']:'friend'),
+      array($account,'host',(isset($_REQUEST['host']))?$_REQUEST['host']:'dynamic'),
+      array($account,'line',(isset($_REQUEST['line']))?$_REQUEST['line']:'aaln/1'),
+      array($account,'slowsequence',(isset($_REQUEST['slowsequence']))?$_REQUEST['slowsequence']:'yes'),
+      array($account,'dtmfmode',(isset($_REQUEST['dtmfmode']))?$_REQUEST['dtmfmode']:'rfc2833'),
+      array($account,'nat',(isset($_REQUEST['nat']))?$_REQUEST['nat']:'no'),
+      array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:'all'),
+      array($account,'allow',(isset($_REQUEST['allow']))?$_REQUEST['allow']:'ulaw'),
+      array($account,'context',(isset($_REQUEST['context']))?$_REQUEST['context']:'from-internal'),
+      array($account,'mailbox',($_REQUEST['mailbox'])?$_REQUEST['mailbox']:$account.'@device'),
+      array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''),
+      array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''),
+      array($account,'accountcode',(isset($_REQUEST['accountcode']))?$_REQUEST['accountcode']:'')
+      //array($account,'record_in',(isset($_REQUEST['record_in']))?$_REQUEST['record_in']:'On-Demand'),
+      //array($account,'record_out',(isset($_REQUEST['record_out']))?$_REQUEST['record_out']:'On-Demand'),
+      //array($account,'callerid',(isset($_REQUEST['description']))?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>')
+    );
+  }
+
+  // Very bad
+  $mgcpfields[] = array($account,'account',$account); 
+  $mgcpfields[] = array($account,'callerid',(isset($_REQUEST['description']) && $_REQUEST['description'])?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>');
+  
+  // Where is this in the interface ??????
+  $mgcpfields[] = array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand');
+  $mgcpfields[] = array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand');
+
+  $compiled = $db->prepare('INSERT INTO mgcp (id, keyword, data) values (?,?,?)');
+  $result = $db->executeMultiple($compiled,$mgcpfields);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getDebugInfo()."<br><br>".'error adding to mgcp table'); 
+  }
+}
+
+function core_devices_delmgcp($account) {
+  global $db;
+  global $currentFile;
+  
+  $sql = "DELETE FROM mgcp WHERE id = '$account'";
+  $result = $db->query($sql);
+  
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage().$sql);
+  }
+}
+
+function core_devices_getmgcp($account) {
+  global $db;
+  $sql = "SELECT keyword,data FROM mgcp WHERE id = '$account'";
+  $results = $db->getAssoc($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  
+  return $results;
+}
+
+//add to skinny table
+function core_devices_addskinny($account) {
+  global $db;
+  global $currentFile;
+
+  foreach ($_REQUEST as $req=>$data) {
+    if ( substr($req, 0, 8) == 'devinfo_' ) {
+      $keyword = substr($req, 8);
+      if ( $keyword == 'dial' && $data == '' ) {
+        $skinnyfields[] = array($account, $keyword, 'skinny/'.$line."@".$account);
+      } elseif ($keyword == 'mailbox' && $data == '') {
+        $skinnyfields[] = array($account,'mailbox',$account.'@device');
+      } else {
+        $skinnyfields[] = array($account, $keyword, $data);
+      }
+    }
+  }
+  
+  if ( !is_array($skinnyfields) ) { // left for compatibilty....lord knows why !
+    $skinnyfields = array(
+      //array($account,'account',$account),
+      array($account,'secret',($_REQUEST['secret'])?$_REQUEST['secret']:''),
+      array($account,'type',($_REQUEST['context'])?$_REQUEST['context']:'friend'),
+      array($account,'host',(isset($_REQUEST['host']))?$_REQUEST['host']:'dynamic'),
+      array($account,'model',(isset($_REQUEST['model']))?$_REQUEST['model']:'79xx'),
+      array($account,'device',(isset($_REQUEST['device']))?$_REQUEST['device']:'SEP0007EBxxxxxx'),
+      array($account,'version',(isset($_REQUEST['version']))?$_REQUEST['version']:'P03-08-02'),
+      array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:'0.0.0.0/0.0.0.0'),
+      array($account,'line',(isset($_REQUEST['line']))?$_REQUEST['line']:''),
+      array($account,'linelabel',(isset($_REQUEST['linelabel']))?$_REQUEST['linelabel']:''),
+      array($account,'context',(isset($_REQUEST['context']))?$_REQUEST['context']:'from-internal'),
+      array($account,'nat',(isset($_REQUEST['nat']))?$_REQUEST['nat']:'no'),
+      array($account,'dtmfmode',(isset($_REQUEST['dtmfmode']))?$_REQUEST['dtmfmode']:'inband'),
+      array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:'all'),
+      array($account,'allow',(isset($_REQUEST['allow']))?$_REQUEST['allow']:''),
+      array($account,'mailbox',($_REQUEST['mailbox'])?$_REQUEST['mailbox']:$account.'@device'),
+      array($account,'callwaiting',($_REQUEST['callwaiting'])?$_REQUEST['callwaiting']:'1'),
+      array($account,'transfer',($_REQUEST['transfer'])?$_REQUEST['transfer']:'1'),
+      array($account,'threewaycalling',($_REQUEST['threewaycalling'])?$_REQUEST['threewaycalling']:'1'),
+      array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''),
+      array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''),
+      array($account,'accountcode',(isset($_REQUEST['accountcode']))?$_REQUEST['accountcode']:'')
+      //array($account,'record_in',(isset($_REQUEST['record_in']))?$_REQUEST['record_in']:'On-Demand'),
+      //array($account,'record_out',(isset($_REQUEST['record_out']))?$_REQUEST['record_out']:'On-Demand'),
+      //array($account,'callerid',(isset($_REQUEST['description']))?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>')
+    );
+  }
+
+  // Very bad
+  $skinnyfields[] = array($account,'account',$account); 
+  $skinnyfields[] = array($account,'callerid',(isset($_REQUEST['description']) && $_REQUEST['description'])?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>');
+  
+  // Where is this in the interface ??????
+  $skinnyfields[] = array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand');
+  $skinnyfields[] = array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand');
+
+  $compiled = $db->prepare('INSERT INTO skinny (id, keyword, data) values (?,?,?)');
+  $result = $db->executeMultiple($compiled,$skinnyfields);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getDebugInfo()."<br><br>".'error adding to skinny table'); 
+  }
+}
+
+function core_devices_delskinny($account) {
+  global $db;
+  global $currentFile;
+  
+  $sql = "DELETE FROM skinny WHERE id = '$account'";
+  $result = $db->query($sql);
+  
+  if(DB::IsError($result)) {
+    die_freepbx($result->getMessage().$sql);
+  }
+}
+
+function core_devices_getskinny($account) {
+  global $db;
+  $sql = "SELECT keyword,data FROM skinny WHERE id = '$account'";
+  $results = $db->getAssoc($sql);
+  if(DB::IsError($results)) {
+    $results = null;
+  }
+  
+  return $results;
+}
+
-function core_devices_addzap($account) {
-  global $db;
-  global $currentFile;
@@ -2751 +3467 @@
-
-  // conditionally, delete from iax or sip
-  switch (strtolower($tech)) {
+    case "h323":
+      sql("DELETE FROM h323 WHERE id = '9999$trunknum' OR id = '99999$trunknum' OR id = '9999999$trunknum'");
+    break;
-    case "iax":
-    case "iax2":
-      sql("DELETE FROM iax WHERE id = '9999$trunknum' OR id = '99999$trunknum' OR id = '9999999$trunknum'");
-    break;
+    case "mgcp":
+      sql("DELETE FROM mgcp WHERE id = '9999$trunknum' OR id = '99999$trunknum' OR id = '9999999$trunknum'");
+    break;
-    case "sip": 
-      sql("DELETE FROM sip WHERE id = '9999$trunknum' OR id = '99999$trunknum' OR id = '9999999$trunknum'");
-    break;
+    case "skinny":
+      sql("DELETE FROM skinny WHERE id = '9999$trunknum' OR id = '99999$trunknum' OR id = '9999999$trunknum'");
+    break;
-  }
-}
-
@@ -2804 +3529 @@
-  $disable_flag = ($disabletrunk == "on")?1:0;
-  
-  switch (strtolower($tech)) {
+    case "h323":
+      core_trunks_addSipOrIax($peerdetails,'h323',$channelid,$trunknum,$disable_flag);
+      if ($usercontext != ""){
+        core_trunks_addSipOrIax($userconfig,'h323',$usercontext,'9'.$trunknum,$disable_flag);
+      }
+      if ($register != ""){
+        core_trunks_addRegister($trunknum,'h323',$register,$disable_flag);
+      }
+    break;
-    case "iax":
-    case "iax2":
-      core_trunks_addSipOrIax($peerdetails,'iax',$channelid,$trunknum,$disable_flag);
@@ -2814 +3548 @@
-        core_trunks_addRegister($trunknum,'iax',$register,$disable_flag);
-      }
-    break;
+    case "mgcp":
+      core_trunks_addSipOrIax($peerdetails,'mgcp',$channelid,$trunknum,$disable_flag);
+      if ($usercontext != ""){
+        core_trunks_addSipOrIax($userconfig,'mgcp',$usercontext,'9'.$trunknum,$disable_flag);
+      }
+      if ($register != ""){
+        core_trunks_addRegister($trunknum,'mgcp',$register,$disable_flag);
+      }
+    break;
-    case "sip":
-      core_trunks_addSipOrIax($peerdetails,'sip',$channelid,$trunknum,$disable_flag);
-      if ($usercontext != ""){
@@ -2823 +3566 @@
-        core_trunks_addRegister($trunknum,'sip',$register,$disable_flag);
-      }
-    break;
+    case "skinny":
+      core_trunks_addSipOrIax($peerdetails,'skinny',$channelid,$trunknum,$disable_flag);
+      if ($usercontext != ""){
+        core_trunks_addSipOrIax($userconfig,'skinny',$usercontext,'9'.$trunknum,$disable_flag);
+      }
+      if ($register != ""){
+        core_trunks_addRegister($trunknum,'skinny',$register,$disable_flag);
+      }
+    break;
-  } 
-}
-
@@ -2836 +3588 @@
-    $tech = "custom";
-  } else {
-    $tech = strtolower( strtok($results[0][0],'/') ); // the technology.  ie: ZAP/g0 is ZAP
-    
-    if ($tech == "iax2") $tech = "iax"; // same thing, here
-  }
-  return $tech;
@@ -4075 +4826 @@
-    $msgInvalidDTMFMODE = _("Please enter the dtmfmode for this device");
-    $msgInvalidChannel = _("Please enter the channel for this device");
-    $msgConfirmSecret = _("You have not entered a Secret for this device, although this is possible it is generally bad practice to not assign a Secret to a device. Are you sure you want to leave the Secret empty?");
+    $msgH323ConfirmIP = _("You have not entered an IP Address for the endpoint, OOH323 requires an IP as it is not an H323 Gatekeeper and does not support host=dynamic.");
+    $msgH323InvalidIP = _("You have not entered an IP Address for the endpoint, Asterisk will not be able to contact it.");
-    $msgInvalidSecret = _("Please enter a Secret for this device");
-    
-    // zap
@@ -4094 +4847 @@
-    $tmparr['mailbox'] = array('value' => '', 'level' => 1);
-    $currentcomponent->addgeneralarrayitem('devtechs', 'zap', $tmparr);
-    unset($tmparr);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // iax2
-    $tmparr = array();
-    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret);
@@ -4112 +4887 @@
-    $currentcomponent->addgeneralarrayitem('devtechs', 'iax2', $tmparr);
-    unset($tmparr);
-
+    // mgcp
+    $tmparr = array();
+    $tmparr['host'] = array('value' => 'dynamic', 'level' => 1);
+    $tmparr['type'] = array('value' => 'friend', 'level' => 1);
+    $tmparr['wcardep'] = array('value' => '*', 'level' => 1);
+    $tmparr['slowsequence'] = array('value' => 'yes', 'level' => 1);
+    $tmparr['line'] = array('value' => '', 'level' => 0);
+    $tmparr['dial'] = array('value' => '', 'level' => 0);
+    $tmparr['dtmfmode'] = array('value' => 'rfc2833', 'level' => 1);
+    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
+    $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1);
+    $tmparr['nat'] = array('value' => 'no', 'level' => 1);
+    $tmparr['callgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['pickupgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['disallow'] = array('value' => 'all', 'level' => 1);
+    $tmparr['allow'] = array('value' => 'ulaw', 'level' => 1);
+    $tmparr['accountcode'] = array('value' => '', 'level' => 1);
+    $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+    $currentcomponent->addgeneralarrayitem('devtechs', 'mgcp', $tmparr);
+    unset($tmparr);
+
+    // skinny
+    $tmparr = array();
+    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret);
+    $tmparr['host'] = array('value' => 'dynamic', 'level' => 0);
+    $tmparr['type'] = array('value' => 'friend', 'level' => 1);
+    $tmparr['model'] = array('value' => '79xx', 'level' => 0);
+    $tmparr['device'] = array('value' => 'SEP0007EBxxxxxx', 'level' => 0);
+    $tmparr['version'] = array('value' => 'P03-0x-0x', 'level' => 0);
+    $tmparr['permit'] = array('value' => '', 'level' => 0);
+    $tmparr['line'] = array('value' => '', 'level' => 0);
+    $tmparr['linelabel'] = array('value' => '', 'level' => 0);
+    $tmparr['dial'] = array('value' => '', 'level' => 0);
+    $tmparr['dtmfmode'] = array('value' => 'rfc2833', 'level' => 1);
+    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
+    $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1);
+    $tmparr['nat'] = array('value' => 'no', 'level' => 1);
+    $tmparr['callgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['pickupgroup'] = array('value' => '', 'level' => 1);
+    $tmparr['callwaiting'] = array('value' => '', 'level' => 1);
+    $tmparr['transfer'] = array('value' => '', 'level' => 1);
+    $tmparr['threewaycalling'] = array('value' => '', 'level' => 1);
+    $tmparr['disallow'] = array('value' => 'all', 'level' => 1);
+    $tmparr['allow'] = array('value' => 'ulaw', 'level' => 1);
+    $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+    $tmparr['accountcode'] = array('value' => '', 'level' => 1);
+
+    $currentcomponent->addgeneralarrayitem('devtechs', 'skinny', $tmparr);
+    unset($tmparr);
+
-    // sip
-    $tmparr = array();
-    $tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => 'isEmpty() && !confirm("'.$msgConfirmSecret.'")', 'failvalidationmsg' => $msgInvalidSecret);
@@ -4120 +4945 @@
-    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
-    $tmparr['host'] = array('value' => 'dynamic', 'level' => 1);
-    $tmparr['type'] = array('value' => 'friend', 'level' => 1);
-yes
+no
-    $tmparr['port'] = array('value' => '5060', 'level' => 1);
-    $tmparr['qualify'] = array('value' => 'yes', 'level' => 1);
-    $tmparr['callgroup'] = array('value' => '', 'level' => 1);
@@ -4141 +4966 @@
-    
-    // Devices list
-    $currentcomponent->addoptlistitem('devicelist', 'sip_generic', _("Generic SIP Device"));
+    $currentcomponent->addoptlistitem('devicelist', 'h323_generic', _("Generic H323 Device"));
-    $currentcomponent->addoptlistitem('devicelist', 'iax2_generic', _("Generic IAX2 Device"));
+    $currentcomponent->addoptlistitem('devicelist', 'mgcp_generic', _("Generic MGCP Device"));
+    $currentcomponent->addoptlistitem('devicelist', 'skinny_generic', _("Generic Skinny Device"));
-    $currentcomponent->addoptlistitem('devicelist', 'zap_generic', _("Generic ZAP Device"));
-    $currentcomponent->addoptlistitem('devicelist', 'custom_custom', _("Other (Custom) Device"));
-    $currentcomponent->setoptlistopts('devicelist', 'sort', false);