dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to use phrases_dir 

changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
This commit is contained in:
Matthew Vale 2015-11-03 11:16:05 +00:00
parent fd397f53c1
commit b9e8b3ef03
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/databases/app_defaults.php
View File

@ -131,6 +131,9 @@ if ($domains_processed == 1) {
if (strlen($_SESSION['switch']['sounds']['dir']) > 0) { if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
$tmp .= correct_path(" sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n"); $tmp .= correct_path(" sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
} }
if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
$tmp .= correct_path(" phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
}
if (strlen($_SESSION['switch']['db']['dir']) > 0) { if (strlen($_SESSION['switch']['db']['dir']) > 0) {
$tmp .= correct_path(" database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n"); $tmp .= correct_path(" database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
} }

11
resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua
View File

@ -142,18 +142,9 @@
table.insert(xml, [[ </macro>]]);; table.insert(xml, [[ </macro>]]);;
end end
require "resources.functions.settings";
settings = settings(domain_uuid);
lang_path = "/usr/local/freeswitch/conf/lang/";
if (settings['switch']['phrases'] ~= nil) then
if (settings['switch']['phrases']['dir'] ~= nil) then
lang_path = settings['switch']['phrases']['dir'];
end
end
--read root xml language file, parse included xml files --read root xml language file, parse included xml files
local xml_file_paths = {} local xml_file_paths = {}
local file_handle = io.open(lang_path.."/"..language.."/"..language..".xml", "r"); local file_handle = io.open(phrases_dir.."/"..language.."/"..language..".xml", "r");
if (file_handle ~= nil) then if (file_handle ~= nil) then
for file_line in file_handle:lines() do for file_line in file_handle:lines() do
if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then