diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg index df70a6bf7a..ebe8b75c56 100644 --- a/resources/templates/provision/yealink/cp860/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1042,7 +1042,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1543,7 +1543,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2040,7 +2040,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2537,7 +2537,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg index 6726329ee3..4f5b781990 100644 --- a/resources/templates/provision/yealink/cp920/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -526,7 +526,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1041,7 +1041,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1543,7 +1543,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2042,7 +2042,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2540,7 +2540,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg index 687f53ae9f..c535a6ec8f 100644 --- a/resources/templates/provision/yealink/cp960/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -528,7 +528,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1043,7 +1043,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1544,7 +1544,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2040,7 +2040,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2537,7 +2537,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg index 402f7282ab..b5de465f4d 100644 --- a/resources/templates/provision/yealink/t19p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1029,7 +1029,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg index 43152be860..6a989f6a38 100644 --- a/resources/templates/provision/yealink/t20p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -706,7 +706,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1031,7 +1031,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1359,7 +1359,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1682,7 +1682,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2045,4 +2045,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg index d11c8a679f..7b40d38978 100644 --- a/resources/templates/provision/yealink/t21p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -528,7 +528,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1041,7 +1041,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1537,7 +1537,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2033,7 +2033,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2529,7 +2529,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg index 402f7282ab..b5de465f4d 100644 --- a/resources/templates/provision/yealink/t22p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1029,7 +1029,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index 30a654b5cf..1e9ca96c38 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg index f432568c91..eb61fc0e14 100644 --- a/resources/templates/provision/yealink/t23p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1013,7 +1013,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1489,7 +1489,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1965,7 +1965,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2441,7 +2441,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg index 0424805b83..9a2aab715e 100644 --- a/resources/templates/provision/yealink/t26p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1030,7 +1030,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg index 867997d05d..bf8bf55a59 100644 --- a/resources/templates/provision/yealink/t27g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1501,7 +1501,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1976,7 +1976,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2451,7 +2451,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3064,4 +3064,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index f67e0a4b0b..61be34b408 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1501,7 +1501,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1976,7 +1976,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2451,7 +2451,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg index 0424805b83..9a2aab715e 100644 --- a/resources/templates/provision/yealink/t28p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1030,7 +1030,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index 725072d368..d5420401ef 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3069,4 +3069,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t2x/{$mac}.cfg b/resources/templates/provision/yealink/t2x/{$mac}.cfg index 3ebd98af97..32e18247f5 100644 --- a/resources/templates/provision/yealink/t2x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t2x/{$mac}.cfg @@ -13,7 +13,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg index a05bfd1601..4b2c2065a4 100644 --- a/resources/templates/provision/yealink/t31g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg index 61d65c83f1..2fcb140a28 100644 --- a/resources/templates/provision/yealink/t32g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg index 52ce42a131..8e47d2daa4 100644 --- a/resources/templates/provision/yealink/t33g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg @@ -118,7 +118,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -689,7 +689,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1257,7 +1257,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1825,7 +1825,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2276,4 +2276,3 @@ account.4.acd.call_information= #bw.virtual_user.1.xsi.port= #bw.virtual_user.1.xsi.server_type= #bw.virtual_user.1.xsi.user= - diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg index 61d65c83f1..2fcb140a28 100644 --- a/resources/templates/provision/yealink/t38g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg index aedec45126..8f8b9f1ee2 100644 --- a/resources/templates/provision/yealink/t40g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1057,7 +1057,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1556,7 +1556,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2055,7 +2055,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2554,7 +2554,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg index 8602ce0f41..62f107dcb1 100644 --- a/resources/templates/provision/yealink/t40p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -533,7 +533,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1057,7 +1057,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1558,7 +1558,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2059,7 +2059,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2560,7 +2560,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg index 86b4884605..2cc4a21e69 100644 --- a/resources/templates/provision/yealink/t41p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1040,7 +1040,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1536,7 +1536,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2032,7 +2032,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2528,7 +2528,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg index f89a4641e8..85c87d65a3 100644 --- a/resources/templates/provision/yealink/t41s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg @@ -18,7 +18,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index 02c95b98f5..dcd3e396a3 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg index d0ad16b777..5b53f481c5 100644 --- a/resources/templates/provision/yealink/t42s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1974,7 +1974,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2445,7 +2445,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t43u/{$mac}.cfg b/resources/templates/provision/yealink/t43u/{$mac}.cfg index 5ef8b0aa0c..8efdebad1c 100644 --- a/resources/templates/provision/yealink/t43u/{$mac}.cfg +++ b/resources/templates/provision/yealink/t43u/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -682,7 +682,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1250,7 +1250,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1818,7 +1818,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2386,7 +2386,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} @@ -2954,7 +2954,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index 5af5ab0e81..92caf56923 100644 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -542,7 +542,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1028,7 +1028,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1504,7 +1504,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1980,7 +1980,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2456,7 +2456,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg index 2f78171ac8..770382a85e 100644 --- a/resources/templates/provision/yealink/t46s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1030,7 +1030,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1511,7 +1511,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1987,7 +1987,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2463,7 +2463,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t46u/{$mac}.cfg b/resources/templates/provision/yealink/t46u/{$mac}.cfg index 123bc52211..2819755115 100644 --- a/resources/templates/provision/yealink/t46u/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46u/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -677,7 +677,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1240,7 +1240,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1803,7 +1803,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2366,7 +2366,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} @@ -2929,7 +2929,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index 521d006b2a..c3e5f15479 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3078,4 +3078,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg index 3058905f95..e5fb1f2f90 100644 --- a/resources/templates/provision/yealink/t48s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1975,7 +1975,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2447,7 +2447,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3057,4 +3057,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg index 8936aed453..1822efc2fd 100644 --- a/resources/templates/provision/yealink/t49g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1066,7 +1066,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1565,7 +1565,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2064,7 +2064,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2563,7 +2563,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg index 7dc01d9b7f..14e0cb1749 100644 --- a/resources/templates/provision/yealink/t4x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg @@ -14,7 +14,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg index db8bdc0c6f..2945091c9b 100644 --- a/resources/templates/provision/yealink/t52s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg @@ -200,7 +200,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -266,7 +266,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg index 5ad109b6a3..c00cf68c6b 100644 --- a/resources/templates/provision/yealink/t53/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53/{$mac}.cfg @@ -113,7 +113,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -652,7 +652,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1179,7 +1179,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1706,7 +1706,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2232,7 +2232,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2772,7 +2772,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3299,7 +3299,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3826,7 +3826,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4353,7 +4353,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4880,7 +4880,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5314,5 +5314,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg index 05428c2ea2..5f601f2246 100644 --- a/resources/templates/provision/yealink/t53w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg @@ -113,7 +113,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -653,7 +653,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1181,7 +1181,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1709,7 +1709,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2236,7 +2236,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2777,7 +2777,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3305,7 +3305,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3833,7 +3833,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4361,7 +4361,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4889,7 +4889,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5324,5 +5324,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg index 59e0b3ff49..48c27929e5 100644 --- a/resources/templates/provision/yealink/t54s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg @@ -200,7 +200,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg index b28f886f07..a1500aaef1 100644 --- a/resources/templates/provision/yealink/t54w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg @@ -119,7 +119,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.password = {$row.password} diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg index 87b3ce9f74..5fa34e9f3e 100644 --- a/resources/templates/provision/yealink/t56a/{$mac}.cfg +++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg @@ -11,7 +11,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} {if isset($account.1.server.1.address)} @@ -484,7 +484,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -946,7 +946,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1409,7 +1409,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1875,7 +1875,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2344,7 +2344,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg index f0c5d53409..39af546c1f 100644 --- a/resources/templates/provision/yealink/t57w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -653,7 +653,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1180,7 +1180,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1707,7 +1707,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2233,7 +2233,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2773,7 +2773,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3300,7 +3300,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3827,7 +3827,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4354,7 +4354,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4881,7 +4881,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5315,5 +5315,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t58a/{$mac}.cfg b/resources/templates/provision/yealink/t58a/{$mac}.cfg index 87b3ce9f74..5fa34e9f3e 100644 --- a/resources/templates/provision/yealink/t58a/{$mac}.cfg +++ b/resources/templates/provision/yealink/t58a/{$mac}.cfg @@ -11,7 +11,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} {if isset($account.1.server.1.address)} @@ -484,7 +484,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -946,7 +946,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1409,7 +1409,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1875,7 +1875,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2344,7 +2344,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg index e57919a6ef..97f7edaa47 100644 --- a/resources/templates/provision/yealink/t58v/{$mac}.cfg +++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg @@ -14,7 +14,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} {if isset($row.server.1.address)} diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg index 757a7f53b4..d1f3df465b 100644 --- a/resources/templates/provision/yealink/t5x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg @@ -15,7 +15,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.password = {$row.password} diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg index ea28a079b2..1bf77c232d 100644 --- a/resources/templates/provision/yealink/vp530/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg index e1c245547f..b1b5a7f10e 100644 --- a/resources/templates/provision/yealink/vp59/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg @@ -13,7 +13,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.user_name = {$row.user_id} diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg index 0ddd832911..2f1a77748a 100644 --- a/resources/templates/provision/yealink/w52p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -347,7 +347,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 1. account.2.display_name = {$account.2.display_name} @@ -620,7 +620,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 1. account.3.display_name = {$account.3.display_name} @@ -893,7 +893,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 1. account.4.display_name = {$account.4.display_name} @@ -1168,7 +1168,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 1. account.5.display_name = {$account.5.display_name} diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg index 34a3c4bc49..7ee2288ff3 100644 --- a/resources/templates/provision/yealink/w56p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -332,7 +332,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 1. account.2.display_name = {$account.2.display_name} @@ -590,7 +590,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 1. account.3.display_name = {$account.3.display_name} @@ -848,7 +848,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 1. account.4.display_name = {$account.4.display_name} @@ -1108,7 +1108,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 1. account.5.display_name = {$account.5.display_name} diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg index 7146af437a..8890e0bac4 100644 --- a/resources/templates/provision/yealink/w60b/{$mac}.cfg +++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg @@ -10,7 +10,7 @@ #Basic Settings account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} {if isset($account.1.server.1.address)} @@ -300,7 +300,7 @@ voice_mail.number.1 = {$voicemail_number} #Basic Settings account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} {if isset($account.2.server.1.address)} @@ -546,7 +546,7 @@ voice_mail.number.2 = {$voicemail_number} #Basic Settings account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} {if isset($account.3.server.1.address)} @@ -792,7 +792,7 @@ voice_mail.number.3 = {$voicemail_number} #Basic Settings account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} {if isset($account.4.server.1.address)} @@ -1038,7 +1038,7 @@ voice_mail.number.4 = {$voicemail_number} #Basic Settings account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} {if isset($account.5.server.1.address)} @@ -1303,7 +1303,7 @@ network.internet_port.gateway = #Basic Settings account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} {if isset($account.6.server.1.address)} @@ -1568,7 +1568,7 @@ network.internet_port.gateway = #Basic Settings account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} {if isset($account.7.server.1.address)} @@ -1833,7 +1833,7 @@ network.internet_port.gateway = #Basic Settings account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} {if isset($account.8.server.1.address)}