ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Minor settings changes

Browse source
This commit is contained in:
steve-lad 2021-07-30 10:18:27 +02:00
parent 60f7d74cf4
commit 97c1f6d5d4
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/sccpgeneral.xml.v433
View file

@ -218,7 +218,7 @@ and open the template in the editor. Base Version before all crash :-)
<label>Device Connect Address / Name </label> <label>Device Connect Address / Name </label>
<name>ccm_address</name> <name>ccm_address</name>
<cbutton field="internal" value="internal">Internal</cbutton> <cbutton field="internal" value="internal">Internal</cbutton>
<default>0.0.0.0:2000</default> <default>0.0.0.0/2000</default>
<input value="NONE" field="ip" nameseparator=":"> <input value="NONE" field="ip" nameseparator=":">
<options placeholder="0.0.0.0 / pbx.org"/> <options placeholder="0.0.0.0 / pbx.org"/>
<class></class> <class></class>

3
install.php
View file

@ -990,7 +990,7 @@ function checkTftpServer() {
// Get TFTP mapping Status // Get TFTP mapping Status
$settingsFromDb['tftp_rewrite'] = array('keyword' => 'tftp_rewrite', 'seq' => 20, 'type' => 0, 'data' => 'off', 'systemdefault' => ''); $settingsFromDb['tftp_rewrite'] = array('keyword' => 'tftp_rewrite', 'seq' => 20, 'type' => 0, 'data' => 'off', 'systemdefault' => '');
if (\FreePbx::Sccp_manager()->checkTftpMapping()) { if ($thisInstaller->checkTftpMapping()) {
$settingsFromDb['tftp_rewrite']['data'] = 'pro'; $settingsFromDb['tftp_rewrite']['data'] = 'pro';
} }
@ -1100,6 +1100,7 @@ function cleanUpSccpSettings() {
} }
// Override certain chan-sccp defaults as they are based on a non-FreePbx system // Override certain chan-sccp defaults as they are based on a non-FreePbx system
$settingsFromDb['context']['systemdefault'] = 'from-internal'; $settingsFromDb['context']['systemdefault'] = 'from-internal';
$settingsFromDb['directed_pickup']['systemdefault'] = 'no';
unset($sysConfiguration[$key]); unset($sysConfiguration[$key]);
} }

2
module.xml
View file

@ -1,7 +1,7 @@
<module> <module>
<rawname>sccp_manager</rawname> <rawname>sccp_manager</rawname>
<name>SCCP Manager</name> <name>SCCP Manager</name>
<version>14.3.0.1</version> <version>14.3.0.0</version>
<type>setup</type> <type>setup</type>
<category>SCCP Connectivity</category> <category>SCCP Connectivity</category>
<publisher>Steve Lad, Alex GP</publisher> <publisher>Steve Lad, Alex GP</publisher>

1
sccpManClasses/dbinterface.class.php
View file

@ -400,7 +400,6 @@ class dbinterface
{ {
$result = 0; $result = 0;
$check_fields = [ $check_fields = [
'430' => ['_hwlang' => "varchar(12)"],
'431' => ['private'=> "enum('on','off')"], '431' => ['private'=> "enum('on','off')"],
'433' => ['directed_pickup'=>''] '433' => ['directed_pickup'=>'']
]; ];

3
sccpManClasses/formcreate.class.php
View file

@ -384,8 +384,7 @@ class formcreate
} }
// Output current value // Output current value
// TODO: This is debug code and needs to be set to only echo res_v echo $res_v;
echo $res_v . $res_n . $sccp_defaults[$res_n]['systemdefault'] . $usingSysDefaults;
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">