From 8b8aa09f40afef101e2a483ef8bb95adfd8d025c Mon Sep 17 00:00:00 2001
From: Vincent <619068384@qq.com>
Date: Thu, 16 Sep 2021 23:09:05 +0800
Subject: [PATCH]  Fix the registration failed after provision Flyingvoice
 phone. (#6054)

---
 .../provision/flyingvoice/fip10/{$mac}.cfg    |  4 ++--
 .../provision/flyingvoice/fip11c/{$mac}.cfg   |  6 +++---
 .../provision/flyingvoice/fip12wp/{$mac}.cfg  |  4 ++--
 .../provision/flyingvoice/fip13g/{$mac}.cfg   |  8 ++++----
 .../provision/flyingvoice/fip14g/{$mac}.cfg   | 16 +++++++--------
 .../provision/flyingvoice/fip15g/{$mac}.cfg   | 20 +++++++++----------
 .../provision/flyingvoice/fip16/{$mac}.cfg    |  4 ++--
 .../flyingvoice/fip16plus/{$mac}.cfg          |  4 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/resources/templates/provision/flyingvoice/fip10/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip10/{$mac}.cfg
index b362724f04..5ef0f18ad4 100644
--- a/resources/templates/provision/flyingvoice/fip10/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip10/{$mac}.cfg
@@ -115,7 +115,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -492,7 +492,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip11c/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip11c/{$mac}.cfg
index a2f696db2d..fbee8d279a 100644
--- a/resources/templates/provision/flyingvoice/fip11c/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip11c/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -493,7 +493,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
@@ -872,7 +872,7 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address}{else} account.3.sip_server.1.address= {$account.3.server_address}{/if}
 
 account.3.sip_server.1.port= {$account.3.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip12wp/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip12wp/{$mac}.cfg
index d8a4132f88..a6e34f0423 100644
--- a/resources/templates/provision/flyingvoice/fip12wp/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip12wp/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -493,7 +493,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip13g/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip13g/{$mac}.cfg
index 83c74539d0..e4080988f4 100644
--- a/resources/templates/provision/flyingvoice/fip13g/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip13g/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -493,7 +493,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
@@ -872,7 +872,7 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address}{else} account.3.sip_server.1.address= {$account.3.server_address}{/if}
 
 account.3.sip_server.1.port= {$account.3.sip_port}
 
@@ -1265,7 +1265,7 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address}{else} account.4.sip_server.1.address= {$account.4.server_address}{/if}
 
 account.4.sip_server.1.port= {$account.4.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip14g/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip14g/{$mac}.cfg
index cacc27599b..47455fb712 100644
--- a/resources/templates/provision/flyingvoice/fip14g/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip14g/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -493,7 +493,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
@@ -872,7 +872,7 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address}{else} account.3.sip_server.1.address= {$account.3.server_address}{/if}
 
 account.3.sip_server.1.port= {$account.3.sip_port}
 
@@ -1265,7 +1265,7 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address}{else} account.4.sip_server.1.address= {$account.4.server_address}{/if}
 
 account.4.sip_server.1.port= {$account.4.sip_port}
 
@@ -1657,7 +1657,7 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address}{else} account.5.sip_server.1.address= {$account.5.server_address}{/if}
 
 account.5.sip_server.1.port= {$account.5.sip_port}
 
@@ -2049,7 +2049,7 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address}{else} account.6.sip_server.1.address= {$account.6.server_address}{/if}
 
 account.6.sip_server.1.port= {$account.6.sip_port}
 
@@ -2442,7 +2442,7 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address}{else} account.7.sip_server.1.address= {$account.7.server_address}{/if}
 
 account.7.sip_server.1.port= {$account.7.sip_port}
 
@@ -2835,7 +2835,7 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address}{else} account.8.sip_server.1.address= {$account.8.server_address}{/if}
 
 account.8.sip_server.1.port= {$account.8.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip15g/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip15g/{$mac}.cfg
index efe5045db5..deb8631f57 100644
--- a/resources/templates/provision/flyingvoice/fip15g/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip15g/{$mac}.cfg
@@ -115,7 +115,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -513,7 +513,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
@@ -913,7 +913,7 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address}{else} account.3.sip_server.1.address= {$account.3.server_address}{/if}
 
 account.3.sip_server.1.port= {$account.3.sip_port}
 
@@ -1327,7 +1327,7 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address}{else} account.4.sip_server.1.address= {$account.4.server_address}{/if}
 
 account.4.sip_server.1.port= {$account.4.sip_port}
 
@@ -1740,7 +1740,7 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address}{else} account.5.sip_server.1.address= {$account.5.server_address}{/if}
 
 account.5.sip_server.1.port= {$account.5.sip_port}
 
@@ -2153,7 +2153,7 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address}{else} account.6.sip_server.1.address= {$account.6.server_address}{/if}
 
 account.6.sip_server.1.port= {$account.6.sip_port}
 
@@ -2567,7 +2567,7 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address}{else} account.7.sip_server.1.address= {$account.7.server_address}{/if}
 
 account.7.sip_server.1.port= {$account.7.sip_port}
 
@@ -2981,7 +2981,7 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address}{else} account.8.sip_server.1.address= {$account.8.server_address}{/if}
 
 account.8.sip_server.1.port= {$account.8.sip_port}
 
@@ -3395,7 +3395,7 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address}{else} account.9.sip_server.1.address= {$account.9.server_address}{/if}
 
 account.9.sip_server.1.port= {$account.9.sip_port}
 
@@ -3788,7 +3788,7 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address}{else} account.10.sip_server.1.address= {$account.10.server_address}{/if}
 
 account.10.sip_server.1.port= {$account.10.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip16/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip16/{$mac}.cfg
index 9dc8d96ede..5da5bb6b35 100644
--- a/resources/templates/provision/flyingvoice/fip16/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip16/{$mac}.cfg
@@ -103,7 +103,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -437,7 +437,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}
 
diff --git a/resources/templates/provision/flyingvoice/fip16plus/{$mac}.cfg b/resources/templates/provision/flyingvoice/fip16plus/{$mac}.cfg
index 9dc8d96ede..5da5bb6b35 100644
--- a/resources/templates/provision/flyingvoice/fip16plus/{$mac}.cfg
+++ b/resources/templates/provision/flyingvoice/fip16plus/{$mac}.cfg
@@ -103,7 +103,7 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address}{else} account.1.sip_server.1.address= {$account.1.server_address}{/if}
 
 account.1.sip_server.1.port= {$account.1.sip_port}
 
@@ -437,7 +437,7 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address}{else} account.2.sip_server.1.address= {$account.2.server_address}{/if}
 
 account.2.sip_server.1.port= {$account.2.sip_port}