Merge branch 'develop'5.1-beta2

2 files changed, 9 insertions, 11 deletions

diff --git a/misc/freeswitch/scripts/phones/phone.lua b/misc/freeswitch/scripts/phones/phone.lua
index 856398b..6da20f0 100644
--- a/misc/freeswitch/scripts/phones/phone.lua
+++ b/misc/freeswitch/scripts/phones/phone.lua
@@ -28,10 +28,10 @@ function Phone.list_by_sql(self, sql_query)
 
     if phone.record.ieee_name == 'snom technology ag' then
       require 'phones.snom'
-      phone.model = phones.snom.Snom:new();
+      phone.model = phones.snom.Snom:new{ log = self.log };
     elseif account_entry.ieee_name == 'siemens enterprise communicationsgmbh & co. kg' then
       require 'phones.siemens'
-      phone.model = phones.siemens.Siemens:new();
+      phone.model = phones.siemens.Siemens:new{ log = self.log };
     end
     table.insert(account_phones, phone);
   end)
@@ -120,5 +120,8 @@ function Phone.resync(self, arg)
   end
 
   arg.ip_address = arg.ip_address or self.record.ip_address;
+  arg.http_user = arg.http_user or self.record.http_user;
+  arg.http_password = arg.http_password or self.record.http_password;
+
   return self.model:resync(arg);
-end
\ No newline at end of file
+end
diff --git a/misc/freeswitch/scripts/phones/snom.lua b/misc/freeswitch/scripts/phones/snom.lua
index 096ccb7..bb17796 100644
--- a/misc/freeswitch/scripts/phones/snom.lua
+++ b/misc/freeswitch/scripts/phones/snom.lua
@@ -53,13 +53,8 @@ function Snom.resync_http(self, ip_address, http_user, http_password, http_port)
     port_str = ':' .. http_port;
   end
 
-  get_command = 'wget --no-proxy -q -O /dev/null -o /dev/null -b --tries=2 --timeout=10 --user="' .. (http_user or '') .. '" --password="' .. (http_password or '') .. '"' ..
-  ' wget http://' .. tostring(ip_address):gsub('[^0-9%.]', '') .. port_str .. '/advanced.htm?reboot=Reboot' ..
-  ' 1>>/dev/null 2>>/dev/null &';
+  local command = 'http_request.lua snom_resync http://' .. tostring(ip_address):gsub('[^0-9%.]', '') .. port_str .. '/advanced.htm?reboot=Reboot ' .. (http_user or '') .. ' ' .. (http_password or '');
 
-  result = os.execute(get_command);
-
-  if result and tonumber(result) == 0  then
-    return true;
-  end
+  require 'common.fapi'
+  return common.fapi.FApi:new():execute('luarun', command);
 end