From 400192b426c867b82fa12ce756fc1a2a2e9cd4fe Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Mon, 25 Jul 2016 18:51:25 -0600
Subject: [PATCH] Add yealink remote phonebook name and url defaults.

---
 .../provision/yealink/cp860/y000000000037.cfg | 31 ++++++++++-
 .../provision/yealink/t20p/y000000000007.cfg  | 31 ++++++++++-
 .../provision/yealink/t21p/y000000000052.cfg  | 31 ++++++++++-
 .../provision/yealink/t22p/y000000000005.cfg  | 31 ++++++++++-
 .../provision/yealink/t23g/y000000000044.cfg  | 31 ++++++++++-
 .../provision/yealink/t23p/y000000000044.cfg  | 31 ++++++++++-
 .../provision/yealink/t26p/y000000000004.cfg  | 31 ++++++++++-
 .../provision/yealink/t27p/y000000000045.cfg  | 31 ++++++++++-
 .../provision/yealink/t28p/y000000000000.cfg  | 31 ++++++++++-
 .../provision/yealink/t29g/y000000000046.cfg  | 31 ++++++++++-
 .../provision/yealink/t32g/y000000000032.cfg  | 31 ++++++++++-
 .../provision/yealink/t38g/y000000000038.cfg  | 31 ++++++++++-
 .../provision/yealink/t41p/y000000000036.cfg  | 31 ++++++++++-
 .../provision/yealink/t42g/y000000000029.cfg  | 35 ++++++++----
 .../provision/yealink/t48g/y000000000035.cfg  | 35 ++++++++----
 .../provision/yealink/t49g/y000000000051.cfg  | 35 ++++++++----
 .../provision/yealink/vp530/y000000000023.cfg | 40 ++++++++++----
 .../provision/yealink/w52p/y000000000025.cfg  | 53 +++++++++++++++++--
 18 files changed, 531 insertions(+), 70 deletions(-)

diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index e59805a1e0..3f6cb017ee 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -557,8 +557,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index 4894e72606..12fdc5c255 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 7d3acbc8be..4d1dabcadd 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -517,8 +517,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index 2fb9dfb4b2..38a9228921 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 7d3acbc8be..4d1dabcadd 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -517,8 +517,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index 7d3acbc8be..4d1dabcadd 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -517,8 +517,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index df8ec4a63c..7e81d98382 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index 8368bd4861..bd9c553d52 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -517,8 +517,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg
index d5204afa3c..948df2e70e 100644
--- a/resources/templates/provision/yealink/t28p/y000000000000.cfg
+++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index cbae0438e6..4c23b07eea 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -517,8 +517,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index b3accbaf37..cde9c04d3f 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index 9976fb6536..915b8ff4ce 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -913,8 +913,35 @@ bw.feature_key_sync =
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.x.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##         	              LDAP Settings                                              ##
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 84c81f7ee1..fa11bb6897 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -557,8 +557,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index f76e48b7e8..ee306bf0b3 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -557,20 +557,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url_1}
-remote_phonebook.data.1.name = {$yealink_remote_phone_book_name_1}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
 
-remote_phonebook.data.2.url =  {$yealink_remote_phone_book_url_2}
-remote_phonebook.data.2.name = {$yealink_remote_phone_book_name_2}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
 
-remote_phonebook.data.3.url =  {$yealink_remote_phone_book_url_3}
-remote_phonebook.data.3.name = {$yealink_remote_phone_book_name_3}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
 
-remote_phonebook.data.4.url =  {$yealink_remote_phone_book_url_4}
-remote_phonebook.data.4.name = {$yealink_remote_phone_book_name_4}
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
 
-remote_phonebook.data.5.url =  {$yealink_remote_phone_book_url_5}
-remote_phonebook.data.5.name = {$yealink_remote_phone_book_name_5}
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index f989fc8f9d..3ea0a898b3 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -509,20 +509,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url_1}
-remote_phonebook.data.1.name = {$yealink_remote_phone_book_name_1}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
 
-remote_phonebook.data.2.url =  {$yealink_remote_phone_book_url_2}
-remote_phonebook.data.2.name = {$yealink_remote_phone_book_name_2}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
 
-remote_phonebook.data.3.url =  {$yealink_remote_phone_book_url_3}
-remote_phonebook.data.3.name = {$yealink_remote_phone_book_name_3}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
 
-remote_phonebook.data.4.url =  {$yealink_remote_phone_book_url_4}
-remote_phonebook.data.4.name = {$yealink_remote_phone_book_name_4}
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
 
-remote_phonebook.data.5.url =  {$yealink_remote_phone_book_url_5}
-remote_phonebook.data.5.name = {$yealink_remote_phone_book_name_5}
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index 9955fcbcea..e5a32e5624 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -557,20 +557,35 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url_1}
-remote_phonebook.data.1.name = {$yealink_remote_phone_book_name_1}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
 
-remote_phonebook.data.2.url =  {$yealink_remote_phone_book_url_2}
-remote_phonebook.data.2.name = {$yealink_remote_phone_book_name_2}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
 
-remote_phonebook.data.3.url =  {$yealink_remote_phone_book_url_3}
-remote_phonebook.data.3.name = {$yealink_remote_phone_book_name_3}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
 
-remote_phonebook.data.4.url =  {$yealink_remote_phone_book_url_4}
-remote_phonebook.data.4.name = {$yealink_remote_phone_book_name_4}
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
 
-remote_phonebook.data.5.url =  {$yealink_remote_phone_book_url_5}
-remote_phonebook.data.5.name = {$yealink_remote_phone_book_name_5}
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
 
 #######################################################################################
 ##                                   Network Directory                               ##
diff --git a/resources/templates/provision/yealink/vp530/y000000000023.cfg b/resources/templates/provision/yealink/vp530/y000000000023.cfg
index 0dd6d44434..1ab1b47517 100644
--- a/resources/templates/provision/yealink/vp530/y000000000023.cfg
+++ b/resources/templates/provision/yealink/vp530/y000000000023.cfg
@@ -791,20 +791,40 @@ remote_phonebook.display_name =
 
 #remote_phonebook.data.x.url =
 #remote_phonebook.data.X.name =
-remote_phonebook.data.1.url =
-remote_phonebook.data.1.name =
 
-remote_phonebook.data.2.url =
-remote_phonebook.data.2.name =
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
 
-remote_phonebook.data.3.url =
-remote_phonebook.data.3.name =
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
 
-remote_phonebook.data.4.url =
-remote_phonebook.data.4.name =
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
 
-remote_phonebook.data.5.url =
-remote_phonebook.data.5.name =
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
+
+#######################################################################################
+##                                   Network Directory                               ##
+#######################################################################################
 
 #Configure the interval(in minutes) for the phone to update phonebook,(1440 by default);
 directory.update_time_interval =
diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg
index ff071656e6..52429455a0 100644
--- a/resources/templates/provision/yealink/w52p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg
@@ -365,12 +365,57 @@ openvpn.url =
 
 
 #######################################################################################
-##                                   Contacts                                        ##
+##         	    Remote Phonebook                                                     ##
 #######################################################################################
+
 #Configure the access URL and dispaly name of the remote phonebook. X ranges from 1 to 5.
-remote_phonebook.data.X.url =
-remote_phonebook.data.X.name =
-directory.update_time_interval = 1440
+remote_phonebook.display_name =
+
+#remote_phonebook.data.x.url =
+#remote_phonebook.data.X.name =
+
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.name = Personal
+remote_phonebook.data.1.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.name = Organization
+remote_phonebook.data.2.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.name = Extensions
+remote_phonebook.data.3.url = https://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
+
+#######################################################################################
+##                                   Network Directory                               ##
+#######################################################################################
+
+#Configure the interval(in minutes) for the phone to update phonebook,(1440 by default);
+directory.update_time_interval =
+
+#Enable or disable the phone to match the incoming call with the contact in the remote phonebook; 0-Disabled, 1-Enabled(default);
+directory.incoming_call_match_enable =
+
+#Enable or disable the broadsoft directory; 0-Disabled (default), 1-Enabled;
+bw.directory_enable =
 
 #Network Phonebook
 xsi.host =