From e5895923f898d9d0f96ae1cf1173b065500445dd Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Fri, 21 May 2021 18:02:55 -0600
Subject: [PATCH] improved snom provisioning (#5954)

* improved snom provisioning
---
 resources/templates/provision/snom/D120/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D315/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D345/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D375/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D385/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D712/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D715/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D717/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D725/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D735/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D745/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D765/{$mac}.xml | 4 +++-
 resources/templates/provision/snom/D785/{$mac}.xml | 4 +++-
 13 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/resources/templates/provision/snom/D120/{$mac}.xml b/resources/templates/provision/snom/D120/{$mac}.xml
index cc8a092c40..33b6089b95 100644
--- a/resources/templates/provision/snom/D120/{$mac}.xml
+++ b/resources/templates/provision/snom/D120/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D315/{$mac}.xml b/resources/templates/provision/snom/D315/{$mac}.xml
index 402c1df165..1ea1ee36c3 100644
--- a/resources/templates/provision/snom/D315/{$mac}.xml
+++ b/resources/templates/provision/snom/D315/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D345/{$mac}.xml b/resources/templates/provision/snom/D345/{$mac}.xml
index cdb8d11f79..692f479ddd 100644
--- a/resources/templates/provision/snom/D345/{$mac}.xml
+++ b/resources/templates/provision/snom/D345/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D375/{$mac}.xml b/resources/templates/provision/snom/D375/{$mac}.xml
index 25fc7330ec..d0fbe2950e 100644
--- a/resources/templates/provision/snom/D375/{$mac}.xml
+++ b/resources/templates/provision/snom/D375/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D385/{$mac}.xml b/resources/templates/provision/snom/D385/{$mac}.xml
index 0819e49668..fdb886b8b6 100644
--- a/resources/templates/provision/snom/D385/{$mac}.xml
+++ b/resources/templates/provision/snom/D385/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D712/{$mac}.xml b/resources/templates/provision/snom/D712/{$mac}.xml
index c286aaf6ac..a9766d9996 100644
--- a/resources/templates/provision/snom/D712/{$mac}.xml
+++ b/resources/templates/provision/snom/D712/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D715/{$mac}.xml b/resources/templates/provision/snom/D715/{$mac}.xml
index 788a315034..28cfd240f7 100644
--- a/resources/templates/provision/snom/D715/{$mac}.xml
+++ b/resources/templates/provision/snom/D715/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D717/{$mac}.xml b/resources/templates/provision/snom/D717/{$mac}.xml
index dc69d7d76d..3707dfa877 100644
--- a/resources/templates/provision/snom/D717/{$mac}.xml
+++ b/resources/templates/provision/snom/D717/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D725/{$mac}.xml b/resources/templates/provision/snom/D725/{$mac}.xml
index 21e3f255a8..58492200bc 100644
--- a/resources/templates/provision/snom/D725/{$mac}.xml
+++ b/resources/templates/provision/snom/D725/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D735/{$mac}.xml b/resources/templates/provision/snom/D735/{$mac}.xml
index f35e0d1a9b..6b9f463a92 100644
--- a/resources/templates/provision/snom/D735/{$mac}.xml
+++ b/resources/templates/provision/snom/D735/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D745/{$mac}.xml b/resources/templates/provision/snom/D745/{$mac}.xml
index 6610a5a78d..d104e16c8e 100644
--- a/resources/templates/provision/snom/D745/{$mac}.xml
+++ b/resources/templates/provision/snom/D745/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D765/{$mac}.xml b/resources/templates/provision/snom/D765/{$mac}.xml
index 3ffbb140b8..af25af5f33 100644
--- a/resources/templates/provision/snom/D765/{$mac}.xml
+++ b/resources/templates/provision/snom/D765/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>
diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml
index 25f25a66db..d6705e3491 100644
--- a/resources/templates/provision/snom/D785/{$mac}.xml
+++ b/resources/templates/provision/snom/D785/{$mac}.xml
@@ -33,7 +33,9 @@
     <call_screen_fkeys_on_connected perm="">F_HOLD F_TRANSFER F_CONFERENCE</call_screen_fkeys_on_connected>
     <!-- Updates -->
     <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
-    <setting_server perm="RW">https://{if isset($http_auth_enabled) && $http_auth_enabled == true}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}</setting_server>
+    <setting_server perm="RW">{if isset($snom_provision_url)}{$snom_provision_url}{else}https://{$domain_name}{$project_path}/app/provision/index.php?mac={$mac}{/if}</setting_server>
+    <http_client_user perm="">{$http_auth_username}</http_client_user>
+    <http_client_pass perm="">{$http_auth_password}</http_client_pass>
     <!-- Admin Access -->
     {if isset($admin_password) }
     <http_user perm="R">{$admin_name}</http_user>