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

Correct Default values

Browse source 
Correct default values
Fix SQL syntax error
This commit is contained in:
steve-lad 2021-06-04 17:02:27 +02:00
parent e8dae84512
commit 17293287fa
2 changed files with 267 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
conf/sccpgeneral.xml.v433
View file

@ -1413,8 +1413,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="1" seq="99"> <item type="IS" id="1" seq="99">
<name>transfer</name> <name>transfer</name>
<label>Transfer</label> <label>Transfer</label>
<default>NONE</default> <default>off</default>
<button value="NONE">Inherit</button> <button value="off">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<help>Transfer allowed</help> <help>Transfer allowed</help>
@ -1431,8 +1431,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="2" seq="99"> <item type="IS" id="2" seq="99">
<name>cfwdall</name> <name>cfwdall</name>
<label>Call Forward</label> <label>Call Forward</label>
<default>NONE</default> <default>off</default>
<button value="NONE">Inherit</button> <button value="off">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<help>Activate the callforward softkeys. Default is On</help> <help>Activate the callforward softkeys. Default is On</help>
@ -1440,8 +1440,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="3" seq="99"> <item type="IS" id="3" seq="99">
<name>cfwdbusy</name> <name>cfwdbusy</name>
<label>Call Forward busy</label> <label>Call Forward busy</label>
<default>NONE</default> <default>off</default>
<button value="NONE">Inherit</button> <button value="off">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<help>Activate the callforward busy softkeys. Default is On</help> <help>Activate the callforward busy softkeys. Default is On</help>
@ -1449,8 +1449,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="3" seq="0"> <item type="IS" id="3" seq="0">
<name>cfwdnoanswer</name> <name>cfwdnoanswer</name>
<label>Call Forward NOANSWER</label> <label>Call Forward NOANSWER</label>
<default>NONE</default> <default>on</default>
<button value="NONE">Inherit</button> <button value="on">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<help>Activate the callforward NOANSWER stuff and softkeys. Default is On</help> <help>Activate the callforward NOANSWER stuff and softkeys. Default is On</help>
@ -1458,8 +1458,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="5" seq="99"> <item type="IS" id="5" seq="99">
<name>dndFeature</name> <name>dndFeature</name>
<label>DND Button on Device</label> <label>DND Button on Device</label>
<default>NONE</default> <default>off</default>
<button value="NONE">Inherit</button> <button value="off">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<help>Do Not Disturb. Default is Off</help> <help>Do Not Disturb. Default is Off</help>
@ -1499,8 +1499,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="14"> <item type="IS" id="14">
<name>mwioncall</name> <name>mwioncall</name>
<label>Message Lamp On Call</label> <label>Message Lamp On Call</label>
<default>NONE</default> <default>on</default>
<button value="NONE">Inherit</button> <button value="on">Inherit</button>
<button value="on">Yes</button> <button value="on">Yes</button>
<button value="off">No</button> <button value="off">No</button>
<help>Set the MWI on call.</help> <help>Set the MWI on call.</help>
@ -1509,8 +1509,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="7" seq="99"> <item type="IS" id="7" seq="99">
<name>mwilamp</name> <name>mwilamp</name>
<label>Message Waiting Indication (MWI)</label> <label>Message Waiting Indication (MWI)</label>
<default>NONE</default> <default>on</default>
<button value="NONE">Inherit</button> <button value="on">Inherit</button>
<button value="on">On</button> <button value="on">On</button>
<button value="off">Off</button> <button value="off">Off</button>
<button value="wink">Wink</button> <button value="wink">Wink</button>
@ -1656,8 +1656,8 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="3" seq="99"> <item type="IS" id="3" seq="99">
<name>nat</name> <name>nat</name>
<label>NAT</label> <label>NAT</label>
<default>NONE</default> <default>auto</default>
<button value="NONE">Inherit</button> <button value="auto">Inherit</button>
<button value="auto">Auto</button> <button value="auto">Auto</button>
<button value="off">Off</button> <button value="off">Off</button>
<button value="on">On</button> <button value="on">On</button>
@ -1667,9 +1667,9 @@ and open the template in the editor. Base Version before all crash :-)
<item type="IS" id="4" seq="99"> <item type="IS" id="4" seq="99">
<name>directrtp</name> <name>directrtp</name>
<label>Direct RTP</label> <label>Direct RTP</label>
<default>NONE</default> <default>off</default>
<button- value="NONE">Auto</button-> <button- value="off">Auto</button->
<button value="NONE">Inherit</button> <button value="off">Inherit</button>
<button value="off">Off</button> <button value="off">Off</button>
<button value="on">On</button> <button value="on">On</button>
<help>This option allow devices to do direct RTP sessions (default Off)</help> <help>This option allow devices to do direct RTP sessions (default Off)</help>

8
sccpManClasses/dbinterface.class.php
View file

@ -83,11 +83,11 @@ class dbinterface
} elseif (!empty($data['type'])) { } elseif (!empty($data['type'])) {
switch ($data['type']) { switch ($data['type']) {
case "cisco-sip": case "cisco-sip":
$stmts = $dbh->prepare('SELECT ' . $fld . ' FROM sccpdeviceconfig WHERE TYPE LIKE \'%-sip\' ORDER BY name'); $stmts = $dbh->prepare("SELECT {$fld} FROM sccpdeviceconfig WHERE TYPE LIKE '%-sip' ORDER BY name");
break; break;
case "cisco": // Fall through to default intentionally case "cisco": // Fall through to default intentionally
default: default:
$stmts = $dbh->prepare('SELECT ' . $fld . ' FROM sccpdeviceconfig WHERE TYPE not LIKE \'%-sip\' ORDER BY name'); $stmts = $dbh->prepare("SELECT {$fld} FROM sccpdeviceconfig WHERE TYPE not LIKE '%-sip' ORDER BY name");
break; break;
} }
} else { //no filter and no name provided - return all } else { //no filter and no name provided - return all
@ -219,10 +219,10 @@ class dbinterface
$stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) ORDER BY model"); $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) ORDER BY model");
break; break;
case 'ciscophones': case 'ciscophones':
$stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor NOT LIKE \'%-sip\' ORDER BY model"); $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor NOT LIKE '%-sip' ORDER BY model");
break; break;
case 'sipphones': case 'sipphones':
$stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor LIKE \'%-sip\' ORDER BY model"); $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor LIKE '%-sip' ORDER BY model");
break; break;
case 'all': // Fall through to default case 'all': // Fall through to default
default: default: