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

Add display settings to device edit

Browse source
This commit is contained in:
stevenA 2022-02-02 14:16:14 +01:00
parent 14d9dfdf98
commit b927523071
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
sccpManTraits/ajaxHelper.php
View file

@ -553,24 +553,33 @@ trait ajaxHelper {
$name_dev = $value; $name_dev = $value;
} }
break; break;
case 'daysdisplaynotactive' :
$searchArr = ['daysdisplaynotactive_0', 'daysdisplaynotactive_1', 'daysdisplaynotactive_2', 'daysdisplaynotactive_3', 'daysdisplaynotactive_4', 'daysdisplaynotactive_5', 'daysdisplaynotactive_6'];
$value = '';
foreach ($searchArr as $settingsVal) {
$value .= (isset($get_settings["sccpdevice_${settingsVal}"])) ? $get_settings["sccpdevice_${settingsVal}"] . ',' : '';
}
$value = rtrim($value,',');
break;
case 'phonecodepage': case 'phonecodepage':
// TODO: May be other exceptions so use switch. Historically this is the only one handled // TODO: May be other exceptions so use switch. Historically this is the only one handled
// phonecodepage depends on 2 variables - language and phone type (uses java or not). // phonecodepage depends on 2 variables - language and phone type (uses java or not).
// Non java phones use ISO8859-1 or CP1251 (Cyrillic); java phones use UTF-8. See @dkgroot. // Non java phones use ISO8859-1 or CP1251 (Cyrillic); java phones use UTF-8. See @dkgroot.
// Below list is not definitive or necessarily accurate - needs to be maintained. // Below list is not definitive or necessarily accurate - needs to be maintained.
$nonJavaPhones = array( '7902', '7905', '7912', '7935', '7940', '7960'); $nonUtf8Phones = array( '7902', '7905', '7912', '7935', '7940', '7960');
if (!empty($get_settings["{$hdr_prefix}devlang"])) { if (!empty($get_settings["{$hdr_prefix}devlang"])) {
switch ($get_settings["{$hdr_prefix}devlang"]) { switch ($get_settings["{$hdr_prefix}devlang"]) {
case 'Arabic_Saudi_Arabia': case 'Arabic_Saudi_Arabia':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'ISO-8859-6' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'ISO-8859-6' : 'utf-8';
break; break;
case 'Greek_Greece': case 'Greek_Greece':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'ISO-8859-7' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'ISO-8859-7' : 'utf-8';
break; break;
case 'Bulgarian_Bulgaria': case 'Bulgarian_Bulgaria':
case 'Russian_Russian_Federation': case 'Russian_Russian_Federation':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'CP1251' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'CP1251' : 'utf-8';
break; break;
case 'Slovenian_Slovenia': case 'Slovenian_Slovenia':
case 'Serbian_Republic_of_Montenegro': case 'Serbian_Republic_of_Montenegro':
@ -578,33 +587,33 @@ trait ajaxHelper {
case 'Croatian_Croatia': case 'Croatian_Croatia':
case 'Hungarian_Hungary': case 'Hungarian_Hungary':
case 'Lithuanian_Lithuania': case 'Lithuanian_Lithuania':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'CP1252' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'CP1252' : 'utf-8';
break; break;
case 'Czech_Czech_Republic': case 'Czech_Czech_Republic':
case 'Slovak_Slovakia': case 'Slovak_Slovakia':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'CP1254' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'CP1254' : 'utf-8';
break; break;
case 'Hebrew_Israel': case 'Hebrew_Israel':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'CP1255' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'CP1255' : 'utf-8';
break; break;
case 'Thai_Thailand': case 'Thai_Thailand':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'TIS-620' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'TIS-620' : 'utf-8';
break; break;
case 'Turkish_Turkey': case 'Turkish_Turkey':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'ISO-8859-9' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'ISO-8859-9' : 'utf-8';
break; break;
case 'Chinese_China': case 'Chinese_China':
case 'Chinese_Taiwan': case 'Chinese_Taiwan':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'GB2312' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'GB2312' : 'utf-8';
break; break;
case 'Japanese_Japan': case 'Japanese_Japan':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'SHIFT_JIS' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'SHIFT_JIS' : 'utf-8';
break; break;
case 'Korean_Korea_Republic': case 'Korean_Korea_Republic':
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'EUC-KR' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'EUC-KR' : 'utf-8';
break; break;
default: default:
$value = (in_array($get_settings['sccp_hw_type'], $nonJavaPhones, true)) ? 'ISO8859-1' : 'utf-8'; $value = (in_array($get_settings['sccp_hw_type'], $nonUtf8Phones, true)) ? 'ISO8859-1' : 'utf-8';
break; break;
} }
} }

1
views/form.adddevice.php
View file

@ -120,6 +120,7 @@ if (!empty($def_val['type']['data'])) {
} }
echo $this->showGroup('sccp_hw_dev2', 1, 'sccp_hw', $def_val); echo $this->showGroup('sccp_hw_dev2', 1, 'sccp_hw', $def_val);
echo $this->showGroup('sccp_hw_dev_advance', 1, 'sccp_hw', $def_val); echo $this->showGroup('sccp_hw_dev_advance', 1, 'sccp_hw', $def_val);
echo $this->showGroup('sccp_dev_vendor_display_conf', 1, 'sccpdevice', $def_val);
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_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); echo $this->showGroup('sccp_dev_vendor_conf', 1, 'vendorconfig', $def_val);