From 649b717ce744157b0ff3be0402bb28c6d5e0ffa8 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Sun, 20 Jun 2021 13:06:53 +0200
Subject: [PATCH] Correct SQL for SET DEFAULT
---
conf/sccpgeneral.xml.v433 | 4 ++--
install.php | 4 ++--
module.xml | 2 +-
views/formShow.php | 13 -------------
4 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index 33c8a2a..6fc466e 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -1446,8 +1446,8 @@ and open the template in the editor. Base Version before all crash :-)
useRedialMenu
off
-
-
+
+
You can specifying 'useRedialMenu = yes' in the sccp.conf device section and the redial softkey will cause the "placed calls" list instead of immediately calling the last dialed number.
-
diff --git a/install.php b/install.php
index 60c80e3..d485969 100644
--- a/install.php
+++ b/install.php
@@ -99,7 +99,7 @@ function Get_DB_config($sccp_compatible)
'_profileid' => array('create' => "INT(11) NOT NULL DEFAULT '0' AFTER `_loginname`"),
'_dialrules' => array('create' => "VARCHAR(255) NULL DEFAULT NULL AFTER `_profileid`"),
- 'useRedialMenu' => array('create' => "VARCHAR(5) NULL DEFAULT 'no' AFTER `_dialrules`"),
+ 'useRedialMenu' => array('create' => "enum('yes','no') NOT NULL default 'no'", 'modify' => "enum('yes','no')"),
'dtmfmode' => array('drop' => "yes"),
'force_dtmfmode' => array('create' => "ENUM('auto','rfc2833','skinny') NOT NULL default 'auto'",
'modify' => "ENUM('auto','rfc2833','skinny')"),
@@ -431,7 +431,7 @@ function InstallDB_updateSchema($db_config)
$count_modify ++;
}
if (!empty($row_data['def_modify'])) {
- $sql_modify .= "MODIFY COLUMN {$row_fld} SET DEFAULT {$row_data['def_modify']}, ";
+ $sql_modify .= "ALTER COLUMN {$row_fld} SET DEFAULT '{$row_data['def_modify']}', ";
$count_modify ++;
}
if (!empty($row_data['drop'])) {
diff --git a/module.xml b/module.xml
index cd5c29f..57723fe 100644
--- a/module.xml
+++ b/module.xml
@@ -1,7 +1,7 @@
sccp_manager
SCCP Manager
- 14.3.0.0
+ 14.3.0.1
setup
SCCP Connectivity
Steve Lad, Alex GP
diff --git a/views/formShow.php b/views/formShow.php
index 04527c1..cb6d45d 100644
--- a/views/formShow.php
+++ b/views/formShow.php
@@ -47,17 +47,6 @@ $model_list = array();
$device_list = array();
$dialplan_list = array();
-//$time_zone = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_time');
-//$system_time_zone = \FreePBX::Sccp_manager()->getSysnemTimeZone();
-//$sofkey_list = \FreePBX::Sccp_manager()-> aminterface->sccp_list_keysets();
-//$model_list = \FreePBX::Sccp_manager()->dbinterface->HWextension_db_SccpTableData("HWDevice");
-//$extension_list = \FreePBX::Sccp_manager()->dbinterface->HWextension_db_SccpTableData("HWextension");
-//$device_list = \FreePBX::Sccp_manager()->dbinterface->HWextension_db_SccpTableData("SccpDevice");
-//$extension_list[]=array(model=>'NONE', vendor=>'CISCO', dns=>'0');
-//$device_list[]=array(name=>'NONE', description=>'No Device');
-
-//print_r($metainfo);
-
if (\FreePBX::Modules()->checkStatus("soundlang")) {
$syslangs = \FreePBX::Soundlang()->getLanguages();
if (!is_array($syslangs)) {
@@ -72,8 +61,6 @@ if (!is_array($moh_list)) {
$moh_list = array('default');
}
-
-
$items = $itm -> children();
if ($h_show==1) {