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

Remove Inherit processing

Browse source 
Remove functionality added to hide inherit in default configs - Inherit has been removed from sccpgeneral.xml
This commit is contained in:
steve-lad 2021-06-18 12:10:26 +02:00
parent 57bc13f782
commit de3c58178b
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Sccp_manager.class.php
View file

@ -173,7 +173,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
* Generate Input elements in Html Code from sccpgeneral.xml * Generate Input elements in Html Code from sccpgeneral.xml
*/ */
public function showGroup($group_name, $show_Header, $form_prefix = 'sccp', $form_values = array(), $show_inherit = true) { public function showGroup($group_name, $show_Header, $form_prefix = 'sccp', $form_values = array()) {
$htmlret = ""; $htmlret = "";
if (empty($form_values)) { if (empty($form_values)) {
$form_values = $this->sccpvalues; $form_values = $this->sccpvalues;
@ -187,7 +187,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
'fvalues' => $form_values, 'fvalues' => $form_values,
'tftp_lang' => $this->tftpLang, 'tftp_lang' => $this->tftpLang,
'metainfo' => $this->sccp_metainfo, 'metainfo' => $this->sccp_metainfo,
'inherit' => $show_inherit
) )
); );
} }

2
views/form.adddevice.php
View file

@ -132,7 +132,7 @@ if (!empty($device_warning)) {
echo $this->showGroup('sccp_hw_dev_softkey', 1, 'sccp_hw', $def_val); echo $this->showGroup('sccp_hw_dev_softkey', 1, 'sccp_hw', $def_val);
// echo $this->showGroup('sccp_hw_dev_pickup', 1, 'sccp_hw', $def_val); This are line properties and does not exist! // echo $this->showGroup('sccp_hw_dev_pickup', 1, 'sccp_hw', $def_val); This are line properties and does not exist!
echo $this->showGroup('sccp_hw_dev_conference', 1, 'sccp_hw', $def_val); echo $this->showGroup('sccp_hw_dev_conference', 1, 'sccp_hw', $def_val);
echo $this->showGroup('sccp_dev_vendor_conf', 1, 'vendorconfig', $def_val, true); echo $this->showGroup('sccp_dev_vendor_conf', 1, 'vendorconfig', $def_val);
echo $this->showGroup('sccp_hw_dev_network', 1, 'sccp_hw', $def_val); echo $this->showGroup('sccp_hw_dev_network', 1, 'sccp_hw', $def_val);
?> ?>
</form> </form>

5
views/formShow.php
View file

@ -382,11 +382,6 @@ foreach ($items as $child) {
$opt_hide .= ' data-vshow="'.$child->option_show.'" data-clshow="'.$child->option_show['class'].'" '; $opt_hide .= ' data-vshow="'.$child->option_show.'" data-clshow="'.$child->option_show['class'].'" ';
} }
foreach ($child->xpath('button') as $value) { foreach ($child->xpath('button') as $value) {
if (!$inherit) {
if ($value == 'Inherit') {
continue;
}
}
$val_check = strtolower((string)$value[@value]); $val_check = strtolower((string)$value[@value]);
if ($val_check == strtolower($res_v)) { if ($val_check == strtolower($res_v)) {
$val_check = " checked"; $val_check = " checked";

2
views/server.advanced.php
View file

@ -17,7 +17,7 @@
$defaultVals = $this->getTableDefaults('sccpdevice', true); $defaultVals = $this->getTableDefaults('sccpdevice', true);
echo $this->showGroup('sccp_srst', 1); echo $this->showGroup('sccp_srst', 1);
echo $this->showGroup('sccp_dev_vendor_conf', 1,'sccpdevice', $defaultVals, false); echo $this->showGroup('sccp_dev_vendor_conf', 1, 'sccpdevice', $defaultVals);
?> ?>
</form> </form>