Prerelease 05.10.2017

This commit is contained in:
PhantomVl 2017-10-05 15:25:16 +03:00
parent 6ae49c32ea
commit 839e4a62db
3 changed files with 17 additions and 12 deletions

View file

@ -4,4 +4,5 @@ http://usecallmanager.nz/user-locale.html
https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+79x1+xml+configuration+files+for+SIP https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+79x1+xml+configuration+files+for+SIP
https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+7970+SIP https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+7970+SIP
https://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cuipph/all_models/xsi/8_5_1/xsi_dev_guide/xmlobjects.html https://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cuipph/all_models/xsi/8_5_1/xsi_dev_guide/xmlobjects.html
https://habrahabr.ru/post/176019/ https://habrahabr.ru/post/176019/
https://learningnetwork.cisco.com/thread/14585

View file

@ -1964,6 +1964,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
'servicesURL' => 'dev_servicesURL', 'directoryURL' => 'dev_directoryURL', 'proxyServerURL' => 'dev_proxyServerURL', 'idleTimeout' => 'dev_idleTimeout', 'servicesURL' => 'dev_servicesURL', 'directoryURL' => 'dev_directoryURL', 'proxyServerURL' => 'dev_proxyServerURL', 'idleTimeout' => 'dev_idleTimeout',
'idleURL' => 'dev_idleURL', 'sshUserId' => 'dev_sshUserId', 'sshPassword' => 'dev_sshPassword', 'deviceProtocol' => 'dev_deviceProtocol' 'idleURL' => 'dev_idleURL', 'sshUserId' => 'dev_sshUserId', 'sshPassword' => 'dev_sshPassword', 'deviceProtocol' => 'dev_deviceProtocol'
); );
$var_xml_general_vars = array('capfAuthMode' => '0', 'deviceSecurityMode' => '1', 'mobility' => '', 'phoneServices' =>'');
if (empty($dev_id)) { if (empty($dev_id)) {
return false; return false;
} }
@ -1992,6 +1994,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
// Set System global Values // Set System global Values
if (!empty($var_xml_general_fields[$key])) { if (!empty($var_xml_general_fields[$key])) {
$xml_work->$key = $this->sccpvalues[$var_xml_general_fields[$key]]['data']; $xml_work->$key = $this->sccpvalues[$var_xml_general_fields[$key]]['data'];
} else {
if (!isset($var_xml_general_vars[$key])) {
$xml_work->$key = $var_xml_general_vars[$key];
}
} }
// Set section Values // Set section Values
$xml_node = $xml_work->$key; $xml_node = $xml_work->$key;
@ -2127,15 +2133,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$this->replaceSimpleXmlNode($xml_work->$key, $xml_node); $this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
} }
break; break;
// case 'networkLocale': // Move all set to $var_xml_general_vars
// $xml_work->$key = $this->sccp_lang[$this->sccpvalues['netlang']['data']]['language']; // case 'mobility':
// $xml_work->$key = $this->sccp_lang[$this->sccpvalues['netlang']['data']]['language']; // case 'capfList':
// break;
case 'mobility':
// break; // break;
case 'phoneServices': // case 'phoneServices':
// break; // break;
$xml_work->$key = ''; // $xml_work->$key = '';
default: default:
break; break;
} }

View file

@ -209,8 +209,8 @@ END;
if (db::IsError($check)) { if (db::IsError($check)) {
die_freepbx("Can not create sccpsettings table, error:$check\n"); die_freepbx("Can not create sccpsettings table, error:$check\n");
} }
sql = <<< END $sql = <<< END
CREATE TABLE IF NOT EXISTS `sccpdevmodel` ( CREATE TABLE IF NOT EXISTS `sccpdevmodel` (
`model` varchar(20) NOT NULL DEFAULT '', `model` varchar(20) NOT NULL DEFAULT '',
`vendor` varchar(40) DEFAULT '', `vendor` varchar(40) DEFAULT '',
@ -222,10 +222,10 @@ sql = <<< END
`nametemplate` VARCHAR(50) NULL DEFAULT NULL, `nametemplate` VARCHAR(50) NULL DEFAULT NULL,
PRIMARY KEY (`model`), PRIMARY KEY (`model`),
KEY `model` (`model`) KEY `model` (`model`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1"; ) ENGINE=MyISAM DEFAULT CHARSET=latin1
END; END;
$check = $db->query($sql); $check = $db->query($sql);
if (db::IsError($check)) { if (db::IsError($check)) {
die_freepbx("Can not create sccpdevmodel table, error:$check\n"); die_freepbx("Can not create sccpdevmodel table, error:$check\n");
} }