From 6af292e2baf56fff467811210262488751c5d063 Mon Sep 17 00:00:00 2001 From: Andrew Querol Date: Wed, 4 Nov 2020 12:06:42 -0600 Subject: [PATCH 1/5] Improve the GXV3370 template to handle multiple SIP lines and add missing settings --- .../provision/grandstream/gxv3370/{$mac}.xml | 498 +++++++++--------- 1 file changed, 258 insertions(+), 240 deletions(-) diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml index 59ed9860b2..7a3d246103 100644 --- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml @@ -27,425 +27,472 @@ - + {foreach $lines as $row} + {if $row.line_number neq ""} - Yes + {if $row.enabled}Yes{else}No{/if} - {$account.1.display_name} + {$row.display_name} - {$account.1.server_address} + {$row.server_address} - {$account.1.user_id} + {$row.user_id} - {$account.1.auth_id} + {$row.auth_id} - {$account.1.password} + {$row.password} - *97 + *97 - {$account.1.display_name} + {$row.display_name} - Disabled + Disabled - {$account.1.outbound_proxy_primary} + {$row.outbound_proxy_primary} - {$account.1.outbound_proxy_secondary} + {$row.outbound_proxy_secondary} - ARecord + ARecord - Default + Default - Auto + Auto - + - Yes + Yes - Instance + Instance - {$account.1.register_expires} + {$row.register_expires} - 0 + 0 - 20 + 20 - Yes + Yes - No + No - 30 + 30 - 3 + 3 - No + No - Default + Default - Default + Default - {$account.1.sip_transport} + {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if} - 5060 + {$row.sip_port} - sip + sip - No + No - Yes + Yes - 0_5sec + 0_5sec - 4sec + 4sec - 0 + 0 - InRoute + InRoute - No + No - 180 + 180 - 90 + 90 - Omit + Omit - UAC + UAC - No + No - No + No - No + No - No + No - PCMU - PCMA - G_726_32 - G_722 - G_729AOrB - iLBC - OPUS + PCMU + PCMA + G_726_32 + G_722 + G_729AOrB + iLBC + OPUS - Callee + Callee - No + No - 30ms + 30ms - 1 + 1 - 126 + 126 - 123 + 123 - No - Yes - No + No + Yes + No - 101 + 101 - Adaptive + Adaptive - No + No - 121 + 121 - 124 + 124 - No + No - 2 + 2 - Yes + Yes - No + No - 0 + 0 - 120 + 120 - Non-Interleaved + Non-Interleaved - 720P + 720P - No + No - BP&MP&HP + BP&MP&HP - 2048 + 2048 - MediaLevel + MediaLevel - 99 + 99 - Yes + Yes - 1080P + 1080P - BP&MP&HP + BP&MP&HP - 1024 + 1024 - 15 + 15 - UDP + UDP - Disabled + Disabled - AES128And256Bit + AES128And256Bit - Yes + Yes - + - No + No - Disable + Disable - Yes + Yes - Prompt + Prompt - EnableIntercom/Paging + EnableIntercom/Paging - Yes + Yes - No + No - Yes + Yes - No + No - No + No - All + All - No + No - No + No - Yes + Yes - + - + - 4 + 4 - 60 + 60 - No + No - Yes + Yes - + - 0 + 0 - {$grandstream_dial_plan} + {$grandstream_dial_plan} - Auto + Auto - content://settings/system/ringtone + content://settings/system/ringtone - No + No - + - content://settings/system/ringtone + content://settings/system/ringtone - + - content://settings/system/ringtone + content://settings/system/ringtone - + - content://settings/system/ringtone + content://settings/system/ringtone + # Web GUI Option Value + # Use System Ring tone content://settings/system/ringtone + # Silent ringtone_silence + # Ring2_OrganDub /system/media/audio/ringtones/Ring2_OrganDub.ogg + # Big_Easy /system/media/audio/ringtones/Big_Easy.ogg + # DonMessWivlt /system/media/audio/ringtones/DonMessWivIt.ogg + # Club_Cubano /system/media/audio/ringtones/Club_Cubano.ogg + # Growl /system/media/audio/ringtones/Growl.ogg + # CrayonRock /system/media/audio/ringtones/CrayonRock.ogg + # Ring9_Nairobi /system/media/audio/ringtones/Ring9_Nairobi.ogg + # Ring10_Nassau /system/media/audio/ringtones/Ring10_Nassau.ogg + # Third_Eye /system/media/audio/ringtones/Third_Eye.ogg + # Ring1_Ding /system/media/audio/ringtones/Ring1_Ding.ogg + # Road_Trip /system/media/audio/ringtones/Road_Trip.ogg + # bellcore-dr2 /system/media/audio/ringtones/bellcore-dr2.ogg + # Ring_Digital_02 /system/media/audio/ringtones/Ring_Digital_02.ogg + # bellcore-dr3 /system/media/audio/ringtones/bellcore-dr3.ogg + # DancinFool /system/media/audio/ringtones/DancinFool.ogg + # Ring_Classic_02 /system/media/audio/ringtones/Ring_Classic_02.ogg + # Ring5_FreeFlight /system/media/audio/ringtones/Ring5_FreeFlight.ogg + # Funk_Yall /system/media/audio/ringtones/Funk_Yall.ogg + # World /system/media/audio/ringtones/World.ogg + # Ring8_MidEvilJaunt /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg + # TwirlAway /system/media/audio/ringtones/TwirlAway.ogg + # bellcore-dr4 /system/media/audio/ringtones/bellcore-dr4.ogg + # Ring6_Glacial_Groove /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg + # Shes_All_That /system/media/audio/ringtones/Shes_All_That.ogg + # Ring4_EtherShake /system/media/audio/ringtones/Ring4_EtherShake.ogg + # Seville /system/media/audio/ringtones/Seville.ogg + # BussaMove /system/media/audio/ringtones/BussaMove.ogg + # Default_ringtone /system/media/audio/ringtones/Default_ringtone.ogg + # BirdLoop /system/media/audio/ringtones/BirdLoop.ogg + # MildlyAlarming /system/media/audio/ringtones/MildlyAlarming.ogg + # Terminated /system/media/audio/ringtones/Terminated.ogg + # Calypso_Steel /system/media/audio/ringtones/Calypso_Steel.ogg + # Safari /system/media/audio/ringtones/Safari.ogg + # Ring_Synth_04 /system/media/audio/ringtones/Ring_Synth_04.ogg + # Ring_Synth_02 /system/media/audio/ringtones/Ring_Synth_02.ogg + # CurveBall /system/media/audio/ringtones/CurveBall.ogg + # Enter_the_Nexus /system/media/audio/ringtones/Enter_the_Nexus.ogg + # Bollywood /system/media/audio/ringtones/Bollywood.ogg + # Champagne_Edition /system/media/audio/ringtones/Champagne_Edition.ogg + # Steppin_Out /system/media/audio/ringtones/Steppin_Out.ogg + # Ring3_Paradise_Island /system/media/audio/ringtones/Ring3_Paradise_Island.ogg + # Playa /system/media/audio/ringtones/Playa.ogg + # No_Limits /system/media/audio/ringtones/No_Limits.ogg + # LoopyLounge /system/media/audio/ringtones/LoopyLounge.ogg + # Cairo /system/media/audio/ringtones/Cairo.ogg + # Ring7_HalfwayHome /system/media/audio/ringtones/Ring7_HalfwayHome.ogg + # SilkyWay /system/media/audio/ringtones/SilkyWay.ogg + # LoveFlute /system/media/audio/ringtones/LoveFlute.ogg + # Eastern_Sky /system/media/audio/ringtones/Eastern_Sky.ogg + # bellcore-dr5 /system/media/audio/ringtones/bellcore-dr5.ogg + # Gimme_Mo_Town /system/media/audio/ringtones/Gimme_Mo_Town.ogg + # bellcore-dr1 /system/media/audio/ringtones/bellcore-dr1.ogg + # Backroad /system/media/audio/ringtones/Backroad.ogg --> - No + No - No + No - No + No - Disabled + Disabled - No + No - No + No - No + No - No + No - + - -1 + -1 - 100 + 100 + + + No + + + + ** + + + + {if isset($grandstream_feature_key_sync)}Yes{else}No{/if} + + + No + + + + + No + + + + No + + + + No + + + + + {if isset($row.shared_line)}Yes{else}No{/if} + + + + {if isset($row.shared_line)}Yes{else}No{/if} + + + Yes + + + + + 15 + {/if} + {/foreach} @@ -899,9 +946,9 @@ Allow - admin1 + {if isset($admin_password)}{$admin_password}{else}admin{/if} - user + {if isset($device_password)}{$device_password}{else}user{/if} @@ -986,11 +1033,17 @@ HTTP - + {if isset($grandstream_firmware_path) && isset($firmware_version)} + {$grandstream_firmware_path}/{$firmware_version} + {elseif isset($grandstream_firmware_path)} + {$grandstream_firmware_path} + {else} + {$domain_name}{$project_path}/app/provision/resources/firmware/ + {/if} - + {$http_auth_username} - + {$http_auth_password} @@ -999,11 +1052,17 @@ HTTP + {if $grandstream_config_server_path=="none"} + {elseif isset($grandstream_config_server_path)} + {$grandstream_config_server_path} + {else} + {$domain_name}{$project_path}/app/provision + {/if} - + {$http_auth_username} - + {$http_auth_password} @@ -1081,9 +1140,7 @@ No - - - No + No No No @@ -1099,8 +1156,7 @@ No No No - - + @@ -1116,8 +1172,7 @@ - - ** + ** ** ** @@ -1208,43 +1263,6 @@ 0 - - - - No - - - No - - - - - No - - - - No - - - - No - - - - - No - - - - No - - - Yes - - - - - 15 From d2917b57a49978d89a8d62f049fbfa9bcd63eecb Mon Sep 17 00:00:00 2001 From: Andrew Querol Date: Wed, 4 Nov 2020 13:06:01 -0600 Subject: [PATCH 2/5] Enable MPK support --- .../provision/grandstream/gxv3370/{$mac}.xml | 73 ++++--------------- 1 file changed, 14 insertions(+), 59 deletions(-) diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml index 7a3d246103..ba91904f09 100644 --- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml @@ -1140,54 +1140,6 @@ No - - No - No - No - No - No - No - No - No - No - No - No - No - No - No - No - - - - - - - - - - - - - - - - - - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** - ** @@ -1268,23 +1220,26 @@ + {$keyIndex=1} - SpeedDial + {$key_types=["none"=>"","speed dial"=>"SpeedDial","blf"=>"BLF","speed dial active"=>"SpeedDialViaActiveAccount","dial dtmf"=>"DialDTMF","intercom"=>"Intercom","transfer"=>"Transfer","call park"=>"CallPark","multicast paging"=>"MulticastPaging","conference"=>"Conference"]} + {foreach $keys as $category => $rows} + {foreach $rows as $row} + {if isset($row.device_key_type)} + {$key_types[$row.device_key_type]} - Account1 + Account{$row.device_key_line} - + {$row.device_key_label} - - - - SpeedDial - Account1 - - - + {$row.device_key_value} + device_key_extension + {$keyIndex=$keyIndex+1} + {/if} + {/foreach} + {/foreach} From cdab2a752c0de2335c42869979bd1fe1d91e1798 Mon Sep 17 00:00:00 2001 From: Andrew Querol Date: Thu, 5 Nov 2020 09:43:51 -0600 Subject: [PATCH 3/5] Fix the whitespace inconsistency --- app/grandstream/app_config.php | 80 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 6071721f35..04ed271cf0 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -614,45 +614,45 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Ring Timeout (in seconds). Default is 60 (30-3600)"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06a35172-1bea-4611-87d0-9d66475ae709"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wallpaper_source"; - $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'] = "false"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background"; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7ee552de-4634-4d61-8869-e0f5230858fa"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_display_language"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "Auto"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Display Language. See provision profile for codes."; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "19604f85-b643-4b92-8e28-9c09c34cf559"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_blind_xfer_blf"; - $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 Blind Transfer to BLF Yes=1, No=0. Default=0"; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "82b7076b-e596-49e8-b535-af86e21e0453"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_address_mode"; - $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'] = "IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE. Default is 0"; - $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6ab26457-fcc8-414e-8ac5-ae681f114974"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_speaker_ring_volume"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "5"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Number: 0-7. Default is 5."; - $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06a35172-1bea-4611-87d0-9d66475ae709"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wallpaper_source"; + $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'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7ee552de-4634-4d61-8869-e0f5230858fa"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_display_language"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "Auto"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Display Language. See provision profile for codes."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "19604f85-b643-4b92-8e28-9c09c34cf559"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_blind_xfer_blf"; + $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 Blind Transfer to BLF Yes=1, No=0. Default=0"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "82b7076b-e596-49e8-b535-af86e21e0453"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_address_mode"; + $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'] = "IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE. Default is 0"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6ab26457-fcc8-414e-8ac5-ae681f114974"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_speaker_ring_volume"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "5"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Number: 0-7. Default is 5."; + $y++; ?> From c959b8cd10e2bcad7153cd55908d45ffb54cc292 Mon Sep 17 00:00:00 2001 From: Andrew Querol Date: Thu, 5 Nov 2020 10:15:32 -0600 Subject: [PATCH 4/5] Add in the new default settings and enable WiFi management. --- app/grandstream/app_config.php | 40 +++++++++++++++++++ .../provision/grandstream/gxv3370/{$mac}.xml | 14 ++++--- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 04ed271cf0..e7a9fa208c 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -654,5 +654,45 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Number: 0-7. Default is 5."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6f3f3390-2b69-4898-a4d9-e62249d58d58"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_feature_key_sync"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure Broadsoft feature key synchronization on supported phones"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a6c84c0b-a7f1-4457-8afb-b64af601597d"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_enable"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi radio on supported phones. If disabled allow the device to manage itself"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f7fdbe09-0d4a-4d06-b70b-e25cdf1b3376"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_essid"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi ESSID on supported phones"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2edaa516-d87e-410f-8ddc-1cc468dabd2e"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_password"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi password on supported phones"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7b525ca5-96ae-4104-ad6c-c929f85c30dc"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_hidden_security"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "None"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the security to use when connecting to a hidden SSID. Valid values: None, WEP, WPA/WPA2_PSK, 802.1X_EAP"; + $y++; ?> diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml index ba91904f09..085bd7a811 100644 --- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml @@ -457,7 +457,7 @@ - {if isset($grandstream_feature_key_sync)}Yes{else}No{/if} + {if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} No @@ -733,17 +733,21 @@ + {if isset($grandstream_wifi_enable)} - No + {if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} - + {if isset($grandstream_wifi_essid)} + {$grandstream_wifi_essid} - + {$grandstream_wifi_password} - None + {$grandstream_wifi_hidden_security} + {/if} 0 + {/if} From cbd8a542aa8ba10e587f54fba85738b20a077817 Mon Sep 17 00:00:00 2001 From: Andrew Querol Date: Tue, 10 Nov 2020 12:34:57 -0600 Subject: [PATCH 5/5] Fix issue where accounts would not be removed. --- .../provision/grandstream/gxv3370/{$mac}.xml | 299 +++++++++--------- 1 file changed, 149 insertions(+), 150 deletions(-) diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml index 085bd7a811..3875638899 100644 --- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml @@ -27,336 +27,336 @@ - {foreach $lines as $row} - {if $row.line_number neq ""} + {for $line=1 to 16} + {$row=$lines.$line} - {if $row.enabled}Yes{else}No{/if} + {if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} - {$row.display_name} + {$row.display_name} - {$row.server_address} + {$row.server_address} - {$row.user_id} + {$row.user_id} - {$row.auth_id} + {$row.auth_id} - {$row.password} + {$row.password} - *97 + *97 - {$row.display_name} + {$row.display_name} - Disabled + Disabled - {$row.outbound_proxy_primary} + {$row.outbound_proxy_primary} - {$row.outbound_proxy_secondary} + {$row.outbound_proxy_secondary} - ARecord + ARecord - Default + Default - Auto + Auto - + - Yes + Yes - Instance + Instance - {$row.register_expires} + {$row.register_expires} - 0 + 0 - 20 + 20 - Yes + Yes - No + No - 30 + 30 - 3 + 3 - No + No - Default + Default - Default + Default - {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if} + {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if} - {$row.sip_port} + {$row.sip_port} - sip + sip - No + No - Yes + Yes - 0_5sec + 0_5sec - 4sec + 4sec - 0 + 0 - InRoute + InRoute - No + No - 180 + 180 - 90 + 90 - Omit + Omit - UAC + UAC - No + No - No + No - No + No - No + No - PCMU - PCMA - G_726_32 - G_722 - G_729AOrB - iLBC - OPUS + PCMU + PCMA + G_726_32 + G_722 + G_729AOrB + iLBC + OPUS - Callee + Callee - No + No - 30ms + 30ms - 1 + 1 - 126 + 126 - 123 + 123 - No - Yes - No + No + Yes + No - 101 + 101 - Adaptive + Adaptive - No + No - 121 + 121 - 124 + 124 - No + No - 2 + 2 - Yes + Yes - No + No - 0 + 0 - 120 + 120 - Non-Interleaved + Non-Interleaved - 720P + 720P - No + No - BP&MP&HP + BP&MP&HP - 2048 + 2048 - MediaLevel + MediaLevel - 99 + 99 - Yes + Yes - 1080P + 1080P - BP&MP&HP + BP&MP&HP - 1024 + 1024 - 15 + 15 - UDP + UDP - Disabled + Disabled - AES128And256Bit + AES128And256Bit - Yes + Yes - + - No + No - Disable + Disable - Yes + Yes - Prompt + Prompt - EnableIntercom/Paging + EnableIntercom/Paging - Yes + Yes - No + No - Yes + Yes - No + No - No + No - All + All - No + No - No + No - Yes + Yes - + - + - 4 + 4 - 60 + 60 - No + No - Yes + Yes - + - 0 + 0 - {$grandstream_dial_plan} + {$grandstream_dial_plan} - Auto + Auto - content://settings/system/ringtone + content://settings/system/ringtone - No + No - + - content://settings/system/ringtone + content://settings/system/ringtone - + - content://settings/system/ringtone + content://settings/system/ringtone - + - content://settings/system/ringtone + content://settings/system/ringtone - No + No - No + No - No + No - Disabled + Disabled - No + No - No + No - No + No - No + No - + - -1 + -1 - 100 + 100 - No + No - + - ** + ** - {if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} + {if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} - No + No - + - No + No - No + No - No + No - {if isset($row.shared_line)}Yes{else}No{/if} + {if isset($row.shared_line)}Yes{else}No{/if} - {if isset($row.shared_line)}Yes{else}No{/if} + {if isset($row.shared_line)}Yes{else}No{/if} - Yes + Yes - + - 15 - {/if} - {/foreach} + 15 + {/for}