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

Update Sccp_manager.class.php

Browse source 
Remove unused methods
Substitute single line methods
Clean up page presentation (this changes the previous tab order)
This commit is contained in:
steve-lad 2021-06-02 16:31:38 +02:00
parent 4620df53c4
commit 7d641e3b2d
1 changed files with 37 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
Sccp_manager.class.php
View file

@ -140,7 +140,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
return; return;
} }
$this->getSccpSettingFromDB(); // Overwrite Exist $this->sccpvalues = $this->dbinterface->get_db_SccpSetting(); // Overwrite Exist
// $this->getSccpSetingINI(false); // get from sccep.ini // $this->getSccpSetingINI(false); // get from sccep.ini
$this->initializeSccpPath(); $this->initializeSccpPath();
$this->initVarfromDefs(); $this->initVarfromDefs();
@ -185,7 +185,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$htmlret .= load_view(__DIR__ . '/views/formShow.php', array( $htmlret .= load_view(__DIR__ . '/views/formShow.php', array(
'itm' => $item, 'h_show' => $heder_show, 'itm' => $item, 'h_show' => $heder_show,
'form_prefix' => $form_prefix, 'fvalues' => $form_values, 'form_prefix' => $form_prefix, 'fvalues' => $form_values,
'tftp_lang' => $this->getTftpLang(), 'metainfo' => $this->sccp_metainfo)); 'tftp_lang' => $this->tftpLang, 'metainfo' => $this->sccp_metainfo));
} }
} else { } else {
$htmlret .= load_view(__DIR__ . '/views/formShowError.php'); $htmlret .= load_view(__DIR__ . '/views/formShowError.php');
@ -269,70 +269,39 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$request = $_REQUEST; $request = $_REQUEST;
$action = !empty($request['action']) ? $request['action'] : ''; $action = !empty($request['action']) ? $request['action'] : '';
if (!empty($this->sccpvalues['displayconfig'])) { $this->pagedata = array(
if (!empty($this->sccpvalues['displayconfig']['data']) && ($this->sccpvalues['displayconfig']['data'] == 'sccpsimple')) { "general" => array(
$this->pagedata = array( "name" => _("General SCCP Settings"),
"general" => array( "page" => 'views/server.setting.php'
"name" => _("General SCCP Settings"),
"page" => 'views/server.setting.php'
),
"sccpdevice" => array(
"name" => _("SCCP Device"),
"page" => 'views/server.device.php'
),
"sccpurl" => array(
"name" => _("SCCP Device URL"),
"page" => 'views/server.url.php'
),
"sccpinfo" => array(
"name" => _("SCCP info"),
"page" => 'views/server.info.php'
),
);
}
}
if (empty($this->pagedata)) {
//$driver = $this->FreePBX->Config->get_conf_setting('ASTSIPDRIVER');
$this->pagedata = array(
"general" => array(
"name" => _("General SCCP Settings"),
"page" => 'views/server.setting.php'
), ),
"sccpdevice" => array( "sccpdevice" => array(
"name" => _("SCCP Device"), "name" => _("SCCP Device"),
"page" => 'views/server.device.php' "page" => 'views/server.device.php'
), ),
"sccpurl" => array( "sccpurl" => array(
"name" => _("SCCP Device URL"), "name" => _("SCCP Device URL"),
"page" => 'views/server.url.php' "page" => 'views/server.url.php'
), ),
"sccpntp" => array( "sccpinfo" => array(
"name" => _("SCCP info"),
"page" => 'views/server.info.php'
)
);
if (isset($this->sccpvalues['displayconfig']['data']) && ($this->sccpvalues['displayconfig']['data'] != 'sccpsimple')) {
$this->pagedata['sccpntp'] = array(
"name" => _("SCCP Time"), "name" => _("SCCP Time"),
"page" => 'views/server.datetime.php' "page" => 'views/server.datetime.php'
), );
"sccpcodec" => array( $this->pagedata['sccpcodec'] = array(
"name" => _("SCCP Codec"), "name" => _("SCCP Codec"),
"page" => 'views/server.codec.php' "page" => 'views/server.codec.php'
), );
"sccpadv" => array( $this->pagedata['sccpadv'] = array(
"name" => _("Advanced SCCP Settings"), "name" => _("Advanced SCCP Settings"),
"page" => 'views/server.advanced.php' "page" => 'views/server.advanced.php'
), );
"sccpinfo" => array(
"name" => _("SCCP info"),
"page" => 'views/server.info.php'
),
);
}
if (!empty($this->pagedata)) {
foreach ($this->pagedata as &$page) {
ob_start();
include($page['page']);
$page['content'] = ob_get_contents();
ob_end_clean();
}
} }
$this->processPageData();
return $this->pagedata; return $this->pagedata;
} }
@ -345,14 +314,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
"page" => 'views/server.info.php' "page" => 'views/server.info.php'
), ),
); );
$this->processPageData();
foreach ($this->pagedata as &$page) {
ob_start();
include($page['page']);
$page['content'] = ob_get_contents();
ob_end_clean();
}
return $this->pagedata; return $this->pagedata;
} }
@ -390,17 +352,20 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
} }
break; break;
} }
foreach ($this->pagedata as &$page) { $this->processPageData();
ob_start();
include($page['page']);
$page['content'] = ob_get_contents();
ob_end_clean();
}
} }
return $this->pagedata; return $this->pagedata;
} }
public function processPageData() {
foreach ($this->pagedata as &$page) {
ob_start();
include($page['page']);
$page['content'] = ob_get_contents();
ob_end_clean();
}
}
public function phoneShowPage() { public function phoneShowPage() {
$request = $_REQUEST; $request = $_REQUEST;
$action = !empty($request['action']) ? $request['action'] : ''; $action = !empty($request['action']) ? $request['action'] : '';
@ -838,8 +803,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
if (!empty($save_settings)) { if (!empty($save_settings)) {
$this->saveSccpSettings($save_settings); $this->saveSccpSettings($save_settings);
$this->getSccpSettingFromDB(); $this->sccpvalues = $this->dbinterface->get_db_SccpSetting();
// $this->createDefaultSccpConfig();
} }
$this->createDefaultSccpConfig(); // Rewrite Config. $this->createDefaultSccpConfig(); // Rewrite Config.
$save_settings[] = array('status' => true); $save_settings[] = array('status' => true);
@ -930,11 +894,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
return $save_settings; return $save_settings;
} }
public function getSccpSettingFromDB() {
$this->sccpvalues = $this->dbinterface->get_db_SccpSetting();
return;
}
public function getMyConfig($var = null, $id = "noid") { public function getMyConfig($var = null, $id = "noid") {
switch ($var) { switch ($var) {
case "voicecodecs": case "voicecodecs":
@ -1064,21 +1023,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
return true; return true;
} }
function Sccp_manager_hookGet_config($engine) {
$this->debugdata($engine);
}
function Sccp_manager_get_config($engine) {
$this->debugdata($engine);
}
/** /**
* Retrieve Active Codecs * Retrieve Active Codecs
* return fiends Lag pack * return fiends Lag pack
*/ */
public function getTftpLang() {
return $this->tftpLang;
}
private function initTftpLang() { private function initTftpLang() {
$result = array(); $result = array();