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

Test for chan_sccp_b version compatibility

Browse source 
SoftKeySets fails with chan_sccp-b prior to revision number 11048.

Check the version with the installer, and subsequently to ensure do not get exception.
This commit is contained in:
steve-lad 2021-02-07 14:48:49 +01:00 committed by Diederik de Groot
parent 9d29d11a08
commit 92ca19ed41
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Sccp_manager.inc/srvinterface.class.php
View file

@ -14,8 +14,8 @@ class srvinterface {
var $error; var $error;
var $_info; var $_info;
var $ami_mode = false; var $ami_mode;
var $useAmiInterface = true; var $useAmiForSoftKeys = true;
public function __construct($parent_class = null) { public function __construct($parent_class = null) {
$this->paren_class = $parent_class; $this->paren_class = $parent_class;
@ -231,11 +231,11 @@ class srvinterface {
default: default:
$retval = 430; $retval = 430;
} }
if ($res['RevisionNum'] < 11063) { if ($res['RevisionNum'] < 11048) {
$this->useAmiInterface = false; $this->useAmiForSoftKeys = false;
} }
if ($revNumComp) { if ($revNumComp) {
return array($retval, $this->useAmiInterface); return array($retval, $this->useAmiForSoftKeys);
} }
return $retval; return $retval;
} }
@ -249,7 +249,7 @@ class srvinterface {
} }
public function sccp_list_keysets() { public function sccp_list_keysets() {
if ($this->ami_mode) { if (($this->ami_mode) && ($this->useAmiForSoftKeys)){
return $this->aminterface->sccp_list_keysets(); return $this->aminterface->sccp_list_keysets();
} else { } else {
return $this->oldinterface->sccp_list_keysets(); return $this->oldinterface->sccp_list_keysets();

6
install.php
View file

@ -17,6 +17,7 @@ global $astman;
global $version; global $version;
global $srvinterface; global $srvinterface;
global $mobile_hw; global $mobile_hw;
global $useAmiForSoftKeys;
$mobile_hw = '0'; $mobile_hw = '0';
$class = "\\FreePBX\\Modules\\Sccp_manager\\srvinterface"; $class = "\\FreePBX\\Modules\\Sccp_manager\\srvinterface";
@ -1003,9 +1004,10 @@ if (!$sccp_db_ver) {
InstallDB_createButtonConfigTrigger(); InstallDB_createButtonConfigTrigger();
InstallDB_CreateSccpDeviceConfigView($sccp_compatible); InstallDB_CreateSccpDeviceConfigView($sccp_compatible);
InstallDB_updateDBVer($sccp_compatible); InstallDB_updateDBVer($sccp_compatible);
dbug('chanSCCPWarning',$chanSCCPWarning);
if ($chanSCCPWarning) { if ($chanSCCPWarning) {
outn("<br>"); outn("<br>");
outn("<font color='red'>Warning: Upgrade chan_sccp_b to use full ami functionality</font>"); outn("<font color='red'>Warning: Upgrade chan_sccp_b to use full ami functionality</font>");
} }
if (!$sccp_db_ver) { if (!$sccp_db_ver) {
Setup_RealTime(); Setup_RealTime();

3
views/server.info.php
View file

@ -36,8 +36,7 @@ $info['aminterface'] = $this->aminterface->info();
$info['XML'] = $this->xmlinterface->info(); $info['XML'] = $this->xmlinterface->info();
$info['sccp_class'] = $driver['sccp']; $info['sccp_class'] = $driver['sccp'];
$info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash']); $info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash']);
if (!$this->srvinterface->useAmiInterface) { if (!$this->srvinterface->useAmiForSoftKeys) {
$info['aminterface']['about'] .= ' -- Disabled';
$info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash'] . ' ----Warning: Upgrade chan_sccp to use full ami functionality'); $info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash'] . ' ----Warning: Upgrade chan_sccp to use full ami functionality');
} }
$info['Asterisk'] = array('Version' => FreePBX::Config()->get('ASTVERSION'), 'about' => 'Asterisk.'); $info['Asterisk'] = array('Version' => FreePBX::Config()->get('ASTVERSION'), 'about' => 'Asterisk.');