From 083453784b7e3adb61c63d0acdae1b8e04fcf856 Mon Sep 17 00:00:00 2001 From: demonspork Date: Fri, 16 Oct 2020 18:47:01 -0500 Subject: [PATCH 1/4] Grandstream GXP and GRP feature Key Sync Grandstream GXP and GRP feature key sync variables. --- app/grandstream/app_config.php | 8 ++++++++ .../templates/provision/grandstream/gac2500/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2612/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2612w/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2613/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2614/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2615/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp2616/{$mac}.xml | 4 +++- .../templates/provision/grandstream/grp26xx/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp140x/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp140xbk/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2100/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2124/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2130/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2135/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2140/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2160/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp2170/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxp21xx/{$mac}.xml | 4 +++- .../templates/provision/grandstream/gxv3175v2/{$mac}.xml | 4 +++- 20 files changed, 65 insertions(+), 19 deletions(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 6071721f35..f2c7beaa4f 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -653,6 +653,14 @@ $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'] = "fd0e54fe-1008-11eb-adc1-0242ac120002"; + $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'] = "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'] = "Enabled: 1, Disabled: 0 Defaults to 0. Valid for firmware higher than 1.0.9.202 for the GXP series and all firmwares GRP phones."; $y++; ?> diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml index 44958da1f2..4f74aa830f 100644 --- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml +++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml @@ -449,7 +449,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml index 26f623e5fd..05912b6942 100644 --- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index 5b3e26f4cd..49c02f2dd1 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 113de1258a..880006a776 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index 29ca189204..ad83910545 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 1bd69836d5..656aa80993 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index efb9fc2ef2..56b57c1461 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml index 3532664e4b..af8f66ad50 100644 --- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml @@ -416,7 +416,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml index 9a9b3c0acb..95c8458dfe 100644 --- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml @@ -290,7 +290,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml index b2073dec5f..1d2ec672ae 100644 --- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml @@ -290,7 +290,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml index 2751136ec3..e29f069075 100644 --- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml @@ -243,7 +243,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml index 353fbb0256..b8865a457d 100644 --- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml @@ -166,7 +166,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml index c240ea921f..154fb94f60 100644 --- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index efaf755057..cf1b6cb7be 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml index efaf755057..cf1b6cb7be 100644 --- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml index 611dc4afc2..fb93d93b6d 100644 --- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml index e350b82463..7f283e6853 100644 --- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml @@ -420,7 +420,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml index 41ed4aeb41..6d15eb1f4b 100644 --- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml @@ -110,7 +110,9 @@ - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml index 331264c920..557d9ff422 100644 --- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml @@ -222,7 +222,9 @@ 100 - 0 +{if isset($grandstream_feature_key_sync)} + {$grandstream_feature_key_sync} +{/if} 1 From 21fd701e6958ecfb32ed529a2c25972c300fd1ec Mon Sep 17 00:00:00 2001 From: demonspork Date: Fri, 16 Oct 2020 18:49:06 -0500 Subject: [PATCH 2/4] Disable grandstream_feature_key_sync by default Disable grandstream_feature_key_sync by default because it requires the lua.conf.xml modification for the server to work with it. --- app/grandstream/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index f2c7beaa4f..0fa537d99f 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -658,7 +658,7 @@ $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'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $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'] = "Enabled: 1, Disabled: 0 Defaults to 0. Valid for firmware higher than 1.0.9.202 for the GXP series and all firmwares GRP phones."; $y++; From d5b88ba4dca4738f647c61d6f41e1781894e84c3 Mon Sep 17 00:00:00 2001 From: demonspork Date: Fri, 16 Oct 2020 18:51:32 -0500 Subject: [PATCH 3/4] Fix Indention Spaces instead of tabs :) --- app/grandstream/app_config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index 0fa537d99f..a3606b7d9f 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -653,8 +653,8 @@ $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'] = "fd0e54fe-1008-11eb-adc1-0242ac120002"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fd0e54fe-1008-11eb-adc1-0242ac120002"; $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'] = "numeric"; From a87a9b4311f2aab93b30bc9a80733661a1dc12ef Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 18 Nov 2020 08:40:28 -0700 Subject: [PATCH 4/4] Update app_config.php --- app/grandstream/app_config.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php index c760b39683..d7328dea1e 100644 --- a/app/grandstream/app_config.php +++ b/app/grandstream/app_config.php @@ -654,14 +654,14 @@ $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'] = "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'] = "Enabled: 1, Disabled: 0 Defaults to 0. Valid for firmware higher than 1.0.9.202 for the GXP series and all firmwares GRP phones."; - $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'] = "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'] = "Enabled: 1, Disabled: 0 Defaults to 0. Valid for firmware higher than 1.0.9.202 for the GXP series and all firmwares GRP 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"; @@ -695,4 +695,4 @@ $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++; -?> \ No newline at end of file +?>