Merge branch 'develop' of github.com:amooma/GS5 into develop

3 files changed, 11 insertions, 8 deletions

diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 53b300c..33204dc 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -42,7 +42,7 @@
     %prefer_saved_over_received_photo{:perm => 'RW'}= 'off'
     %no_dnd{:perm => 'RW'}= 'off'
     %transfer_on_hangup{:perm => 'RW'}= 'on'
-    %transfer_on_hangup_non_pots{:perm => 'RW'}= 'on'
+    %transfer_on_hangup_non_pots{:perm => 'RW'}= 'off'
     %call_join_xfer{:perm => 'RW'}= 'on'
     %conf_hangup{:perm => 'RW'}= 'on'
     %logon_wizard{:perm => 'RW'}= 'off'
diff --git a/misc/freeswitch/scripts/dialplan/functions.lua b/misc/freeswitch/scripts/dialplan/functions.lua
index 2ca51c8..32fad78 100644
--- a/misc/freeswitch/scripts/dialplan/functions.lua
+++ b/misc/freeswitch/scripts/dialplan/functions.lua
@@ -264,7 +264,7 @@ function Functions.account_node_change(self, caller)
 
   -- resync caller phones
   for index, phone_caller in ipairs(caller_phones) do
-    local result = phone_caller:resync{ auth_name = caller_sip_account.auth_name, domain = caller.domain };
+    local result = phone_caller:resync{ auth_name = caller_sip_account.record.auth_name, domain = caller_sip_account.record.host };
     self.log:info('NODE_CHANGE - resync phone - mac: ', phone_caller.record.mac_address, ', ip_address: ', phone_caller.record.ip_address, ', result: ', result);
   end
 
@@ -302,6 +302,7 @@ function Functions.user_login(self, caller, number, pin)
 
   if not caller_phone then
     self.log:notice('LOGIN - caller phone not found or not hot-deskable');
+    local result = phone_class:resync{ auth_name = caller_sip_account.record.auth_name, domain = caller_sip_account.record.host };
     return { continue = false, code = 403, phrase = 'Phone not hot-deskable', no_cdr = true }
   end
 
@@ -374,13 +375,13 @@ function Functions.user_login(self, caller, number, pin)
 
   -- resync destination phones
   for index, phone_destination in ipairs(destination_phones) do
-    local result = phone_destination:resync{ auth_name = destination_sip_account.auth_name, domain = caller.domain_local };
+    local result = phone_destination:resync{ auth_name = destination_sip_account.record.auth_name, domain = destination_sip_account.record.host };
     self.log:info('LOGIN - resync destination phone - mac: ', phone_destination.record.mac_address, ', ip_address: ', phone_destination.record.ip_address, ', result: ', result);
   end
 
   -- resync caller phones
   for index, phone_caller in ipairs(caller_phones) do
-    local result = phone_caller:resync{ auth_name = caller_sip_account.auth_name, domain = caller.domain };
+    local result = phone_caller:resync{ auth_name = caller_sip_account.record.auth_name, domain = caller_sip_account.record.host };
     self.log:info('LOGIN - resync caller phone - mac: ', phone_caller.record.mac_address, ', ip_address: ', phone_caller.record.ip_address, ', result: ', result);
   end
 
@@ -409,8 +410,9 @@ function Functions.user_logout(self, caller)
   
   local caller_phones = phone_class:find_all_hot_deskable_by_account(caller_sip_account.id);
   
-  if caller_phones == 0 then
+  if #caller_phones == 0 then
     self.log:notice('LOGOUT - caller phones not found or not hot-deskable');
+    local result = phone_class:resync{ auth_name = caller_sip_account.record.auth_name, domain = caller_sip_account.record.host };
     return { continue = false, code = 403, phrase = 'Phone not hot-deskable', no_cdr = true }
   end
 
@@ -426,7 +428,7 @@ function Functions.user_logout(self, caller)
 
   -- resync caller phones
   for index, phone_caller in ipairs(caller_phones) do
-    local result = phone_caller:resync{ auth_name = caller_sip_account.auth_name, domain = caller.domain };
+    local result = phone_caller:resync{ auth_name = caller_sip_account.record.auth_name, domain = caller_sip_account.record.host };
     self.log:info('LOGIN - resync caller phone - mac: ', phone_caller.record.mac_address, ', ip_address: ', phone_caller.record.ip_address, ', result: ', result);
   end
 
diff --git a/misc/freeswitch/scripts/phones/phone.lua b/misc/freeswitch/scripts/phones/phone.lua
index 6da20f0..57997ba 100644
--- a/misc/freeswitch/scripts/phones/phone.lua
+++ b/misc/freeswitch/scripts/phones/phone.lua
@@ -115,8 +115,9 @@ end
 
 function Phone.resync(self, arg)
   if not self.model then
-    self.log:notice('PHONE_RESYNC - unsupported phone model');
-    return false;
+    self.log:notice('PHONE_RESYNC phone model not found - trying Snom resync');
+    require 'phones.snom'
+    return phones.snom.Snom:new{ log = self.log }:resync(arg);
   end
 
   arg.ip_address = arg.ip_address or self.record.ip_address;