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

Diederik de Groot <dkgroot@talon.nl> 03.11.2017

Browse source 
- Update README.md
  - Commented out astman_retrieveJSFromMetaData in install.php (was moved to srvinterface)
  - Addd/Updated some !TODO! entries
  - Spelling:
  - devise -> device
  - Compatable/Comable -> Compatible
  - Templet -> Template
  - buton -> button
  - Templatee -> Template
  - format style PHP
This commit is contained in:
PhantomVl 2017-11-03 17:46:34 +03:00
parent 9a18a0940b
commit e416b55654
7 changed files with 1079 additions and 1078 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Sccp_manager.class.php
View file

@ -76,7 +76,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
// const General - teplet.xml = '20';
// const General - system_path = '2';
// const General - don't store = '99';
// 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;
@ -84,7 +83,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
private $tftpLang = array();
private $hint_context = '@ext-local'; /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Get it from Config !!!
private $val_null = 'NONE'; /// REPLACE to null Field
public $sccp_model_list = array();
private $cnf_wr = null;
public $sccppath = array();
@ -145,6 +143,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
/*
* Generate Input elements in Html Code from sccpgeneral.xml
*/
public function ShowGroup($grup_name, $heder_show, $form_prefix = 'sccp', $form_values = null) {
$htmlret = "";
if (empty($form_values)) {
@ -167,6 +166,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
/*
* Load config vars from base array
*/
public function initVarfromDefs() {
foreach ($this->extconfigs->getextConfig('sccpDefaults') as $key => $value) {
if (empty($this->sccpvalues[$key])) {
@ -178,6 +178,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
/*
* Load config vars from xml
*/
public function initVarfromXml() {
if ((array) $this->xml_data) {
foreach ($this->xml_data->xpath('//page_group') as $item) {
@ -232,26 +233,31 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
/* unused */
public function doConfigPageInit($page) {
$this->doGeneralPost();
}
/* unused */
public function install() {
}
/* unused */
public function uninstall() {
}
/* unused */
public function backup() {
}
/* unused */
public function restore($backup) {
}
@ -799,7 +805,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
}
}
}
return $result;
break;
@ -811,7 +816,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
return $result;
break;
}
}
@ -826,6 +830,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
* * Save Hardware Device Information to Db + ???? Create / update XML Profile
*
*/
function save_hw_phone($get_settings, $validateonly = false) {
$hdr_prefix = 'sccp_hw_';
$hdr_arprefix = 'sccp_hw-ar_';
@ -889,7 +894,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$arr_data = substr($arr_data, 0, -1);
$value = $arr_data;
}
}
if (!empty($value)) {
$save_settings[$key] = $value;
@ -1093,7 +1097,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$this->sccpvalues[$var['keyword']] = array('keyword' => $var['keyword'], 'data' => $var['data'], 'seq' => $var['seq'], 'type' => $var['type']);
}
return;
}
function sccp_get_keysetdata($name) {
@ -1406,6 +1409,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
/*
* Check tftp/xml file path and permissions
*/
private function init_tftp_lang_path() {
$dir = $this->sccppath["tftp_path"];
foreach ($this->extconfigs->getextConfig('sccp_lang') as $lang_key => $lang_value) {
@ -1422,6 +1426,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
* Check file paths and permissions
*/
/* !TODO!: This function is getting a little big. Might be possible to sperate tftp work into it's own file/class */
function init_sccp_path() {
global $db;
global $amp_conf;
@ -1508,8 +1513,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
} else {
$driver = $this->FreePBX->Core->getAllDriversInfo();
}
if (!file_exists($this->sccppath["sccp_conf"])) { // System re Config
@ -1538,6 +1541,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
*/
/* !TODO!: please use DialPlan instead of DP */
/* !TODO!: I think Dialplan stuff can be removed or at least commented out */
function get_DP_list() {
$dir = $this->sccppath["tftp_DP"] . '/*.xml';
$base_len = strlen($this->sccppath["tftp_DP"]) + 1;
@ -1574,7 +1578,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
return $res;
}
function save_DialPlan($get_settings) {
$xmlstr = "<DIALTEMPLATE>\n";
$dialFelds = array('match', 'timeout', 'rewrite', 'tone'); //str -to lo !
@ -1598,7 +1601,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
} else {
$errors = array('Fields need to match !!');
}
$xmlstr .= "/>\n";
}
@ -1607,9 +1609,14 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
if ($get_settings['idtemplate'] == '*new*') {
if (!empty($get_settings[$hdr_prefix . 'dialtemplate_name'])) {
$put_file = (string) $get_settings[$hdr_prefix . 'dialtemplate_name'];
} else { $errors = array('Fields Dial Plan Name is requered !!'); }
} else $put_file = (string)$get_settings['idtemplate'];
} else { $errors = array('Fields Dial Plan Name is requered !!'); }
} else {
$errors = array('Fields Dial Plan Name is requered !!');
}
} else
$put_file = (string) $get_settings['idtemplate'];
} else {
$errors = array('Fields Dial Plan Name is requered !!');
}
if (empty($errors)) {
// $put_file = 'test';
@ -1626,7 +1633,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
* sccp_db_save_setting(empty) - Save All settings from $sccpvalues
*/
private function sccp_db_save_setting($save_value = array()) {
global $db;
global $amp_conf;
@ -2019,9 +2025,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
}
function sccp_create_sccp_init() {
// Make sccp.conf data
// [general]
@ -2098,7 +2101,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
return $raw_settings;
}
function getIP_information() {
$interfaces['auto'] = array('0.0.0.0', 'All', '0');

7
Sccp_manager.inc/dbinterface.class.php
View file

@ -1,4 +1,5 @@
<?php
/**
*
* Core Comsnd Interface
@ -7,10 +8,13 @@
*/
namespace FreePBX\modules\Sccp_manager;
class dbinterface {
private $val_null = 'NONE'; /// REPLACE to null Field
public function __construct() {
}
public function info() {
@ -22,6 +26,7 @@ class dbinterface {
/*
* Core Access Function
*/
public function get_db_SccpTableData($dataid, $data = array()) {
if ($dataid == '') {
return False;
@ -76,6 +81,7 @@ class dbinterface {
/*
* Get Sccp Device Model information
*/
function getDb_model_info($get = "all", $format_list = "all", $filter = array()) {
global $db;
switch ($format_list) {
@ -204,4 +210,5 @@ class dbinterface {
}
return $result;
}
}

7
Sccp_manager.inc/extconfigs.class.php
View file

@ -1,9 +1,13 @@
<?php
/**
*
*/
namespace FreePBX\modules\Sccp_manager;
class extconfigs {
public function __construct() {
}
@ -81,7 +85,6 @@ class extconfigs {
"linetable" => 'sccpline',
"tftp_path" => '/tftpboot'
);
private $keysetdefault = array('onhook' => 'redial,newcall,cfwdall,dnd,pickup,gpickup,private',
'connected' => 'hold,endcall,park,vidmode,select,cfwdall,cfwdbusy,idivert',
'onhold' => 'resume,newcall,endcall,transfer,conflist,select,dirtrfr,idivert,meetme',
@ -137,7 +140,6 @@ class extconfigs {
'zh_CN' => array('code' => 'cn', 'language' => 'Chinese', 'locale' => 'Chinese_China'),
'zh_TW' => array('code' => 'zh', 'language' => 'Chinese', 'locale' => 'Chinese_Taiwan')
);
private $cisco_timezone = array(
'Dateline' => array('offset' => '-720', 'daylight' => ''),
'Samoa' => array('offset' => '-660', 'daylight' => ''),
@ -187,7 +189,6 @@ class extconfigs {
'Russian/Magadan' => array('offset' => '660', 'daylight' => '', 'cisco_code' => 'Central Pacific Standard Time'),
'Russian/Kamchatka' => array('offset' => '720', 'daylight' => '', 'cisco_code' => 'Fiji Standard Time'),
/* EnD - Russion Regions */
'Iran' => array('offset' => '210', 'daylight' => 'Daylight'),
'Caucasus' => array('offset' => '240', 'daylight' => 'Daylight'),
'Arabian' => array('offset' => '240', 'daylight' => ''),

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

@ -1,18 +1,21 @@
<?php
/**
*
* Core Comsnd Interface
*
*
*/
/* !TODO!: Re-Indent this file */
namespace FreePBX\modules\Sccp_manager;
class srvinterface {
public function __construct() {
}
public function info() {
$Ver = '13.0.2';
return Array('Version' => $Ver,
@ -22,6 +25,7 @@ class srvinterface {
/*
Core Access Function
*/
public function sccp_core_commands($params = array()) {
global $astman;
$cmd_list = array('get_softkey' => array('cmd' => "sccp show softkeyssets", 'param' => ''),
@ -111,6 +115,7 @@ class srvinterface {
}
/* Current not use */
public function sccp_list_hints() {
$ast_out = $this->sccp_core_commands(array('cmd' => 'get_hints'));
$ast_out = preg_split("/[\n]/", $ast_out['data']);
@ -137,6 +142,7 @@ class srvinterface {
}
/* !TODO!: install.php is still using the other version number */
public function get_compatible_sccp() {
$res = $this->getChanSCCPVersion();
if (empty($res)) {
@ -155,6 +161,7 @@ class srvinterface {
/* !TODO!: Multiple Version functions (choose one) */
/* !TODO!: private ? */
function getCoreSCCPVersion() {
$result = array();
$ast_out = $this->sccp_version();
@ -172,7 +179,6 @@ class srvinterface {
}
}
return $result;
}
/* !TODO!: Old Method */
@ -189,6 +195,7 @@ class srvinterface {
/* !TODO!: Multiple Version functions (choose one :-) */
/* !TODO!: private ? */
function getChanSCCPVersion() {
global $astman;
$result = array();
@ -308,7 +315,6 @@ class srvinterface {
list ($descr, $adress, $devname, $status, $token, $junk) = explode(";|", implode(";|", $line_arr));
// list ($descr, $adress, $devname, $status, $junk) = $line_arr;
// if (strlen($ast_key[$devname]) < 1) {
if (strlen($devname) > 1) {
$ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $token);
@ -327,6 +333,7 @@ class srvinterface {
}
return $ast_key;
}
/*
* Replace sccp_core_commands($params = array()) {
*/

13
Sccp_manager.inc/xmlinterface.class.php
View file

@ -1,25 +1,29 @@
<?php
/**
*
* Core Comsnd Interface
*
*
*/
/* !TODO!: Would you like to use my XSD file to check if the provided template file is a correct cisco cnf.xml file ? */
namespace FreePBX\modules\Sccp_manager;
class xmlinterface {
private $val_null = 'NONE'; /// REPLACE to null Field
public function __construct() {
}
public function info() {
$Ver = '13.0.2';
return Array('Version' => $Ver,
'about' => 'Create XML data interface ver: ' . $Ver);
}
function create_default_XML($data_path = '', $data_values = array(), $model_information = array(), $lang_info = array()) {
if (empty($data_path) || empty($data_values)) {
return;
@ -112,7 +116,6 @@ class xmlinterface {
}
}
function create_SEP_XML($data_path = '', $data_values = array(), $dev_config = array(), $dev_id = '', $lang_info = array()) {
$var_xml_general_fields = array('authenticationURL' => 'dev_authenticationURL', 'informationURL' => 'dev_informationURL', 'messagesURL' => 'dev_messagesURL',
@ -320,8 +323,6 @@ class xmlinterface {
return time();
}
private function replaceSimpleXmlNode($xml, $element = SimpleXMLElement) {
$dom = dom_import_simplexml($xml);
$import = $dom->ownerDocument->importNode(
@ -340,6 +341,4 @@ class xmlinterface {
$dom->parentNode->appendChild($import->cloneNode(true));
}
}

1
conf/Sccp.class.php.v431
View file

@ -1,4 +1,5 @@
<?php
// vim: set ai ts=4 sw=4 ft=php:
// Version for SCCP Manager 13.0.0.A
namespace FreePBX\modules\Core\Drivers;

18
install.php
View file

@ -34,7 +34,6 @@ $db_config_v0 = array(
'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"),
'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'ringtone' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'transfer' => array('def_modify' => "on"),
'cfwdall' => array('def_modify' => "on"),
'cfwdbusy' => array('def_modify' => "on"),
@ -45,7 +44,6 @@ $db_config_v0 = array(
'audio_cos' => array('def_modify' => "6"),
'video_tos' => array('def_modify' => "0x88"),
'video_cos' => array('def_modify' => "5"),
'mwilamp' => array('def_modify' => "on"),
'mwioncall' => array('def_modify' => "on"),
'private' => array('def_modify' => "on"),
@ -53,7 +51,6 @@ $db_config_v0 = array(
'nat' => array('def_modify' => "auto"),
'softkeyset' => array('def_modify' => "softkeyset")
),
'sccpline' => array(
'namedcallgroup' => array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `setvar`", 'modify' => "VARCHAR(100)"),
'namedpickupgroup' => array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `namedcallgroup`", 'modify' => "VARCHAR(100)"),
@ -89,15 +86,12 @@ $db_config_v5 = array(
'hwlang' => array('rename' => "_hwlang"),
'_hwlang' => array('create' => 'varchar(12) NULL DEFAULT NULL'),
'useRedialMenu' => array('create' => "VARCHAR(5) NULL DEFAULT 'no' AFTER `_hwlang`"),
//'dtmfmode' => array('create' => "VARCHAR(10) default 'outofband'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'outofband'),
'dtmfmode' => array('drop' => "yes"),
'deny' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"),
'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"),
'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'ringtone' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'transfer' => array('create' => 'VARCHAR(5) DEFAULT "on"', 'modify' => "VARCHAR(5)", 'def_modify' => "on"),
'cfwdall' => array('create' => 'VARCHAR(5) DEFAULT "on"', 'modify' => "VARCHAR(5)", 'def_modify' => "on"),
'cfwdbusy' => array('create' => 'VARCHAR(5) DEFAULT "on"', 'modify' => "VARCHAR(5)", 'def_modify' => "on"),
@ -109,7 +103,6 @@ $db_config_v5 = array(
'video_tos' => array('def_modify' => "0x88"),
'video_cos' => array('def_modify' => "5"),
'trustphoneip' => array('drop' => "yes"),
'mwilamp' => array('create' => 'VARCHAR(5) DEFAULT "on"', 'modify' => "VARCHAR(5)", 'def_modify' => "on"),
'mwioncall' => array('create' => 'VARCHAR(5) DEFAULT "off"', 'modify' => "VARCHAR(5)", 'def_modify' => "off"),
'private' => array('create' => 'VARCHAR(5) DEFAULT "on"', 'modify' => "VARCHAR(5)", 'def_modify' => "on"),
@ -156,15 +149,12 @@ $db_config_v3 = array(
'hwlang' => array('rename' => "_hwlang"),
'_hwlang' => array('create' => 'varchar(12) NULL DEFAULT NULL'),
'useRedialMenu' => array('create' => "VARCHAR(5) NULL DEFAULT 'no' AFTER `_hwlang`"),
//'dtmfmode' => array('create' => "VARCHAR(10) default 'outofband'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'outofband'),
'dtmfmode' => array('drop' => "yes"),
'deny' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"),
'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"),
'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'ringtone' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"),
'transfer' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
'cfwdall' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
'cfwdbusy' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
@ -176,7 +166,6 @@ $db_config_v3 = array(
'video_tos' => array('def_modify' => "0x88"),
'video_cos' => array('def_modify' => "5"),
'trustphoneip' => array('drop' => "yes"),
'mwilamp' => array('create' => "enum('on','off','wink','flash','blink') NULL default 'on'", 'modify' => "enum('on','off','wink','flash','blink')"),
'mwioncall' => array('create' => "enum('on','off') NULL default 'on'", 'modify' => "enum('on','off')"),
'private' => array('create' => "enum('on','off') NOT NULL default 'off'", 'modify' => "enum('on','off')"), // Что-то лишенне
@ -186,10 +175,8 @@ $db_config_v3 = array(
'conf_play_part_announce' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
'conf_mute_on_entry' => array('create' => "enum('on','off') NOT NULL default 'off'", 'modify' => "enum('on','off')"),
'conf_show_conflist' => array('create' => "enum('on','off') NOT NULL default 'on'", 'modify' => "enum('on','off')"),
'type' => array('create' => 'VARCHAR(15) NULL DEFAULT NULL', 'modify' => "VARCHAR(15)"),
'imageversion' => array('create' => 'VARCHAR(31) NULL DEFAULT NULL', 'modify' => "VARCHAR(31)"),
'softkeyset' => array('def_modify' => "softkeyset")
),
'sccpline' => array(
@ -211,7 +198,6 @@ $db_config_v3 = array(
'musicclass' => array('def_modify' => "default"),
'id' => array('create' => 'MEDIUMINT(9) NOT NULL AUTO_INCREMENT, ADD UNIQUE(id);', 'modify' => "MEDIUMINT(9)", 'index' => 'id'),
// 'id' =>array('create' => 'VARCHAR( 20 ) NULL DEFAULT NULL', 'modify' => "VARCHAR(20)", 'def_modify' =>"NULL"),
'echocancel' => array('create' => "enum('on','off') NOT NULL default 'off'", 'modify' => "enum('on','off')"),
'silencesuppression' => array('create' => "enum('on','off') NOT NULL default 'off'", 'modify' => "enum('on','off')"),
'dnd' => array('create' => "enum('off','reject','silent','user') NOT NULL default 'reject'", 'modify' => "enum('off','reject','silent','user')", 'def_modify' => "reject")
@ -248,6 +234,7 @@ function CheckSCCPManagerDBTables($table_req) {
}
/* notused */
function CheckPermissions() {
outn("<li>" . _("Checking Filesystem Permissions") . "</li>");
$dst = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/views';
@ -285,7 +272,6 @@ function CheckChanSCCPCompatible() {
return $sccp_compatible;
}
function InstallDB_sccpsettings() {
global $db;
outn("<li>" . _("Creating sccpsettings table...") . "</li>");
@ -401,7 +387,6 @@ function InstallDB_updateSchema($db_config) {
$sql_create .= 'DROP COLUMN `' . $row_fld . '`, ';
$count_modify ++;
}
}
}
if (!empty($sql_update)) {
@ -601,7 +586,6 @@ function Setup_RealTime() {
$cnf_wr->writeConfig('res_config_mysql.conf', $res_conf, false);
}
$cnf_wr->writeConfig('extconfig.conf', $ext_conf, false);
}
CheckSCCPManagerDBTables($table_req);