From 06501600d7424bb977d434efbb391331c1709c38 Mon Sep 17 00:00:00 2001
From: benwiesner1 <42681729+benwiesner1@users.noreply.github.com>
Date: Thu, 1 Aug 2019 09:59:12 -0700
Subject: [PATCH] Update {$mac}.cfg (#4407)

* Update {$mac}.cfg

cleaned up template / aded headset hook option

* Update {$mac}.cfg
---
 .../provision/polycom/5.x/{$mac}.cfg          | 35 +++++--------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 5d3315ce0e..7efa3f8705 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <PHONE>
 	<REGISTRATION
-
-		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+        {foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
 		reg.{$row.line_number}.label="{$row.display_name}"
 
@@ -17,13 +16,11 @@
 		reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
 		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
-
 		{if $row.sip_transport == ''}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.outboundProxy.transport="UDPOnly"{/if}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.outboundProxy.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.outboundProxy.transport="DNSnaptr"{/if}
-
 		{if isset($row.server_address_primary)}
 		reg.{$row.line_number}.server.1.address="{$row.server_address_primary}"
 		{else}
@@ -39,9 +36,7 @@
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.1.transport="UDPOnly"{/if}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.1.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.1.transport="DNSnaptr"{/if}
-
 		{if isset($row.register_expires)}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{/if}
-
 		reg.{$row.line_number}.server.2.address="{$row.server_address_secondary}"
 		{if isset($row.sip_port)}
 		reg.{$row.line_number}.server.2.port="{$row.sip_port}"
@@ -52,11 +47,8 @@
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.2.transport="UDPOnly"{/if}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.2.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.2.transport="DNSnaptr"{/if}
-
-		{if isset($row.register_expires)}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{/if}
-
-		{/foreach}
-		
+       		{if isset($row.register_expires)}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{/if}
+        	{/foreach}
 		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
 		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
 	/>
@@ -187,46 +179,36 @@
 		voIpProt.server.2.failOver.onlySignalWithRegistered="1" 
 		voIpProt.server.2.failOver.failBack.mode="duration"
 		voIpProt.server.2.failOver.failBack.timeout="120"
-
 		feature.bluetooth.radioOn="{$polycom_bluetooth_radio_on}"
 		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
 		voice.volume.persist.handsfree="1"
 		voice.volume.persist.headset="1"
 		feature.nonVolatileRingerVolume.enabled="1"
-		{if $headset_mode != ''}up.handsfreeMode="1"
-		up.headsetMode="{$headset_mode}"{/if}
-		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
-		{if isset($polycom_onetouchvoicemail)}
-			up.oneTouchVoiceMail="{$polycom_onetouchvoicemail}"
-		{else}
-			up.oneTouchVoiceMail="0"
-		{/if}
+		up.headsetMode="{$polycom_headset_mode}"
+		up.analogHeadsetOption="{$polycom_analog_headset_option}"
+		up.oneTouchVoiceMail="{$polycom_onetouchvoicemail}"
 		exchange.server.url="0.0.0.0"
 		up.warningLevel="2"
 		call.defaultTransferType="{$polycom_default_transfer_method}"
 		call.callWaiting.enable="{$polycom_call_waiting}"
 		call.callWaiting.ring="beep"
 		call.callsPerLineKey="{$polycom_calls_per_line_key}"
-		
 		up.OffHookLineView.enabled="{$polycom_offhook_line_view_enabled}"
 		prov.polling.enabled="{$polycom_provision_polling_enabled}"
 		prov.polling.time="{$polycom_provision_polling_time}"
 		feature.urlDialing.enabled="0"
 		feature.logUpload.enabled="{$polycom_log_upload_enabled}"
 		powerSaving.enable="{$polycom_power_saving_enable}"
-		up.headsetMode="1"
 		voice.aec.hf.enable="1"
 		voice.aec.hs.enable="1"
 		dir.local.readonly="{$polycom_contact_list_readonly}"
-	        video.enable="{$polycom_video_enable}"
+		video.enable="{$polycom_video_enable}"
 		video.callMode.default="{$polycom_video_audio_call_mode}"
 		feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"
-
 		msg.mwi.{$row.line_number}.callBackMode="contact"
 		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 	/>
-
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
@@ -236,8 +218,7 @@
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
 	/>
-
-	<usb 
+	<USB 
 		feature.callRecording.enabled="0"
 	/>
 </PHONE>