summaryrefslogtreecommitdiff
path: root/misc/freeswitch/scripts/configuration.lua
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-10 14:22:49 +0100
committerspag <spag@golwen.net>2013-01-10 14:22:49 +0100
commit44059b1cb8348c2ee24e056f81c3380abd55096d (patch)
treef64d3509192cb01a6a2808247a870068b2814f60 /misc/freeswitch/scripts/configuration.lua
parent490e3f9bcda2943d1bff77ec5cfaa0a9b7d13458 (diff)
read conference controls from database
Diffstat (limited to 'misc/freeswitch/scripts/configuration.lua')
-rw-r--r--misc/freeswitch/scripts/configuration.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/freeswitch/scripts/configuration.lua b/misc/freeswitch/scripts/configuration.lua
index 41c1523..0cd3752 100644
--- a/misc/freeswitch/scripts/configuration.lua
+++ b/misc/freeswitch/scripts/configuration.lua
@@ -100,7 +100,7 @@ function conf_conference(database)
require 'common.configuration_table'
XML_STRING = xml:document(xml:conference());
- local conference_parameters = common.configuration_table.get(database, 'conferences', 'parameters');
+ local config = common.configuration_table.get(database, 'conferences');
local event_name = params:getHeader("Event-Name")
if event_name == 'COMMAND' then
@@ -112,8 +112,8 @@ function conf_conference(database)
conference = common.conference.Conference:new{log=log, database=database}:find_by_id(conf_name);
if conference then
log:debug('CONFIG_CONFERENCE ', conf_name, ' name: ', conference.record.name, ', profile: ', profile_name);
- conference_parameters['caller-id-name'] = conference.record.name or '';
- XML_STRING = xml:document(xml:conference(xml:conference_profile(profile_name, conference_parameters)));
+ config.parameters['caller-id-name'] = conference.record.name or '';
+ XML_STRING = xml:document(xml:conference(xml:conference_profile(profile_name, config.parameters), config.controls_speaker, config.controls_moderator));
else
log:error('CONFIG_CONFERENCE ', conf_name, ' - conference not found');
end