MT#9177 Small fixes for yealink

ipeshinskaya/9177
Irina Peshinskaya 11 years ago
parent 9b9e2973ee
commit e39da24bc9

@ -204,6 +204,7 @@ has_field 'bootstrap_method' => (
options => [
{ label => 'Cisco', value => 'http' },
{ label => 'Panasonic', value => 'redirect_panasonic' },
{ label => 'Yealink', value => 'redirect_yealink' },
],
default => 'http',
element_attr => {

@ -63,7 +63,6 @@ sub rpc_https_call{
sub init_content_params{
my($self) = @_;
$self->params->{redirect_uri_params} ||= '{MAC}';
$self->{content_params} ||= {};
$self->content_params->{uri} = $self->get_bootstrap_uri();
@ -93,7 +92,7 @@ sub get_bootstrap_uri{
my $uri = $self->params->{redirect_uri};
my $uri_params = $self->params->{redirect_uri_params} || '';
if($uri){
if(!$uri =~/^https?:\/\//i ){
if($uri !~/^https?:\/\//i ){
$uri = 'http://'.$uri;
}
}else{

@ -34,10 +34,6 @@ function vendor2bootstrapMethod(vendorField){
bootstrapMethod = 'redirect_panasonic';
break;
;
case "linksys":
bootstrapMethod = 'redirect_linksys';
break;
;
case "yealink":
bootstrapMethod = 'redirect_yealink';
break;

Loading…
Cancel
Save