diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index cb4f5d9..ecaf49f 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -75,23 +75,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { public $sccppath = array(); public $sccpvalues = array(); public $sccp_conf_init = array(); - public $sccpDefaults = array( - "servername" => 'VPBXSCCP', - "bindaddr" => '0.0.0.0', "port" => '2000', # chan_sccp also supports ipv6 - # bindaddr = "::" will support ipv6 and ipv4 at the same time - "deny" => '0.0.0.0/0.0.0.0', - "permit" => '0.0.0.0/0.0.0.0', # defaults to 'internal' which means: - # permit:127.0.0.0/255.0.0.0,permit:10.0.0.0/255.0.0.0,permit:172.0.0.0/255.224.0.0,permit:192.168.0.0/255.255.0.0" - "dateformat" => 'D.M.Y', # This is the german default format. Should be "D/M/Y" or "D/M/YA" instead - "disallow" => 'all', "allow" => 'alaw;ulaw', - "devicetable" => 'sccpdevice', - "hotline_enabled" => 'no', - "hotline_context" => 'default', - "hotline_extension" => '*60', - "hotline_label" => 'hotline', - "linetable" => 'sccpline', - "tftp_path" => '/tftpboot' - ); public $xml_data; public function __construct($freepbx = null) { @@ -105,16 +88,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $this->cnf_read = \FreePBX::LoadConfig(); $this->v = new \Respect\Validation\Validator(); - if(!class_exists("FreePBX\modules\Sccp_manager\configs",false)) { - include(__DIR__."/Sccp_manager.inc/configs.class.php"); - $driverNamespace = "\\FreePBX\\Modules\\Sccp_manager\\configs"; - $class = $driverNamespace; - $this->configs = new $class(); -// $this->configs = \FreePBX\Modules\Sccp_manager\configs; - } -/* - $driverNamespace = "\\FreePBX\\Modules\\Sccp_manager\\configs"; - foreach(glob(__DIR__."/functions.inc/drivers/*.class.php") as $driver) { + $driverNamespace = "\\FreePBX\\Modules\\Sccp_manager"; + foreach(glob(__DIR__."/Sccp_manager.inc/*.class.php") as $driver) { if(preg_match("/\/([a-z1-9]*)\.class\.php$/i",$driver,$matches)) { $name = $matches[1]; $class = $driverNamespace . "\\" . $name; @@ -122,15 +97,14 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { include($driver); } if(class_exists($class,false)) { - $this->drivers[strtolower($name)] = new $class($this->freepbx); + $this->$name = new $class(); } else { - throw new \Exception("Invalid Class inside the drivers folder"); + throw new \Exception("Invalid Class inside in the include folder"); } } } - * - */ - $this->getSccpSettingsDB(false); // Overwrite Exist + + $this->getSccpSettingFromDB(); // Overwrite Exist // $this->getSccpSetingINI(false); // get from sccep.ini $this->init_sccp_path(); $this->initVarfromDefs(); @@ -138,7 +112,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { // Load Advanced Form Constuctor Data - $xml_vars = __DIR__ . '/conf/sccpgeneral.xml.v'.$this->sccpvalues['sccp_comatable']; + $xml_vars = __DIR__ . '/conf/sccpgeneral.xml.v'.$this->sccpvalues['sccp_comatable']['data']; if (!file_exists($xml_vars)) { $xml_vars = __DIR__ . '/conf/sccpgeneral.xml'; } @@ -174,7 +148,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { * Load config vars from base array */ public function initVarfromDefs() { - foreach ($this->$this->configs->getConfig('sccpDefaults') as $key => $value) { + foreach ($this->extconfigs->getextConfig('sccpDefaults') as $key => $value) { if (empty($this->sccpvalues[$key])) { $this->sccpvalues[$key] = array('keyword' => $key, 'data' => $value, 'type' => '0', 'seq' => '0'); } @@ -551,7 +525,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $this->sccp_db_save_setting(); // $this->sccp_create_sccp_init(); - $res = $this->sccp_core_comands(array('cmd' => 'sccp_reload')); + $res = $this->srvinterface->sccp_core_comands(array('cmd' => 'sccp_reload')); $msg = 'Config Saved: ' . $res['Response'] . '. Info :' . $res['data']; // needreload(); return array('status' => true, 'message' => $msg, 'reload' => true); @@ -586,11 +560,11 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { foreach ($request['idn'] as $idv) { $msg = strpos($idv, 'SEP-'); if (!(strpos($idv, 'SEP') === false)) { - $this->sccp_save_db('sccpdevice', array('name' => $idv), 'delete', "name"); - $this->sccp_save_db("sccpbuttons", array(), 'delete', '', $idv); + $this->dbinterface->sccp_save_db('sccpdevice', array('name' => $idv), 'delete', "name"); + $this->dbinterface->sccp_save_db("sccpbuttons", array(), 'delete', '', $idv); $this->sccp_delete_device_XML($idv); // Концы в вводу !! // $this->sccp_core_comands(array('cmd' => 'reload_phone', 'name' => $idv)); - $this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)); + $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)); } } return array('status' => true, 'table_reload' => true, 'message' => 'HW is Delete ! '); @@ -599,7 +573,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { case 'create_hw_tftp': $this->sccp_delete_device_XML('all'); // Концы в вводу !! $this->sccp_create_tftp_XML(); - $models = $this->get_db_SccpTableData("SccpDevice"); + $models = $this->dbinterface->get_db_SccpTableData("SccpDevice"); $ver_id = ' on found active model !'; foreach ($models as $data) { $ver_id = $this->sccp_create_device_XML($data['name']); @@ -615,23 +589,23 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $msg = strpos($idv, 'SEP-'); if (!(strpos($idv, 'SEP') === false)) { if ($cmd_id == 'reset_token') { - $res = $this->sccp_core_comands(array('cmd' => 'reset_token', 'name' => $idv)); + $res = $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_token', 'name' => $idv)); } else { - $res = $this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)); + $res = $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)); } // $msg = print_r($this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)), 1); $msg = $res['Response'] . ' ' . $res['data']; } if ($idv == 'all') { - $dev_list = $this->sccp_get_active_devise(); + $dev_list = $this->srvinterface->sccp_get_active_devise(); foreach ($dev_list as $key => $data) { if ($cmd_id == 'reset_token') { if (($data['token'] == 'Rej') || ($data['status'] == 'Token ') ) { - $res = $this->sccp_core_comands(array('cmd' => 'reset_token', 'name' => $key)); + $res = $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_token', 'name' => $key)); $msg .= 'Send Token reset to :'. $key .' '; } } else { - $res = $this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $key)); + $res = $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $key)); $msg .= $res['Response'] . ' ' . $res['data'] . ' '; } // $msg .= $res['Response'] . ' ' . $res['data'] . ' '; @@ -659,7 +633,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $save_settings[$value] = 'none'; } } - $this->sccp_save_db('sccpdevmodel', $save_settings, $upd_mode, "model"); + $this->dbinterface->sccp_save_db('sccpdevmodel', $save_settings, $upd_mode, "model"); return array('status' => true, 'table_reload' => true); } return $save_settings; @@ -674,7 +648,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $save_settings = array(); if (!empty($request['model'])) { foreach ($request['model'] as $idv) { - $this->sccp_save_db('sccpdevmodel', array('model' => $idv, 'enabled' => $model_set), 'update', "model"); + $this->dbinterface ->sccp_save_db('sccpdevmodel', array('model' => $idv, 'enabled' => $model_set), 'update', "model"); } } return array('status' => true, 'table_reload' => true); @@ -682,7 +656,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { break; case 'model_delete': if (!empty($request['model'])) { - $this->sccp_save_db('sccpdevmodel', array('model' => $request['model']), 'delete', "model"); + $this->dbinterface->sccp_save_db('sccpdevmodel', array('model' => $request['model']), 'delete', "model"); return array('status' => true, 'table_reload' => true); } break; @@ -705,7 +679,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $id_name = $request['softkey']; unset($this->sccp_conf_init[$id_name]); $this->sccp_create_sccp_init(); - $msg = print_r($this->sccp_core_comands(array('cmd' => 'sccp_reload')), 1); + $msg = print_r($this->srvinterface->sccp_core_comands(array('cmd' => 'sccp_reload')), 1); return array('status' => true, 'table_reload' => true); } break; @@ -713,13 +687,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (!empty($request['id'])) { $id_name = $request['id']; $this->sccp_conf_init[$id_name]['type'] = "softkeyset"; - foreach ($this->$this->configs->getConfig('keyset') as $keyl => $vall) { + foreach ($this->extconfigs->getextConfig('keyset') as $keyl => $vall) { if (!empty($request[$keyl])) { $this->sccp_conf_init[$id_name][$keyl] = $request[$keyl]; } } $this->sccp_create_sccp_init(); - $msg = print_r($this->sccp_core_comands(array('cmd' => 'sccp_reload')), 1); + $msg = print_r($this->srvinterface->sccp_core_comands(array('cmd' => 'sccp_reload')), 1); return array('status' => true, 'table_reload' => true); // return $this->sccp_conf_init[$id_name]; @@ -731,10 +705,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $result = array(); $i = 0; $keyl = 'default'; - foreach ($this->sccp_list_keysets() as $keyl => $vall) { + foreach ($this->srvinterface->sccp_list_keysets() as $keyl => $vall) { $result[$i]['softkeys'] = $keyl; if ($keyl == 'default') { - foreach ($this->configs->getConfig('keyset') as $key => $value) { + foreach ($this->extconfigs->getextConfig('keyset') as $key => $value) { $result[$i][$key] = str_replace(',', '
', $value); } } else { @@ -748,15 +722,15 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { return $result; break; case "getExtensionGrid": - $result = $this->get_db_SccpTableData('SccpExtension'); + $result = $this->dbinterface->get_db_SccpTableData('SccpExtension'); if (empty($result)) { $result = array(); } return $result; break; case "getPhoneGrid": - $result = $this->get_db_SccpTableData('SccpDevice'); - $staus = $this->sccp_get_active_devise(); + $result = $this->dbinterface->get_db_SccpTableData('SccpDevice'); + $staus = $this->srvinterface->sccp_get_active_devise(); if (empty($result)) { $result = array(); } else { @@ -781,7 +755,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { foreach ($staus as $dev_ids) { $id_name = $dev_ids['name']; if (empty($dev_ids['news'])) { - $dev_data = $this->sccp_getdevice_info($id_name); + $dev_data = $this->srvinterface->sccp_getdevice_info($id_name); +// $dev_data = $this->sccp_getdevice_info($id_name); $dev_addon= $dev_data['SCCP_Vendor']['model_addon']; if (empty($dev_addon)) { $dev_addon = null; @@ -831,17 +806,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { 'monitor' => array('name' => 'Record Calls', 'value' => '') ); $name_dev = ''; - $db_field = $this->get_db_SccpTableData("get_colums_sccpdevice"); + $db_field = $this->dbinterface->get_db_SccpTableData("get_colums_sccpdevice"); $hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid']; $update_hw = ($hw_id == 'new') ? 'update' : 'clear'; foreach ($db_field as $data) { $key = (string) $data['Field']; $value = ""; switch ($key) { -// case 'permit': -// case 'deny': -// $value = $get_settings[$hdr_prefix . $key . '_net'] . '/' . $get_settings[$hdr_prefix . $key . '_mask']; -// break; case 'name': if (!empty($get_settings[$hdr_prefix . 'mac'])) { $value = $get_settings[$hdr_prefix . 'mac']; @@ -893,12 +864,23 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } } // Save / Updade Base - $this->sccp_save_db("sccpdevice", $save_settings, 'replace'); -// return print_r($save_settings,1); + $this->dbinterface->sccp_save_db("sccpdevice", $save_settings, 'replace'); + // Get Model Butons info - $lines_list = $this->get_db_SccpTableData('SccpExtension'); + $lines_list = $this->dbinterface->get_db_SccpTableData('SccpExtension'); $max_btn = ((!empty($get_settings['butonscount']) ? $get_settings['butonscount'] : 100)); - for ($it = 0; $it < $max_btn; $it++) { + $last_btn = $max_btn; + for ($it = $max_btn; $it >0; $it--) { + if (!empty($get_settings['button' . $it . '_type'])) { + $last_btn = $it; + $btn_t = $get_settings['button' . $it . '_type']; + if ($btn_t != 'empty'){ + break; + } + } + } + + for ($it = 0; $it <= $last_btn; $it++) { if (!empty($get_settings['button' . $it . '_type'])) { $btn_t = $get_settings['button' . $it . '_type']; @@ -924,7 +906,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { case 'monitor': $btn_t = 'speeddial'; $btn_opt = (string) $get_settings['button' . $it . '_line']; - $db_res = $this->get_db_SccpTableData('SccpExtension', array('id' => $btn_opt)); + $db_res = $this-> dbinterface->get_db_SccpTableData('SccpExtension', array('id' => $btn_opt)); $btn_n = $db_res[0]['label']; $btn_opt .= ',' . $btn_opt . $this->hint_context; break; @@ -969,7 +951,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } break; case 'empty': - $btn_t = ''; + $btn_t = 'empty'; break; } if (!empty($btn_t)) { @@ -977,20 +959,19 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } } } + // Sace Buttons config - $this->sccp_save_db("sccpbuttons", $save_buttons, $update_hw, '', $name_dev); + $this->dbinterface ->sccp_save_db("sccpbuttons", $save_buttons, $update_hw, '', $name_dev); + // Create Device XML $this->sccp_create_device_XML($name_dev); -// sccp restart -// $this->sccp_core_comands(array('cmd'=>'reset_phone', 'name' => $name_dev)); -// -// $this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $idv)); + if ($hw_id == 'new') { - $this->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $name_dev)); + $this->srvinterface->sccp_core_comands(array('cmd' => 'reset_phone', 'name' => $name_dev)); } else { - $this->sccp_core_comands(array('cmd' => 'reload_phone', 'name' => $name_dev)); + $this->srvinterface->sccp_core_comands(array('cmd' => 'reload_phone', 'name' => $name_dev)); } -// die(); + return $save_settings; } @@ -1051,239 +1032,23 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } if (!empty($save_settings)) { $this->sccp_db_save_setting($save_settings); - $this->getSccpSettingsDB(); // Overwrite Exist + $this->getSccpSettingFromDB(); // $this->sccp_create_sccp_init(); } $this->sccp_create_sccp_init(); // Rewrite Config. $save_settings[] = array('status' => true); return $save_settings; } - - /** - * - * Core Comsnd Interface - * - * - */ - public function sccp_core_comands($params = array()) { - global $astman; - $cmd_list = array('get_softkey' => array('cmd' => "sccp show softkeyssets", 'param' => ''), - 'get_version' => array('cmd' => "sccp show version", 'param' => ''), - 'get_device' => array('cmd' => "sccp show devices", 'param' => ''), - 'get_dev_info' => array('cmd' => "sccp show device", 'param' => 'name'), - 'get_hints' => array('cmd' => "core show hints", 'param' => ''), - 'sccp_reload' => array('cmd' => "sccp reload force", 'param' => ''), - 'reset_phone' => array('cmd' => "sccp reset ", 'param' => 'name'), // Жесткая перезагрузка - 'reload_phone' => array('cmd' => "sccp reload device ", 'param' => 'name'), - 'reset_token' => array('cmd' => "sccp tokenack ", 'param' => 'name'), - ); - $result = true; - if (!empty($params['cmd'])) { - $id_cmd = $params['cmd']; - if (!empty($cmd_list[$id_cmd])) { - $id_param = $cmd_list[$id_cmd]['param']; - if (!empty($id_param)) { - if (!empty($params[$id_param])) { - $result = $astman->Command($cmd_list[$id_cmd]['cmd'] .' '. $params[$id_param]); - } - } else { - $result = $astman->Command($cmd_list[$id_cmd]['cmd']); - } - } else { - switch ($params['cmd']) { - case 'phone_call': - if (!empty($params['name'])) { - $result = $astman->Command('sccp call ' . $params['name'] . ' ' . $params['call']); - } - break; - case 'phone_message': - if (!empty($params['msg'])) { - $msg = $params['msg']; - } else { - $msg = $this->sccpvalues['servername']['data']; - } - if (!empty($params['name'])) { - $astman->Command('sccp device ' . $params['name'] . ' ' . $msg); - } else { - - } - break; - default: - $result = false; - break; - } - } - } - return $result; - } - - /** - * - * return Html_ Input control code---------------------------------------------------------------------------------------temp - * - * - */ - public function sccp_getdevice_info($dev_id) { - if (empty($dev_id)) { - return array(); + public function getSccpSettingFromDB() { + $raw_data = $this->dbinterface->get_db_SccpSetting(); + foreach ($raw_data as $var) { + $this->sccpvalues[$var['keyword']] = array('keyword' => $var['keyword'], 'data' => $var['data'], 'seq' => $var['seq'], 'type' => $var['type']); } - $res = $this->sccp_core_comands(array('cmd' => 'get_dev_info', 'name' => $dev_id)); - $res1 = str_replace(array("\r\n", "\r", "\n"), ';', strip_tags((string)$res['data'])); - if (strpos($res1,'MAC-Address')) { - $res2 = substr($res1,0,strpos($res1,'+--- Buttons ')); - $res1 = explode(';',substr($res2,strpos($res2,'MAC-Address'))); - foreach ($res1 as $data ){ - if (!empty($data)) { - $tmp = explode(':',$data); - $data_key =str_replace(array(" ", "-", "\t"), '_', trim($tmp[0])); - $res3[$data_key] =$tmp[1]; - } - } - - $res1 = $res3['Skinny_Phone_Type']; - if (!empty($res3['Addons'])) { - $res2 = $res3['Addons']; - } else { - $res2 = ''; - } - $res3['SCCP_Vendor']= Array('vendor' => strtok($res1,' '),'model' => strtok('('), 'model_id' => strtok(')'), 'vendor_addon' => strtok($res2,' '), 'model_addon' => strtok(' ')); - return $res3; - } else { - return array(); - } - } - - public function sccp_list_hints() { - $ast_out = $this->sccp_core_comands(array('cmd' => 'get_hints')); - $ast_out = preg_split("/[\n]/", $ast_out['data']); - $ast_key = array(); - for ($i = 0; $i < 3; $i++) { - $ast_out[$i] = ""; - } - $i = count($ast_out) - 1; - $ast_out[--$i] = ""; - $ast_out[--$i] = ""; - foreach ($ast_out as $line) { - if (strlen($line) > 3) { - list ($line, $junk) = explode(' ', $line); - if (isset($ast_key[$line])) { - if (strlen($ast_key[$line]) < 1) { - $ast_key[$line] = $line; - } - } else { - $ast_key[$line] = $line; - } - } - } - return $ast_key; - } - /* - * Итого res = (0,1,10,11) - */ - public function get_comatable_sccp() { - $res = 0; - $ast_out = $this->sccp_version(); - if ($ast_out[0] >= '4.3.0'){ - $res = 1; - } - if (!empty($ast_out[1]) && $ast_out[1] == 'develop'){ - $res = 10; - if (!empty($ast_out[3])) { - if (base_convert($ast_out[3],16,10) >= base_convert('702487a',16,10)){ - $res += 1; - } - } - } - return $res; + return; - } + } - public function sccp_version() { - $ast_out = $this->sccp_core_comands(array('cmd' => 'get_version')); - if (preg_match("/Release.*\(/", $ast_out['data'] , $matches)) { - $ast_out = substr($matches[0],9,-1); - return explode(' ', $ast_out); - } else { - return aray('unknown'); - } - } - public function sccp_list_keysets() { - $ast_out = $this->sccp_core_comands(array('cmd' => 'get_softkey')); - - $ast_out = preg_split("/[\n]/", $ast_out['data']); - $ast_key = array(); - for ($i = 0; $i < 5; $i++) { - $ast_out[$i] = ""; - } - $i = count($ast_out) - 1; - $ast_out[--$i] = ""; - foreach ($ast_out as $line) { - if (strlen($line) > 3) { - $line = substr($line, 2); - list ($line, $junk) = explode(' ', $line); - if (isset($ast_key[$line])) { - if (strlen($ast_key[$line]) < 1) { - $ast_key[$line] = $line; - } - } else { - $ast_key[$line] = $line; - } - } - } - return $ast_key; - } - - public function sccp_get_active_devise() { - $ast_out = $this->sccp_core_comands(array('cmd' => 'get_device')); - - $ast_out = preg_split("/[\n]/", $ast_out['data']); - - $ast_key = array(); - for ($i = 0; $i < 5; $i++) { - $ast_out[$i] = ""; - } - $i = count($ast_out) - 1; - $ast_out[--$i] = ""; - foreach ($ast_out as $line) { - if (strlen($line) > 3) { - $line = substr($line, 2); - $line = preg_replace("/\s{2,}/", " ", $line); - $line_arr = explode(' ', $line); - $it = 1; - do { - if (strpos($line_arr[$it + 1], 'SEP') === false) { - $line_arr[0] .= ' ' . $line_arr[$it]; - unset($line_arr[$it]); - } else { - break; - } - $it++; - } while ((count($line_arr) > 3) and ( $it < count($line_arr))); - explode(";|", implode(";|", $line_arr)); - 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); - } -/* - if (isset($ast_key[$devname])) { - if (strlen($ast_key[$devname]) < 1) { - $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $descr); - } - } else { - $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $token); - } - * - */ - } - } - return $ast_key; - } - function sccp_get_keysetdata($name) { if ($name == 'default') { @@ -1577,7 +1342,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (is_dir($dir . DIRECTORY_SEPARATOR . $value)) { $filename = $dir . DIRECTORY_SEPARATOR . $value . DIRECTORY_SEPARATOR . $this->SCCP_LANG_DICTIONARY; if (file_exists($filename)) { - $lang_ar = $this->configs->getConfig('sccp_lang'); + $lang_ar = $this->extconfigs->getextConfig('sccp_lang'); foreach ($lang_ar as $lang_key => $lang_value) { if ($lang_value['locale'] == $value) { $result[$lang_key] = $value; @@ -1597,7 +1362,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { private function init_tftp_lang_path() { $dir = $this->sccppath["tftp_path"]; - foreach ($this->configs->getConfig('sccp_lang') as $lang_key => $lang_value) { + foreach ($this->extconfigs->getextConfig('sccp_lang') as $lang_key => $lang_value) { $filename = $dir . DIRECTORY_SEPARATOR . $lang_value['locale']; if (!file_exists($filename)) { if (!mkdir($filename, 0777, true)) { @@ -1635,8 +1400,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } } if (empty($this->sccppath["tftp_path"])) { - if (file_exists($this->sccpDefaults["tftp_path"])) { - $this->sccppath["tftp_path"] = $this->sccpDefaults["tftp_path"]; + if (file_exists($this->extconfigs->getextConfig('sccpDefaults',"tftp_path"))) { + $this->sccppath["tftp_path"] = $this->extconfigs->getextConfig('sccpDefaults',"tftp_path"); } } } @@ -1668,7 +1433,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { copy($filename, $dst_path . basename($filename)); } } - $this->sccpvalues['sccp_comatable'] = $this->get_comatable_sccp(); + $this->sccpvalues['sccp_comatable'] = array('keyword' => 'sccp_comatable', 'data' => $this->srvinterface->get_comatable_sccp(), 'type' => '1', 'seq' => '99'); +// $this->sccpvalues['sccp_comatable'] = '11'; $driver = $this->FreePBX->Core->getAllDriversInfo(); $driver_replace = ''; @@ -1686,7 +1452,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $dst = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/core/functions.inc/drivers/Sccp.class.php'; if (!file_exists($dst) || $driver_replace =='yes') { - $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst).'.v'.$this->sccpvalues['sccp_comatable']; + $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst).'.v'.$this->sccpvalues['sccp_comatable']['data']; if (file_exists($src_path)) { copy($src_path, $dst); } else { @@ -1803,77 +1569,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { * sccp_db_save_setting(empty) - Save All settings from $sccpvalues */ - private function sccp_save_db($db_name = "", $save_value = array(), $mode = 'update', $key_fld = "", $hwid = "") { - // mode clear - Empty tabele before update - // mode update - update / replace record - global $db; -// global $amp_conf; - $result = "Error"; - - switch ($db_name) { - case 'sccpsettings': - if ($mode == 'clear') { - $sql = 'truncate `sccpsettings`'; - $stmt = $db->prepare($sql); - $stmt->execute(); - $stmt = $db->prepare('INSERT INTO `sccpsettings` (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)'); - $result = $db->executeMultiple($stmt, $save_value); - } else { - $stmt = $db->prepare('REPLACE INTO `sccpsettings` (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)'); - $result = $db->executeMultiple($stmt, $save_value); - } - break; - case 'sccpdevmodel': - case 'sccpdevice': - $sql_db = $db_name; - $sql_key = ""; - $sql_var = ""; - foreach ($save_value as $key_v => $data) { - if (!empty($sql_var)) { - $sql_var .= ', '; - } - if ($data === 'none') { - $sql_var .= '`' . $key_v . '`=NULL'; - } else { - $sql_var .= '`' . $key_v . '`="' . $data . '"'; - } - if ($key_fld == $key_v) { - $sql_key = '`' . $key_v . '`="' . $data . '"'; - } - } - if (!empty($sql_var)) { - if ($mode == 'delete') { - $req = 'DELETE FROM `' . $sql_db . '` WHERE ' . $sql_key . ';'; - } else { - if ($mode == 'update') { - $req = 'UPDATE `' . $sql_db . '` SET ' . $sql_var . ' WHERE ' . $sql_key . ';'; - } else { - $req = 'REPLACE INTO `' . $sql_db . '` SET ' . $sql_var . ';'; - } - } - } - $stmt = $db->prepare($req); - $result = $stmt->execute(); - break; - case 'sccpbuttons': - if (($mode == 'clear') || ($mode == 'delete')) { - $sql = 'DELETE FROM `buttonconfig` WHERE device="' . $hwid . '";'; - $stmt = $db->prepare($sql); - $stmt->execute(); - } - if ($mode == 'delete') { - break; - } - if (!empty($save_value)) { - $sql = 'INSERT INTO `buttonconfig` (`device`, `instance`, `type`, `name`, `options`) VALUES (?,?,?,?,?);'; - $stmt = $db->prepare($sql); - $res = $db->executeMultiple($stmt, $save_value); - } - - break; - } - return $result; - } private function sccp_db_save_setting($save_value = array()) { global $db; @@ -1887,9 +1582,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $save_settings[] = array($key, $db->escapeSimple($val['data']), $val['seq'], $val['type']); } } - $this->sccp_save_db('sccpsettings', $save_settings, 'clear'); + $this->dbinterface->sccp_save_db('sccpsettings', $save_settings, 'clear'); } else { - $this->sccp_save_db('sccpsettings', $save_value, 'update'); + $this->dbinterface->sccp_save_db('sccpsettings', $save_value, 'update'); return true; } return true; @@ -1956,13 +1651,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $lang = $this->sccpvalues['devlang']['data']; } // configs->getConfig('sccp_lang') - $lang_arr = $this->configs->getConfig('sccp_lang',$lang); + $lang_arr = $this->extconfigs->getextConfig('sccp_lang',$lang); $xnode->name = $lang_arr['locale']; $xnode->langCode = $$lang_arr['code']; // $this -> replaceSimpleXmlNode($xml_work->$key,$xnode); break; case 'networkLocale': - $lang_arr = $this->configs->getConfig('sccp_lang',$this->sccpvalues['netlang']['data']); + $lang_arr = $this->extconfigs->getextConfig('sccp_lang',$this->sccpvalues['netlang']['data']); $xnode = $lang_arr['language']; break; } @@ -2003,7 +1698,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (empty($dev_id)) { return false; } - $var_hw_config = $this->get_db_SccpTableData("get_sccpdevice_byid", array('id' => $dev_id)); + $var_hw_config = $this->dbinterface->get_db_SccpTableData("get_sccpdevice_byid", array('id' => $dev_id)); if (empty($var_hw_config)) { return false; @@ -2164,7 +1859,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if ($key == 'networkLocale') { $xml_work->$key = $lang; } else { - $lang_arr = $this->configs->getConfig('sccp_lang',$lang); + $lang_arr = $this->extconfigs->getextConfig('sccp_lang',$lang); if (!empty($lang_arr)) { $xml_node->name = $lang_arr['locale']; $xml_node->langCode = $lang_arr['code']; @@ -2246,137 +1941,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { // return $this-> sccp_conf_init; } - /* - * Load Config Value from mysql DB - * sccp_db_save_setting(empty) - Save All settings from $sccpvalues - */ - - public function get_db_SccpTableData($dataid, $data = array()) { - if ($dataid == '') { - return False; - } - switch ($dataid) { - case "SccpExtension": - if (empty($data['id'])) { - $sql = "SELECT * FROM `sccpline` ORDER BY `id`"; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - } else { - $sql = "SELECT * FROM `sccpline` WHERE `id`=" . $data['id']; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - } - break; - case "SccpDevice": -// $sql = "SELECT * FROM `sccpdeviceconfig` ORDER BY `name`"; - $sql = "select `name`,`name` as `mac`, `type`, `button`, `addon` from `sccpdeviceconfig` ORDER BY `name`"; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - break; - case "HWDevice": - $raw_settings = $this->getSccp_model_information($get = "phones", $validate = false, $format_list = "model"); - break; - case "HWextension": - $raw_settings = $this->getSccp_model_information($get = "extension", $validate = false, $format_list = "model"); - break; - case "get_colums_sccpdevice": - $sql = "DESCRIBE sccpdevice"; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - break; - case "get_sccpdevice_byid": - $sql = 'SELECT t1.*, types.dns, types.buttons, types.loadimage, types.nametemplate as nametemplate, ' - . 'addon.buttons as addon_buttons FROM sccpdevice AS t1 ' - . 'LEFT JOIN sccpdevmodel as types ON t1.type=types.model ' - . 'LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name="' . $data['id'] . '";'; - $raw_settings = sql($sql, "getRow", DB_FETCHMODE_ASSOC); - break; - case "get_sccpdevice_buttons": - $sql = 'SELECT * FROM buttonconfig WHERE device="' . $data['id'] . '";'; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - break; - } - - return $raw_settings; - } - - public function getSccpSettingsDB($returnraw = false) { - $sql = "SELECT `keyword`, `data`, `type`, `seq` FROM `sccpsettings` ORDER BY `type`, `seq`"; - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - - if ($returnraw === true) { - return $raw_settings; - } - - - foreach ($raw_settings as $var) { - $this->sccpvalues[$var['keyword']] = array('keyword' => $var['keyword'], 'data' => $var['data'], 'seq' => $var['seq'], 'type' => $var['type']); - } - return; - } - - /* - * Get Sccp Device Model information - * - */ - function getSccp_model_information($get = "all", $validate = false, $format_list = "all", $filter = array()) { - global $db; $file_ext = array('.loads', '.LOADS', '.sbn', '.SBN', '.bin', '.BIN'); - $dir = $this->sccppath["tftp_path"]; $dir_tepl = $this->sccppath["tftp_templates"]; - switch ($format_list) { - case "model": - $sel_inf = "model, vendor, dns, buttons"; - break; - case "all": - default: - $sel_inf = "*"; - break; - } - if ($validate) { - $sel_inf .= ", '0' as 'validate'"; - } - switch ($get) { - case "byciscoid": - if (!empty($filter)) { - if (!empty($filter['model'])) { - if (strpos($filter['model'],'loadInformation')) { - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`loadinformationid` =" . $filter['model'] . ") ORDER BY model "; - } else { - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`loadinformationid` ='loadInformation" . $filter['model'] . "') ORDER BY model "; - } - } else { -// $sql = "SELECT ".$filter['model']; - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; - } - break; - } - break; - case "byid": - if (!empty($filter)) { - if (!empty($filter['model'])) { - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`model` =" . $filter['model'] . ") ORDER BY model "; - } else { -// $sql = "SELECT ".$filter['model']; - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; - } - break; - } - break; - case "extension": - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (dns = 0)ORDER BY model "; - break; - case "enabled": - case "phones": - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (dns > 0) and (enabled > 0) ORDER BY model "; -// $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (enabled > 0) ORDER BY model "; - break; - case "all": - default: - $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; - break; - } - $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); - $i = 0; + $raw_settings = $this-> dbinterface -> getDb_model_info($get, $format_list, $filter) ; + if ($validate) { for ($i = 0; $i < count($raw_settings); $i++) { $raw_settings[$i]['validate'] = '-;-'; @@ -2415,6 +1986,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } return $raw_settings; } + function getIP_information() { $interfaces['auto'] = array('0.0.0.0', 'All', '0'); diff --git a/Sccp_manager.inc/configs.class.php b/Sccp_manager.inc/configs.class.php deleted file mode 100644 index 6f786b8..0000000 --- a/Sccp_manager.inc/configs.class.php +++ /dev/null @@ -1,93 +0,0 @@ -freepbx = $freepbx; -// $this->database = $freepbx->Database; - } - public function getConfig($id = '', $index = '') { - switch ($id) { - case 'keyset': - if (empty($index)) { - return $this->keysetdefault; - } else { - if (isset($this->keysetdefault[$index])) { - return $this->keysetdefault[$index]; - } else { - return array(''); - } - } - break; - case 'sccp_lang': - return $this->cisco_language; - break; - - default: - return array('noId'); - break; - } - return array(); - } - 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', - 'ringin' => 'answer,endcall,transvm,idivert', - 'offhook' => 'redial,endcall,private,cfwdall,cfwdbusy,pickup,gpickup,meetme,barge', - 'conntrans' => 'hold,endcall,transfer,conf,park,select,dirtrfr,vidmode,meetme,cfwdall,cfwdbusy', - 'digitsfoll' => 'back,endcall,dial', - 'connconf' => 'conflist,newcall,endcall,hold,vidmode', - 'ringout' => 'empty,endcall,transfer,cfwdall,idivert', - 'offhookfeat' => 'redial,endcall', - 'onhint' => 'redial,newcall,pickup,gpickup,barge', - 'onstealable' => 'redial,newcall,cfwdall,pickup,gpickup,dnd,intrcpt', - 'holdconf' => 'resume,newcall,endcall,join', - 'uriaction' => 'default'); -// Cisco Language Code / Directory - private $cisco_language = array('ar_SA' => array('code' => 'ar', 'language' => 'Arabic', 'locale' => 'Arabic_Saudi_Arabia'), - 'bg_BG' => array('code' => 'bg', 'language' => 'Bulgarian', 'locale' => 'Bulgarian_Bulgaria'), - 'cz_CZ' => array('code' => 'cz', 'language' => 'Czech', 'locale' => 'Czech_Czech_Republic'), - 'da_DK' => array('code' => 'da', 'language' => 'Danish', 'locale' => 'Danish_Denmark'), - 'de_DE' => array('code' => 'de', 'language' => 'German', 'locale' => 'German_Germany'), - 'el_GR' => array('code' => 'el', 'language' => 'Greek', 'locale' => 'Greek_Greece'), - 'en_AU' => array('code' => 'en', 'language' => 'English', 'locale' => 'AU_English_United_States'), - 'en_GB' => array('code' => 'en', 'language' => 'English', 'locale' => 'English_United_Kingdom'), - 'en_US' => array('code' => 'en', 'language' => 'English', 'locale' => 'English_United_States'), - 'es_ES' => array('code' => 'es', 'language' => 'Spanish', 'locale' => 'Spanish_Spain'), - 'et_EE' => array('code' => 'et', 'language' => 'Estonian', 'locale' => 'Estonian_Estonia'), - 'fi_FI' => array('code' => 'fi', 'language' => 'Finnish', 'locale' => 'Finnish_Finland'), - 'fr_CA' => array('code' => 'fr', 'language' => 'French', 'locale' => 'French_Canada'), - 'fr_FR' => array('code' => 'fr', 'language' => 'French', 'locale' => 'French_France'), - 'he_IL' => array('code' => 'he', 'language' => 'Hebrew', 'locale' => 'Hebrew_Israel'), - 'hr_HR' => array('code' => 'hr', 'language' => 'Croatian', 'locale' => 'Croatian_Croatia'), - 'hu_HU' => array('code' => 'hu', 'language' => 'Hungarian', 'locale' => 'Hungarian_Hungary'), - 'it_IT' => array('code' => 'it', 'language' => 'Italian', 'locale' => 'Italian_Italy'), - 'ja_JP' => array('code' => 'ja', 'language' => 'Japanese', 'locale' => 'Japanese_Japan'), - 'ko_KO' => array('code' => 'ko', 'language' => 'Korean', 'locale' => 'Korean_Korea_Republic'), - 'lt_LT' => array('code' => 'lt', 'language' => 'Lithuanian', 'locale' => 'Lithuanian_Lithuania'), - 'lv_LV' => array('code' => 'lv', 'language' => 'Latvian', 'locale' => 'Latvian_Latvia'), - 'nl_NL' => array('code' => 'nl', 'language' => 'Dutch', 'locale' => 'Dutch_Netherlands'), - 'no_NO' => array('code' => 'no', 'language' => 'Norwegian', 'locale' => 'Norwegian_Norway'), - 'pl_PL' => array('code' => 'pl', 'language' => 'Polish', 'locale' => 'Polish_Poland'), - 'pt_BR' => array('code' => 'pt', 'language' => 'Portuguese', 'locale' => 'Portuguese_Brazil'), - 'pt_PT' => array('code' => 'pt', 'language' => 'Portuguese', 'locale' => 'Portuguese_Portugal'), - 'ro_RO' => array('code' => 'ro', 'language' => 'Romanian', 'locale' => 'Romanian_Romania'), - 'ru_RU' => array('code' => 'ru', 'language' => 'Russian', 'locale' => 'Russian_Russian_Federation'), - 'sk_SK' => array('code' => 'sk', 'language' => 'Slovakian', 'locale' => 'Slovak_Slovakia'), - 'sl_SL' => array('code' => 'sl', 'language' => 'Slovenian', 'locale' => 'Slovenian_Slovenia'), - 'sr_ME' => array('code' => 'sr', 'language' => 'Serbian', 'locale' => 'Serbian_Republic_of_Montenegro'), - 'sr_RS' => array('code' => 'rs', 'language' => 'Serbian', 'locale' => 'Serbian_Republic_of_Serbia'), - 'sv_SE' => array('code' => 'sv', 'language' => 'Swedish', 'locale' => 'Swedish_Sweden'), - 'th_TH' => array('code' => 'th', 'language' => 'Thailand', 'locale' => 'Thai_Thailand'), - 'tr_TR' => array('code' => 'tr', 'language' => 'Turkish', 'locale' => 'Turkish_Turkey'), - 'zh_CN' => array('code' => 'cn', 'language' => 'Chinese', 'locale' => 'Chinese_China'), - 'zh_TW' => array('code' => 'zh', 'language' => 'Chinese', 'locale' => 'Chinese_Taiwan') - ); - - -} \ No newline at end of file diff --git a/Sccp_manager.inc/dbinterface.class.php b/Sccp_manager.inc/dbinterface.class.php new file mode 100644 index 0000000..fc1aa11 --- /dev/null +++ b/Sccp_manager.inc/dbinterface.class.php @@ -0,0 +1,207 @@ +'Data access interface'); + } + +/* + Core Access Function + */ + public function get_db_SccpTableData($dataid, $data = array()) { + if ($dataid == '') { + return False; + } + switch ($dataid) { + case "SccpExtension": + if (empty($data['id'])) { + $sql = "SELECT * FROM `sccpline` ORDER BY `id`"; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + } else { + $sql = "SELECT * FROM `sccpline` WHERE `id`=" . $data['id']; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + } + break; + case "SccpDevice": +// $sql = "SELECT * FROM `sccpdeviceconfig` ORDER BY `name`"; + $sql = "select `name`,`name` as `mac`, `type`, `button`, `addon` from `sccpdeviceconfig` ORDER BY `name`"; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + break; + case "HWDevice": + $raw_settings = $this->getDb_model_info($get = "phones", $format_list = "model"); + break; + case "HWextension": + $raw_settings = $this->getDb_model_info($get = "extension", $format_list = "model"); + break; + case "get_colums_sccpdevice": + $sql = "DESCRIBE sccpdevice"; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + break; + case "get_sccpdevice_byid": + $sql = 'SELECT t1.*, types.dns, types.buttons, types.loadimage, types.nametemplate as nametemplate, ' + . 'addon.buttons as addon_buttons FROM sccpdevice AS t1 ' + . 'LEFT JOIN sccpdevmodel as types ON t1.type=types.model ' + . 'LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name="' . $data['id'] . '";'; + $raw_settings = sql($sql, "getRow", DB_FETCHMODE_ASSOC); + break; + case "get_sccpdevice_buttons": + $sql = 'SELECT * FROM buttonconfig WHERE device="' . $data['id'] . '";'; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + break; + } + + return $raw_settings; + } + + public function get_db_SccpSetting() { + $sql = "SELECT `keyword`, `data`, `type`, `seq` FROM `sccpsettings` ORDER BY `type`, `seq`"; + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + return $raw_settings; + } + + /* + * Get Sccp Device Model information + * + */ + + function getDb_model_info($get = "all", $format_list = "all", $filter = array()) { + global $db; + switch ($format_list) { + case "model": + $sel_inf = "model, vendor, dns, buttons"; + break; + case "all": + default: + $sel_inf = "*"; + break; + } + + $sel_inf .= ", '0' as 'validate'"; + switch ($get) { + case "byciscoid": + if (!empty($filter)) { + if (!empty($filter['model'])) { + if (strpos($filter['model'],'loadInformation')) { + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`loadinformationid` =" . $filter['model'] . ") ORDER BY model "; + } else { + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`loadinformationid` ='loadInformation" . $filter['model'] . "') ORDER BY model "; + } + } else { +// $sql = "SELECT ".$filter['model']; + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; + } + break; + } + break; + case "byid": + if (!empty($filter)) { + if (!empty($filter['model'])) { + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (`model` =" . $filter['model'] . ") ORDER BY model "; + } else { +// $sql = "SELECT ".$filter['model']; + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; + } + break; + } + break; + case "extension": + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (dns = 0)ORDER BY model "; + break; + case "enabled": + case "phones": + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (dns > 0) and (enabled > 0) ORDER BY model "; +// $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel WHERE (enabled > 0) ORDER BY model "; + break; + case "all": + default: + $sql = "SELECT " . $sel_inf . " FROM sccpdevmodel ORDER BY model "; + break; + } + $raw_settings = sql($sql, "getAll", DB_FETCHMODE_ASSOC); + return $raw_settings; + } + + function sccp_save_db($db_name = "", $save_value = array(), $mode = 'update', $key_fld = "", $hwid = "") { + // mode clear - Empty tabele before update + // mode update - update / replace record + global $db; +// global $amp_conf; + $result = "Error"; + + switch ($db_name) { + case 'sccpsettings': + if ($mode == 'clear') { + $sql = 'truncate `sccpsettings`'; + $stmt = $db->prepare($sql); + $stmt->execute(); + $stmt = $db->prepare('INSERT INTO `sccpsettings` (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)'); + $result = $db->executeMultiple($stmt, $save_value); + } else { + $stmt = $db->prepare('REPLACE INTO `sccpsettings` (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)'); + $result = $db->executeMultiple($stmt, $save_value); + } + break; + case 'sccpdevmodel': + case 'sccpdevice': + $sql_db = $db_name; + $sql_key = ""; + $sql_var = ""; + foreach ($save_value as $key_v => $data) { + if (!empty($sql_var)) { + $sql_var .= ', '; + } + if ($data === 'none') { + $sql_var .= '`' . $key_v . '`=NULL'; + } else { + $sql_var .= '`' . $key_v . '`="' . $data . '"'; + } + if ($key_fld == $key_v) { + $sql_key = '`' . $key_v . '`="' . $data . '"'; + } + } + if (!empty($sql_var)) { + if ($mode == 'delete') { + $req = 'DELETE FROM `' . $sql_db . '` WHERE ' . $sql_key . ';'; + } else { + if ($mode == 'update') { + $req = 'UPDATE `' . $sql_db . '` SET ' . $sql_var . ' WHERE ' . $sql_key . ';'; + } else { + $req = 'REPLACE INTO `' . $sql_db . '` SET ' . $sql_var . ';'; + } + } + } + $stmt = $db->prepare($req); + $result = $stmt->execute(); + break; + case 'sccpbuttons': + if (($mode == 'clear') || ($mode == 'delete')) { + $sql = 'DELETE FROM `buttonconfig` WHERE device="' . $hwid . '";'; + $stmt = $db->prepare($sql); + $stmt->execute(); + } + if ($mode == 'delete') { + break; + } + if (!empty($save_value)) { + $sql = 'INSERT INTO `buttonconfig` (`device`, `instance`, `type`, `name`, `options`) VALUES (?,?,?,?,?);'; + $stmt = $db->prepare($sql); + $res = $db->executeMultiple($stmt, $save_value); + } + + break; + } + return $result; + } + + +} \ No newline at end of file diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php new file mode 100644 index 0000000..a0e936e --- /dev/null +++ b/Sccp_manager.inc/extconfigs.class.php @@ -0,0 +1,185 @@ +'Default Setings and Enums'); + } + + public function getextConfig($id = '', $index = '') { + switch ($id) { + case 'keyset': + $result = $this->keysetdefault; + break; + case 'sccp_lang': + $result = $this->cisco_language; + break; + case 'sccpDefaults': + $result = $this->sccpDefaults; + break; + + default: + return array('noId'); + break; + } + if (empty($index)) { + return $result; + } else { + if (isset($result[$index])) { + return $result[$index]; + } else { + return array(''); + } + } + } + + private $sccpDefaults = array( + "servername" => 'VPBXSCCP', + "bindaddr" => '0.0.0.0', "port" => '2000', # chan_sccp also supports ipv6 + # bindaddr = "::" will support ipv6 and ipv4 at the same time + "deny" => '0.0.0.0/0.0.0.0', + "permit" => '0.0.0.0/0.0.0.0', # defaults to 'internal' which means: + # permit:127.0.0.0/255.0.0.0,permit:10.0.0.0/255.0.0.0,permit:172.0.0.0/255.224.0.0,permit:192.168.0.0/255.255.0.0" + "dateformat" => 'D.M.Y', # This is the german default format. Should be "D/M/Y" or "D/M/YA" instead + "disallow" => 'all', "allow" => 'alaw;ulaw', + "devicetable" => 'sccpdevice', + "hotline_enabled" => 'no', + "hotline_context" => 'default', + "hotline_extension" => '*60', + "hotline_label" => 'hotline', + "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', + 'ringin' => 'answer,endcall,transvm,idivert', + 'offhook' => 'redial,endcall,private,cfwdall,cfwdbusy,pickup,gpickup,meetme,barge', + 'conntrans' => 'hold,endcall,transfer,conf,park,select,dirtrfr,vidmode,meetme,cfwdall,cfwdbusy', + 'digitsfoll' => 'back,endcall,dial', + 'connconf' => 'conflist,newcall,endcall,hold,vidmode', + 'ringout' => 'empty,endcall,transfer,cfwdall,idivert', + 'offhookfeat' => 'redial,endcall', + 'onhint' => 'redial,newcall,pickup,gpickup,barge', + 'onstealable' => 'redial,newcall,cfwdall,pickup,gpickup,dnd,intrcpt', + 'holdconf' => 'resume,newcall,endcall,join', + 'uriaction' => 'default'); +// Cisco Language Code / Directory + + private $cisco_language = array('ar_SA' => array('code' => 'ar', 'language' => 'Arabic', 'locale' => 'Arabic_Saudi_Arabia'), + 'bg_BG' => array('code' => 'bg', 'language' => 'Bulgarian', 'locale' => 'Bulgarian_Bulgaria'), + 'cz_CZ' => array('code' => 'cz', 'language' => 'Czech', 'locale' => 'Czech_Czech_Republic'), + 'da_DK' => array('code' => 'da', 'language' => 'Danish', 'locale' => 'Danish_Denmark'), + 'de_DE' => array('code' => 'de', 'language' => 'German', 'locale' => 'German_Germany'), + 'el_GR' => array('code' => 'el', 'language' => 'Greek', 'locale' => 'Greek_Greece'), + 'en_AU' => array('code' => 'en', 'language' => 'English', 'locale' => 'AU_English_United_States'), + 'en_GB' => array('code' => 'en', 'language' => 'English', 'locale' => 'English_United_Kingdom'), + 'en_US' => array('code' => 'en', 'language' => 'English', 'locale' => 'English_United_States'), + 'es_ES' => array('code' => 'es', 'language' => 'Spanish', 'locale' => 'Spanish_Spain'), + 'et_EE' => array('code' => 'et', 'language' => 'Estonian', 'locale' => 'Estonian_Estonia'), + 'fi_FI' => array('code' => 'fi', 'language' => 'Finnish', 'locale' => 'Finnish_Finland'), + 'fr_CA' => array('code' => 'fr', 'language' => 'French', 'locale' => 'French_Canada'), + 'fr_FR' => array('code' => 'fr', 'language' => 'French', 'locale' => 'French_France'), + 'he_IL' => array('code' => 'he', 'language' => 'Hebrew', 'locale' => 'Hebrew_Israel'), + 'hr_HR' => array('code' => 'hr', 'language' => 'Croatian', 'locale' => 'Croatian_Croatia'), + 'hu_HU' => array('code' => 'hu', 'language' => 'Hungarian', 'locale' => 'Hungarian_Hungary'), + 'it_IT' => array('code' => 'it', 'language' => 'Italian', 'locale' => 'Italian_Italy'), + 'ja_JP' => array('code' => 'ja', 'language' => 'Japanese', 'locale' => 'Japanese_Japan'), + 'ko_KO' => array('code' => 'ko', 'language' => 'Korean', 'locale' => 'Korean_Korea_Republic'), + 'lt_LT' => array('code' => 'lt', 'language' => 'Lithuanian', 'locale' => 'Lithuanian_Lithuania'), + 'lv_LV' => array('code' => 'lv', 'language' => 'Latvian', 'locale' => 'Latvian_Latvia'), + 'nl_NL' => array('code' => 'nl', 'language' => 'Dutch', 'locale' => 'Dutch_Netherlands'), + 'no_NO' => array('code' => 'no', 'language' => 'Norwegian', 'locale' => 'Norwegian_Norway'), + 'pl_PL' => array('code' => 'pl', 'language' => 'Polish', 'locale' => 'Polish_Poland'), + 'pt_BR' => array('code' => 'pt', 'language' => 'Portuguese', 'locale' => 'Portuguese_Brazil'), + 'pt_PT' => array('code' => 'pt', 'language' => 'Portuguese', 'locale' => 'Portuguese_Portugal'), + 'ro_RO' => array('code' => 'ro', 'language' => 'Romanian', 'locale' => 'Romanian_Romania'), + 'ru_RU' => array('code' => 'ru', 'language' => 'Russian', 'locale' => 'Russian_Russian_Federation'), + 'sk_SK' => array('code' => 'sk', 'language' => 'Slovakian', 'locale' => 'Slovak_Slovakia'), + 'sl_SL' => array('code' => 'sl', 'language' => 'Slovenian', 'locale' => 'Slovenian_Slovenia'), + 'sr_ME' => array('code' => 'sr', 'language' => 'Serbian', 'locale' => 'Serbian_Republic_of_Montenegro'), + 'sr_RS' => array('code' => 'rs', 'language' => 'Serbian', 'locale' => 'Serbian_Republic_of_Serbia'), + 'sv_SE' => array('code' => 'sv', 'language' => 'Swedish', 'locale' => 'Swedish_Sweden'), + 'th_TH' => array('code' => 'th', 'language' => 'Thailand', 'locale' => 'Thai_Thailand'), + 'tr_TR' => array('code' => 'tr', 'language' => 'Turkish', 'locale' => 'Turkish_Turkey'), + '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' => '-12', 'time' => 'Standard Time'), + 'Samoa' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Hawaiian' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Alaskan' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Pacific' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Mountain' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'US Mountain' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Central' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Mexico' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Canada Central' => array('offset' => '-12', 'time' => 'Standard Time'), + 'SA Pacific' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Eastern' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'US Eastern' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Atlantic' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'SA Western' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Newfoundland' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'South America' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'SA Eastern' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Mid-Atlantic' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Azores' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'GMT' => array('offset' => '00', 'time' => 'Standard/Daylight Time'), + 'Greenwich' => array('offset' => '00', 'time' => 'Standard Time'), + 'W. Europe' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'GTB' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Egypt' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'E. Europe' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Romance' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Central Europe' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'South Africa' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Jerusalem' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Saudi Arabia' => array('offset' => '-12', 'time' => 'Standard Time'), +/* Russion Regions */ + 'Russian/Kaliningrad' => array('offset' => '02', 'time' => 'Standard/Daylight Time'), + 'Russian/Moscow' => array('offset' => '03', 'time' => 'Standard/Daylight Time'), + 'Russian/St.Peterburg' => array('offset' => '03', 'time' => 'Standard/Daylight Time'), + 'Russian/Samara' => array('offset' => '04', 'time' => 'Standard/Daylight Time'), + 'Russian/Novosibirsk' => array('offset' => '07', 'time' => 'Standard/Daylight Time'), + 'Russian/Ekaterinburg' => array('offset' => '07', 'time' => 'Standard/Daylight Time'), + 'Russian/Irkutsk' => array('offset' => '08', 'time' => 'Standard/Daylight Time'), + 'Russian/Yakutsk' => array('offset' => '09', 'time' => 'Standard/Daylight Time'), + 'Russian/Khabarovsk' => array('offset' => '10', 'time' => 'Standard/Daylight Time'), + 'Russian/Vladivostok' => array('offset' => '10', 'time' => 'Standard/Daylight Time'), + 'Russian/Sakhalin' => array('offset' => '11', 'time' => 'Standard/Daylight Time'), + 'Russian/Magadan' => array('offset' => '11', 'time' => 'Standard/Daylight Time'), + 'Russian/Kamchatka' => array('offset' => '12', 'time' => 'Standard/Daylight Time'), +/* EnD - Russion Regions */ + + 'Iran' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Caucasus' => array('offset' => '-12', 'time' => 'Standard/Daylight Time'), + 'Arabian' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Afghanistan' => array('offset' => '-12', 'time' => 'Standard Time'), + 'West Asia' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Central Asia' => array('offset' => '-12', 'time' => 'Standard Time'), + 'SE Asia' => array('offset' => '-12', 'time' => 'Standard Time'), + 'China' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Taipei' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Tokyo' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Cen. Australia' => array('offset' => '10', 'time' => 'Standard/Daylight Time'), + 'AUS Central' => array('offset' => '-12', 'time' => 'Standard Time'), + 'E. Australia' => array('offset' => '-12', 'time' => 'Standard Time'), + 'AUS Eastern' => array('offset' => '10', 'time' => 'Standard/Daylight Time'), + 'West Pacific' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Tasmania' => array('offset' => '10', 'time' => 'Standard/Daylight Time'), + 'Central Pacific' => array('offset' => '-12', 'time' => 'Standard Time'), + 'Fiji' => array('offset' => '-12', 'time' => 'Standard Time'), + 'New Zealand' => array('offset' => '10', 'time' => 'Standard/Daylight Time') + ); + +} \ No newline at end of file diff --git a/Sccp_manager.inc/srvinterface.class.php b/Sccp_manager.inc/srvinterface.class.php new file mode 100644 index 0000000..e1cbf38 --- /dev/null +++ b/Sccp_manager.inc/srvinterface.class.php @@ -0,0 +1,233 @@ +'server interface data'); + } + +/* + Core Access Function + */ + public function sccp_core_comands($params = array()) { + global $astman; + $cmd_list = array('get_softkey' => array('cmd' => "sccp show softkeyssets", 'param' => ''), + 'get_version' => array('cmd' => "sccp show version", 'param' => ''), + 'get_device' => array('cmd' => "sccp show devices", 'param' => ''), + 'get_dev_info' => array('cmd' => "sccp show device", 'param' => 'name'), + 'get_hints' => array('cmd' => "core show hints", 'param' => ''), + 'sccp_reload' => array('cmd' => "sccp reload force", 'param' => ''), + 'reset_phone' => array('cmd' => "sccp reset ", 'param' => 'name'), // Жесткая перезагрузка + 'reload_phone' => array('cmd' => "sccp reload device ", 'param' => 'name'), + 'reset_token' => array('cmd' => "sccp tokenack ", 'param' => 'name'), + ); + $result = true; + if (!empty($params['cmd'])) { + $id_cmd = $params['cmd']; + if (!empty($cmd_list[$id_cmd])) { + $id_param = $cmd_list[$id_cmd]['param']; + if (!empty($id_param)) { + if (!empty($params[$id_param])) { + $result = $astman->Command($cmd_list[$id_cmd]['cmd'] .' '. $params[$id_param]); + } + } else { + $result = $astman->Command($cmd_list[$id_cmd]['cmd']); + } + } else { + switch ($params['cmd']) { + case 'phone_call': + if (!empty($params['name'])) { + $result = $astman->Command('sccp call ' . $params['name'] . ' ' . $params['call']); + } + break; + case 'phone_message': + if (!empty($params['msg'])) { + $msg = $params['msg']; + } else { + $msg = $this->sccpvalues['servername']['data']; + } + if (!empty($params['name'])) { + $astman->Command('sccp device ' . $params['name'] . ' ' . $msg); + } else { + + } + break; + default: + $result = false; + break; + } + } + } + return $result; + } + + public function sccp_getdevice_info($dev_id) { + if (empty($dev_id)) { + return array(); + } + $res = $this->sccp_core_comands(array('cmd' => 'get_dev_info', 'name' => $dev_id)); + $res1 = str_replace(array("\r\n", "\r", "\n"), ';', strip_tags((string)$res['data'])); + if (strpos($res1,'MAC-Address')) { + $res2 = substr($res1,0,strpos($res1,'+--- Buttons ')); + $res1 = explode(';',substr($res2,strpos($res2,'MAC-Address'))); + foreach ($res1 as $data ){ + if (!empty($data)) { + $tmp = explode(':',$data); + $data_key =str_replace(array(" ", "-", "\t"), '_', trim($tmp[0])); + $res3[$data_key] =$tmp[1]; + } + } + + $res1 = $res3['Skinny_Phone_Type']; + if (!empty($res3['Addons'])) { + $res2 = $res3['Addons']; + } else { + $res2 = ''; + } + $res3['SCCP_Vendor']= Array('vendor' => strtok($res1,' '),'model' => strtok('('), 'model_id' => strtok(')'), 'vendor_addon' => strtok($res2,' '), 'model_addon' => strtok(' ')); + return $res3; + } else { + return array(); + } + } +/* Current not use */ + public function sccp_list_hints() { + $ast_out = $this->sccp_core_comands(array('cmd' => 'get_hints')); + $ast_out = preg_split("/[\n]/", $ast_out['data']); + $ast_key = array(); + for ($i = 0; $i < 3; $i++) { + $ast_out[$i] = ""; + } + $i = count($ast_out) - 1; + $ast_out[--$i] = ""; + $ast_out[--$i] = ""; + foreach ($ast_out as $line) { + if (strlen($line) > 3) { + list ($line, $junk) = explode(' ', $line); + if (isset($ast_key[$line])) { + if (strlen($ast_key[$line]) < 1) { + $ast_key[$line] = $line; + } + } else { + $ast_key[$line] = $line; + } + } + } + return $ast_key; + } + + public function get_comatable_sccp() { + $res = 0; + $ast_out = $this->sccp_version(); + if ($ast_out[0] >= '4.3.0'){ + $res = 1; + } + if (!empty($ast_out[1]) && $ast_out[1] == 'develop'){ + $res = 10; + if (!empty($ast_out[3])) { + if (base_convert($ast_out[3],16,10) >= base_convert('702487a',16,10)){ + $res += 1; + } + } + } + return $res; + + } +// rename public - > privat + public function sccp_version() { + $ast_out = $this->sccp_core_comands(array('cmd' => 'get_version')); + if (preg_match("/Release.*\(/", $ast_out['data'] , $matches)) { + $ast_out = substr($matches[0],9,-1); + return explode(' ', $ast_out); + } else { + return aray('unknown'); + } + } + + public function sccp_list_keysets() { + $ast_out = $this->sccp_core_comands(array('cmd' => 'get_softkey')); + + $ast_out = preg_split("/[\n]/", $ast_out['data']); + $ast_key = array(); + for ($i = 0; $i < 5; $i++) { + $ast_out[$i] = ""; + } + $i = count($ast_out) - 1; + $ast_out[--$i] = ""; + foreach ($ast_out as $line) { + if (strlen($line) > 3) { + $line = substr($line, 2); + list ($line, $junk) = explode(' ', $line); + if (isset($ast_key[$line])) { + if (strlen($ast_key[$line]) < 1) { + $ast_key[$line] = $line; + } + } else { + $ast_key[$line] = $line; + } + } + } + return $ast_key; + } + + public function sccp_get_active_devise() { + $ast_out = $this->sccp_core_comands(array('cmd' => 'get_device')); + + $ast_out = preg_split("/[\n]/", $ast_out['data']); + + $ast_key = array(); + for ($i = 0; $i < 5; $i++) { + $ast_out[$i] = ""; + } + $i = count($ast_out) - 1; + $ast_out[--$i] = ""; + foreach ($ast_out as $line) { + if (strlen($line) > 3) { + $line = substr($line, 2); + $line = preg_replace("/\s{2,}/", " ", $line); + $line_arr = explode(' ', $line); + $it = 1; + do { + if (strpos($line_arr[$it + 1], 'SEP') === false) { + $line_arr[0] .= ' ' . $line_arr[$it]; + unset($line_arr[$it]); + } else { + break; + } + $it++; + } while ((count($line_arr) > 3) and ( $it < count($line_arr))); + explode(";|", implode(";|", $line_arr)); + 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); + } +/* + if (isset($ast_key[$devname])) { + if (strlen($ast_key[$devname]) < 1) { + $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $descr); + } + } else { + $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $token); + } + * + */ + } + } + return $ast_key; + } + + +} \ No newline at end of file diff --git a/views/advserver.keyset.php b/views/advserver.keyset.php index 2be5cea..c5fa57c 100644 --- a/views/advserver.keyset.php +++ b/views/advserver.keyset.php @@ -8,7 +8,9 @@ $keymultiselect = array('AllRight' =>'>>', 'Right' => '>', 'AllLeft' => '<<', 'Left' => '<'); // ------------------------------------- Key Set Value --------------------------------------------------------- -$keysetarray = array('onhook' => array('redial','newcall','cfwdall','dnd','pickup','gpickup','private'), +$keysetarray = $this->extconfigs->getextConfig('keyset'); + +/*$keysetarray1 = array('onhook' => array('redial','newcall','cfwdall','dnd','pickup','gpickup','private'), 'connected' => array('hold','endcall','park','vidmode','select','cfwdall','cfwdbusy','idivert'), 'onhold' => array('resume','newcall','endcall','transfer','conflist','select','dirtrfr','idivert','meetme'), 'ringin' => array('answer','endcall','transvm','idivert'), @@ -22,7 +24,7 @@ $keysetarray = array('onhook' => array('redial','newcall','cfwdall','dnd','pi 'onstealable'=> array('redial','newcall','cfwdall','pickup','gpickup','dnd','intrcpt'), 'holdconf' => array('resume','newcall','endcall','join'), 'uriaction' => array('default')); - +*/ // ------------------------------------- Key Set Display information --------------------------------------------------------- $keynamearray = array('onhook' => array(sname => 'ONHOOK', name =>'Display Onhook',help =>'help.'), 'connected' => array(sname => 'CONNECTED', name =>'Display Connected',help =>'help.'), @@ -39,9 +41,6 @@ $keynamearray = array('onhook' => array(sname => 'ONHOOK', name =>'Display On 'holdconf' => array(sname => 'HOLDCONF', name =>'Display holdconf',help =>'help.'), 'uriaction' => array(sname => '', name =>'Display uriaction',help =>'help.') ); -// print_r($this->sccp_list_keysets()); -// echo "

"; -// print_r($this->sccp_conf_init); ?>
@@ -133,7 +132,8 @@ $keynamearray = array('onhook' => array(sname => 'ONHOOK', name =>'Display On echo ''; echo '
'; diff --git a/views/form.adddevice.php b/views/form.adddevice.php index 224e296..b861f44 100644 --- a/views/form.adddevice.php +++ b/views/form.adddevice.php @@ -22,7 +22,7 @@ if (!empty($_REQUEST['new_id'])) { if (!empty($_REQUEST['id'])) { $dev_id = $_REQUEST['id']; $dev_new = $dev_id; - $db_res = $this->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); + $db_res = $this->dbinterface->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); foreach ($db_res as $key => $val) { if (!empty($val)) { switch ($key) { diff --git a/views/form.buttons.php b/views/form.buttons.php index 5ac379b..f86c75e 100644 --- a/views/form.buttons.php +++ b/views/form.buttons.php @@ -14,8 +14,8 @@ $forminfo =array( $buttons_type= array("empty","line","silent","monitor","speeddial","feature","adv.line"); $feature_list= array('parkinglot'=>'Park Slots','monitor'=> "Record Calls",'devstate'=> "Change Status"); -$lines_list = $this->get_db_SccpTableData('SccpExtension'); -$hint_list = $this->get_db_SccpTableData('SccpExtension'); +$lines_list = $this->dbinterface->get_db_SccpTableData('SccpExtension'); +$hint_list = $this->dbinterface->get_db_SccpTableData('SccpExtension'); //$hint_list = $this->sccp_list_hints(); $line_id =0; $max_buttons =56; @@ -23,8 +23,8 @@ $show_buttons =1; //print_r($hint_list); if (!empty($_REQUEST['id'])) { $dev_id = $_REQUEST['id']; - $db_butons = $this->get_db_SccpTableData('get_sccpdevice_buttons', array("id" => $dev_id)); - $db_device = $this->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); + $db_butons = $this->dbinterface->get_db_SccpTableData('get_sccpdevice_buttons', array("id" => $dev_id)); + $db_device = $this->dbinterface->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); $max_buttons = $db_device['buttons']; if (!empty($db_device['addon_buttons'])){ $max_buttons += $db_device['addon_buttons']; @@ -34,7 +34,7 @@ if (!empty($_REQUEST['id'])) { if (!empty($_REQUEST['new_id'])) { $val = $_REQUEST['type']; $dev_schema = $this-> getSccp_model_information('byid', false, "all", array('model' =>$val)); -// $db_device = $this->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $val)); +// $db_device = $this->dbinterface->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $val)); $max_buttons = $dev_schema[0]['buttons']; if (!empty($_REQUEST['addon'])) { $val = $_REQUEST['addon']; diff --git a/views/formShow.php b/views/formShow.php index c7e68da..c09e7b8 100644 --- a/views/formShow.php +++ b/views/formShow.php @@ -44,9 +44,9 @@ if (function_exists('music_list')){ if (!is_array($moh_list)){ $moh_list = array('default'); } -$sofkey_list = \FreePBX::Sccp_manager()-> sccp_list_keysets(); -$model_list = \FreePBX::Sccp_manager()->get_db_SccpTableData("HWDevice"); -$extension_list = \FreePBX::Sccp_manager()->get_db_SccpTableData("HWextension"); +$sofkey_list = \FreePBX::Sccp_manager()-> srvinterface -> sccp_list_keysets(); +$model_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWDevice"); +$extension_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWextension"); $extension_list[]=array(model=>'none', vendor=>'CISCO', dns=>'0'); diff --git a/views/server.codec.php b/views/server.codec.php index 738e002..8d84e06 100644 --- a/views/server.codec.php +++ b/views/server.codec.php @@ -10,9 +10,12 @@ $def_val = null; $dev_id = null; $sccp_codec = $this->getCodecs('audio', true); +$sccp_disalow_def = $this->extconfigs->getextConfig('sccpDefaults','disallow'); +$sccp_disalow = $sccp_disalow_def; + if (!empty($_REQUEST['id'])) { $dev_id = $_REQUEST['id']; - $db_res = $this->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); + $db_res = $this->dbinterface->get_db_SccpTableData('get_sccpdevice_byid', array("id" => $dev_id)); if (!empty($db_res['allow'])) { $i = 1; foreach(explode(';', $db_res['allow']) as $c){ @@ -25,6 +28,10 @@ if (!empty($_REQUEST['id'])) { } } } + if (!empty($db_res['disallow'])) { + $sccp_disalow = $db_res['disallow']; + } + } else { $codec_list = $sccp_codec; } @@ -93,8 +100,8 @@ if (!empty($_REQUEST['id'])) {
- - + +
diff --git a/views/server.setting.php b/views/server.setting.php index 42722be..4a76783 100644 --- a/views/server.setting.php +++ b/views/server.setting.php @@ -8,15 +8,11 @@ // print_r($this->sccpvalues['sccp_comatable']); // print_r($this->sccpvalues); // $id_name = 'SEP000A8A5C5F25'; -// $dev_data = $this->sccp_getdevice_info($id_name); -// print_r($dev_data); +// $dev_data = $this->srvinterface->sccp_getdevice_info($id_name); -/// $sccpdriver = $this->freepbx->Config->get_conf_setting('ASTSCCPDRIVER'); - $driver = $this->configs->getConfig('sccp_lang'); -// $driver = $this->FreePBX->Config->get_conf_setting('ASTSCCPDRIVER'); -// $driver = $this->FreePBX->Config->get_conf_setting('ASTSIPDRIVER'); -// $tversion = $freepbx->Config; - print_r($driver ); +// print_r($dev_data); +// $lang_arr = $this->extconfigs->getextConfig('sccp_lang','sk_SK'); + //print_r($this->sccpvalues); ?>