ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

-- Bug fix

Browse source
This commit is contained in:
PhantomVl 2020-04-21 13:51:10 +03:00 committed by Diederik de Groot
parent 14cb629f61
commit 5cebb936c9
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Sccp_manager.class.php
View file

@ -94,8 +94,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO
// private $SCCP_LANG_DICTIONARY = 'SCCP-dictionary.xml'; // CISCO LANG file search in /tftp-path // private $SCCP_LANG_DICTIONARY = 'SCCP-dictionary.xml'; // CISCO LANG file search in /tftp-path
private $SCCP_LANG_DICTIONARY = 'be-sccp.jar'; // CISCO LANG file search in /tftp-path private $SCCP_LANG_DICTIONARY = 'be-sccp.jar'; // CISCO LANG file search in /tftp-path
private $pagedata = null; private $pagedata = null;
private $sccp_driver_ver = '11.31'; // Ver fore SCCP.CLASS.PHP private $sccp_driver_ver = '11.4'; // Ver fore SCCP.CLASS.PHP
public $sccp_manager_ver = '14.0.0.2'; public $sccp_manager_ver = '14.0.0.2';
public $sccp_branch = 'm'; // Ver fore SCCP.CLASS.PHP
private $tftpLang = array(); private $tftpLang = array();
// private $hint_context = '@ext-local'; /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Get it from Config !!! // private $hint_context = '@ext-local'; /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Get it from Config !!!
private $hint_context = array('default' => '@ext-local'); /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Get it from Config !!! private $hint_context = array('default' => '@ext-local'); /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Get it from Config !!!
@ -1707,7 +1708,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO
{ {
global $db; global $db;
global $amp_conf; global $amp_conf;
$driver_revision = array('0' => '', '430' => '.v431', '431' => '.v432', '432' => '.v432', '433' => '.v433'); $driver_revision = array('0' => '', '430' => '.v431', '431' => '.v432', '432' => '.v432', '433' => '.v433'. $this->sccp_branch);
$confDir = $amp_conf["ASTETCDIR"]; $confDir = $amp_conf["ASTETCDIR"];
if (empty($this->sccppath["asterisk"])) { if (empty($this->sccppath["asterisk"])) {

2
conf/Sccp.class.php
View file

@ -25,7 +25,7 @@ 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"),
"Version" => "11.3", "Version" => "11.4",
"about" => "Sccp mysql class Base ver: 11.3, Sccp ver: default" "about" => "Sccp mysql class Base ver: 11.3, Sccp ver: default"
); );

8
conf/Sccp.class.php.v433
View file

@ -43,8 +43,9 @@ 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"),
"Version" => "11.4.v434m", // 11.4.v434m => 11.4 - Version; .v433 - revision (.v431, .v432, .v432, .v433 );
"about" => "Sccp mysql class Base ver: 11.4, Sccp ver: 434" "Version" => "11.4.v433m",
"about" => "Sccp mysql class Base ver: 11.4, Sccp ver: 433, branch: m"
); );
} }
public function addDevice($id, $settings) { public function addDevice($id, $settings) {
@ -303,7 +304,8 @@ class Sccp extends \FreePBX\modules\Core\Driver {
//Fill Codecs Informations //Fill Codecs Informations
$Sccp_Codec = array('gsm','slin16','alaw','ulaw','g722','g723','g726','g728','g729','ilibc','opus','h264','h263','h265','h261'); // $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); $allCodecs = $this->freepbx->Codecs->getAudio(true);
$allVCodecs = $this->freepbx->Codecs->getVideo(); $allVCodecs = $this->freepbx->Codecs->getVideo();
$ACodec_cur = array('all'); $ACodec_cur = array('all');