summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-12 04:21:06 -0400
committerPeter Kozak <spag@golwen.net>2013-03-12 04:21:06 -0400
commit2eacac2c8db953054278fdc0ddc0f0de46435861 (patch)
tree5b7aa450cd5531db298211b0394ea1b3ee39465b
parentdac06ea97202f97c226e50025850c85494007452 (diff)
return status record
-rw-r--r--misc/freeswitch/scripts/dialplan/dialplan.lua10
1 files changed, 4 insertions, 6 deletions
diff --git a/misc/freeswitch/scripts/dialplan/dialplan.lua b/misc/freeswitch/scripts/dialplan/dialplan.lua
index fabc5af..bbf1242 100644
--- a/misc/freeswitch/scripts/dialplan/dialplan.lua
+++ b/misc/freeswitch/scripts/dialplan/dialplan.lua
@@ -76,7 +76,7 @@ end
function Dialplan.configuration_read(self)
- require 'common.configuration_table'
+ require 'common.configuration_table';
-- dialplan configuration
self.config = common.configuration_table.get(self.database, 'dialplan');
@@ -462,16 +462,14 @@ end
function Dialplan.conference(self, destination)
- -- call local conference
- require 'common.conference'
- conference = common.conference.Conference:new{ log = self.log, database = self.database }:find_by_id(destination.id);
+ require 'common.conference';
+ local conference = common.conference.Conference:new{ log = self.log, database = self.database }:find_by_id(destination.id);
if not conference then
return { continue = false, code = 404, phrase = 'Conference not found' }
end
- local cause = conference:enter(self.caller, self.domain);
- return { continue = false, cause = cause }
+ return conference:enter(self.caller, self.domain);
end