Set default for LangDir

When Sccp_manager construct is called by the installer, this variable is not set. The installer sets it later
This commit is contained in:
steve-lad 2021-07-18 12:23:17 +02:00
parent d7fd77dfe8
commit 913cbd14c4

View file

@ -754,8 +754,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
private function findInstLangs() { private function findInstLangs() {
//locales and languages are installed in the tftp_lang_path //locales and languages are installed in the tftp_lang_path
$result = array(); $result = array();
// TODO: Installer comes here so need to set default / ? $langDir = '/'; //set default for when called by installer on virgin system
$langDir = $this->sccppath["tftp_lang_path"]; if (!empty($this->sccppath["tftp_lang_path"])) {
$langDir = $this->sccppath["tftp_lang_path"];
}
$localeJar = 'be-sccp.jar'; // This jar should exist if the locale is populated $localeJar = 'be-sccp.jar'; // This jar should exist if the locale is populated
$langArr = $this->extconfigs->getExtConfig('sccp_lang'); $langArr = $this->extconfigs->getExtConfig('sccp_lang');
$localeArray = array_combine(array_keys($langArr),array_column($langArr, 'locale')); $localeArray = array_combine(array_keys($langArr),array_column($langArr, 'locale'));