Fix reversion errors
When rebasing, errors were introduced. This commit reverses those errors. It may also revert some commits
This commit is contained in:
steve-lad
parent
ad1184af43
commit
4ce789cd3e
|
|
@ -837,7 +837,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
|
||||||
$upd_mode = 'replace';
|
$upd_mode = 'replace';
|
||||||
case 'model_update':
|
case 'model_update':
|
||||||
if ($request['command'] == 'model_update') {
|
if ($request['command'] == 'model_update') {
|
||||||
$key_name = array('model','vendor','dns', 'buttons', 'loadimage', 'loadinformationid', 'nametemplate');
|
$key_name = array('model', 'loadimage', 'nametemplate');
|
||||||
$upd_mode = 'update';
|
$upd_mode = 'update';
|
||||||
}
|
}
|
||||||
if (!empty($request['model'])) {
|
if (!empty($request['model'])) {
|
||||||
|
|
|
||||||
|
|
@ -550,8 +550,7 @@ $(document).ready(function () {
|
||||||
}
|
}
|
||||||
if ($(this).data('id') === 'model_apply') {
|
if ($(this).data('id') === 'model_apply') {
|
||||||
var dev_cmd = 'model_update';
|
var dev_cmd = 'model_update';
|
||||||
//var dev_fld = ["model", "loadimage", "nametemplate"];
|
var dev_fld = ["model", "loadimage", "nametemplate"];
|
||||||
var dev_fld = ["model", "vendor", "dns", "buttons", "loadimage", "loadinformationid", "nametemplate"];
|
|
||||||
datas = '';
|
datas = '';
|
||||||
for (var i = 0; i < dev_fld.length; i++) {
|
for (var i = 0; i < dev_fld.length; i++) {
|
||||||
datas = datas + dev_fld[i] + '=' + $('#editd_' + dev_fld[i]).val() + '&';
|
datas = datas + dev_fld[i] + '=' + $('#editd_' + dev_fld[i]).val() + '&';
|
||||||
|
|
|
||||||
|
|
@ -1,50 +1,22 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// vim: set ai ts=4 sw=4 ft=php:
|
// vim: set ai ts=4 sw=4 ft=php:
|
||||||
// Version for SCCP Manager 13.0.X
|
// Version for SCCP Manager 13.0.X
|
||||||
//
|
//
|
||||||
// Templete for Sccp Driver
|
// Templete for Sccp Driver
|
||||||
//
|
//
|
||||||
|
|
||||||
namespace FreePBX\modules\Core\Drivers;
|
namespace FreePBX\modules\Core\Drivers;
|
||||||
class Sccp extends \FreePBX\modules\Core\Driver {
|
class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
public $version;
|
|
||||||
// Key (db) = > key Settings
|
|
||||||
private $data_fld = array("pin"=>'pin', "label" => 'label', "accountcode" => 'account',
|
private $data_fld = array("pin"=>'pin', "label" => 'label', "accountcode" => 'account',
|
||||||
"context" =>'lcontext',"incominglimit"=>'incominglimit',
|
"context" =>'lcontext',"incominglimit"=>'incominglimit',
|
||||||
// "callgroup"=>'callgroup',"pickupgroup"=>'pickupgroup',
|
"callgroup"=>'callgroup',"pickupgroup"=>'pickupgroup',
|
||||||
'directed_pickup_context' => 'directed_pickup_context',
|
|
||||||
'directed_pickup' => 'directed_pickup',
|
|
||||||
'pickup_modeanswer' => 'pickup_modeanswer',
|
|
||||||
'namedcallgroup'=>'namedcallgroup', 'namedpickupgroup' => 'namedpickupgroup',
|
|
||||||
"transfer" => 'transfer', "echocancel" => 'echocancel',
|
"transfer" => 'transfer', "echocancel" => 'echocancel',
|
||||||
"language" => 'language', "description" => 'callerid',
|
"language" => 'language', "description" => 'callerid',
|
||||||
"cid_num" => 'cid_num', "cid_name" => 'label', "mailbox" => 'mailbox',
|
"cid_num" => 'cid_num', "cid_name" => 'label', "mailbox" => 'description',
|
||||||
"musicclass" => 'musicclass',"allow" => 'allow',"disallow" => 'disallow',
|
"musicclass" => 'musicclass',
|
||||||
"videomode" => 'videomode',
|
|
||||||
"dnd" => 'dnd', "silencesuppression" => 'silencesuppression',
|
"dnd" => 'dnd', "silencesuppression" => 'silencesuppression',
|
||||||
"secondary_dialtone_digits" => 'secondary_dialtone_digits', "secondary_dialtone_tone" => 'secondary_dialtone_tone'
|
"secondary_dialtone_digits" => 'secondary_dialtone_digits', "secondary_dialtone_tone" => 'secondary_dialtone_tone',
|
||||||
|
'namedcallgroup'=>'namedcallgroup', 'namedpickupgroup' => 'namedpickupgroup'
|
||||||
);
|
);
|
||||||
private $guidefaults =array(
|
|
||||||
'gui_checkset' => array( "elemname" => "", "prompttext" => "", "helptext" => "", "currentvalue" => "", "valarray" => array(), "jsonclick" => '',
|
|
||||||
"jsvalidation" => "", "failvalidationmsg" => "", "canbeempty" => true, "maxchars" => 0, "disable" => false, "inputgroup" => false,
|
|
||||||
"class" => "", "cblabel" => 'Enable', "disabled_value" => 'DEFAULT', "check_enables" => 'true', "cbdisable" => false, "cbclass" => '') );
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Export Functions
|
|
||||||
* getInfo
|
|
||||||
* addDevice
|
|
||||||
* delDevice
|
|
||||||
* getDevice
|
|
||||||
* getDefaultDeviceSettings
|
|
||||||
* getDeviceDisplay
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
public function __construct($freepbx) {
|
|
||||||
parent::__construct($freepbx);
|
|
||||||
// $this->version = $freepbx->Config->get('ASTVERSION');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getInfo() {
|
public function getInfo() {
|
||||||
return array(
|
return array(
|
||||||
|
|
@ -53,20 +25,28 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
"prettyName" => _("Sccp Custom Driver"),
|
"prettyName" => _("Sccp Custom Driver"),
|
||||||
"shortName" => "SCCP",
|
"shortName" => "SCCP",
|
||||||
"description" => _("Sccp Device"),
|
"description" => _("Sccp Device"),
|
||||||
// 11.4.v434m => 11.4 - Version; .v433 - revision (.v431, .v432, .v432, .v433 );
|
"Version" => "11.4",
|
||||||
"Version" => "11.4.v433m",
|
"about" => "Sccp mysql class Base ver: 11.3, Sccp ver: default"
|
||||||
"about" => "Sccp mysql class Base ver: 11.4, Sccp ver: 433, branch: m"
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* public function addDevice1($id, $settings) {
|
||||||
|
$sql = 'INSERT INTO sccp (id, keyword, data, flags) values (?,?,?,?)';
|
||||||
|
$sth = $this->database->prepare($sql);
|
||||||
|
$settings = is_array($settings)?$settings:array();
|
||||||
|
foreach($settings as $key => $setting) {
|
||||||
|
$sth->execute(array($id,$key,$setting['value'],$setting['flag']));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
*/
|
||||||
public function addDevice($id, $settings) {
|
public function addDevice($id, $settings) {
|
||||||
$add_fld = array ("name"=>'label',"outboundcid"=>'cid_num',"langcode"=>'language',"extdisplay"=>'description','devinfo_mailbox'=>'mailbox');
|
$add_fld = array ("name"=>'label',"outboundcid"=>'cid_num',"langcode"=>'language',"extdisplay"=>'description');
|
||||||
// print_r($_REQUEST);
|
// print_r($_REQUEST);
|
||||||
// echo '<br><br>';
|
// echo '<br><br>';
|
||||||
// die(print_r($settings));
|
// die(print_r($settings));
|
||||||
$settings['cid_num']['value']='';
|
$settings['cid_num']['value']='';
|
||||||
$settings['cid_name']['value'] = $label;
|
|
||||||
$settings['mailbox']['value']= '';
|
|
||||||
|
|
||||||
if (isset($_REQUEST)){
|
if (isset($_REQUEST)){
|
||||||
foreach($add_fld as $key => $val) {
|
foreach($add_fld as $key => $val) {
|
||||||
if (!empty($_REQUEST[$key])){
|
if (!empty($_REQUEST[$key])){
|
||||||
|
|
@ -74,189 +54,105 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$allow_codec = array();
|
|
||||||
foreach($settings as $key => $val) {
|
|
||||||
if (strpos($key,'codec_') !== false ) {
|
|
||||||
$allow_codec[] =substr($key,6);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$settings['allow']['value'] = implode(",", $allow_codec);
|
|
||||||
|
|
||||||
if (empty($settings['cid_num']['value'])) {
|
if (empty($settings['cid_num']['value'])) {
|
||||||
$settings['cid_num']['value']= $id;
|
$settings['cid_num']['value']= $id;
|
||||||
} else {
|
|
||||||
$outboundcid = $settings['cid_num']['value'];
|
|
||||||
if (preg_match('/"(.*)"\s?<(.*)>/', $outboundcid, $matches)) {
|
|
||||||
$settings['cid_num']['value'] = $matches[2];
|
|
||||||
$settings['cid_name']['value'] = $matches[1];
|
|
||||||
} else if (is_integer($outboundcid)) {
|
|
||||||
$settings['cid_num']['value'] = $outboundcid;
|
|
||||||
}
|
}
|
||||||
}
|
$sql = 'INSERT INTO sccpline (name';
|
||||||
|
|
||||||
if (!empty($_REQUEST['vm']) && ($_REQUEST['vm'] =='enabled')){ // mailbox
|
|
||||||
if (empty($settings['mailbox']['value'])) {
|
|
||||||
$settings['mailbox']['value']= $id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// die(print_r($settings));
|
|
||||||
$tech = Array();
|
|
||||||
$sql = "DESCRIBE `sccpline`";
|
|
||||||
foreach ($this->database->query($sql) as $row) {
|
|
||||||
$tech[$row["Field"]]=$row["Field"];
|
|
||||||
}
|
|
||||||
|
|
||||||
// die(print_r($tech));
|
|
||||||
|
|
||||||
$sql = 'REPLACE INTO sccpline (name';
|
|
||||||
$sqlv = 'values ("'.$id.'"';
|
$sqlv = 'values ("'.$id.'"';
|
||||||
foreach($this->data_fld as $key => $val) {
|
foreach($this->data_fld as $key => $val) {
|
||||||
if (isset($tech[$key])) {
|
|
||||||
switch ($key) {
|
|
||||||
case 'incominglimit':
|
|
||||||
$sql .= ', '.$key;
|
|
||||||
if (!empty($settings[$val]['value'])){
|
|
||||||
$sqlv .= ", '".$settings[$val]['value']."' ";
|
|
||||||
} else {
|
|
||||||
$sqlv .= ", DEFAULT(`".$key."`)";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'secondary_dialtone_digits':
|
|
||||||
case 'secondary_dialtone_tone':
|
|
||||||
case 'dnd':
|
|
||||||
$sql .= ', '.$key;
|
|
||||||
if (!$this->is_my_blank($settings[$val]['value'])){
|
|
||||||
$sqlv .= ", '".$settings[$val]['value']."' ";
|
|
||||||
} else {
|
|
||||||
$sqlv .= ", NULL ";
|
|
||||||
// $sqlv .= ", DEFAULT(`".$key."`)";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if (!empty($settings[$val]) ) {
|
if (!empty($settings[$val]) ) {
|
||||||
if (!empty($settings[$val]['value'])){
|
if (!empty($settings[$val]['value'])){
|
||||||
$sql .= ', '.$key;
|
$sql .= ', '.$key;
|
||||||
$sqlv .= ", '".$settings[$val]['value']."' ";
|
$sqlv .= ", '".$settings[$val]['value']."' ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$sql .= ") ".$sqlv.");";
|
$sql .= ") ".$sqlv.");";
|
||||||
// die(print_r($sql));
|
|
||||||
$sth = $this->database->prepare($sql);
|
$sth = $this->database->prepare($sql);
|
||||||
$sth->execute();
|
$sth->execute();
|
||||||
|
|
||||||
$this->reload_line($id);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delDevice($id) {
|
public function delDevice($id) {
|
||||||
// $sql = "DELETE FROM sccpline WHERE id = ?";
|
|
||||||
$sql = "DELETE FROM sccpline WHERE name = ?";
|
$sql = "DELETE FROM sccpline WHERE name = ?";
|
||||||
$sth = $this->database->prepare($sql);
|
$sth = $this->database->prepare($sql);
|
||||||
$sth->execute(array($id));
|
$sth->execute(array($id));
|
||||||
$this->reload_line($id);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reload_line($id) {
|
|
||||||
global $astman;
|
|
||||||
$result = $astman->Command('sccp reload line ' . $id);
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDevice($id) {
|
public function getDevice($id) {
|
||||||
$sccp_line = array();
|
$sccp_line = array();
|
||||||
|
// $sql = "SELECT name as id, name as name";
|
||||||
$sql = "SELECT name as id, name as name ";
|
$sql = "SELECT name as id, name as name ";
|
||||||
foreach($this->data_fld as $key => $val) {
|
foreach($this->data_fld as $key => $val) {
|
||||||
$sql .= ',`'. $key .'` as '.$val;
|
$sql .= ',`'. $key .'` as '.$val;
|
||||||
}
|
}
|
||||||
// $sql .= " FROM sccpline WHERE id = ?";
|
|
||||||
$sql .= " FROM sccpline WHERE name = ?";
|
$sql .= " FROM sccpline WHERE name = ?";
|
||||||
$sth = $this->database->prepare($sql);
|
$sth = $this->database->prepare($sql);
|
||||||
$result = array();
|
$result = array();
|
||||||
$tech = array();
|
$tech = array();
|
||||||
// print_r($sql);
|
|
||||||
try {
|
try {
|
||||||
$sth->execute(array($id));
|
$sth->execute(array($id));
|
||||||
$tech = $sth->fetch();
|
$result = $sth->fetch(\PDO::FETCH_ASSOC);
|
||||||
|
$tech = $result;
|
||||||
$tech['dial']='SCCP/'.$id;
|
$tech['dial']='SCCP/'.$id;
|
||||||
} catch(\Exception $e) {}
|
} catch(\Exception $e) {}
|
||||||
|
|
||||||
// print_r($tech);
|
|
||||||
// echo '<br><br>';
|
|
||||||
// print_r($sql);
|
|
||||||
// die(print_r($id));
|
|
||||||
// echo '<br><br>';
|
|
||||||
|
|
||||||
return $tech;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getNamedGroup() {
|
|
||||||
$sql = "select namedcallgroup from sccpline group by namedcallgroup";
|
|
||||||
$sth = $this->database->prepare($sql);
|
|
||||||
$result = array();
|
|
||||||
$tech = array();
|
|
||||||
// $tech['namedcallgroup'] = '';
|
|
||||||
// $tech['namedpickupgroup'] = '';
|
|
||||||
try {
|
|
||||||
$sth->execute();
|
|
||||||
$result = $sth->fetchAll();
|
|
||||||
foreach($result as $val) {
|
|
||||||
$tech['namedcallgroup'][] = $val[0];
|
|
||||||
}
|
|
||||||
} catch(\Exception $e) {}
|
|
||||||
$sql = "select namedpickupgroup from sccpline group by namedpickupgroup";
|
|
||||||
$sth = $this->database->prepare($sql);
|
|
||||||
try {
|
|
||||||
$sth->execute();
|
|
||||||
$result = $sth->fetchAll();
|
|
||||||
foreach($result as $val) {
|
|
||||||
$tech['namedpickupgroup'][] = $val[0];
|
|
||||||
}
|
|
||||||
} catch(\Exception $e) {}
|
|
||||||
|
|
||||||
return $tech;
|
return $tech;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDefaultDeviceSettings($id, $displayname, &$flag) {
|
public function getDefaultDeviceSettings($id, $displayname, &$flag) {
|
||||||
$dial = 'SCCP';
|
$dial = 'SCCP';
|
||||||
$settings = array(
|
$settings = array(
|
||||||
"mailbox" => array(
|
"pin" => array(
|
||||||
"value" => "",
|
"value" => "",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
"incominglimit" => array(
|
"incominglimit" => array(
|
||||||
"value" => "2",
|
"value" => "",
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"directed_pickup_context" => array(
|
|
||||||
"value" => "from-internal",
|
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
"lcontext" => array(
|
"lcontext" => array(
|
||||||
"value" => "from-internal",
|
"value" => "from-internal",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
// "callgroup" => array(
|
"callgroup" => array(
|
||||||
// "value" => "from-internal",
|
"value" => "",
|
||||||
// "flag" => $flag++
|
"flag" => $flag++
|
||||||
// ),
|
),
|
||||||
"namedcallgroup" => array(
|
"namedcallgroup" => array(
|
||||||
"value" => "",
|
"value" => "",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
// "pickupgroup" => array(
|
"pickupgroup" => array(
|
||||||
// "value" => "",
|
"value" => "",
|
||||||
// "flag" => $flag++
|
"flag" => $flag++
|
||||||
// ),
|
),
|
||||||
"namedpickupgroup" => array(
|
"namedpickupgroup" => array(
|
||||||
"value" => "",
|
"value" => "",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
|
"transfer" => array(
|
||||||
|
"value" => "yes",
|
||||||
|
"flag" => $flag++
|
||||||
|
),
|
||||||
|
"adhocNumber" => array(
|
||||||
|
"value" => "",
|
||||||
|
"flag" => $flag++
|
||||||
|
),
|
||||||
|
"echocancel" => array(
|
||||||
|
"value" => "no",
|
||||||
|
"flag" => $flag++
|
||||||
|
),
|
||||||
|
"dnd" => array(
|
||||||
|
"value" => "UserDefined",
|
||||||
|
"flag" => $flag++
|
||||||
|
),
|
||||||
|
"silencesuppression" => array(
|
||||||
|
"value" => "no",
|
||||||
|
"flag" => $flag++
|
||||||
|
),
|
||||||
"secondary_dialtone_digits" => array(
|
"secondary_dialtone_digits" => array(
|
||||||
"value" => "9",
|
"value" => "9",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
|
|
@ -265,46 +161,10 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
"value" => "0x22",
|
"value" => "0x22",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
"transfer" => array(
|
|
||||||
"value" => "on",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"echocancel" => array(
|
|
||||||
"value" => "on",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"dnd" => array(
|
|
||||||
"value" => "",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"silencesuppression" => array(
|
|
||||||
"value" => "off",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"musicclass" => array(
|
"musicclass" => array(
|
||||||
"value" => "default",
|
"value" => "default",
|
||||||
"flag" => $flag++
|
"flag" => $flag++
|
||||||
),
|
),
|
||||||
"pin" => array(
|
|
||||||
"value" => "",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"musicclass" => array(
|
|
||||||
"value" => "default",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"allow" => array(
|
|
||||||
"value" => "all",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"disallow" => array(
|
|
||||||
"value" => "all",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
"videomode" => array(
|
|
||||||
"value" => "auto",
|
|
||||||
"flag" => $flag++
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
return array(
|
return array(
|
||||||
"dial" => $dial,
|
"dial" => $dial,
|
||||||
|
|
@ -312,111 +172,39 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# !TODO!: -TODO-: Would it not be better to put this part in the view directory (MVC) ? No, This is a template for Freepbx.
|
||||||
public function getDeviceDisplay($display, $deviceInfo, $currentcomponent, $primarySection) {
|
public function getDeviceDisplay($display, $deviceInfo, $currentcomponent, $primarySection) {
|
||||||
$section = _("SCCP Extension Details");
|
$section = _("Settings");
|
||||||
$section_с = _("SCCP Codec Details");
|
$category = "general";
|
||||||
$gn_category = "sccp";
|
|
||||||
global $currentcomponent, $display;
|
|
||||||
$named_group = $this->getNamedGroup();
|
|
||||||
//add sccp category
|
|
||||||
$currentcomponent->addTabTranslation('sccp',_('SCCP'));
|
|
||||||
// $currentcomponent->addTabTranslation('Codec',_('Codec'));
|
|
||||||
|
|
||||||
//Fill Codecs Informations
|
|
||||||
|
|
||||||
// $Sccp_Codec = array('gsm','slin16','alaw','ulaw','g722','g723','g726','g728','g729','ilibc','opus','h264','h263','h265','h261');
|
|
||||||
$Sccp_Codec = array('alaw', 'ulaw', 'g722', 'g723', 'g726', 'g729', 'gsm', 'h264', 'h263', 'h261');
|
|
||||||
$allCodecs = $this->freepbx->Codecs->getAudio(true);
|
|
||||||
$allVCodecs = $this->freepbx->Codecs->getVideo();
|
|
||||||
$ACodec_cur = array('all');
|
|
||||||
$VCodec_cur = array('all');
|
|
||||||
|
|
||||||
foreach ($allCodecs as $c => $v) {
|
|
||||||
if (array_search($c,$Sccp_Codec) !=null) {
|
|
||||||
$currentcomponent->addoptlistitem('devinfo_sccp_codec', "devinfo_codec_"."$c", "$c");
|
|
||||||
if (isset($deviceInfo['allow'])) {
|
|
||||||
if (strpos($deviceInfo['allow'],$c)!== false) {
|
|
||||||
$ACodec_cur[] ="devinfo_codec_"."$c";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($allVCodecs as $c => $v) {
|
|
||||||
if (array_search($c,$Sccp_Codec) !=null) {
|
|
||||||
$currentcomponent->addoptlistitem('devinfo_sccp_vcodec', "devinfo_codec_"."$c", "$c");
|
|
||||||
if (isset($deviceInfo['allow'])) {
|
|
||||||
if (strpos($deviceInfo['allow'],$c)!== false) {
|
|
||||||
$VCodec_cur[] ="devinfo_codec_"."$c";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$el = array(
|
|
||||||
"elemname" => "devinfo_sccp_codec",
|
|
||||||
"prompttext" => _('Line Audio Codec:'),
|
|
||||||
"helptext" => _("Line Audio Codec"),
|
|
||||||
"currentvalue" => $ACodec_cur,
|
|
||||||
"valarray" => $currentcomponent->getoptlist('devinfo_sccp_codec'),
|
|
||||||
"class" => $section_с,
|
|
||||||
"disable" => 0
|
|
||||||
);
|
|
||||||
|
|
||||||
$currentcomponent->addguielem($section_с, new \gui_checkset(array_merge($this->guidefaults['gui_checkset'],$el)), $gn_category);
|
|
||||||
unset($el);
|
|
||||||
|
|
||||||
$el = array(
|
|
||||||
"elemname" => "devinfo_sccp_vcodec",
|
|
||||||
"prompttext" => _('Line Video Codec:'),
|
|
||||||
"helptext" => _("Line Video Codec"),
|
|
||||||
"currentvalue" => $VCodec_cur,
|
|
||||||
"valarray" => $currentcomponent->getoptlist('devinfo_sccp_vcodec'),
|
|
||||||
"class" => $section_с,
|
|
||||||
"disable" => 0
|
|
||||||
);
|
|
||||||
$currentcomponent->addguielem($section_с, new \gui_checkset(array_merge($this->guidefaults['gui_checkset'],$el)), $gn_category);
|
|
||||||
|
|
||||||
$tmparr = array();
|
$tmparr = array();
|
||||||
$tt = _("Name or id of lincked maibox");
|
$tt = _("The maximum number of incoming calls on this line.");
|
||||||
$tmparr['mailbox'] = array('prompttext' => _('Mailbox'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
|
||||||
$tt = _("The SCCP channel number for this port. If you plaining to use this line as 'Shared' or use on several devices - leave this field blank or set limit to 10 calls.");
|
|
||||||
// $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel);
|
// $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel);
|
||||||
// $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section, 'category' => 'general');
|
// !TODO!: Please change the default value for incominglimit to '6' or higher
|
||||||
|
$tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
$tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
$tt = _("Asterisk context which this line will use to send and receive calls (Note: Only change this is you know what you are doing).");
|
||||||
|
$tmparr['lcontext'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
$tt = _("Asterisk context this device will send calls to. Only change this is you know what you are doing.");
|
// !TODO!: -TODO-: Maybe completely remove support for old numberic callgroup/pickupgroup in favor of the named version ? See Sccp.class.php.v431
|
||||||
$tmparr['lcontext'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
$tt = _("Phone call group (numeric only, example:1,3-4)");
|
||||||
|
$tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
$tt = _("Asterisk context this device will can pickup calls. Only change this is you know what you are doing.");
|
// !TODO!: -TODO-: multiple allowed (not sure if that is implemented here). See Sccp.class.php.v431
|
||||||
$tmparr['directed_pickup_context'] = array('prompttext' => _('Directed PickUp Сontext '), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
$tt = _("Phone named call group (>asterisk-11)");
|
||||||
|
$tmparr['namedcallgroup'] = array('prompttext' => _('Named Call Group'),'value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
// $tt = _("Phone call group callgroup=1,3-4");
|
$tt = _("Sets the pickup group (numeric only, example:1,3-4) this line is a member of. Allows this line to pickup calls from remote phones which are in this callhroup.");
|
||||||
// $tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section);
|
$tmparr['pickupgroup'] = array('prompttext' => _('Pickup group id'),'value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
|
// !TODO!: -TODO-: multiple allowed (not sure if that is implemented here). See Sccp.class.php.v431
|
||||||
|
$tt = _("Sets the named pickup name group this line is a member of. Allows this line to pickup calls from remote phones which are in this name callgroup (>asterisk-11).");
|
||||||
|
$tmparr['namedpickupgroup'] = array('prompttext' => _('Named Pickup Group'),'value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
|
$tt = _("Phone pincode (Note used)");
|
||||||
|
$tmparr['pin'] = array('value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
$tt = _("Sets the named caller groups this line is a member of (ast111) : ");
|
|
||||||
if (!empty($named_group['namedcallgroup'])) {
|
|
||||||
foreach ($named_group['namedcallgroup'] as $val) {
|
|
||||||
$tt .= $val. ', ';
|
|
||||||
}
|
|
||||||
$tt .= '... ';
|
|
||||||
}
|
|
||||||
$tmparr['namedcallgroup'] = array('prompttext' => _('Named Call Group'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
|
||||||
// $tmparr['namedcallgroup'] = array('prompttext' => _('Named Call Group'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section, 'category' => 'general');
|
|
||||||
// $tt = _("Phone pickup group pickupgroup=1,3-4");
|
|
||||||
// $tmparr['pickupgroup'] = array('prompttext' => _('Pickup group id'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section);
|
|
||||||
$tt = _("Named PickupGroup : ");
|
|
||||||
if (!empty($named_group['namedpickupgroup'])) {
|
|
||||||
foreach ($named_group['namedpickupgroup'] as $val) {
|
|
||||||
$tt .= $val. ', ';
|
|
||||||
}
|
|
||||||
$tt .= '... ';
|
|
||||||
}
|
|
||||||
$tmparr['namedpickupgroup'] = array('prompttext' => _('Named Pickup Group'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
|
||||||
// $tmparr['namedpickupgroup'] = array('prompttext' => _('Named Pickup Group'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section, 'category' => 'general');
|
|
||||||
$tt = _("Digits to indicate an external line to user (secondary dialtone) Sample 9 or 8 (max 9 digits)");
|
$tt = _("Digits to indicate an external line to user (secondary dialtone) Sample 9 or 8 (max 9 digits)");
|
||||||
$tmparr['secondary_dialtone_digits'] = array('prompttext' => _('Secondary dialtone digits'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
$tmparr['secondary_dialtone_digits'] = array('prompttext' => _('Secondary dialtone digits'), 'value' => '', 'tt' => $tt, 'level' => 1);
|
||||||
|
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array( 'value' => '0x21', 'text' => 'Inside Dial Tone');
|
$select[] = array( 'value' => '0x21', 'text' => 'Inside Dial Tone');
|
||||||
|
|
@ -461,7 +249,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
$select[] = array( 'value' => '0x7A', 'text' => 'MLPP Bpa');
|
$select[] = array( 'value' => '0x7A', 'text' => 'MLPP Bpa');
|
||||||
$select[] = array( 'value' => '0x7B', 'text' => 'MLPP Bnea');
|
$select[] = array( 'value' => '0x7B', 'text' => 'MLPP Bnea');
|
||||||
$select[] = array( 'value' => '0x7C', 'text' => 'MLPP Upa');
|
$select[] = array( 'value' => '0x7C', 'text' => 'MLPP Upa');
|
||||||
/* !TODO!: I would remove the values below this line, except for 'No Tone' */
|
/* !TODO!: +TODO+: I would remove the values below this line, except for 'No Tone' */
|
||||||
// $select[] = array( 'value' => '0x7F', 'text' => 'No Tone');
|
// $select[] = array( 'value' => '0x7F', 'text' => 'No Tone');
|
||||||
$select[] = array( 'value' => '0x80', 'text' => 'Meetme Greeting Tone');
|
$select[] = array( 'value' => '0x80', 'text' => 'Meetme Greeting Tone');
|
||||||
$select[] = array( 'value' => '0x81', 'text' => 'Meetme Number Invalid Tone');
|
$select[] = array( 'value' => '0x81', 'text' => 'Meetme Number Invalid Tone');
|
||||||
|
|
@ -477,54 +265,39 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
$select[] = array('value' => 'no', 'text' => 'No');
|
$select[] = array('value' => 'no', 'text' => 'No');
|
||||||
|
|
||||||
$tt = _("Outside dialtone frequency (defaul 0x22)");
|
$tt = _("Outside dialtone frequency (defaul 0x22)");
|
||||||
$tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone'), 'value' => '0x22', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select', 'section' => $section,'category' => $gn_category);
|
$tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone'), 'value' => '0x22', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# !TODO!: -TODO-: is there no easier way to specify a boolean radio group ? No.
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array('value' => '', 'text' => 'Inherit');
|
$select[] = array('value' => 'yes', 'text' => 'Yes');
|
||||||
$select[] = array('value' => 'on', 'text' => 'Yes');
|
$select[] = array('value' => 'no', 'text' => 'No');
|
||||||
$select[] = array('value' => 'off', 'text' => 'No');
|
|
||||||
$tt = _("Enable/Disable the `directed` pickup softkey");
|
|
||||||
$tmparr['directed_pickup'] = array('prompttext' => _('Directed pickup'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
|
||||||
|
|
||||||
unset($select);
|
|
||||||
$select[] = array('value' => '', 'text' => 'Inherit');
|
|
||||||
$select[] = array('value' => 'on', 'text' => 'Yes');
|
|
||||||
$select[] = array('value' => 'off', 'text' => 'No');
|
|
||||||
$tt = _("Should the picked/gpicked-up call be answered automatically");
|
|
||||||
$tmparr['pickup_modeanswer'] = array('prompttext' => _('Pickup Modeanswer'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
|
||||||
|
|
||||||
unset($select);
|
|
||||||
$select[] = array('value' => '', 'text' => 'Inherit');
|
|
||||||
$select[] = array('value' => 'on', 'text' => 'Yes');
|
|
||||||
$select[] = array('value' => 'off', 'text' => 'No');
|
|
||||||
$tt = _("Allow call transfer.");
|
$tt = _("Allow call transfer.");
|
||||||
// $tmparr['transfer'] = array('prompttext' => _('Call Transfer'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section, 'category' => 'general');
|
$tmparr['transfer'] = array('prompttext' => _('Call Transfer'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio');
|
||||||
$tmparr['transfer'] = array('prompttext' => _('Call Transfer'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
|
||||||
|
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array('value' => 'on', 'text' => 'Yes');
|
$select[] = array('value' => 'yes', 'text' => 'Yes');
|
||||||
$select[] = array('value' => 'off', 'text' => 'No');
|
$select[] = array('value' => 'no', 'text' => 'No');
|
||||||
$tt = _("Echo cancel");
|
$tt = _("Echo cancel");
|
||||||
$tmparr['echocancel'] = array('prompttext' => _('Echo cancel'), 'value' => 'on', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
$tmparr['echocancel'] = array('prompttext' => _('Echo cancel'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio');
|
||||||
|
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array('value' => 'off', 'text' => 'Off');
|
$select[] = array('value' => 'off', 'text' => 'Off');
|
||||||
$select[] = array('value' => 'reject', 'text' => 'Reject');
|
$select[] = array('value' => 'reject', 'text' => 'Reject');
|
||||||
$select[] = array('value' => 'silent', 'text' => 'Silent');
|
$select[] = array('value' => 'silent', 'text' => 'Silent');
|
||||||
$select[] = array('value' => 'user', 'text' => 'Cycle');
|
$select[] = array('value' => 'UserDefined', 'text' => 'UserDefined');
|
||||||
$tt = _("DND: Means how will dnd react when it is set on the device level dnd can have three states: off / busy(reject) / silent / Cycle").'<br>'.
|
# !TODO!: -TODO-: The next entry should be "null/empty" (not UserDefined) -> to indicate the trie-state behaviour
|
||||||
_("Cycle - dnd that cycles through all three states off -> reject -> silent -> off (this is the normal behaviour)").'<br>'.
|
# !TODO!: -TODO-: Userdefined is also a possible state, but it is not used or implemented (and it should not be implemented here, i think). See Sccp.class.php.v431, See Sccp.class.php - Old Style
|
||||||
|
$tt = _("DND: How will dnd react when it is set on the device level dnd can have three states: off / busy(reject) / silent / UserDefined").'<br>'.
|
||||||
|
_("UserDefined - dnd that cycles through all three states off -> reject -> silent -> off (this is the normal behaviour)").'<br>'.
|
||||||
_("Reject - Usesr can only switch off and on (in reject/busy mode)").'<br>'.
|
_("Reject - Usesr can only switch off and on (in reject/busy mode)").'<br>'.
|
||||||
_("Silent - Usesr can only switch off and on (in silent mode)");
|
_("Silent - Usesr can only switch off and on (in silent mode)");
|
||||||
$tmparr['dnd'] = array('prompttext' => _('DND'), 'value' => 'reject', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
$tmparr['dnd'] = array('prompttext' => _('DND'), 'value' => 'UserDefined', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio');
|
||||||
|
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array('value' => 'on', 'text' => 'Yes');
|
$select[] = array('value' => 'yes', 'text' => 'Yes');
|
||||||
$select[] = array('value' => 'off', 'text' => 'No');
|
$select[] = array('value' => 'no', 'text' => 'No');
|
||||||
$tt = _("Silence Suppression. Asterisk Not supported");
|
$tt = _("Silence Suppression. Asterisk Not supported");
|
||||||
$tmparr['silencesuppression'] = array('prompttext' => _('Silence Suppression'), 'value' => 'off', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section,'category' => $gn_category);
|
$tmparr['silencesuppression'] = array('prompttext' => _('Silence Suppression'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio');
|
||||||
|
|
||||||
unset($select);
|
unset($select);
|
||||||
$select[] = array('value' => 'default', 'text' => _('default'));
|
$select[] = array('value' => 'default', 'text' => _('default'));
|
||||||
|
|
@ -538,35 +311,9 @@ class Sccp extends \FreePBX\modules\Core\Driver {
|
||||||
}
|
}
|
||||||
|
|
||||||
$tt = _("Music on hold");
|
$tt = _("Music on hold");
|
||||||
$tmparr['musicclass'] = array('prompttext' => _('Music on hold'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'section' => $section,'category' => $gn_category);
|
$tmparr['musicclass'] = array('prompttext' => _('Music on hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1);
|
||||||
unset($select);
|
|
||||||
|
|
||||||
$tt = _("Sets the named pickup groups this line is a member of (this phone can pickup calls from remote phones which are in this caller group (ast111)");
|
|
||||||
$tmparr['pin'] = array('value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section ,'category' => $gn_category);
|
|
||||||
unset($select);
|
|
||||||
|
|
||||||
|
|
||||||
$select[] = array('value' => 'off', 'text' => 'Off');
|
|
||||||
$select[] = array('value' => 'user', 'text' => 'User');
|
|
||||||
$select[] = array('value' => 'auto', 'text' => 'Auto');
|
|
||||||
$tt = _("Automatic or Manual video mode. Valid values are 'auto', 'user' or 'off'. When set to 'auto', video will automatically start if both parties have a compatible code enabled. In 'user' mode the user needs to press the vidmode softkey before video will be tried. Default:'auto'");
|
|
||||||
$tmparr['videomode'] = array('prompttext' => _('Video Mode '), 'value' => 'auto', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio', 'section' => $section_с, 'category' => $gn_category);
|
|
||||||
unset($select);
|
|
||||||
|
|
||||||
$tt = _("Codec disallow");
|
|
||||||
$tmparr['disallow'] = array('prompttext' => _('Codec disallow'), 'value' => 'all', 'tt' => $tt, 'level' => 1, 'section' => $section_с,'category' => $gn_category);
|
|
||||||
unset($select);
|
|
||||||
|
|
||||||
$devopts = $tmparr;
|
$devopts = $tmparr;
|
||||||
return $devopts;
|
return $devopts;
|
||||||
}
|
}
|
||||||
public function getDeviceHeaders() {
|
|
||||||
return array(
|
|
||||||
'secret' => array('identifier' => _('Secret'), 'description' => sprintf(_('Secret [Enter "%s" to regenerate]'),"REGEN")),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
public function is_my_blank($value) {
|
|
||||||
return empty($value) && !is_numeric($value);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -235,8 +235,6 @@ function Get_DB_config($sccp_compatible)
|
||||||
'directed_pickup' => array('drop' => "yes"),
|
'directed_pickup' => array('drop' => "yes"),
|
||||||
'directed_pickup_context' => array('drop' => "yes"),
|
'directed_pickup_context' => array('drop' => "yes"),
|
||||||
'pickupcontext' => array('drop' => "yes"),
|
'pickupcontext' => array('drop' => "yes"),
|
||||||
'allow' => array('drop' => "yes"),
|
|
||||||
'disallow' => array('drop' => "yes"),
|
|
||||||
'directed_pickup_modeanswer' => array('drop' => "yes"),
|
'directed_pickup_modeanswer' => array('drop' => "yes"),
|
||||||
'pickupmodeanswer' => array('drop' => "yes"),
|
'pickupmodeanswer' => array('drop' => "yes"),
|
||||||
'disallow' => array('drop' => "yes"),
|
'disallow' => array('drop' => "yes"),
|
||||||
|
|
@ -286,7 +284,6 @@ function Get_DB_config($sccp_compatible)
|
||||||
'conf_show_conflist' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
|
'conf_show_conflist' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
|
||||||
'type' => array('create' => 'VARCHAR(15) NULL DEFAULT NULL', 'modify' => "VARCHAR(15)"),
|
'type' => array('create' => 'VARCHAR(15) NULL DEFAULT NULL', 'modify' => "VARCHAR(15)"),
|
||||||
'imageversion' => array('create' => 'VARCHAR(31) NULL DEFAULT NULL', 'modify' => "VARCHAR(31)"),
|
'imageversion' => array('create' => 'VARCHAR(31) NULL DEFAULT NULL', 'modify' => "VARCHAR(31)"),
|
||||||
'phonecodepage' => array('create' => 'VARCHAR(50) NULL DEFAULT NULL', 'modify' => "VARCHAR(50)"),
|
|
||||||
'softkeyset' => array('def_modify' => "softkeyset")
|
'softkeyset' => array('def_modify' => "softkeyset")
|
||||||
),
|
),
|
||||||
'sccpline' => array(
|
'sccpline' => array(
|
||||||
|
|
|
||||||
|
|
@ -56,12 +56,12 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Begin Form Input New -->
|
<!-- Begin Form Input New -->
|
||||||
<div class="modal fade add_new_model" tabindex="-1" role="dialog" aria-labelledby="myLargeModelLabel">
|
<div class="modal fade add_new_model" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel">
|
||||||
<div class="modal-dialog modal-lg" role="document">
|
<div class="modal-dialog modal-lg" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||||
<h4 class="modal-title" id="gridSystemModelLabel"><?php echo _('Model');?></h4>
|
<h4 class="modal-title" id="gridSystemModalLabel"><?php echo _('Modal title');?></h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
||||||
|
|
@ -99,6 +99,7 @@
|
||||||
<span id="new_dns-help" class="help-block fpbx-help-block">Help.</span>
|
<span id="new_dns-help" class="help-block fpbx-help-block">Help.</span>
|
||||||
</div></div></div>
|
</div></div></div>
|
||||||
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
||||||
<label class="control-label" for="new_buttons"><?php echo _('Model Line Buttons');?></label>
|
<label class="control-label" for="new_buttons"><?php echo _('Model Line Buttons');?></label>
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="new_buttons"></i>
|
<i class="fa fa-question-circle fpbx-help-icon" data-for="new_buttons"></i>
|
||||||
|
|
@ -148,14 +149,17 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal fade" id="edit_model" tabindex="-1" role="dialog" aria-labelledby="myLargeModelLabel">
|
|
||||||
|
|
||||||
|
<div class="modal fade" id="edit_model" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel">
|
||||||
<div class="modal-dialog modal-lg" role="document">
|
<div class="modal-dialog modal-lg" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||||
<h4 class="modal-title" id="gridSystemModelLabel"><?php echo _('Model');?></h4>
|
<h4 class="modal-title" id="gridSystemModalLabel"><?php echo _('Modal title');?></h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
||||||
<label class="control-label" for="editd_model"><?php echo _('Device Model');?></label>
|
<label class="control-label" for="editd_model"><?php echo _('Device Model');?></label>
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_model"></i>
|
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_model"></i>
|
||||||
|
|
@ -167,44 +171,9 @@
|
||||||
</div></div></div>
|
</div></div></div>
|
||||||
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
|
||||||
<label class="control-label" for="editd_vendor"><?php echo _('Vendor name');?></label>
|
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_vendor"></i>
|
|
||||||
</div><div class="col-md-9">
|
|
||||||
<input type="text" class="form-control" id="editd_vendor" name="editd_vendor" value="CISCO">
|
|
||||||
</div> </div></div>
|
|
||||||
<div class="row"><div class="col-md-12">
|
|
||||||
<span id="editd_vendor-help" class="help-block fpbx-help-block">Use "CISCO" for the Skinny Client Control Protocol and "CISCO-SIP" for the CISCO Sip Protocol</span>
|
|
||||||
</div></div></div>
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
|
||||||
<label class="control-label" for="editd_dns"><?php echo _('Expansion Module');?></label>
|
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_dns"></i>
|
|
||||||
</div><div class="col-md-9">
|
|
||||||
<select name="editd_dns" id="editd_dns">
|
|
||||||
<option value="1" selected='selected'>Phone - no sidecars.</option>
|
|
||||||
<option value="2">Phone - one sidecar.</option>
|
|
||||||
<option value="3">Phone - two sidecars.</option>
|
|
||||||
<option value="0">Sidecar</option>
|
|
||||||
</select>
|
|
||||||
</div> </div></div>
|
|
||||||
<div class="row"><div class="col-md-12">
|
|
||||||
<span id="editd_dns-help" class="help-block fpbx-help-block">Help.</span>
|
|
||||||
</div></div></div>
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
|
||||||
<label class="control-label" for="editd_buttons"><?php echo _('Model Line Buttons');?></label>
|
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_buttons"></i>
|
|
||||||
</div><div class="col-md-9">
|
|
||||||
<input type="number" min="1" min="96" class="form-control" id="editd_buttons" name="editd_buttons" value="1">
|
|
||||||
</div> </div></div>
|
|
||||||
<div class="row"><div class="col-md-12">
|
|
||||||
<span id="editd_buttons-help" class="help-block fpbx-help-block">Help.</span>
|
|
||||||
</div></div></div>
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
||||||
<label class="control-label" for="editd_loadimage"><?php echo _('Load Image');?></label>
|
<label class="control-label" for="editd_loadimage"><?php echo _('Load Image');?></label>
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_loadimage"></i>
|
<i class="fa fa-question-circle fpbx-help-icon" data-for="edit_devimage"></i>
|
||||||
</div><div class="col-md-9">
|
</div><div class="col-md-9">
|
||||||
<input type="text" class="form-control" id="editd_loadimage" name="editd_loadimage" value="">
|
<input type="text" class="form-control" id="editd_loadimage" name="editd_loadimage" value="">
|
||||||
</div> </div></div>
|
</div> </div></div>
|
||||||
|
|
@ -212,16 +181,6 @@
|
||||||
<span id="editd_loadimage-help" class="help-block fpbx-help-block">Help.</span>
|
<span id="editd_loadimage-help" class="help-block fpbx-help-block">Help.</span>
|
||||||
</div></div></div>
|
</div></div></div>
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
|
||||||
<label class="control-label" for="editd_loadinformationid"><?php echo _('Load Information ID');?></label>
|
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_loadinformationid"></i>
|
|
||||||
</div><div class="col-md-9">
|
|
||||||
<input type="text" class="form-control" id="editd_loadinformationid" name="editd_loadinformationid" value="">
|
|
||||||
</div> </div></div>
|
|
||||||
<div class="row"><div class="col-md-12">
|
|
||||||
<span id="editd_loadinformationid-help" class="help-block fpbx-help-block">Help.</span>
|
|
||||||
</div></div></div>
|
|
||||||
|
|
||||||
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
<div class="element-container"><div class="row"> <div class="form-group"><div class="col-md-3">
|
||||||
<label class="control-label" for="editd_nametemplate"><?php echo _('Model template XML');?></label>
|
<label class="control-label" for="editd_nametemplate"><?php echo _('Model template XML');?></label>
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_nametemplate"></i>
|
<i class="fa fa-question-circle fpbx-help-icon" data-for="editd_nametemplate"></i>
|
||||||
|
|
@ -301,10 +260,6 @@
|
||||||
document.getElementById("editd_model").value = clr;
|
document.getElementById("editd_model").value = clr;
|
||||||
document.getElementById("editd_loadimage").value = drow['loadimage'];
|
document.getElementById("editd_loadimage").value = drow['loadimage'];
|
||||||
document.getElementById("editd_nametemplate").value = drow['nametemplate'];
|
document.getElementById("editd_nametemplate").value = drow['nametemplate'];
|
||||||
document.getElementById("editd_loadinformationid").value = drow['loadinformationid'];
|
|
||||||
document.getElementById("editd_dns").value = drow['dns'];
|
|
||||||
document.getElementById("editd_vendor").value = drow['vendor'];
|
|
||||||
document.getElementById("editd_buttons").value = drow['buttons'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -38,45 +38,14 @@ if (!empty($_REQUEST['id'])) {
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!-- TODO: Codec selection has moved to the line level in newer chan-sccp versions and should be moved -->
|
|
||||||
<form autocomplete="off" name="frm_codec" id="frm_codec" class="fpbx-submit" action="" method="post">
|
<form autocomplete="off" name="frm_codec" id="frm_codec" class="fpbx-submit" action="" method="post">
|
||||||
<input type="hidden" name="category" value="codecform">
|
<input type="hidden" name="category" value="codecform">
|
||||||
<input type="hidden" name="Submit" value="Submit">
|
<input type="hidden" name="Submit" value="Submit">
|
||||||
|
|
||||||
<div class="section" data-id="sccp_dcodecs">
|
|
||||||
<!--Codec disallow-->
|
|
||||||
<div class="element-container">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-12">
|
|
||||||
<div class="row">
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="col-md-3">
|
|
||||||
<label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
|
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-9 radioset">
|
|
||||||
<input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">
|
|
||||||
<label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-12">
|
|
||||||
<span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Plz eneter format: alaw,ulaw") ?></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!--END Codec disallow-->
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--SCCP Audio Codecs-->
|
<!--SCCP Audio Codecs-->
|
||||||
<div class="section-title" data-for="sccp_acodecs">
|
<div class="section-title" data-for="sccp_acodecs">
|
||||||
<h3><i class="fa fa-minus"></i><?php echo _("SCCP Audio Codecs ") ?></h3>
|
<h3><i class="fa fa-minus"></i><?php echo _("SCCP Audio Codecs ") ?></h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="section" data-id="sccp_acodecs">
|
<div class="section" data-id="sccp_acodecs">
|
||||||
<!--Codecs-->
|
<!--Codecs-->
|
||||||
<div class="element-container">
|
<div class="element-container">
|
||||||
|
|
@ -178,12 +147,7 @@ if (!empty($_REQUEST['id'])) {
|
||||||
</div>
|
</div>
|
||||||
<div class="section" data-id="sccp_dcodecs">
|
<div class="section" data-id="sccp_dcodecs">
|
||||||
|
|
||||||
<!--SCCP Video Codecs-->
|
<!--Codec disallow-->
|
||||||
<div class="section-title" data-for="sccp_vcodecs">
|
|
||||||
<h3><i class="fa fa-minus"></i><?php echo _("SCCP Video Codecs ") ?></h3>
|
|
||||||
</div>
|
|
||||||
<div class="section" data-id="sccp_vcodecs">
|
|
||||||
<!--Codecs-->
|
|
||||||
<div class="element-container">
|
<div class="element-container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
@ -193,32 +157,9 @@ if (!empty($_REQUEST['id'])) {
|
||||||
<label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
|
<label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
|
||||||
<i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
|
<i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-9">
|
<div class="col-md-9 radioset">
|
||||||
<div>
|
<input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">
|
||||||
<?php echo show_help(_("This is the default Codec setting for SCCP Device.")) ?>
|
<label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
|
||||||
</div>
|
|
||||||
<?php
|
|
||||||
$seq = 1;
|
|
||||||
|
|
||||||
echo '<ul class="sortable">';
|
|
||||||
foreach ($video_codecs as $codec => $codec_state) {
|
|
||||||
$codec_trans = _($codec);
|
|
||||||
$codec_checked = $codec_state ? 'checked' : '';
|
|
||||||
echo '<li><a href="#">'
|
|
||||||
. '<img src="assets/sipsettings/images/arrow_up_down.png" height="16" width="16" border="0" alt="move" style="float:none; margin-left:-6px; margin-bottom:-3px;cursor:move" /> '
|
|
||||||
. '<input type="checkbox" '
|
|
||||||
. ($codec_checked ? 'value="' . $seq++ . '" ' : '')
|
|
||||||
. 'name="voicecodecs[' . $codec . ']" '
|
|
||||||
. 'id="' . $codec . '" '
|
|
||||||
. 'class="audio-codecs" '
|
|
||||||
. $codec_checked
|
|
||||||
. ' />'
|
|
||||||
. ' <label for="' . $codec . '"> '
|
|
||||||
. '<small>' . $codec_trans . '</small>'
|
|
||||||
. " </label></a></li>\n";
|
|
||||||
}
|
|
||||||
echo '</ul>';
|
|
||||||
?>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue