Update Sccp.class.php.v433

Correct indentation
Rewrite SQL Replace statement to simplify
This commit is contained in:
steve-lad 2021-05-30 13:22:46 +02:00
parent 9c4c94cba7
commit 7cf12356c1

View file

@ -90,9 +90,18 @@ class Sccp extends \FreePBX\modules\Core\Driver {
foreach ($this->database->query($sql) as $row) { foreach ($this->database->query($sql) as $row) {
$tech[$row["Field"]]=$row["Field"]; $tech[$row["Field"]]=$row["Field"];
} }
$sqlCol = 'name';
// die(print_r($tech)); $sqlVal = "\'{$id}\'";
foreach($this->data_fld as $key => $val) {
if (!empty($settings[$val]) ) {
if (!empty($settings[$val]['value'])){
$sqlCol .= ", {$key}";
$sqlVal .= ", \' {$settings[$val]['value']} \'";
}
}
}
$sql = "REPLACE INTO sccpline ( {$sqlCol} ) VALUES ( {$sqlVal} );";
/*
$sql = 'REPLACE INTO sccpline (name'; $sql = 'REPLACE INTO sccpline (name';
$sqlv = 'values ("'.$id.'"'; $sqlv = 'values ("'.$id.'"';
foreach($this->data_fld as $key => $val) { foreach($this->data_fld as $key => $val) {
@ -104,6 +113,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
} }
} }
$sql .= ") ".$sqlv.");"; $sql .= ") ".$sqlv.");";
*/
$sth = $this->database->prepare($sql); $sth = $this->database->prepare($sql);
$sth->execute(); $sth->execute();
return true; return true;
@ -141,71 +151,71 @@ class Sccp extends \FreePBX\modules\Core\Driver {
public function getDefaultDeviceSettings($id, $displayname, &$flag) { public function getDefaultDeviceSettings($id, $displayname, &$flag) {
$dial = 'SCCP'; $dial = 'SCCP';
$settings = array( $settings = array(
"pin" => array( "pin" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"incominglimit" => array( "incominglimit" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"lcontext" => array( "lcontext" => array(
"value" => "from-internal", "value" => "from-internal",
"flag" => $flag++ "flag" => $flag++
), ),
"callgroup" => array( "callgroup" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"namedcallgroup" => array( "namedcallgroup" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"pickupgroup" => array( "pickupgroup" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"namedpickupgroup" => array( "namedpickupgroup" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"transfer" => array( "transfer" => array(
"value" => "yes", "value" => "yes",
"flag" => $flag++ "flag" => $flag++
), ),
"adhocNumber" => array( "adhocNumber" => array(
"value" => "", "value" => "",
"flag" => $flag++ "flag" => $flag++
), ),
"echocancel" => array( "echocancel" => array(
"value" => "no", "value" => "no",
"flag" => $flag++ "flag" => $flag++
), ),
"dnd" => array( "dnd" => array(
"value" => "UserDefined", "value" => "UserDefined",
"flag" => $flag++ "flag" => $flag++
), ),
"silencesuppression" => array( "silencesuppression" => array(
"value" => "no", "value" => "no",
"flag" => $flag++ "flag" => $flag++
), ),
"secondary_dialtone_digits" => array( "secondary_dialtone_digits" => array(
"value" => "9", "value" => "9",
"flag" => $flag++ "flag" => $flag++
), ),
"secondary_dialtone_tone" => array( "secondary_dialtone_tone" => array(
"value" => "0x22", "value" => "0x22",
"flag" => $flag++ "flag" => $flag++
), ),
"musicclass" => array( "musicclass" => array(
"value" => "default", "value" => "default",
"flag" => $flag++ "flag" => $flag++
), )
); );
return array( return array(
"dial" => $dial, "dial" => $dial,
"settings" => $settings "settings" => $settings
); );
} }
# !TODO!: -TODO-: Would it not be better to put this part in the view directory (MVC) ? No, This is a template for Freepbx. # !TODO!: -TODO-: Would it not be better to put this part in the view directory (MVC) ? No, This is a template for Freepbx.