From 4ce1efa2d12a61e28622c52fe2879097513d810a Mon Sep 17 00:00:00 2001
From: Mark J Crane <markjcrane@gmail.com>
Date: Fri, 23 Apr 2021 12:44:32 -0600
Subject: [PATCH] Use voicemail_number variable consistently in all SNOM
 templates.

---
 resources/templates/provision/snom/300/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/320/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/360/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/3xx/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/720/{$mac}.xml  |  2 +-
 resources/templates/provision/snom/7xx/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/8xx/{$mac}.xml  | 10 +++++-----
 resources/templates/provision/snom/D120/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D315/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D345/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D375/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D385/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D712/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D715/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D717/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D725/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D735/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D745/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D765/{$mac}.xml |  2 +-
 resources/templates/provision/snom/D785/{$mac}.xml |  2 +-
 20 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/resources/templates/provision/snom/300/{$mac}.xml b/resources/templates/provision/snom/300/{$mac}.xml
index 58ccfa15d4..abfd8b5e2c 100644
--- a/resources/templates/provision/snom/300/{$mac}.xml
+++ b/resources/templates/provision/snom/300/{$mac}.xml
@@ -70,7 +70,7 @@
 <user_pass idx="2" perm="">*****</user_pass>
 <user_pass idx="3" perm="">*****</user_pass>
 <user_pass idx="4" perm="">*****</user_pass>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_mailbox idx="2" perm=""></user_mailbox>
 <user_mailbox idx="3" perm=""></user_mailbox>
 <user_mailbox idx="4" perm=""></user_mailbox>
@@ -79,25 +79,25 @@
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_host idx="2" perm="">{$user.2.server_address}</user_host>
 <user_pass idx="2" perm="">{$user.2.password}</user_pass>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_srtp idx="2" perm="">off</user_srtp>
 <user_realname idx="3" perm="">{$user.3.display_name}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_host idx="3" perm="">{$user.3.server_address}</user_host>
 <user_pass idx="3" perm="">{$user.3.password}</user_pass>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_srtp idx="3" perm="">off</user_srtp>
 <user_realname idx="4" perm="">{$user.4.display_name}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_host idx="4" perm="">{$user.4.server_address}</user_host>
 <user_pass idx="4" perm="">{$user.4.password}</user_pass>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_srtp idx="4" perm="">off</user_srtp>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.password}</user_pass>
 <user_host idx="5" perm="">{$user.5.server_address}</user_host>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_srtp idx="5" perm="">off</user_srtp>
 <user_srtp idx="4" perm="">off</user_srtp>
 <user_ringer idx="1">Ringer6</user_ringer>
diff --git a/resources/templates/provision/snom/320/{$mac}.xml b/resources/templates/provision/snom/320/{$mac}.xml
index f3bc63ea4c..e7d6e90346 100644
--- a/resources/templates/provision/snom/320/{$mac}.xml
+++ b/resources/templates/provision/snom/320/{$mac}.xml
@@ -58,31 +58,31 @@
 <user_outbound idx="1" perm="">{$user.1.server_address}</user_outbound>
 <user_pname idx="1" perm=""></user_pname>
 <user_pass idx="1" perm="">{$user.1.password}</user_pass>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="2" perm="">{$user.2.display_name}</user_realname>
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_pass idx="2" perm="">{$user.2.password}</user_pass>
 <user_host idx="2" perm="">{$user.2.server_address}</user_host>
 <user_srtp idx="2" perm="">off</user_srtp>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="3" perm="">{$user.3.display_name}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_pass idx="3" perm="">{$user.3.password}</user_pass>
 <user_host idx="3" perm="">{$user.3.server_address}</user_host>
 <user_srtp idx="3" perm="">off</user_srtp>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="4" perm="">{$user.4.display_name}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_pass idx="4" perm="">{$user.4.password}</user_pass>
 <user_host idx="4" perm="">{$user.4.server_address}</user_host>
 <user_srtp idx="4" perm="">off</user_srtp>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.password}</user_pass>
 <user_host idx="5" perm="">{$user.5.domain_name}</user_host>
 <user_srtp idx="5" perm="">off</user_srtp>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_symmetrical_rtp idx="1" perm="">on</user_symmetrical_rtp>
 <user_ice idx="1" perm="">off</user_ice>
 <stun_server idx="1" perm=""></stun_server>
diff --git a/resources/templates/provision/snom/360/{$mac}.xml b/resources/templates/provision/snom/360/{$mac}.xml
index 6d68dfebef..2d28427bf0 100644
--- a/resources/templates/provision/snom/360/{$mac}.xml
+++ b/resources/templates/provision/snom/360/{$mac}.xml
@@ -24,35 +24,35 @@
 <user_host idx="1" perm="">{$user.1.server_address}</user_host>
 <user_server_type idx="1" perm="">Default</user_server_type>
 <user_srtp idx="1" perm="">off</user_srtp>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="2" perm="">{$user.2.display_name}</user_realname>
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_pass idx="2" perm="">{$user.2.password}</user_pass>
 <user_host idx="2" perm="">{$user.2.server_address}</user_host>
 <user_server_type idx="2" perm="">Default</user_server_type>
 <user_srtp idx="2" perm="">off</user_srtp>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="3" perm="">{$user.3.display_name}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_pass idx="3" perm="">{$user.3.password}</user_pass>
 <user_host idx="3" perm="">{$user.3.server_address}</user_host>
 <user_server_type idx="3" perm="">Default</user_server_type>
 <user_srtp idx="3" perm="">off</user_srtp>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="4" perm="">{$user.4.display_name}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_pass idx="4" perm="">{$user.4.password}</user_pass>
 <user_host idx="4" perm="">{$user.4.server_address}</user_host>
 <user_server_type idx="4" perm="">Default</user_server_type>
 <user_srtp idx="4" perm="">off</user_srtp>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.password}</user_pass>
 <user_host idx="5" perm="">{$user.5.server_address}</user_host>
 <user_server_type idx="5" perm="">Default</user_server_type>
 <user_srtp idx="5" perm="">off</user_srtp>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_symmetrical_rtp idx="1" perm="">on</user_symmetrical_rtp>
 <user_ice idx="1" perm="">off</user_ice>
 <stun_server idx="1" perm=""></stun_server>
diff --git a/resources/templates/provision/snom/3xx/{$mac}.xml b/resources/templates/provision/snom/3xx/{$mac}.xml
index 44bb8b281f..5b7193fd82 100644
--- a/resources/templates/provision/snom/3xx/{$mac}.xml
+++ b/resources/templates/provision/snom/3xx/{$mac}.xml
@@ -41,35 +41,35 @@
 <user_host idx="1" perm="">{$user.1.server_address}:{$user.1.sip_port};transport={$user.1.sip_transport}</user_host>
 <user_server_type idx="1" perm="">Default</user_server_type>
 <user_srtp idx="1" perm="">off</user_srtp>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="2" perm="">{$user.2.display_name}:{$user.2.sip_port};transport={$user.2.sip_transport}</user_realname>
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_pass idx="2" perm="">{$user.2.user_password}</user_pass>
 <user_host idx="2" perm="">{$user.2.server_address}</user_host>
 <user_server_type idx="2" perm="">Default</user_server_type>
 <user_srtp idx="2" perm="">off</user_srtp>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="3" perm="">{$user.3.display_name}:{$user.3.sip_port};transport={$user.3.sip_transport}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_pass idx="3" perm="">{$user.3.user_password}</user_pass>
 <user_host idx="3" perm="">{$user.3.server_address}</user_host>
 <user_server_type idx="3" perm="">Default</user_server_type>
 <user_srtp idx="3" perm="">off</user_srtp>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="4" perm="">{$user.4.display_name}:{$user.4.sip_port};transport={$user.4.sip_transport}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_pass idx="4" perm="">{$user.4.user_password}</user_pass>
 <user_host idx="4" perm="">{$user.4.server_address}</user_host>
 <user_server_type idx="4" perm="">Default</user_server_type>
 <user_srtp idx="4" perm="">off</user_srtp>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.user_password}</user_pass>
 <user_host idx="5" perm="">{$user.5.server_address}</user_host>
 <user_server_type idx="5" perm="">Default</user_server_type>
 <user_srtp idx="5" perm="">off</user_srtp>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_symmetrical_rtp idx="1" perm="">on</user_symmetrical_rtp>
 <user_ice idx="1" perm="">off</user_ice>
 <stun_server idx="1" perm=""></stun_server>
diff --git a/resources/templates/provision/snom/720/{$mac}.xml b/resources/templates/provision/snom/720/{$mac}.xml
index c725ff1c0c..f8133617df 100644
--- a/resources/templates/provision/snom/720/{$mac}.xml
+++ b/resources/templates/provision/snom/720/{$mac}.xml
@@ -625,7 +625,7 @@
 <user_expiry idx="10" perm="">3600</user_expiry>
 <user_expiry idx="11" perm="">3600</user_expiry>
 <user_expiry idx="12" perm="">3600</user_expiry>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_mailbox idx="2" perm=""></user_mailbox>
 <user_mailbox idx="3" perm=""></user_mailbox>
 <user_mailbox idx="4" perm=""></user_mailbox>
diff --git a/resources/templates/provision/snom/7xx/{$mac}.xml b/resources/templates/provision/snom/7xx/{$mac}.xml
index 46943e0c12..1472fe08ce 100644
--- a/resources/templates/provision/snom/7xx/{$mac}.xml
+++ b/resources/templates/provision/snom/7xx/{$mac}.xml
@@ -42,7 +42,7 @@
 <user_expiry idx="1" perm="">{$user.1.register_expires}</user_expiry>
 <user_server_type idx="1" perm="">Default</user_server_type>
 <user_srtp idx="1" perm="">off</user_srtp>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="2" perm="">{$user.2.display_name}</user_realname>
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_pass idx="2" perm="">{$user.2.password}</user_pass>
@@ -50,7 +50,7 @@
 <user_expiry idx="2" perm="">{$user.2.register_expires}</user_expiry>
 <user_server_type idx="2" perm="">Default</user_server_type>
 <user_srtp idx="2" perm="">off</user_srtp>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="3" perm="">{$user.3.display_name}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_pass idx="3" perm="">{$user.3.password}</user_pass>
@@ -58,7 +58,7 @@
 <user_expiry idx="3" perm="">{$user.3.register_expires}</user_expiry>
 <user_server_type idx="3" perm="">Default</user_server_type>
 <user_srtp idx="3" perm="">off</user_srtp>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="4" perm="">{$user.4.display_name}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_pass idx="4" perm="">{$user.4.password}</user_pass>
@@ -66,7 +66,7 @@
 <user_expiry idx="4" perm="">{$user.4.register_expires}</user_expiry>
 <user_server_type idx="4" perm="">Default</user_server_type>
 <user_srtp idx="4" perm="">off</user_srtp>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.password}</user_pass>
@@ -74,7 +74,7 @@
 <user_expiry idx="5" perm="">{$user.5.register_expires}</user_expiry>
 <user_server_type idx="5" perm="">Default</user_server_type>
 <user_srtp idx="5" perm="">off</user_srtp>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_symmetrical_rtp idx="1" perm="">on</user_symmetrical_rtp>
 <user_ice idx="1" perm="">off</user_ice>
 <stun_server idx="1" perm=""></stun_server>
diff --git a/resources/templates/provision/snom/8xx/{$mac}.xml b/resources/templates/provision/snom/8xx/{$mac}.xml
index 0e21a68274..6d04fd5c39 100644
--- a/resources/templates/provision/snom/8xx/{$mac}.xml
+++ b/resources/templates/provision/snom/8xx/{$mac}.xml
@@ -39,35 +39,35 @@
 <user_host idx="1" perm="">{$user.1.server_address}</user_host>
 <user_server_type idx="1" perm="">Default</user_server_type>
 <user_srtp idx="1" perm="">off</user_srtp>
-<user_mailbox idx="1" perm="">*97</user_mailbox>
+<user_mailbox idx="1" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="2" perm="">{$user.2.display_name}</user_realname>
 <user_name idx="2" perm="">{$user.2.user_id}</user_name>
 <user_pass idx="2" perm="">{$user.2.password}</user_pass>
 <user_host idx="2" perm="">{$user.2.server_address}</user_host>
 <user_server_type idx="2" perm="">Default</user_server_type>
 <user_srtp idx="2" perm="">off</user_srtp>
-<user_mailbox idx="2" perm="">*97</user_mailbox>
+<user_mailbox idx="2" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="3" perm="">{$user.3.display_name}</user_realname>
 <user_name idx="3" perm="">{$user.3.user_id}</user_name>
 <user_pass idx="3" perm="">{$user.3.password}</user_pass>
 <user_host idx="3" perm="">{$user.3.server_address}</user_host>
 <user_server_type idx="3" perm="">Default</user_server_type>
 <user_srtp idx="3" perm="">off</user_srtp>
-<user_mailbox idx="3" perm="">*97</user_mailbox>
+<user_mailbox idx="3" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="4" perm="">{$user.4.display_name}</user_realname>
 <user_name idx="4" perm="">{$user.4.user_id}</user_name>
 <user_pass idx="4" perm="">{$user.4.password}</user_pass>
 <user_host idx="4" perm="">{$user.4.server_address}</user_host>
 <user_server_type idx="4" perm="">Default</user_server_type>
 <user_srtp idx="4" perm="">off</user_srtp>
-<user_mailbox idx="4" perm="">*97</user_mailbox>
+<user_mailbox idx="4" perm="">{$voicemail_number}</user_mailbox>
 <user_realname idx="5" perm="">{$user.5.display_name}</user_realname>
 <user_name idx="5" perm="">{$user.5.user_id}</user_name>
 <user_pass idx="5" perm="">{$user.5.password}</user_pass>
 <user_host idx="5" perm="">{$user.5.server_address}</user_host>
 <user_server_type idx="5" perm="">Default</user_server_type>
 <user_srtp idx="5" perm="">off</user_srtp>
-<user_mailbox idx="5" perm="">*97</user_mailbox>
+<user_mailbox idx="5" perm="">{$voicemail_number}</user_mailbox>
 <user_symmetrical_rtp idx="1" perm="">on</user_symmetrical_rtp>
 <user_ice idx="1" perm="">off</user_ice>
 <stun_server idx="1" perm=""></stun_server>
diff --git a/resources/templates/provision/snom/D120/{$mac}.xml b/resources/templates/provision/snom/D120/{$mac}.xml
index 67f7647640..cc8a092c40 100644
--- a/resources/templates/provision/snom/D120/{$mac}.xml
+++ b/resources/templates/provision/snom/D120/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D315/{$mac}.xml b/resources/templates/provision/snom/D315/{$mac}.xml
index ec5d2bf812..402c1df165 100644
--- a/resources/templates/provision/snom/D315/{$mac}.xml
+++ b/resources/templates/provision/snom/D315/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D345/{$mac}.xml b/resources/templates/provision/snom/D345/{$mac}.xml
index 04c3cf566d..cdb8d11f79 100644
--- a/resources/templates/provision/snom/D345/{$mac}.xml
+++ b/resources/templates/provision/snom/D345/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D375/{$mac}.xml b/resources/templates/provision/snom/D375/{$mac}.xml
index 2a892d1c7d..25fc7330ec 100644
--- a/resources/templates/provision/snom/D375/{$mac}.xml
+++ b/resources/templates/provision/snom/D375/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D385/{$mac}.xml b/resources/templates/provision/snom/D385/{$mac}.xml
index 5ba172e7be..0819e49668 100644
--- a/resources/templates/provision/snom/D385/{$mac}.xml
+++ b/resources/templates/provision/snom/D385/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D712/{$mac}.xml b/resources/templates/provision/snom/D712/{$mac}.xml
index edbfdf995e..c286aaf6ac 100644
--- a/resources/templates/provision/snom/D712/{$mac}.xml
+++ b/resources/templates/provision/snom/D712/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D715/{$mac}.xml b/resources/templates/provision/snom/D715/{$mac}.xml
index 5eb68f626f..788a315034 100644
--- a/resources/templates/provision/snom/D715/{$mac}.xml
+++ b/resources/templates/provision/snom/D715/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D717/{$mac}.xml b/resources/templates/provision/snom/D717/{$mac}.xml
index 736a6190a5..dc69d7d76d 100644
--- a/resources/templates/provision/snom/D717/{$mac}.xml
+++ b/resources/templates/provision/snom/D717/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D725/{$mac}.xml b/resources/templates/provision/snom/D725/{$mac}.xml
index cbd7823ee7..21e3f255a8 100644
--- a/resources/templates/provision/snom/D725/{$mac}.xml
+++ b/resources/templates/provision/snom/D725/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D735/{$mac}.xml b/resources/templates/provision/snom/D735/{$mac}.xml
index 1f689f9182..f35e0d1a9b 100644
--- a/resources/templates/provision/snom/D735/{$mac}.xml
+++ b/resources/templates/provision/snom/D735/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D745/{$mac}.xml b/resources/templates/provision/snom/D745/{$mac}.xml
index b523ad23ac..6610a5a78d 100644
--- a/resources/templates/provision/snom/D745/{$mac}.xml
+++ b/resources/templates/provision/snom/D745/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
 	{if isset($account.{$row.line_number}.shared_line) }
 	<user_shared_line idx="{$row.line_number}" perm="RW">{$account.{$row.line_number}.shared_line}</user_shared_line>
 	{else}
diff --git a/resources/templates/provision/snom/D765/{$mac}.xml b/resources/templates/provision/snom/D765/{$mac}.xml
index 4c593ddad4..3ffbb140b8 100644
--- a/resources/templates/provision/snom/D765/{$mac}.xml
+++ b/resources/templates/provision/snom/D765/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml
index 9474cfd875..25f25a66db 100644
--- a/resources/templates/provision/snom/D785/{$mac}.xml
+++ b/resources/templates/provision/snom/D785/{$mac}.xml
@@ -58,7 +58,7 @@
     <user_expiry idx="{$row.line_number}" perm="R">{$row.register_expires}</user_expiry>
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
-    <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+    <user_mailbox idx="{$row.line_number}" perm="R">{$voicemail_number}</user_mailbox>
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>