From 5cebb936c9a07d5b35bd314876f98c916db7dde2 Mon Sep 17 00:00:00 2001 From: PhantomVl Date: Tue, 21 Apr 2020 13:51:10 +0300 Subject: [PATCH] -- Bug fix --- Sccp_manager.class.php | 5 +++-- conf/Sccp.class.php | 2 +- conf/Sccp.class.php.v433 | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index ce73e9c..92c7255 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -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 = 'be-sccp.jar'; // CISCO LANG file search in /tftp-path 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_branch = 'm'; // Ver fore SCCP.CLASS.PHP private $tftpLang = array(); // private $hint_context = '@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 $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"]; if (empty($this->sccppath["asterisk"])) { diff --git a/conf/Sccp.class.php b/conf/Sccp.class.php index 224eb3b..d1851cb 100644 --- a/conf/Sccp.class.php +++ b/conf/Sccp.class.php @@ -25,7 +25,7 @@ class Sccp extends \FreePBX\modules\Core\Driver { "prettyName" => _("Sccp Custom Driver"), "shortName" => "SCCP", "description" => _("Sccp Device"), - "Version" => "11.3", + "Version" => "11.4", "about" => "Sccp mysql class Base ver: 11.3, Sccp ver: default" ); diff --git a/conf/Sccp.class.php.v433 b/conf/Sccp.class.php.v433 index 76947d8..4acb386 100644 --- a/conf/Sccp.class.php.v433 +++ b/conf/Sccp.class.php.v433 @@ -43,8 +43,9 @@ class Sccp extends \FreePBX\modules\Core\Driver { "prettyName" => _("Sccp Custom Driver"), "shortName" => "SCCP", "description" => _("Sccp Device"), - "Version" => "11.4.v434m", - "about" => "Sccp mysql class Base ver: 11.4, Sccp ver: 434" +// 11.4.v434m => 11.4 - Version; .v433 - revision (.v431, .v432, .v432, .v433 ); + "Version" => "11.4.v433m", + "about" => "Sccp mysql class Base ver: 11.4, Sccp ver: 433, branch: m" ); } public function addDevice($id, $settings) { @@ -303,7 +304,8 @@ class Sccp extends \FreePBX\modules\Core\Driver { //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); $allVCodecs = $this->freepbx->Codecs->getVideo(); $ACodec_cur = array('all');