nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grandstream Provisioning File Updates (#6899)

Browse Source 
* Fixed issue with registration time for Grandstreams with registration expiration time set for less than 60 seconds
* Updated Grandstream GXP provisioning files to use values from registration expiration time
* Fixed physical key profile issues on GXP & GRP phones
This commit is contained in:
Zachary Kitchen
2024-02-19 22:07:12 -06:00
committed by GitHub
parent 3fb475d67d
commit 859f08fbb2
11 changed files with 4790 additions and 8457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/provision/resources/classes/provision.php
View File

@@ -826,7 +826,7 @@
}
//convert seconds to minutes for grandstream
if ($device_vendor == 'grandstream') {
if ($device_vendor == 'grandstream' && $register_expires >= 60) {
$register_expires = round($register_expires / 60);
}

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

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

8
resources/templates/provision/grandstream/grp2612w/{$mac}.xml
View File

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

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

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

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

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

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

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

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

@@ -903,21 +903,21 @@
<!-- DND Call Feature On -->
<!-- Pvalue P2344 -->
<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<!-- Pvalue P2345 -->
<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<!-- Pvalue P26013 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<!-- Pvalue P26014 -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

8
resources/templates/provision/grandstream/grp261x/{$mac}.xml
View File

@@ -684,18 +684,18 @@
<item name="account.{$line}.featureCodes.callFeatures">No</item>
<!-- DND Call Feature On -->
<item name="account.{$line}.featureCodes.dndOn"></item>
<item name="account.{$line}.featureCodes.dndOn">*78</item>
<!-- DND Call Feature Off -->
<item name="account.{$line}.featureCodes.dndOff"></item>
<item name="account.{$line}.featureCodes.dndOff">*79</item>
<!-- #Call Forward Unconditionally (All) - On -->
<!-- # String -->
<item name="account.{$line}.featureCodes.callForwardUnconditionallyOn"></item>
<item name="account.{$line}.featureCodes.callForwardUnconditionallyOn">*72</item>
<!-- #Call Forward Unconditionally (All) - Off -->
<!-- # String -->
<item name="account.{$line}.featureCodes.callForwardUnconditionallyOff"></item>
<item name="account.{$line}.featureCodes.callForwardUnconditionallyOff">*73</item>
<!-- #Call Forward Unconditionally (All) - Target -->
<!-- # String -->

13109
resources/templates/provision/grandstream/grp26xx/{$mac}.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -136,7 +136,7 @@
<!-- Register Expiration (m) -->
<!-- Number: 0 - 64800 -->
<item name="account.{$row.line_number}.sip.registerExpiration">15</item>
<item name="account.{$row.line_number}.sip.registerExpiration">{$row.register_expires}</item>
<!-- Subscribe Expiration (m) -->
<!-- Number: 0 - 64800 -->
@@ -657,7 +657,7 @@
<!-- # Custom Alert-Info for Auto Answer. -->
<!-- # String -->
<item name="account.{$row.line_number}.intercom.customCallInfoForAutoAnswer"/>
<item name="account.{$row.line_number}.intercom.customCallInfoForAutoAnswer"/></item>
<!-- ############################################################### -->
<!-- # Account 1/Feature Codes -->
@@ -668,46 +668,46 @@
<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
<!-- DND Call Feature On -->
<item name="account.{$row.line_number}.featureCodes.dndOn"/>
<item name="account.{$row.line_number}.featureCodes.dndOn"/>*78</item>
<!-- DND Call Feature Off -->
<item name="account.{$row.line_number}.featureCodes.dndOff"/>
<item name="account.{$row.line_number}.featureCodes.dndOff"/>*79</item>
<!-- #Call Forward Always - On -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"/>*72</item>
<!-- #Call Forward Always - Off -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"/>*73</item>
<!-- #Call Forward Always- Target -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyTarget"/></item>
<!-- #Call Forward Busy - On -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOn"/></item>
<!-- #Call Forward Busy - Off -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOff"/></item>
<!-- #Call Forward Busy - Target -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyTarget"/></item>
<!-- #Call Forward No Answer - On -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOn"/></item>
<!-- #Call Forward No Answer - Off -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOff"/></item>
<!-- #Call Forward No Answer - Target -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedTarget"/></item>
<!-- #Delayed Call Forward Wait Time (in seconds). Default is 12 -->
<!-- #Number: 1 - 120 -->
@@ -2944,10 +2944,10 @@
{/literal}
{assign var=key_types value=["none"=>-1,"line"=>0,"shared"=>1,"speed dial"=>10, "blf"=>11, "presence watcher"=>12,
"eventlist blf"=>13,"speed dial active"=>14,"dial dtmf"=>15,"voicemail"=>16,"call return"=>17,
"transfer"=>18,"call park"=>19,"intercom"=>20,"ldap search"=>21,"conference"=>22,"multicast paging"=>23,
"record"=>24,"call log"=>25,"monitored call park"=>26,"menu"=>27]}
{assign var=key_types value=["none"=>-1, "speed dial"=>0, "blf"=>1, "presence watcher"=>2,
"eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,
"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"conference"=>12,"multicast paging"=>13,
"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
{foreach $keys['line'] as $row}
{$line=$row.device_key_id}
@@ -3239,3 +3239,9 @@
</gs_provision>

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

@@ -136,7 +136,7 @@
<!-- Register Expiration (m) -->
<!-- Number: 0 - 64800 -->
<item name="account.{$row.line_number}.sip.registerExpiration">15</item>
<item name="account.{$row.line_number}.sip.registerExpiration">{$row.register_expires}</item>
<!-- Subscribe Expiration (m) -->
<!-- Number: 0 - 64800 -->
@@ -657,7 +657,7 @@
<!-- # Custom Alert-Info for Auto Answer. -->
<!-- # String -->
<item name="account.{$row.line_number}.intercom.customCallInfoForAutoAnswer"/>
<item name="account.{$row.line_number}.intercom.customCallInfoForAutoAnswer"/></item>
<!-- ############################################################### -->
<!-- # Account 1/Feature Codes -->
@@ -668,46 +668,46 @@
<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
<!-- DND Call Feature On -->
<item name="account.{$row.line_number}.featureCodes.dndOn"/>
<item name="account.{$row.line_number}.featureCodes.dndOn"/>*78</item>
<!-- DND Call Feature Off -->
<item name="account.{$row.line_number}.featureCodes.dndOff"/>
<item name="account.{$row.line_number}.featureCodes.dndOff"/>*79</item>
<!-- #Call Forward Always - On -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"/>*72</item>
<!-- #Call Forward Always - Off -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"/>*73</item>
<!-- #Call Forward Always- Target -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyTarget"/></item>
<!-- #Call Forward Busy - On -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOn"/></item>
<!-- #Call Forward Busy - Off -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyOff"/></item>
<!-- #Call Forward Busy - Target -->
<!-- # String -->
<item name="account.{$row.line_number}.featureCodes.callForwardBusyTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardBusyTarget"/></item>
<!-- #Call Forward No Answer - On -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOn"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOn"/></item>
<!-- #Call Forward No Answer - Off -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOff"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedOff"/></item>
<!-- #Call Forward No Answer - Target -->
<!-- #String -->
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedTarget"/>
<item name="account.{$row.line_number}.featureCodes.callForwardDelayedTarget"/></item>
<!-- #Delayed Call Forward Wait Time (in seconds). Default is 12 -->
<!-- #Number: 1 - 120 -->
@@ -1249,8 +1249,8 @@
<!-- TFTP, HTTP, HTTPS, FTP,FTPS -->
<item name="provisioning.firmware.protocol">HTTP</item>
<!-- Firmware Server Path -->
{if isset($grandstream_firmware_path) && isset($firmware_version)}
<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
{if isset($grandstream_firmware_path) && isset($grandstream_firmware_version)}
<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$grandstream_firmware_version}</item>
{elseif isset($grandstream_firmware_path)}
<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
{else}
@@ -2943,10 +2943,10 @@
<!-- # Phonebook(30), Paging(33) -->
{/literal}
{assign var=key_types value=["none"=>-1,"line"=>0,"shared"=>1,"speed dial"=>10, "blf"=>11, "presence watcher"=>12,
"eventlist blf"=>13,"speed dial active"=>14,"dial dtmf"=>15,"voicemail"=>16,"call return"=>17,
"transfer"=>18,"call park"=>19,"intercom"=>20,"ldap search"=>21,"conference"=>22,"multicast paging"=>23,
"record"=>24,"call log"=>25,"monitored call park"=>26,"menu"=>27]}
{assign var=key_types value=["none"=>-1, "speed dial"=>0, "blf"=>1, "presence watcher"=>2,
"eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,
"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"conference"=>12,"multicast paging"=>13,
"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
{foreach $keys['line'] as $row}
{$line=$row.device_key_id}
@@ -3240,4 +3240,4 @@
{/foreach}
</config>
</gs_provision>
</gs_provision>