diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-12 09:57:41 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-12 09:57:41 +0100 |
| commit | 06416788b61a43c8b6c43e5b436778dd0ff817d3 (patch) | |
| tree | 07e4c04130b67dceccc793f39c23c793b1cd9bed /misc/freeswitch/scripts/common/sip_account.lua | |
| parent | dd975872925cab5dc5b1e15a31af7f5d1cc1385c (diff) | |
| parent | cbc6a6a5a004c99112e3d444c333e1ebf619962c (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'misc/freeswitch/scripts/common/sip_account.lua')
| -rw-r--r-- | misc/freeswitch/scripts/common/sip_account.lua | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/misc/freeswitch/scripts/common/sip_account.lua b/misc/freeswitch/scripts/common/sip_account.lua index 8dd432b..d023f20 100644 --- a/misc/freeswitch/scripts/common/sip_account.lua +++ b/misc/freeswitch/scripts/common/sip_account.lua @@ -38,8 +38,12 @@ function SipAccount.find_by_sql(self, where) `a`.`sip_accountable_id`, \ `a`.`hotdeskable`, \ `a`.`gs_node_id`, \ - `b`.`host` \ - FROM `sip_accounts` `a` JOIN `sip_domains` `b` ON `a`.`sip_domain_id` = `b`.`id` \ + `b`.`host`, \ + `c`.`sip_host`, \ + `c`.`profile_name` \ + FROM `sip_accounts` `a` \ + JOIN `sip_domains` `b` ON `a`.`sip_domain_id` = `b`.`id` \ + LEFT JOIN `sip_registrations` `c` ON `a`.`auth_name` = `c`.`sip_user` \ WHERE ' .. where .. ' LIMIT 1'; local sip_account = nil; |