Update Grandstream Templates on most common models (#6479)

Add grandstream_missed_call_log, grandstream_missed_call_notification, grandstream_missed_call_backlight, grandstream_firmware_upgrade_protocol, grandstream_onhook_dial_barging,  grandstream_transfer_mode_via_vpk, grandstream_enable_call_features.
Add condition on grandstream_distinctive_ringtone_name_1, and grandstream_distinctive_ringtone_name_2.
Update Connection request user/pw to work better with GDMS.
On grandstream_wallpaper_url, use current setting name on GRP2613

app/grandstream/app_config.php

@@ -234,7 +234,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_phonebook_xml_server_path";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "mydomain.com/app/provision/";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "mydomain.com/app/provision/pb/";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Grandstream Phonebook Server Path - NOTE template adds MAC on the end of this if contact_grandstream is enabled.  This also requires nginx rewrite rules for phonebook.xml";
 		$y++;
@@ -846,4 +846,68 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Show Keys Label. 1 - Show, 2 - Hide, 0 - Toggle. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "13d088f2-5d1b-47bf-a9b5-e7fdc24faeec";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_missed_call_log";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Missed Call Log. 0 - Disabled, 1 - Enabled. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f6c06df3-1d62-4c1d-a10c-11ddd42e0dff";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_missed_call_notification";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2303515c-198c-4229-87e2-495e1121d0cf";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_missed_call_backlight";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "bc8725c3-29c7-4d99-ba4d-177070e6e398";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_firmware_upgrade_protocol";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "54222376-2427-4260-9553-c7c379fc9721";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_onhook_dial_barging";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f21df044-9ff4-426c-b87c-422786deac44";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_transfer_mode_via_vpk";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "00d3dc88-1f66-4cbb-81d1-5463e9c3dfa8";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_enable_call_features";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Call Features.  0 - no, 1 - yes";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4828806c-efae-44a8-9317-651313be2e60";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ptt_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable/Disable PTT. 0 - Disable, 1 - Enable. Default is 0.";
+		$y++;
 ?>

resources/templates/provision/grandstream/dp750/{$mac}.xml

@@ -2876,7 +2876,11 @@
 <!-- Upgrade via. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 <!-- Number: 0 to 2 -->
 <!-- Mandatory -->
+{if isset($grandstream_firmware_upgrade_protocol) }
+<P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+{else}
 <P6767>1</P6767>
+{/if}
 
 <!-- Firmware Server Path -->
 <!-- String: serveraddress  -->
@@ -3087,11 +3091,11 @@
 
 <!-- Connection Request Username	 -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- Connection Request Password	 -->
 <!-- String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- ##################################################### -->
 <!-- #  Maintenance/Security Settings/Web/SSH Settings  ## -->

resources/templates/provision/grandstream/grp2612/{$mac}.xml

@@ -801,7 +801,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
     <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -811,7 +815,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
     <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -2520,7 +2528,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
     <P6767>1</P6767>
+    {/if}
     
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -2621,11 +2633,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511>{$mac|replace:'-':''}</P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -2650,7 +2662,11 @@
     <!-- # Configuration Via Keypad Menu. 0 - Unrestricted, 1 - Basic settings only, 2 - Constraint mode, 3 - Locked Mode. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_configuration_via_keypad)}<P1357>{$grandstream_configuration_via_keypad}</P1357>{else}<P1357>0</P1357>{/if}
+    {if isset($grandstream_configuration_via_keypad)}
+    <P1357>{$grandstream_configuration_via_keypad}</P1357>
+    {else}
+    <P1357>0</P1357>
+    {/if}
 
     <!-- # Validate Server Certificates. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -3088,7 +3104,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -3440,7 +3460,12 @@
     <!-- # Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_onhook_dial_barging)}	
+    <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
     <P8397>1</P8397>	
+    {/if}	
+
 
     <!-- # Off-hook Auto Dial -->
     <!-- # String -->
@@ -3696,7 +3721,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4021,7 +4050,7 @@
 
     <!-- # NTP Update Interval -->
     <!-- # String -->
-    <!-- # Number: 5 - 1440， Default is 1440  -->
+    <!-- # Number: 5 - 1440, Default is 1440  -->
     <P5005>1440</P5005>
 
     <!-- # Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
@@ -4107,7 +4136,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -4181,7 +4214,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
@@ -4393,7 +4430,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4407,7 +4448,7 @@
     {if isset($grandstream_show_key_labels)}
         <P8386>{$grandstream_show_key_labels}</P8386>
     {else}
-        <P8386>1</P8386>
+        <P8386>0</P8386>
     {/if}
 
 

resources/templates/provision/grandstream/grp2613/{$mac}.xml

@@ -801,7 +801,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
     <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -811,7 +815,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
     <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -3358,7 +3366,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
     <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -3484,11 +3496,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511>{$mac|replace:'-':''}</P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -3971,7 +3983,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -4282,7 +4298,11 @@
     <!-- # Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_onhook_dial_barging)}	
+    <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
     <P8397>1</P8397>	
+    {/if}	
 
     <!-- # Off-hook Auto Dial -->
     <!-- # String -->
@@ -4536,7 +4556,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4955,7 +4979,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -5004,7 +5032,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
@@ -5014,10 +5046,9 @@
 
     <!-- # Wallpaper Server Path -->
     <!-- # String  -->
-{if isset($grandstream2135_wallpaper_url)}
+{if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
-    <P2917>{$grandstream2135_wallpaper_url}</P2917>
+    <P2917>{$grandstream_wallpaper_url}</P2917>
-
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -5216,7 +5247,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/grp2614/{$mac}.xml

@@ -801,7 +801,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
     <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -811,7 +815,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
     <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -4576,7 +4584,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
     <P6767>1</P6767>
+    {/if}
     
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -4702,11 +4714,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511>{$mac|replace:'-':''}</P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -5197,7 +5209,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -5549,7 +5565,11 @@
     <!-- # Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_onhook_dial_barging)}	
+    <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
     <P8397>1</P8397>	
+    {/if}	
 
     <!-- # Off-hook Auto Dial -->
     <!-- # String -->
@@ -5811,7 +5831,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -6286,7 +6310,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -6335,7 +6363,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
@@ -6567,7 +6599,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/grp2615/{$mac}.xml

@@ -801,7 +801,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
     <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -811,7 +815,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
     <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -5615,7 +5623,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
     <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -5741,11 +5753,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511>{$mac|replace:'-':''}</P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -6228,7 +6240,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -6580,7 +6596,11 @@
     <!-- # Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_onhook_dial_barging)}	
+    <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
     <P8397>1</P8397>	
+    {/if}	
 
     <!-- # Off-hook Auto Dial -->
     <!-- # String -->
@@ -6838,7 +6858,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7312,7 +7336,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -7361,7 +7389,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
@@ -7579,7 +7611,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/grp2616/{$mac}.xml

@@ -801,7 +801,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
     <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -811,7 +815,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
     <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6498,7 +6506,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
     <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6624,11 +6636,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511>{$mac|replace:'-':''}</P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7120,7 +7132,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7472,7 +7488,11 @@
     <!-- # Onhook Dial Barging. 0 - Disabled, 1 - Enabled. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_onhook_dial_barging)}	
+    <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
     <P8397>1</P8397>	
+    {/if}	
 
     <!-- # Off-hook Auto Dial -->
     <!-- # String -->
@@ -7734,7 +7754,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8209,7 +8233,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -8258,7 +8286,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
@@ -8490,7 +8522,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/gxp2130/{$mac}.xml

@@ -809,7 +809,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -819,7 +823,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6445,7 +6453,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P6767>2</P6767>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
+    <P6767>1</P6767>
+    {/if}
     
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6577,11 +6589,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7087,7 +7099,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7441,6 +7457,8 @@
     <!-- # Mandatory -->
     {if isset($grandstream_onhook_dial_barging)}	
     <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
+    <P8397>1</P8397>	
     {/if}	
 
     <!-- # Off-hook Auto Dial -->
@@ -7708,7 +7726,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8183,7 +8205,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -8232,7 +8258,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
@@ -8488,7 +8518,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/gxp2135/{$mac}.xml

@@ -739,10 +739,9 @@
     <!-- # Mandatory -->
     <P129>0</P129>
 
-    <!-- # Auto Answer. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- # Start Video Automatically. 0 - Disable, 1 - Enable. Default is 1. -->
     <!-- # Number: 0, 1 -->
-    <!-- # Mandatory -->
+    <P2314>0</P2314>
-    <P90>0</P90>
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -809,7 +808,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -819,7 +822,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6445,7 +6452,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P6767>2</P6767>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
+    <P6767>1</P6767>
+    {/if}
     
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6577,11 +6588,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7087,7 +7098,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7441,6 +7456,8 @@
     <!-- # Mandatory -->
     {if isset($grandstream_onhook_dial_barging)}	
     <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
+    <P8397>1</P8397>	
     {/if}	
 
     <!-- # Off-hook Auto Dial -->
@@ -7708,7 +7725,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8183,7 +8204,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -8232,7 +8257,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
@@ -8488,7 +8517,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/gxp2140/{$mac}.xml

@@ -809,7 +809,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -819,7 +823,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6445,7 +6453,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P6767>2</P6767>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
+    <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6577,11 +6589,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7087,7 +7099,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7441,6 +7457,8 @@
     <!-- # Mandatory -->
     {if isset($grandstream_onhook_dial_barging)}	
     <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
+    <P8397>1</P8397>	
     {/if}	
 
     <!-- # Off-hook Auto Dial -->
@@ -7708,7 +7726,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8183,7 +8205,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    {if isset($grandstream_dhcp_time_zone)}
+    <P143>{$grandstream_dhcp_time_zone}</P143>
+    {else}
+    <P143>1</P143>
+    {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -8232,7 +8258,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
@@ -8488,7 +8518,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/gxp2160/{$mac}.xml

@@ -809,7 +809,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -819,7 +823,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6445,7 +6453,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P6767>2</P6767>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
+    <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6577,11 +6589,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7087,7 +7099,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7708,7 +7724,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8232,7 +8252,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->

resources/templates/provision/grandstream/gxp2170/{$mac}.xml

@@ -809,7 +809,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -819,7 +823,11 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- # Matching Rule 2 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
@@ -6445,7 +6453,11 @@
     <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1.  -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P6767>2</P6767>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+    {else}
+    <P6767>1</P6767>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # String -->
@@ -6577,11 +6589,11 @@
 
     <!-- # Connection Request Username	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+	<P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password	 -->
     <!-- # String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+	<P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # Connection Request Port. Default is 7547. -->
     <!-- # Number -->
@@ -7087,7 +7099,11 @@
     <!-- # Disabled/Enabled. 0 - Disabled, 1 - Enabled. -->
     <!-- # Number: 0, 1. Default is 0 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_log) }
+    <P2981>{$grandstream_missed_call_log}</P2981>
+    {else}
     <P2981>0</P2981>
+    {/if}
 
     <!-- # Name.  -->
     <!-- # String -->
@@ -7441,6 +7457,8 @@
     <!-- # Mandatory -->
     {if isset($grandstream_onhook_dial_barging)}	
     <P8397>{$grandstream_onhook_dial_barging}</P8397>
+    {else}	
+    <P8397>1</P8397>	
     {/if}	
 
     <!-- # Off-hook Auto Dial -->
@@ -7708,7 +7726,11 @@
     <!-- # Enable Missed Call Notification. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_missed_call_notification) }
+    <P8393>{$grandstream_missed_call_notification}</P8393>
+    {else}
     <P8393>0</P8393>
+    {/if}
 
     <!-- # Enable Call Completion Service. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8183,10 +8205,10 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-{if isset($grandstream_dhcp_option_2_timezone_override) }
+    {if isset($grandstream_dhcp_time_zone)}
-    <P143>{$grandstream_dhcp_option_2_timezone_override}</P143>
+    <P143>{$grandstream_dhcp_time_zone}</P143>
     {else}
-    {if isset($grandstream_dhcp_time_zone)}<P143>{$grandstream_dhcp_time_zone}</P143>{else}<P143>0</P143>{/if}
+    <P143>1</P143>
     {/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
@@ -8236,7 +8258,11 @@
     <!-- # Disable Missed Call Backlight. 0 - No, 1 - Yes, 2 - Yes, but flash MWI LED. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P351>1</P351>
+    {if isset($grandstream_missed_call_backlight) }
+    <P351>{$grandstream_missed_call_backlight}</P351>
+    {else}
+    <P351>0</P351>
+    {/if}
 
     <!-- # Wallpaper Settings -->
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
@@ -8492,7 +8518,11 @@
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_transfer_mode_via_vpk)}
+    <P8390>{$grandstream_transfer_mode_via_vpk}</P8390>
+    {else}
     <P8390>0</P8390>
+    {/if}
 
     <!-- # Enable transfer via non-Transfer MPK. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/gxw42xx/{$mac}.xml

@@ -151,10 +151,14 @@
 <!--  String; between ascii values 33 and 126 -->
 <P1361>{$http_auth_password}</P1361>
 
-<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
+<!-- Firmware Upgrade and Provisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 <!-- Number: 0 to 2 -->
 <!-- Mandatory -->
+{if isset($grandstream_firmware_upgrade_protocol) }
+<P212>{$grandstream_firmware_upgrade_protocol}</P212>
+{else}
 <P212>2</P212>
+{/if}
 
 <!-- Firmware Server Path -->
 {if isset($grandstream_firmware_path) && isset($firmware_version)}
@@ -598,7 +602,15 @@
 {if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
 {if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
 {if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
-{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'dns srv'}
+    {if isset($grandstream_dnssrv_transport)}
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=0}
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2}
+        {else}{$tp=1}
+        {/if}
+	{else}{$tp=1}
+	{/if}
+{/if}
 <P130>{$tp}</P130>
 
 <!-- SIP Registration. 0 - no, 1 - yes -->
@@ -1045,7 +1057,11 @@
 <!-- Enable Call Features.  0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
 <!-- Mandatory -->
+{if isset($grandstream_enable_call_features) }
+<P191>{$grandstream_enable_call_features}</P191>
+{else}
 <P191>1</P191>
+{/if}
 
 <!-- Disable Call Waiting. 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->

resources/templates/provision/grandstream/ht814/{$mac}.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <!-- Grandstream XML Provisioning Configuration -->
 <gs_provision version="1">
 <mac>{$mac|replace:'-':''}</mac>
@@ -73,10 +72,14 @@
     <!-- # 0 - No, 1 - Yes (default is No) -->
     <P22030>0</P22030>
 
-    <!-- # Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade, 3 - FTP Upgrade, 4 - FTPS Upgrade. -->
+    <!-- # Firmware Upgrade and Provisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade, 3 - FTP Upgrade, 4 - FTPS Upgrade. -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P212>2</P212>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P212>{$grandstream_firmware_upgrade_protocol}</P212>
+    {else}
+    <P212>1</P212>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # Server address -->
@@ -234,11 +237,11 @@
 
     <!-- # Connection Request Username -->
     <!-- # String -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password -->
     <!-- # String -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # CPE SSL Certificate -->
     <P8220></P8220>

resources/templates/provision/grandstream/ht818/{$mac}.xml

@@ -73,10 +73,14 @@
     <!-- # 0 - No, 1 - Yes (default is No) -->
     <P22030>0</P22030>
 
-    <!-- # Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade, 3 - FTP Upgrade, 4 - FTPS Upgrade. -->
+    <!-- # Firmware Upgrade and Provisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade, 3 - FTP Upgrade, 4 - FTPS Upgrade. -->
     <!-- # Number: 0, 1, 2, 3, 4 -->
     <!-- # Mandatory -->
-    <P212>2</P212>
+    {if isset($grandstream_firmware_upgrade_protocol) }
+    <P212>{$grandstream_firmware_upgrade_protocol}</P212>
+    {else}
+    <P212>1</P212>
+    {/if}
 
     <!-- # Firmware Server Path -->
     <!-- # Server address -->
@@ -213,7 +217,7 @@
     <P1409>1</P1409>
 
     <!-- # ACS URL -->
-    <!-- #P4503= -->
+    <P4503>https://acs.gdms.cloud</P4503>
 
     <!-- # ACS Username -->
     <!-- # String -->
@@ -234,11 +238,11 @@
 
     <!-- # Connection Request Username -->
     <!-- # String -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- # Connection Request Password -->
     <!-- # String -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- # CPE SSL Certificate -->
     <P8220></P8220>
@@ -855,29 +859,37 @@
     <!-- # Distinctive Ring Tone Choice 1 -->
     <!-- # Number: 0-9 -->
     <!-- # Mandatory -->
-    <P870>0</P870>
+    <P870>{$grandstream_distinctive_ringtone_1}</P870>
 
     <!-- # Choice 1 incoming caller ID -->
     <!-- # String -->
-    <P871></P871>
+{if isset($grandstream_distinctive_ringtone_name_1)}
+    <P871>{$grandstream_distinctive_ringtone_name_1}</P871>
+{else}
+    <P871>ring1</P871>
+{/if}
 
     <!-- # Distinctive Ring Tone Choice 2 -->
     <!-- # Number: 0-9 -->
     <!-- # Mandatory -->
-    <P872>0</P872>
+    <P872>{$grandstream_distinctive_ringtone_2}</P872>
 
     <!-- # Choice 2 incoming caller ID -->
     <!-- # String -->
-    <P873></P873>
+{if isset($grandstream_distinctive_ringtone_name_2)}
+    <P873>{$grandstream_distinctive_ringtone_name_2}</P873>
+{else}
+    <P873>ring2</P873>
+{/if}
 
     <!-- # Distinctive Ring Tone Choice 3 -->
     <!-- # Number: 0-9 -->
     <!-- # Mandatory -->
-    <P874>0</P874>
+    <P874>{$grandstream_distinctive_ringtone_3}</P874>
 
     <!-- # Choice 3 incoming caller ID -->
     <!-- # String -->
-    <P875></P875>
+    <P875>{$grandstream_distinctive_ringtone_name_3}</P875>
 
     <!-- # Disable Call-Waiting. 0 - No, 1 - Yes -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/wp810/{$mac}.xml

@@ -197,7 +197,15 @@
 {if $sip_transport_1 == 'udp'}{$tp=0}{/if}
 {if $sip_transport_1 == 'tcp'}{$tp=1}{/if}
 {if $sip_transport_1 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_1 == 'dns srv'}{$tp=1}{/if}
+{if $sip_transport_1 == 'dns srv'}
+    {if isset($grandstream_dnssrv_transport)}
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=0}
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2}
+        {else}{$tp=1}
+        {/if}
+   	{else}{$tp=1}
+    {/if}
+{/if}
     <P130>{$tp}</P130>
 
     <!-- SIP Listening Mode. -->
@@ -620,7 +628,11 @@
 
     <!-- Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
     <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+    <P1488>ring1</P1488>
+{/if}
 
     <!-- Matching Rule 1 Distinctive Ringtone -->
     <!-- 0 - Default Ringtone -->
@@ -630,7 +642,11 @@
 
     <!-- Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
     <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+    <P1490>ring2</P1490>
+{/if}
 
     <!-- Matching Rule 2 Distinctive Ringtone -->
     <!-- 0 - Default Ringtone -->
@@ -941,7 +957,15 @@
 {if $sip_transport_2 == 'udp'}{$tp=0}{/if}
 {if $sip_transport_2 == 'tcp'}{$tp=1}{/if}
 {if $sip_transport_2 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_2 == 'dns srv'}{$tp=1}{/if}
+{if $sip_transport_2 == 'dns srv'}
+    {if isset($grandstream_dnssrv_transport)}
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=0}
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2}
+        {else}{$tp=1}
+        {/if}
+   	{else}{$tp=1}
+    {/if}
+{/if}
     <P448>{$tp}</P448>
 
     <!-- SIP Listening Mode. -->
@@ -1985,14 +2009,20 @@
     <!-- Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1. -->
     <!-- Number: 0, 1, 2, 3, 4 -->
     <!-- Mandatory -->
-    <P6767>1</P6767>
+{if isset($grandstream_firmware_upgrade_protocol) }
+    <P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+{else}
+    <P6767>2</P6767>
+{/if}
 
     <!-- Firmware Server Path -->
     <!-- String -->
-{if isset($grandstream_firmware_path)}
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
     <P192>{$grandstream_firmware_path}</P192>
 {else}
-    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    <P192>{$domain_name}{$project_path}/app/provision/resources/firmware/</P192>
 {/if}
 
     <!-- Firmware HTTP/HTTPS Username -->
@@ -2115,11 +2145,11 @@
 
     <!-- Connection Request Username -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4511></P4511>
+    <P4511>{$mac|replace:'-':''|upper}</P4511>
 
     <!-- Connection Request Password -->
     <!-- String: a-z, A-Z, 0-9 -->
-    <P4512></P4512>
+    <P4512>{$mac|replace:'-':''|upper}</P4512>
 
     <!-- Connection Request Port. Default is 7547. -->
     <!-- Number -->

resources/templates/provision/grandstream/wp820/{$mac}.xml

@@ -199,7 +199,15 @@
 {if $sip_transport_1 == 'udp'}{$tp=0}{/if}
 {if $sip_transport_1 == 'tcp'}{$tp=1}{/if}
 {if $sip_transport_1 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_1 == 'dns srv'}{$tp=1}{/if}
+{if $sip_transport_1 == 'dns srv'}
+    {if isset($grandstream_dnssrv_transport)}
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=0}
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2}
+        {else}{$tp=1}
+        {/if}
+   	{else}{$tp=1}
+    {/if}
+{/if}
 <P130>{$tp}</P130>
 
 <!-- # Local SIP Port. Default is 5060 -->
@@ -455,6 +463,10 @@
 <!-- # Account 1/Call Settings -->
 <!-- ############################################################### -->
 <!-- # Call Features -->
+<!-- # Start Video Automatically. 0 - Disable, 1 - Enable. Default is 1. -->
+<!-- # Number: 0, 1 -->
+<P2314>0</P2314>
+
 <!-- # Auto Answer When Idle.  0 - No, 1 - Yes, 2 - Enable Intercom/Paging  -->
 <!-- # Number: 0, 1, 2. Default is 0 -->
 <!-- # Mandatory -->
@@ -560,13 +572,21 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_1)}
 <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+{else}
+<P1488>ring1</P1488>
+{/if}
 
 <!-- # Matching Rule 1 Distinctive Ringtone (Cannot be provisioned by config template currently) -->
 
 <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- # String -->
+{if isset($grandstream_distinctive_ringtone_name_2)}
 <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+{else}
+<P1490>ring2</P1490>
+{/if}
 
 <!-- # Matching Rule 2 Distinctive Ringtone (Cannot be provisioned by config template currently) -->
 
@@ -832,7 +852,15 @@
 {if $sip_transport_2 == 'udp'}{$tp=0}{/if}
 {if $sip_transport_2 == 'tcp'}{$tp=1}{/if}
 {if $sip_transport_2 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_2 == 'dns srv'}{$tp=1}{/if}
+{if $sip_transport_2 == 'dns srv'}
+    {if isset($grandstream_dnssrv_transport)}
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=0}
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=2}
+        {else}{$tp=1}
+        {/if}
+   	{else}{$tp=1}
+    {/if}
+{/if}
 <P448>{$tp}</P448>
 
 <!-- # Local SIP Port. Default is 5060 -->
@@ -1001,17 +1029,29 @@
 <!-- # Send DTMF: In-audio. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($grandstream_senddtmf_inaudio) }    
+    <P2301>{$grandstream_senddtmf_inaudio}</P2301>
+{else}
     <P2301>0</P2301>
+{/if}
 
 <!-- # Send DTMF: Via RTP (RFC2833). 0 - No, 1 - Yes. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($grandstream_senddtmf_rtp) }    
+    <P2302>{$grandstream_senddtmf_rtp}</P2302>
+{else}
     <P2302>1</P2302>
+{/if}
 
 <!-- # Send DTMF: Via SIP INFO. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($grandstream_senddtmf_sipinfo) }    
+    <P2303>{$grandstream_senddtmf_sipinfo}</P2303>
+{else}
     <P2303>0</P2303>
+{/if}
 
 <!-- # DTMF Payload Type. Default is 101 -->
 <!-- # Number: 96 - 127 -->
@@ -1344,6 +1384,14 @@
 <!-- #################################################################### -->
 <!-- # Phone Settings/Call Settings                   				  ## -->
 <!-- #################################################################### -->
+<!-- # Enable Video Call. 0 - Yes, 1 - No. Default is 0. -->
+<!-- # Number: 0, 1 -->
+<P22091>1</P22091>
+
+<!-- # Default Video Zoom Area. Default is 0. -->
+<!-- # Number: 0 - 9 -->
+<P22324>0</P22324>
+
 <!-- # Disable Call Waiting. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
@@ -1477,7 +1525,11 @@
 <!-- # Enable/Disable PTT (Spectralink). 0 - Disable, 1 - Enable. Default is 0. -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($grandstream_ptt_enable)}
+<P22177>{$grandstream_ptt_enable}</P22177>
+{else}
 <P22177>0</P22177>
+{/if}
 
 <!-- # PTT payload size (ms). 10, 20, 30, 40, 50, 60. Default is 30. -->
 <!-- # Number: 10, 20, 30, 40, 50, 60 -->
@@ -1492,7 +1544,7 @@
 <!-- # PTT audio codecs. 0 - G711, 1 - G722, 2 - Opus. Default is 0. -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P22180>0</P22180>
+<P22180>1</P22180>
 
 <!-- # Emergency PTT/Paging Volume. 1-8. Default is 8. -->
 <!-- # Number: 1-8 -->
@@ -1501,7 +1553,7 @@
 
 <!-- # PTT caller ID -->
 <!-- # String -->
-<P22182>channel(*)</P22182>
+<P22182>{$account.1.display_name}</P22182>
 
 <!-- # (Spectralink) multicast address and port -->
 <!-- # String -->
@@ -1738,6 +1790,18 @@
 <!-- # String -->
 <P1588></P1588>
 
+<!-- # Wallpaper Settings -->
+<!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB, 3 - Uploaded, 4 - Color Background -->
+<!-- # Number: 0-4 -->
+<!-- # Mandatory -->
+<!-- <P2916>1</P2916> -->
+<!-- # Wallpaper Server Path -->
+<!-- # String  -->
+{if isset($grandstream_wallpaper_url)}
+<P2916>1</P2916>
+<P2917>{$grandstream_wallpaper_url}</P2917>
+{/if}
+
 <!-- #################################################################### -->
 <!-- # Network Settings/Wi-Fi Settings/Wi-Fi Basics                    ## -->
 <!-- #################################################################### -->
@@ -2013,7 +2077,11 @@
 <!-- # Date Display Format. 0 - Normal(M/D/YYYY), 1 - YYYY/MM/DD, 2 - MM/DD/YYYY, 3 - DD/MM/YYYY.  Default value is 1. -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_date_display_format)}
+<P102>{$grandstream_date_display_format}</P102>
+{else}
 <P102>2</P102>
+{/if}
 
 <!-- #################################################################### -->
 <!-- # System Settings/Time and Language/Language                      ## -->
@@ -2184,11 +2252,11 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 <!-- # Reboot -->
-<P1409>0</P1409>
+<P1409>1</P1409>
 
 <!-- # ACS URL -->
 <!-- # String  -->
-<P4503></P4503>
+<P4503>https://acs.gdms.cloud</P4503>
 
 <!-- # TR-069 Username -->
 <!-- # String -->
@@ -2208,11 +2276,11 @@
 
 <!-- # Connection Request Username	 -->
 <!-- # String: a-z, A-Z, 0-9 -->
-<P4511></P4511>
+<P4511>{$mac|replace:'-':''|upper}</P4511>
 
 <!-- # Connection Request Password	 -->
 <!-- # String: a-z, A-Z, 0-9 -->
-<P4512></P4512>
+<P4512>{$mac|replace:'-':''|upper}</P4512>
 
 <!-- # Connection Request Port.  -->
 <!-- # Number -->
@@ -2236,14 +2304,20 @@
 <!-- # Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1. Default is 2 -->
 <!-- # Number: 0, 1, 2, 3, 4 -->
 <!-- # Mandatory -->
+{if isset($grandstream_firmware_upgrade_protocol) }
+<P6767>{$grandstream_firmware_upgrade_protocol}</P6767>
+{else}
 <P6767>2</P6767>
+{/if}
 
 <!-- # Firmware Server Path -->
 <!-- # String -->
-{if isset($grandstream_firmware_path)}
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
 <P192>{$grandstream_firmware_path}</P192>
 {else}
-<P192>{$domain_name}{$project_path}/app/provision</P192>
+<P192>{$domain_name}{$project_path}/app/provision/resources/firmware/</P192>
 {/if}
 
 <!-- # Firmware HTTP/HTTPS User Name -->
@@ -2321,7 +2395,7 @@
 <!-- # Default is No -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
-<P194>1</P194>
+<P194>0</P194>
 
 <!-- # Automatic Upgrade Check Interval (m). Minimum 60 minutes. Default value is 10080 (7 days) -->
 <!-- # Number: 60 - 5256000 -->