Bug Fixes - Back port from Develop
Add device did not set default line; only set after editing and saving device SCCPTokenAct response handler was incorrect
This commit is contained in:
parent
f84499c8b0
commit
8438e2af40
|
@ -1171,7 +1171,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
|
||||||
$db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpdevice");
|
$db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpdevice");
|
||||||
$hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid'];
|
$hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid'];
|
||||||
$hw_type = (empty($get_settings['sccp_device_typeid'])) ? 'sccpdevice' : $get_settings['sccp_device_typeid'];
|
$hw_type = (empty($get_settings['sccp_device_typeid'])) ? 'sccpdevice' : $get_settings['sccp_device_typeid'];
|
||||||
$update_hw = ($hw_id == 'new') ? 'update' : 'clear';
|
$update_hw = ($hw_id == 'new') ? 'add' : 'clear';
|
||||||
$hw_prefix = 'SEP';
|
$hw_prefix = 'SEP';
|
||||||
if (!empty($get_settings[$hdr_prefix . 'type'])) {
|
if (!empty($get_settings[$hdr_prefix . 'type'])) {
|
||||||
$value = $get_settings[$hdr_prefix . 'type'];
|
$value = $get_settings[$hdr_prefix . 'type'];
|
||||||
|
|
|
@ -392,7 +392,7 @@ class SCCPTokenAckAction extends ActionMessage
|
||||||
{
|
{
|
||||||
parent::__construct('SCCPTokenAck');
|
parent::__construct('SCCPTokenAck');
|
||||||
$this->setKey('DeviceId', $DeviceName);
|
$this->setKey('DeviceId', $DeviceName);
|
||||||
$this->setResponseHandler("SCCPGeneric");
|
$this->setResponseHandler("Generic");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue