summaryrefslogtreecommitdiff
path: root/misc/freeswitch/scripts/common/gateway.lua
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-20 19:06:19 +0200
commiteb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch)
tree71f449ccd6f15422717de3ac24f87d5e888ddd79 /misc/freeswitch/scripts/common/gateway.lua
parentdf6e17e48995f25e72509986f30700d778b179b6 (diff)
parent3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff)
Merge branch 'develop'
Diffstat (limited to 'misc/freeswitch/scripts/common/gateway.lua')
-rw-r--r--misc/freeswitch/scripts/common/gateway.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/misc/freeswitch/scripts/common/gateway.lua b/misc/freeswitch/scripts/common/gateway.lua
index ac38326..09e8c4b 100644
--- a/misc/freeswitch/scripts/common/gateway.lua
+++ b/misc/freeswitch/scripts/common/gateway.lua
@@ -34,6 +34,10 @@ end
function Gateway.find_by_id(self, id)
+ if not tonumber(id) then
+ return nil;
+ end
+
local sql_query = 'SELECT `a`.*, `c`.`sip_host` AS `domain`, `c`.`contact` AS `contact_full`, `c`.`network_ip`, `c`.`network_port` \
FROM `gateways` `a` \
LEFT JOIN `gateway_settings` `b` ON `a`.`id` = `b`.`gateway_id` AND `b`.`name` = "inbound_username" \
@@ -57,6 +61,9 @@ function Gateway.find_by_id(self, id)
if gateway then
gateway.settings = self:config_table_get('gateway_settings', gateway.id);
+ if common.str.blank(gateway.domain) then
+ gateway.domain = gateway.settings.domain;
+ end
end
return gateway;