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

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Browse Source
This commit is contained in:
fusionate
2023-05-23 18:38:57 +00:00
parent dfdcba5a0c 2608f1ffad
commit 2cf6e79c2e
19 changed files with 6954 additions and 6964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/grandstream/app_config.php
View File

@@ -1117,4 +1117,13 @@
$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'] = "Listening group name, for example: \"Cordless\", \"PTT\", or \"WalkieTalkie\"";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b2f79366-07e8-4def-8e55-6e9ea635226d";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_public_mode";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$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'] = "Public Mode. 0 - No, 1 - Yes. Default is 0";
?>

1
resources/classes/template.php
View File

@@ -44,6 +44,7 @@
$this->object->setTemplateDir($this->template_dir);
$this->object->setCompileDir($this->cache_dir);
$this->object->setCacheDir($this->cache_dir);
$this->object->registerPlugin("modifier","in_array", "in_array");
}
if ($this->engine === 'raintpl') {
require_once "resources/templates/engine/raintpl/rain.tpl.class.php";

5
resources/switch.php
View File

@@ -365,6 +365,11 @@ function save_var_xml() {
if (is_array($_SESSION['switch']['conf'])) {
global $config, $domain_uuid;
//skip this function if the conf directory is empty
if (empty($_SESSION['switch']['conf']['dir'])) {
return false;
}
//open the vars.xml file
$fout = fopen($_SESSION['switch']['conf']['dir']."/vars.xml","w");

23
resources/templates/engine/smarty/plugins/modifier.in_array.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
/**
* Smarty plugin
*
* @package Smarty
* @subpackage PluginsModifier
*/
/**
* Smarty in_array modifier plugin
* Type: modifier
* Name: in_array
* Purpose: Checks if a value exists in an array
*
* @param string $needle
* @param array $haystack
*
* @return boolean
*/
function smarty_modifier_in_array($needle, $haystack)
{
return in_array($needle, $haystack);
}

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

@@ -2945,25 +2945,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -3023,25 +3023,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -3836,25 +3836,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -5056,23 +5056,22 @@
<!-- # String -->
<P76></P76>
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6098,25 +6098,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6973,25 +6973,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6275,10 +6275,6 @@
<!-- # String: a-z, A-Z, 0-9, ".", ":" -->
<P101></P101>
<!-- # STUN server -->
<!-- # String -->
<P76></P76>
<!-- # Delay Registration. Default is 0. -->
<!-- # Number: 0 - 90 -->
<!-- # Mandatory -->
@@ -6288,19 +6284,19 @@
<!-- # Number: 0, 1. 0 - No, 1 - Yes. -->
<P8468>0</P8468>
<!-- # Enable Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{else}
<P1345>0</P1345>
{/if}
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}

6297
resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -3569,12 +3569,21 @@
<!-- # STUN server -->
<!-- # String -->
<P76></P76>
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
<P1345>0</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
<!-- ############################################################################## -->
<!-- ## Settings/Call Features -->
<!-- ############################################################################## -->

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

@@ -6940,25 +6940,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6943,25 +6943,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6942,23 +6942,22 @@
<!-- # String -->
<P76></P76>
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6942,23 +6942,22 @@
<!-- # String -->
<P76></P76>
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

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

@@ -6944,28 +6944,20 @@
<!-- # STUN server -->
<!-- # String -->
{if isset($grandstream_stun_server) }<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
{if isset($grandstream_stun_server) }
<P76>{$grandstream_stun_server}</P76>
{else}
<P76></P76>
{/if}
<!-- # Public Mode. 0 - No, 1 - Yes. Default is 0 -->
<!-- # Number: 0, 1 -->
<!-- # Mandatory -->
{if isset($public_mode) }
{if $public_mode|strtolower == 'true'}
<P1345>1</P1345>
{elseif $public_mode|strtolower == 'yes'}
<P1345>1</P1345>
{elseif $public_mode == '1'}
<P1345>1</P1345>
{if isset($grandstream_public_mode) }
<P1345>{$grandstream_public_mode}</P1345>
{else}
<P1345>0</P1345>
{/if}
{else}
<P1345>0</P1345>
{/if}
<!-- # Enable Fix For RTP Timestamp Jump. Default is 0 -->
<!-- # Number: 0, 1 -->

7340
resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
View File

File diff suppressed because it is too large Load Diff