From c076fae4857e3eb1c954d6c624092fb68c868867 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 21 Jun 2022 17:25:11 -0600
Subject: [PATCH] Use # instead of * to prevent *97 conflict with voicemail.
 (#6430)

* Use # instead of * to prevent *97 conflict with voicemail.
---
 resources/templates/provision/cisco/8811/{$mac}.xml | 8 ++++----
 resources/templates/provision/cisco/8832/{$mac}.xml | 8 ++++----
 resources/templates/provision/cisco/8841/{$mac}.xml | 8 ++++----
 resources/templates/provision/cisco/8845/{$mac}.xml | 8 ++++----
 resources/templates/provision/cisco/8851/{$mac}.xml | 8 ++++----
 resources/templates/provision/cisco/8861/{$mac}.xml | 8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/templates/provision/cisco/8811/{$mac}.xml b/resources/templates/provision/cisco/8811/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8811/{$mac}.xml
+++ b/resources/templates/provision/cisco/8811/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
diff --git a/resources/templates/provision/cisco/8832/{$mac}.xml b/resources/templates/provision/cisco/8832/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8832/{$mac}.xml
+++ b/resources/templates/provision/cisco/8832/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
diff --git a/resources/templates/provision/cisco/8841/{$mac}.xml b/resources/templates/provision/cisco/8841/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8841/{$mac}.xml
+++ b/resources/templates/provision/cisco/8841/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
diff --git a/resources/templates/provision/cisco/8845/{$mac}.xml b/resources/templates/provision/cisco/8845/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8845/{$mac}.xml
+++ b/resources/templates/provision/cisco/8845/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
diff --git a/resources/templates/provision/cisco/8851/{$mac}.xml b/resources/templates/provision/cisco/8851/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8851/{$mac}.xml
+++ b/resources/templates/provision/cisco/8851/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
diff --git a/resources/templates/provision/cisco/8861/{$mac}.xml b/resources/templates/provision/cisco/8861/{$mac}.xml
index c3d68daca4..0f5d307c7c 100644
--- a/resources/templates/provision/cisco/8861/{$mac}.xml
+++ b/resources/templates/provision/cisco/8861/{$mac}.xml
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->