nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 17:13:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the phrases_dir is not nil.

Browse Source
This commit is contained in:
markjcrane
2016-03-04 15:08:58 -07:00
parent b4b86b0478
commit 7cbb32dcd3
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,14 @@
--action = params:getHeader("action");
language = params:getHeader("lang");
--make sure phrase_dir variable is not nil
if (phrases_dir == nil) then
--define the variable
phrases_dir = '';
--include the config.lua and local.lua
require "resources.functions.config";
end
--additional information
--event_calling_function = params:getHeader("Event-Calling-Function");
@@ -116,7 +124,7 @@
match_tag = "open";
x = 0;
dbh:query(sql, function(row)
--phrase_uuid,domain_uuid,phrase_name,phrase_language
--phrase_uuid,domain_uuid,phrase_name,phrase_language
--phrase_description,phrase_enabled,phrase_detail_uuid
--phrase_detail_group,phrase_detail_tag,phrase_detail_pattern
--phrase_detail_function,phrase_detail_data,phrase_detail_method
@@ -141,23 +149,21 @@
table.insert(xml, [[ </input>]]);
table.insert(xml, [[ </macro>]]);
end
--read root xml language file, parse included xml files
if (phrases_dir ~= nil) then
local xml_file_paths = {}
local file_handle = io.open(phrases_dir.."/"..language.."/"..language..".xml", "r");
if (file_handle ~= nil) then
for file_line in file_handle:lines() do
if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then
pos_beg = string.find(file_line, 'cmd="include" data="', 0, true) + 20;
pos_end = string.find(file_line, '"/>', 0, true) - 1;
xml_file_path = string.sub(file_line, pos_beg, pos_end);
table.insert(xml_file_paths, phrases_dir.."/"..language.."/"..xml_file_path);
--freeswitch.consoleLog("notice", "file path = "..xml_file_path.."\n");
end
local xml_file_paths = {}
local file_handle = io.open(phrases_dir.."/"..language.."/"..language..".xml", "r");
if (file_handle ~= nil) then
for file_line in file_handle:lines() do
if (string.find(file_line, 'cmd="include" data="', 0, true) ~= nil) then
pos_beg = string.find(file_line, 'cmd="include" data="', 0, true) + 20;
pos_end = string.find(file_line, '"/>', 0, true) - 1;
xml_file_path = string.sub(file_line, pos_beg, pos_end);
table.insert(xml_file_paths, phrases_dir.."/"..language.."/"..xml_file_path);
--freeswitch.consoleLog("notice", "file path = "..xml_file_path.."\n");
end
file_handle:close();
end
file_handle:close();
end
--iterate array of file paths, get contents of other xml macro files
@@ -174,7 +180,7 @@
xml_file:close();
end
end
--output xml & close previous file
table.insert(xml, [[ </macros>]]);
table.insert(xml, [[ </phrases>]]);