summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-08-15 09:06:18 +0200
committerPeter Kozak <spag@golwen.net>2013-08-15 09:06:18 +0200
commita99f1f53cd46f1a3218b5ce20bc13db7a927c15e (patch)
treea85d26f262028d58139af1ebc9ea4da845b7316e
parent39066ee4a6518b1d80c273d9a363484365360f82 (diff)
diaplays error if phone model not found
-rw-r--r--app/controllers/config_yealink_controller.rb26
1 files changed, 21 insertions, 5 deletions
diff --git a/app/controllers/config_yealink_controller.rb b/app/controllers/config_yealink_controller.rb
index 900c4e2..d616191 100644
--- a/app/controllers/config_yealink_controller.rb
+++ b/app/controllers/config_yealink_controller.rb
@@ -41,7 +41,22 @@ class ConfigYealinkController < ApplicationController
end
end
- @phone.phone_model = PhoneModel.where(:name => 'Yealink W52P').first
+ phone_model = nil
+ if request.env['HTTP_USER_AGENT'].index('W52P')
+ phone_model = PhoneModel.where(:name => 'Yealink W52P').first
+ end
+
+ if ! phone_model
+ render(
+ :status => 404,
+ :layout => false,
+ :content_type => 'text/plain',
+ :text => "<!-- Phone Model not found in: \"#{request.env['HTTP_USER_AGENT']}\" -->",
+ )
+ return
+ end
+
+ @phone.phone_model = phone_model
if ! @phone.save
render(
:status => 500,
@@ -132,6 +147,7 @@ class ConfigYealinkController < ApplicationController
sip_account_entry['user_name'] = sip_account.auth_name
sip_account_entry['sip_server_host'] = sip_account.sip_domain
sip_account_entry['outbound_host'] = sip_account.sip_domain
+ sip_account_entry['sip_listen_port'] = 5060 + (index*2)
end
sip_account_entry
@@ -243,8 +259,8 @@ class ConfigYealinkController < ApplicationController
'backup_outbound_host' => '',
'backup_outbound_port' => '',
'anonymous_call' => '0',
- 'anonymous_call_oncode' => 'f-cliron',
- 'anonymous_call_offcode' => 'f-cliroff',
+ 'anonymous_call_oncode' => '',
+ 'anonymous_call_offcode' => '',
'reject_anonymous_call' => '0',
'anonymous_reject_oncode' => '',
'anonymous_reject_offcode' => '',
@@ -272,8 +288,8 @@ class ConfigYealinkController < ApplicationController
'dtmf.dtmf_payload' => '',
'dtmf.info_type' => '',
'dnd.enable' => '0',
- 'dnd.on_code' => 'f-dndon',
- 'dnd.off_code' => 'f-dndoff',
+ 'dnd.on_code' => '',
+ 'dnd.off_code' => '',
}
end