dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

City Code for GXP Phones (#3064) 

* City Code for GXP Phones

This allows users to add custom city codes to tables.

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update app_config.php

* Update {$mac}.xml

This fixes the unintended consequences when users are trying to push an assigned BLF key to transfer a call it would attempt to perform an attended transfer rather than a blind transfer.

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml

* Update {$mac}.xml
This commit is contained in:
Zachary Kitchen 2018-05-23 15:12:40 -05:00 committed by FusionPBX
parent 0de7aecda0
commit b0c539a020
6 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/grandstream/app_config.php
View File

@ -388,4 +388,12 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0";
$y++; $y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5da62e0c-5eb0-11e8-9c2d-fa7ae01bbebc";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_city_code";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "Boise,ID";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter City to configure City for the Weather app on the Phone";
$y++;
?> ?>

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

@ -716,7 +716,7 @@
<!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 --> <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
<P2384>0</P2384> <P2384>1</P2384>
<!-- No Key Entry Timeout (in seconds). Default is 4 --> <!-- No Key Entry Timeout (in seconds). Default is 4 -->
<!-- Number: 1 - 15 --> <!-- Number: 1 - 15 -->
@ -5970,11 +5970,16 @@
<!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 --> <!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($grandstream_city_code)}
<P1405>0</P1405>
{else}
<P1405>1</P1405> <P1405>1</P1405>
{/if}
<!-- Self-Defined City Code -->
<!-- String --> <!-- # Self-Defined City Code -->
<P1377></P1377> <!-- # String -->
<P1377>{$grandstream_city_code}</P1377>
<!-- Update Interval (in minutes). Default is 15 --> <!-- Update Interval (in minutes). Default is 15 -->
<!-- Number: 5 - 360 --> <!-- Number: 5 - 360 -->

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

@ -716,7 +716,7 @@
<!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 --> <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
<P2384>0</P2384> <P2384>1</P2384>
<!-- No Key Entry Timeout (in seconds). Default is 4 --> <!-- No Key Entry Timeout (in seconds). Default is 4 -->
<!-- Number: 1 - 15 --> <!-- Number: 1 - 15 -->
@ -5970,11 +5970,16 @@
<!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 --> <!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($grandstream_city_code)}
<P1405>0</P1405>
{else}
<P1405>1</P1405> <P1405>1</P1405>
{/if}
<!-- Self-Defined City Code -->
<!-- String --> <!-- # Self-Defined City Code -->
<P1377></P1377> <!-- # String -->
<P1377>{$grandstream_city_code}</P1377>
<!-- Update Interval (in minutes). Default is 15 --> <!-- Update Interval (in minutes). Default is 15 -->
<!-- Number: 5 - 360 --> <!-- Number: 5 - 360 -->

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

@ -716,7 +716,7 @@
<!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 --> <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
<P2384>0</P2384> <P2384>1</P2384>
<!-- No Key Entry Timeout (in seconds). Default is 4 --> <!-- No Key Entry Timeout (in seconds). Default is 4 -->
<!-- Number: 1 - 15 --> <!-- Number: 1 - 15 -->
@ -5970,11 +5970,16 @@
<!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 --> <!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($grandstream_city_code)}
<P1405>0</P1405>
{else}
<P1405>1</P1405> <P1405>1</P1405>
{/if}
<!-- Self-Defined City Code -->
<!-- String --> <!-- # Self-Defined City Code -->
<P1377></P1377> <!-- # String -->
<P1377>{$grandstream_city_code}</P1377>
<!-- Update Interval (in minutes). Default is 15 --> <!-- Update Interval (in minutes). Default is 15 -->
<!-- Number: 5 - 360 --> <!-- Number: 5 - 360 -->

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

@ -716,7 +716,7 @@
<!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 --> <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
<P2384>0</P2384> <P2384>1</P2384>
<!-- No Key Entry Timeout (in seconds). Default is 4 --> <!-- No Key Entry Timeout (in seconds). Default is 4 -->
<!-- Number: 1 - 15 --> <!-- Number: 1 - 15 -->
@ -5970,11 +5970,16 @@
<!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 --> <!-- 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
<!-- Number: 0, 1 --> <!-- Number: 0, 1 -->
<!-- Mandatory --> <!-- Mandatory -->
{if isset($grandstream_city_code)}
<P1405>0</P1405>
{else}
<P1405>1</P1405> <P1405>1</P1405>
{/if}
<!-- Self-Defined City Code -->
<!-- String --> <!-- # Self-Defined City Code -->
<P1377></P1377> <!-- # String -->
<P1377>{$grandstream_city_code}</P1377>
<!-- Update Interval (in minutes). Default is 15 --> <!-- Update Interval (in minutes). Default is 15 -->
<!-- Number: 5 - 360 --> <!-- Number: 5 - 360 -->

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

@ -731,7 +731,7 @@
<!-- # Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 --> <!-- # Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 --> <!-- # Number: 0, 1 -->
<!-- # Mandatory --> <!-- # Mandatory -->
<P2384>0</P2384> <P2384>1</P2384>
<!-- # Blind Transfer Wait Timeout. Default is 30 --> <!-- # Blind Transfer Wait Timeout. Default is 30 -->
<!-- # Number: 30 - 300 --> <!-- # Number: 30 - 300 -->
@ -7243,11 +7243,16 @@
<!-- # 0 - Self-Defined City Code, 1 - Automatic. Default is 1 --> <!-- # 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
<!-- # Number: 0, 1 --> <!-- # Number: 0, 1 -->
<!-- # Mandatory --> <!-- # Mandatory -->
{if isset($grandstream_city_code)}
<P1405>0</P1405>
{else}
<P1405>1</P1405> <P1405>1</P1405>
{/if}
<!-- # Self-Defined City Code --> <!-- # Self-Defined City Code -->
<!-- # String --> <!-- # String -->
<P1377></P1377> <P1377>{$grandstream_city_code}</P1377>
<!-- # Update Interval (in minutes). Default is 15 --> <!-- # Update Interval (in minutes). Default is 15 -->
<!-- # Number: 5 - 360 --> <!-- # Number: 5 - 360 -->