From 2f26ec5db8663119c1ce450e7b3d60b78287415f Mon Sep 17 00:00:00 2001
From: James Rose <james.o.rose@gmail.com>
Date: Fri, 15 Aug 2014 00:48:15 +0000
Subject: [PATCH] more support for different voicemail numbers

---
 resources/templates/provision/cisco/spa501g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa502g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa504g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa508g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa509g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa512g/{$mac}.xml | 2 +-
 resources/templates/provision/cisco/spa514g/{$mac}.xml | 2 +-
 resources/templates/provision/yealink/t20p/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t22p/{$mac}.cfg  | 4 ++--
 resources/templates/provision/yealink/t26p/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t28p/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t32g/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t38g/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t46g/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/t48g/{$mac}.cfg  | 2 +-
 resources/templates/provision/yealink/vp530/{$mac}.cfg | 2 +-
 resources/templates/provision/yealink/w52p/{$mac}.cfg  | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 401b3cc864..083cfa3eeb 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -339,7 +339,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
   
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index 67dadfa99c..e6278457fd 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -346,7 +346,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General" />
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index da2c9f236a..968c24ff34 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -167,7 +167,7 @@
 <Daylight_Saving_Time_Rule group="Regional/Miscellaneous" />
 <Daylight_Saving_Time_Enable group="Regional/Miscellaneous">No</Daylight_Saving_Time_Enable>
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General">Default</Select_Logo>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index 7ede7e43ab..da16a8809c 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -345,7 +345,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General" />
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index a8dcf12786..5e20ed7d24 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -346,7 +346,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General" />
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index 012c798498..e2fca1853b 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -347,7 +347,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General">Default</Select_Logo>
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index 138491ac7b..1c84d70a9f 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -150,7 +150,7 @@
 <!-- Phone/General -->
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
-<Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
+<Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 <Text_Logo group="Phone/General" />
 <BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General" />
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index cd5c0bb272..548e98fcd5 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index 6f2ee3d906..7919e0ef3c 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -1,4 +1,4 @@
-#!version:1.0.0.1
+f#!version:1.0.0.1
 
 ##File header "#!version:1.0.0.1" can not be edited or deleted.##
 
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 81a6432295..ecc4c4997b 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 81a6432295..ecc4c4997b 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 6a92541823..b7de551e22 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 6a92541823..b7de551e22 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -58,7 +58,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 2440a9e80b..92c44b7616 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -143,7 +143,7 @@ account.1.advanced.timer_t1 =
 account.1.advanced.timer_t2 = 
 account.1.advanced.timer_t4 = 
 
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index dabf126fdb..d8871d847c 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -143,7 +143,7 @@ account.1.advanced.timer_t1 =
 account.1.advanced.timer_t2 = 
 account.1.advanced.timer_t4 = 
 
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index 06011bbc71..826dcf7683 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -63,7 +63,7 @@ account.1.backup_outbound_host =
 account.1.backup_outbound_port = 
 
 #Configure the voice mail number of account 1.
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 
 #Configure the proxy server to account 1.
 account.1.proxy_require = 
diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index 4af67aad40..a6bc0d586a 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -1205,7 +1205,7 @@ account.5.dnd.enable =
 #Configure the DND on code and off code for account5.
 
 #######################################################################################
-voice_mail.number.1 = *97
+voice_mail.number.1 = {$voicemail_number}
 ##                                   Network                                         ## 
 #######################################################################################