From 668bc3355ce7b0e851aeb24a839b2023819c98ca Mon Sep 17 00:00:00 2001 From: dkgroot Date: Sun, 6 Jun 2021 14:07:07 +0000 Subject: [PATCH 01/49] Update version number to 14.2.0.2 --- module.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 7b468d4..4ed9ca8 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.2.0.1 + 14.2.0.2 setup SCCP Connectivity Steve Lad, Alex GP @@ -18,6 +18,7 @@ * Version 14.0.0.1 * - Alfa Release new DB structure Add User mobility * Version 14.1.0.1 * - Migrated to chan-sccp repo * Version 14.2.0.1 * - Retired old interface - min chan-sccp v433 + * Version 14.2.0.2 * - Fix module database definition https://github.com/chan-sccp/sccp_manager From 792cf3452279a1579dc83cead1008b0d95c479d4 Mon Sep 17 00:00:00 2001 From: dkgroot Date: Sun, 6 Jun 2021 18:10:08 +0000 Subject: [PATCH 02/49] Update json file --- sccpManagerUpdater.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sccpManagerUpdater.json b/sccpManagerUpdater.json index cc7e59d..35ab5f6 100644 --- a/sccpManagerUpdater.json +++ b/sccpManagerUpdater.json @@ -2,24 +2,20 @@ "rawname": "sccp_manager", "repo": "extended", "name": "Sccp Manager", - "version": "14.2.0.2", + "version": "14.2.0.3", "publisher": "Steve Lad", "license": "GPL", "licenselink": "http://www.gnu.org/licenses/gpl.txt", - "changelog": [ - "*14.2.0.2* First release of new version without old interface", - "*13.0.0.1* Packaging of ver 1.0.0.1", - "*12.0.0.1* Packaging of ver 1.0.0.1" - ], + "changelog": "*14.2.0.3* Fix module database definition\n*14.2.0.3* Fix module database definition\n*14.2.0.2* First release of new version without old interface\n*13.0.0.1* Packaging of ver 1.0.0.1\n*12.0.0.1* Packaging of ver 1.0.0.1", "category": "Settings", "description": "The Cisco Manager module lets you manage the chan-sccp module.", "depends": { - "version": "14.0", + "version": "14.0" }, "supported": { "version": "13.0" }, - "location": "https://github.com/chan-sccp/sccp_manager/archive/refs/tags/V14.2.0.2.tar.gz", - "md5sum": "885935a928b29927a2f9006eda20b549", - "packaged": "3362963" + "location": "https://github.com/chan-sccp/sccp_manager/archive/refs/tags/v14.2.0.3.tar.gz", + "md5sum": "9aff57a6553a4a3649e056013fe1758f", + "packaged": "1623001021" } From 0c2df2d5293463a52e37d388258734fb7157b0f7 Mon Sep 17 00:00:00 2001 From: dkgroot Date: Sun, 6 Jun 2021 18:12:50 +0000 Subject: [PATCH 03/49] Update module to point to other updateurl branch --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 4ed9ca8..98954f4 100644 --- a/module.xml +++ b/module.xml @@ -25,7 +25,7 @@ 13.0.0.2M https://github.com/chan-sccp/sccp_manager - https://raw.githubusercontent.com/chan-sccp/sccp_manager/develop/sccpManagerUpdater.json + https://raw.githubusercontent.com/chan-sccp/sccp_manager/update_json/sccpManagerUpdater.json GPL From 4ec741e1fac6e8df39f4378cb820f1d6914cbd6a Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 7 Jun 2021 12:44:18 +0200 Subject: [PATCH 04/49] Revert "Update module to point to other updateurl branch" This reverts commit 0c2df2d5293463a52e37d388258734fb7157b0f7. --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 98954f4..4ed9ca8 100644 --- a/module.xml +++ b/module.xml @@ -25,7 +25,7 @@ 13.0.0.2M https://github.com/chan-sccp/sccp_manager - https://raw.githubusercontent.com/chan-sccp/sccp_manager/update_json/sccpManagerUpdater.json + https://raw.githubusercontent.com/chan-sccp/sccp_manager/develop/sccpManagerUpdater.json GPL From 0fa539bd6a6dae2111ca2a69d819b832dfb972a7 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 7 Jun 2021 16:23:21 +0200 Subject: [PATCH 05/49] Remove unused delete button Remove disabled delete button --- views/hardware.extension.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/views/hardware.extension.php b/views/hardware.extension.php index bde3121..e7eefed 100644 --- a/views/hardware.extension.php +++ b/views/hardware.extension.php @@ -19,9 +19,6 @@ if (!empty($this->sccpvalues['system_rouminguser'])) {

  -
@@ -47,7 +44,7 @@ if (!empty($this->sccpvalues['system_rouminguser'])) { if (rmn_dev == 'yes') { exp_dev += '  '; } - return exp_dev; + return exp_dev; return '  '; } - \ No newline at end of file + From 5ad6f5bae048a2b009700aa8565f5d797bc6c5a5 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 8 Jun 2021 12:50:48 +0200 Subject: [PATCH 06/49] Update button labels Update button labels in Server Config Atom whitespace removal in hardware.phone --- sccpManTraits/bmoFunctions.php | 5 +++-- views/hardware.phone.php | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php index c703810..5ff2e18 100644 --- a/sccpManTraits/bmoFunctions.php +++ b/sccpManTraits/bmoFunctions.php @@ -34,6 +34,7 @@ trait bmoFunctions { } public function getActionBar($request) { + dbug('request',$request); $buttons = array(); switch ($request['display']) { case 'sccp_adv': @@ -92,13 +93,13 @@ trait bmoFunctions { 'submit' => array( 'name' => 'ajaxsubmit', 'id' => 'ajaxsubmit', - 'value' => _("Submit") + 'value' => _("Save") ), 'reset' => array( 'name' => 'reset', 'id' => 'ajaxcancel', 'data-reload' => 'reload', - 'value' => _("Reset") + 'value' => _("Cancel") ), ); diff --git a/views/hardware.phone.php b/views/hardware.phone.php index b5f3b9a..cf83ae4 100644 --- a/views/hardware.phone.php +++ b/views/hardware.phone.php @@ -35,7 +35,7 @@ - + @@ -62,7 +62,7 @@ } } return exp_model; - + } function DispayDeviceActionsKeyFormatter(value, row, index) { var exp_model = ''; @@ -70,9 +70,9 @@ exp_model += '    \n'; - + } else { exp_model += '    \n'; exp_model += '  '; @@ -84,7 +84,7 @@ if (value === null) { return '-- EMPTY --'; } - var data = value.split(";"); + var data = value.split(";"); result = ''; for (var i = 0; i < data.length; i++) { var val = data[i].split(','); @@ -94,5 +94,5 @@ } return result; } - - \ No newline at end of file + + From 03057edd6c98ed4f9d718dde4f90cd7334a8fdd0 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 8 Jun 2021 14:39:23 +0200 Subject: [PATCH 07/49] Fix Broken Rnav in add device Replace _DIR_ with absolute path; _DIR_ references sccpTraits Fix error in toolbar id --- sccpManTraits/bmoFunctions.php | 3 +-- views/hardware.rnav.php | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php index 5ff2e18..9d54576 100644 --- a/sccpManTraits/bmoFunctions.php +++ b/sccpManTraits/bmoFunctions.php @@ -34,7 +34,6 @@ trait bmoFunctions { } public function getActionBar($request) { - dbug('request',$request); $buttons = array(); switch ($request['display']) { case 'sccp_adv': @@ -110,7 +109,7 @@ trait bmoFunctions { public function getRightNav($request) { if (isset($request['tech_hardware']) && ($request['tech_hardware'] == 'cisco')) { - return load_view(__DIR__ . "/views/hardware.rnav.php", array('request' => $request)); + return load_view("/var/www/html/admin/modules/sccp_manager/views/hardware.rnav.php", array('request' => $request)); } } diff --git a/views/hardware.rnav.php b/views/hardware.rnav.php index df0271e..3080456 100644 --- a/views/hardware.rnav.php +++ b/views/hardware.rnav.php @@ -1,18 +1,24 @@ -
+ data-search="true" + data-toolbar="#toolbar-sccp-rnav" + data-url="ajax.php?module=sccp_manager&command=getPhoneGrid&type=sccp" + data-cache="false" + data-toggle="table" + class="table"> - - - + + +
From dface29681686caf07a15d7aa0b489fa9f901cc5 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 8 Jun 2021 14:43:13 +0200 Subject: [PATCH 08/49] Delete .nfs.2005102d.05d5 Delete extraneous file --- views/.nfs.2005102d.05d5 | Bin 4096 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 views/.nfs.2005102d.05d5 diff --git a/views/.nfs.2005102d.05d5 b/views/.nfs.2005102d.05d5 deleted file mode 100644 index 8787841520bc03863226103feac39b83c5e06942..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vVqiUI z1JS`yK|uMa^k@i-hQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2v8*i7=fmMFc`>% zWMmdA6r~pDmlh?bDx~EXWh-Rnm89mCWaj53=Hyf=!cbj9nnLwI M+$%B+a{vDW0Ix+Hl>h($ From 7f96c121fad7b77e0137a4d757d597ed6c1f78d0 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 8 Jun 2021 15:23:43 +0200 Subject: [PATCH 09/49] Update module category in updater.json Update module category in updater.json - this is used in Module Admin Remove unused JS --- assets/js/sccp_manager.js | 35 ++--------------------------------- sccpManagerUpdater.json | 2 +- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index f169511..e60ffc1 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -25,37 +25,7 @@ $(document).ready(function () { } }); - /* - $('#ajaxbackup').on('click', function (e) { - var vdata = ''; - var snd_command = 'backupsettings'; - $('.fpbx-submit').each(function () { - vdata = vdata + $(this).serialize() + '&'; - }); - - $.ajax({ - type: 'POST', - url: 'ajax.php?module=sccp_manager&command=' + snd_command, - data: vdata, - success: function (data) { - if (data.status === true) { - if (data.message) { - alert(data.message); - } else { - alert('Data Save'); - } - } else { - if (Array.isArray(data.message)) { - data.message.forEach(function (entry) { - fpbxToast(entry, 'error', 'error'); - }); - } - } - } - }); - - }); - */ + // ajaxsubmit2 is "Save and continue" - saves form data and stays on form $('#ajaxsubmit2').on('click', function (e) { var vdata = ''; var snd_command = 'savesettings'; @@ -93,7 +63,7 @@ $(document).ready(function () { } }); }); - + // ajaxsubmit is save and close form $('#ajaxsubmit').on('click', function (e) { var vdata = ''; var snd_command = 'savesettings'; @@ -136,7 +106,6 @@ $(document).ready(function () { if (data.search != null) { location.search = data.search; } -// if (data.reload === true ) { if (data.reload === true && old_style ===true ) { location.reload(); } diff --git a/sccpManagerUpdater.json b/sccpManagerUpdater.json index 35ab5f6..0d19988 100644 --- a/sccpManagerUpdater.json +++ b/sccpManagerUpdater.json @@ -7,7 +7,7 @@ "license": "GPL", "licenselink": "http://www.gnu.org/licenses/gpl.txt", "changelog": "*14.2.0.3* Fix module database definition\n*14.2.0.3* Fix module database definition\n*14.2.0.2* First release of new version without old interface\n*13.0.0.1* Packaging of ver 1.0.0.1\n*12.0.0.1* Packaging of ver 1.0.0.1", - "category": "Settings", + "category": "Sccp Connectivity", "description": "The Cisco Manager module lets you manage the chan-sccp module.", "depends": { "version": "14.0" From 214509e2c750eeac082b64563e65ba8b3a399767 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Thu, 10 Jun 2021 12:15:18 +0200 Subject: [PATCH 10/49] Use BMO Hooks Use BMO Hooks Correct HTML --- sccpManTraits/bmoFunctions.php | 57 ++++++++++++++++++++++++++++++-- views/advserver.dialtemplate.php | 6 ++-- views/advserver.keyset.php | 22 ++++++------ views/advserver.model.php | 2 +- views/hardware.extension.php | 12 +++---- views/hardware.phone.php | 4 +-- views/hardware.sphone.php | 18 +++++----- 7 files changed, 86 insertions(+), 35 deletions(-) diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php index 9d54576..9bbd35e 100644 --- a/sccpManTraits/bmoFunctions.php +++ b/sccpManTraits/bmoFunctions.php @@ -3,12 +3,41 @@ namespace FreePBX\modules\Sccp_manager\sccpManTraits; trait bmoFunctions { - /* unused but FPBX API requires it */ + + //Need to reload freePBX for modifications below to work + + //need to catch extensions + public static function myConfigPageInits() { + dbug('have config page inits'); + return array("extensions"); + } public function doConfigPageInit($page) { + if ($page == "extensions") { + dbug('have extensions in doConfigPageInit'); + } $this->doGeneralPost(); } + // Try to change extensions which is part of core + public static function myGuiHooks() { + return array('core'); + } + + public function doGuiHook(&$cc) { + dbug('$_REQUEST', $_REQUEST); + //dbug('CC', $cc); + if ($_REQUEST['display'] == "extensions" ) { + if (isset($_REQUEST['tech_hardware'])) { + dbug('Have caught hook in doGuiHook'); + $this->getActionBar($_REQUEST); + } + //$cc->addguielem("_top", new \gui_pageheading('', 'I added a header', false)); + } + } + + + /* unused but FPBX API requires it */ public function install() { @@ -85,7 +114,6 @@ trait bmoFunctions { 'value' => _("Cancel") ), ); - break; case 'sccpsettings': $buttons = array( @@ -101,7 +129,30 @@ trait bmoFunctions { 'value' => _("Cancel") ), ); - + break; + case 'extensions': + // only called from configpage inits + $buttons = array( + 'submit' => array( + 'name' => 'ajaxsubmit', + 'id' => 'ajaxsubmit', + 'data-search' => '?display=sccp_custom', + 'value' => _("Save") + ), + 'Save' => array( + 'name' => 'ajaxsubmit2', + 'id' => 'ajaxsubmit2', + 'stayonpage' => 'yes', + 'value' => _("Save + Continue") + ), + 'cancel' => array( + 'name' => 'cancel', + 'id' => 'ajaxcancel', + 'data-search' => '?display=sccp_custom', + 'data-hash' => 'sccpdevice', + 'value' => _("Cancel") + ), + ); break; } return $buttons; diff --git a/views/advserver.dialtemplate.php b/views/advserver.dialtemplate.php index cc37ab7..e7bd7bf 100644 --- a/views/advserver.dialtemplate.php +++ b/views/advserver.dialtemplate.php @@ -12,12 +12,12 @@

-   +  
- +
@@ -39,4 +39,4 @@ } return exp_model; } - \ No newline at end of file + diff --git a/views/advserver.keyset.php b/views/advserver.keyset.php index 2dc039c..6228047 100644 --- a/views/advserver.keyset.php +++ b/views/advserver.keyset.php @@ -54,7 +54,7 @@ $keynamearray = array('onhook' => array('sname' => 'ONHOOK', 'name' =>'Displa
-
+
@@ -72,7 +72,7 @@ $keynamearray = array('onhook' => array('sname' => 'ONHOOK', 'name' =>'Displa - +
@@ -101,9 +101,9 @@ $keynamearray = array('onhook' => array('sname' => 'ONHOOK', 'name' =>'Displa Help. max len = 15 - +
    - + $value) { @@ -129,7 +129,7 @@ foreach ($keysetarray as $key => $value) { } echo '
    '; echo '
    '; - + echo '
    UTC - Date Format: Time zone + System Time zone - this is set by FreePBX and can be changed in Settings : Advanced Settings diff --git a/views/formShow.php b/views/formShow.php index 336c182..66e9fdf 100644 --- a/views/formShow.php +++ b/views/formShow.php @@ -946,13 +946,6 @@ foreach ($items as $child) { } } - $time_regions = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Russian', 'Indian', 'Pacific'); - $time_zone_global = DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC); - $time_zone_ru = array('Russian/Kaliningrad', 'Russian/Moscow', 'Russian/St.Peterburg', 'Russian/Samara', 'Russian/Novosibirsk', 'Russian/Ekaterinburg', 'Russian/Irkutsk', 'Russian/Yakutsk', 'Russian/Khabarovsk', 'Russian/Vladivostok', 'Russian/Sakhalin', 'Russian/Magadan', 'Russian/Kamchatka'); - $time_zone_list = array_merge($time_zone_global, $time_zone_ru); - $optgroup = ''; - sort($time_zone_list); - if (empty($child->class)) { $child->class = 'form-control'; } @@ -963,45 +956,23 @@ foreach ($items as $child) { } } - if (empty($child->value)) { - $child->value = \date_default_timezone_get(); -// if (!empty($child->default)){ -// $child->value = $child->default; -// } - } + $child->value = \date_default_timezone_get(); echo ''; ?>
    -
    - -
    +
    +
    +
    -
    -
    class . '" id="' . $res_id . '">'; - foreach ($time_zone_list as $opt_key) { - $z = explode('/', $opt_key, 2); - if (count($z) != 2 || !in_array($z[0], $time_regions)) { - continue; - } - if ($optgroup != $z[0]) { - if ($optgroup !== '') { - echo ''; - } - $optgroup = $z[0]; - echo ''; - } - echo ''; - } - if ($optgroup !== '') { - echo ''; - } - - ?> -
    -
    +
    +
    value; + ?> +
    +
    +
    help);?>
    From 6260f79b86255a3448b6507a971ae2151dd2e97e Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Sun, 13 Jun 2021 15:46:06 +0200 Subject: [PATCH 31/49] Update Version --- module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 4571785..9b1719f 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.2.0.2 + 14.2.0.5 setup SCCP Connectivity Steve Lad, Alex GP From 7107dbe86b672a1b3d225ed3b73a20cce8830126 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:43:31 +0200 Subject: [PATCH 32/49] Fix issue with not saving all settings An erroneous break instead of continue was truncating sccpsettings Simplify logic by avoiding create then delete for settings where data was empty --- Sccp_manager.class.php | 4 ++-- sccpManClasses/dbinterface.class.php | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 0cc0ee6..c6f6767 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -163,10 +163,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $this->initVarfromXml(); // Overwrite Exist } - if (get_class($freepbx) === 'FreePBX') { + //if (get_class($freepbx) === 'FreePBX') { // only save settings when building a new FreePBX object $this->saveSccpSettings(); - } + //} } /* diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php index 2a5e071..5fa736c 100644 --- a/sccpManClasses/dbinterface.class.php +++ b/sccpManClasses/dbinterface.class.php @@ -239,7 +239,6 @@ class dbinterface // mode update - update / replace record $dbh = \FreePBX::Database(); $result = false; - $delete_value = array(); switch ($table_name) { case 'sccpsettings': if ($mode == 'replace') { // Change mode name to be more transparent @@ -250,9 +249,8 @@ class dbinterface } foreach ($save_value as $key => $dataArr) { if (!empty($dataArr) && isset($dataArr['data'])) { - if ($dataArr['data'] == $this->val_null) { - $delete_value[] = $save_value[$key]['keyword']; - break; + if (empty($dataArr['data'])) { + continue; } } $stmt->bindParam(':keyword',$dataArr['keyword'],\PDO::PARAM_STR); @@ -261,13 +259,6 @@ class dbinterface $stmt->bindParam(':type',$dataArr['type'],\PDO::PARAM_INT); $result = $stmt->execute(); } - if (!empty($delete_value)) { - $stmt = $dbh->prepare('DELETE FROM sccpsettings WHERE keyword = :keyword'); - foreach ($delete_value as $del_key) { - $stmt->bindParam(':keyword',$del_key,\PDO::PARAM_STR); - $result = $stmt->execute(); - } - } break; case 'sccpdevmodel': // Fall through to next intentionally case 'sccpdevice': // Fall through to next intentionally From f159ab72f6886401d39ee7cf7b917b26dc1d2588 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Sun, 13 Jun 2021 16:55:26 +0200 Subject: [PATCH 33/49] Clean up defaults Set new base defaults to 433 Remove obsolete conf files to enhance maintainability --- conf/Sccp.class.php | 319 --------- conf/sccpgeneral.xml | 1018 --------------------------- sccpManClasses/extconfigs.class.php | 3 +- 3 files changed, 2 insertions(+), 1338 deletions(-) delete mode 100644 conf/Sccp.class.php delete mode 100644 conf/sccpgeneral.xml diff --git a/conf/Sccp.class.php b/conf/Sccp.class.php deleted file mode 100644 index d1851cb..0000000 --- a/conf/Sccp.class.php +++ /dev/null @@ -1,319 +0,0 @@ -'pin', "label" => 'label', "accountcode" => 'account', - "context" =>'lcontext',"incominglimit"=>'incominglimit', - "callgroup"=>'callgroup',"pickupgroup"=>'pickupgroup', - "transfer" => 'transfer', "echocancel" => 'echocancel', - "language" => 'language', "description" => 'callerid', - "cid_num" => 'cid_num', "cid_name" => 'label', "mailbox" => 'description', - "musicclass" => 'musicclass', - "dnd" => 'dnd', "silencesuppression" => 'silencesuppression', - "secondary_dialtone_digits" => 'secondary_dialtone_digits', "secondary_dialtone_tone" => 'secondary_dialtone_tone', - 'namedcallgroup'=>'namedcallgroup', 'namedpickupgroup' => 'namedpickupgroup' - ); - - public function getInfo() { - return array( - "rawName" => "sccp", - "hardware" => "sccp_custom", - "prettyName" => _("Sccp Custom Driver"), - "shortName" => "SCCP", - "description" => _("Sccp Device"), - "Version" => "11.4", - "about" => "Sccp mysql class Base ver: 11.3, Sccp ver: default" - - ); - } - -/* public function addDevice1($id, $settings) { - $sql = 'INSERT INTO sccp (id, keyword, data, flags) values (?,?,?,?)'; - $sth = $this->database->prepare($sql); - $settings = is_array($settings)?$settings:array(); - foreach($settings as $key => $setting) { - $sth->execute(array($id,$key,$setting['value'],$setting['flag'])); - } - return true; - } -*/ - public function addDevice($id, $settings) { - $add_fld = array ("name"=>'label',"outboundcid"=>'cid_num',"langcode"=>'language',"extdisplay"=>'description'); -// print_r($_REQUEST); -// echo '

    '; -// die(print_r($settings)); - $settings['cid_num']['value']=''; - if (isset($_REQUEST)){ - foreach($add_fld as $key => $val) { - if (!empty($_REQUEST[$key])){ - $settings[$val]['value'] = $_REQUEST[$key]; - } - } - } - if (empty($settings['cid_num']['value'])) { - $settings['cid_num']['value']= $id; - } - $sql = 'INSERT INTO sccpline (name'; - $sqlv = 'values ("'.$id.'"'; - foreach($this->data_fld as $key => $val) { - if (!empty($settings[$val]) ) { - if (!empty($settings[$val]['value'])){ - $sql .= ', '.$key; - $sqlv .= ", '".$settings[$val]['value']."' "; - } - } - } - $sql .= ") ".$sqlv.");"; - $sth = $this->database->prepare($sql); - $sth->execute(); - return true; - } - - public function delDevice($id) { - $sql = "DELETE FROM sccpline WHERE name = ?"; - $sth = $this->database->prepare($sql); - $sth->execute(array($id)); - return true; - } - - - public function getDevice($id) { - $sccp_line = array(); -// $sql = "SELECT name as id, name as name"; - $sql = "SELECT name as id, name as name "; - foreach($this->data_fld as $key => $val) { - $sql .= ',`'. $key .'` as '.$val; - } - $sql .= " FROM sccpline WHERE name = ?"; - $sth = $this->database->prepare($sql); - $result = array(); - $tech = array(); - try { - $sth->execute(array($id)); - $result = $sth->fetch(\PDO::FETCH_ASSOC); - $tech = $result; - $tech['dial']='SCCP/'.$id; - } catch(\Exception $e) {} - - return $tech; - } - - public function getDefaultDeviceSettings($id, $displayname, &$flag) { - $dial = 'SCCP'; - $settings = array( - "pin" => array( - "value" => "", - "flag" => $flag++ - ), - "incominglimit" => array( - "value" => "", - "flag" => $flag++ - ), - "lcontext" => array( - "value" => "from-internal", - "flag" => $flag++ - ), - "callgroup" => array( - "value" => "", - "flag" => $flag++ - ), - "namedcallgroup" => array( - "value" => "", - "flag" => $flag++ - ), - "pickupgroup" => array( - "value" => "", - "flag" => $flag++ - ), - "namedpickupgroup" => array( - "value" => "", - "flag" => $flag++ - ), - "transfer" => array( - "value" => "yes", - "flag" => $flag++ - ), - "adhocNumber" => array( - "value" => "", - "flag" => $flag++ - ), - "echocancel" => array( - "value" => "no", - "flag" => $flag++ - ), - "dnd" => array( - "value" => "UserDefined", - "flag" => $flag++ - ), - "silencesuppression" => array( - "value" => "no", - "flag" => $flag++ - ), - "secondary_dialtone_digits" => array( - "value" => "9", - "flag" => $flag++ - ), - "secondary_dialtone_tone" => array( - "value" => "0x22", - "flag" => $flag++ - ), - "musicclass" => array( - "value" => "default", - "flag" => $flag++ - ), - ); - return array( - "dial" => $dial, - "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. - public function getDeviceDisplay($display, $deviceInfo, $currentcomponent, $primarySection) { - $section = _("Settings"); - $category = "general"; - $tmparr = array(); - $tt = _("The maximum number of incoming calls on this line."); -// $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel); -// !TODO!: Please change the default value for incominglimit to '6' or higher - $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 1); - - $tt = _("Asterisk context which this line will use to send and receive calls (Note: Only change this is you know what you are doing)."); - $tmparr['lcontext'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1); - -// !TODO!: -TODO-: Maybe completely remove support for old numberic callgroup/pickupgroup in favor of the named version ? See Sccp.class.php.v431 - $tt = _("Phone call group (numeric only, example:1,3-4)"); - $tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1); - -// !TODO!: -TODO-: multiple allowed (not sure if that is implemented here). See Sccp.class.php.v431 - $tt = _("Phone named call group (>asterisk-11)"); - $tmparr['namedcallgroup'] = array('prompttext' => _('Named Call Group'),'value' => '', 'tt' => $tt, 'level' => 1); - - $tt = _("Sets the pickup group (numeric only, example:1,3-4) this line is a member of. Allows this line to pickup calls from remote phones which are in this callhroup."); - $tmparr['pickupgroup'] = array('prompttext' => _('Pickup group id'),'value' => '', 'tt' => $tt, 'level' => 1); - -// !TODO!: -TODO-: multiple allowed (not sure if that is implemented here). See Sccp.class.php.v431 - $tt = _("Sets the named pickup name group this line is a member of. Allows this line to pickup calls from remote phones which are in this name callgroup (>asterisk-11)."); - $tmparr['namedpickupgroup'] = array('prompttext' => _('Named Pickup Group'),'value' => '', 'tt' => $tt, 'level' => 1); - - $tt = _("Phone pincode (Note used)"); - $tmparr['pin'] = array('value' => '', 'tt' => $tt, 'level' => 1); - - $tt = _("Digits to indicate an external line to user (secondary dialtone) Sample 9 or 8 (max 9 digits)"); - $tmparr['secondary_dialtone_digits'] = array('prompttext' => _('Secondary dialtone digits'), 'value' => '', 'tt' => $tt, 'level' => 1); - - unset($select); - $select[] = array( 'value' => '0x21', 'text' => 'Inside Dial Tone'); - $select[] = array( 'value' => '0x22', 'text' => 'Outside Dial Tone'); - $select[] = array( 'value' => '0x23', 'text' => 'Line Busy Tone'); - $select[] = array( 'value' => '0x24', 'text' => 'Alerting Tone'); - $select[] = array( 'value' => '0x25', 'text' => 'Reorder Tone'); - $select[] = array( 'value' => '0x26', 'text' => 'Recorder Warning Tone'); - $select[] = array( 'value' => '0x27', 'text' => 'Recorder Detected Tone'); - $select[] = array( 'value' => '0x28', 'text' => 'Reverting Tone'); - $select[] = array( 'value' => '0x29', 'text' => 'Receiver OffHook Tone'); - $select[] = array( 'value' => '0x2A', 'text' => 'Partial Dial Tone'); - $select[] = array( 'value' => '0x2B', 'text' => 'No Such Number Tone'); - $select[] = array( 'value' => '0x2C', 'text' => 'Busy Verification Tone'); - $select[] = array( 'value' => '0x2D', 'text' => 'Call Waiting Tone'); - $select[] = array( 'value' => '0x2E', 'text' => 'Confirmation Tone'); - $select[] = array( 'value' => '0x2F', 'text' => 'Camp On Indication Tone'); - $select[] = array( 'value' => '0x30', 'text' => 'Recall Dial Tone'); - $select[] = array( 'value' => '0x31', 'text' => 'Zip Zip'); - $select[] = array( 'value' => '0x32', 'text' => 'Zip'); - $select[] = array( 'value' => '0x33', 'text' => 'Beep Bonk'); - $select[] = array( 'value' => '0x34', 'text' => 'Music Tone'); - $select[] = array( 'value' => '0x35', 'text' => 'Hold Tone'); - $select[] = array( 'value' => '0x36', 'text' => 'Test Tone'); - $select[] = array( 'value' => '0x37', 'text' => 'DT Monitor Warning Tone'); - $select[] = array( 'value' => '0x40', 'text' => 'Add Call Waiting'); - $select[] = array( 'value' => '0x41', 'text' => 'Priority Call Wait'); - $select[] = array( 'value' => '0x42', 'text' => 'Recall Dial'); - $select[] = array( 'value' => '0x43', 'text' => 'Barg In'); - $select[] = array( 'value' => '0x44', 'text' => 'Distinct Alert'); - $select[] = array( 'value' => '0x45', 'text' => 'Priority Alert'); - $select[] = array( 'value' => '0x46', 'text' => 'Reminder Ring'); - $select[] = array( 'value' => '0x47', 'text' => 'Precedence RingBank'); - $select[] = array( 'value' => '0x48', 'text' => 'Pre-EmptionTone'); - $select[] = array( 'value' => '0x67', 'text' => '2105 HZ'); - $select[] = array( 'value' => '0x68', 'text' => '2600 HZ'); - $select[] = array( 'value' => '0x69', 'text' => '440 HZ'); - $select[] = array( 'value' => '0x6A', 'text' => '300 HZ'); - $select[] = array( 'value' => '0x77', 'text' => 'MLPP Pala'); - $select[] = array( 'value' => '0x78', 'text' => 'MLPP Ica'); - $select[] = array( 'value' => '0x79', 'text' => 'MLPP Vca'); - $select[] = array( 'value' => '0x7A', 'text' => 'MLPP Bpa'); - $select[] = array( 'value' => '0x7B', 'text' => 'MLPP Bnea'); - $select[] = array( 'value' => '0x7C', 'text' => 'MLPP Upa'); -/* !TODO!: +TODO+: I would remove the values below this line, except for 'No Tone' */ -// $select[] = array( 'value' => '0x7F', 'text' => 'No Tone'); - $select[] = array( 'value' => '0x80', 'text' => 'Meetme Greeting Tone'); - $select[] = array( 'value' => '0x81', 'text' => 'Meetme Number Invalid Tone'); - $select[] = array( 'value' => '0x82', 'text' => 'Meetme Number Failed Tone'); - $select[] = array( 'value' => '0x83', 'text' => 'Meetme Enter Pin Tone'); - $select[] = array( 'value' => '0x84', 'text' => 'Meetme Invalid Pin Tone'); - $select[] = array( 'value' => '0x85', 'text' => 'Meetme Failed Pin Tone'); - $select[] = array( 'value' => '0x86', 'text' => 'Meetme CFB Failed Tone'); - $select[] = array( 'value' => '0x87', 'text' => 'Meetme Enter Access Code Tone'); - $select[] = array( 'value' => '0x88', 'text' => 'Meetme Access Code Invalid Tone'); - $select[] = array( 'value' => '0x89', 'text' => 'Meetme Access Code Failed Tone'); - $select[] = array('value' => 'yes', 'text' => 'Yes'); - $select[] = array('value' => 'no', 'text' => 'No'); - - $tt = _("Outside dialtone frequency (defaul 0x22)"); - $tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone'), 'value' => '0x22', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select'); - -# !TODO!: -TODO-: is there no easier way to specify a boolean radio group ? No. - unset($select); - $select[] = array('value' => 'yes', 'text' => 'Yes'); - $select[] = array('value' => 'no', 'text' => 'No'); - $tt = _("Allow call transfer."); - $tmparr['transfer'] = array('prompttext' => _('Call Transfer'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio'); - - unset($select); - $select[] = array('value' => 'yes', 'text' => 'Yes'); - $select[] = array('value' => 'no', 'text' => 'No'); - $tt = _("Echo cancel"); - $tmparr['echocancel'] = array('prompttext' => _('Echo cancel'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio'); - - unset($select); - $select[] = array('value' => 'off', 'text' => 'Off'); - $select[] = array('value' => 'reject', 'text' => 'Reject'); - $select[] = array('value' => 'silent', 'text' => 'Silent'); - $select[] = array('value' => 'UserDefined', 'text' => 'UserDefined'); -# !TODO!: -TODO-: The next entry should be "null/empty" (not UserDefined) -> to indicate the trie-state behaviour -# !TODO!: -TODO-: Userdefined is also a possible state, but it is not used or implemented (and it should not be implemented here, i think). See Sccp.class.php.v431, See Sccp.class.php - Old Style - $tt = _("DND: How will dnd react when it is set on the device level dnd can have three states: off / busy(reject) / silent / UserDefined").'
    '. - _("UserDefined - dnd that cycles through all three states off -> reject -> silent -> off (this is the normal behaviour)").'
    '. - _("Reject - Usesr can only switch off and on (in reject/busy mode)").'
    '. - _("Silent - Usesr can only switch off and on (in silent mode)"); - $tmparr['dnd'] = array('prompttext' => _('DND'), 'value' => 'UserDefined', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio'); - - unset($select); - $select[] = array('value' => 'yes', 'text' => 'Yes'); - $select[] = array('value' => 'no', 'text' => 'No'); - $tt = _("Silence Suppression. Asterisk Not supported"); - $tmparr['silencesuppression'] = array('prompttext' => _('Silence Suppression'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio'); - - unset($select); - $select[] = array('value' => 'default', 'text' => _('default')); - if (function_exists('music_list')){ - $moh_list = music_list(); - } else { - $moh_list = array('default'); - } - foreach ($moh_list as $value) { - $select[] = array('value' => $value, 'text' => _($value)); - } - - $tt = _("Music on hold"); - $tmparr['musicclass'] = array('prompttext' => _('Music on hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1); - - $devopts = $tmparr; - return $devopts; - } -} diff --git a/conf/sccpgeneral.xml b/conf/sccpgeneral.xml deleted file mode 100644 index 3ce4f26..0000000 --- a/conf/sccpgeneral.xml +++ /dev/null @@ -1,1018 +0,0 @@ - - - - - XML_info - NONE - - - - - - - - - - - dev_sshUserId - cisco - - Help. - - - - dev_sshPassword - cisco - - Help. - - - - dev_deviceProtocol - SCCP - - Help. - - - - sccp_xml_about - XML Base ver: 11.2, Sccp ver: default - - Help. - - - - - - - - - servername - Vt - - Servername: This is the type of server - usually, it will be Asterisk. - - - - bindaddr - 0.0.0.0 - sccp-custom - - - port - 2000 - sccp-custom - - Bind Address: The address to bind to for SCCP. In general, it should be set to '0.0.0.0'. If you find problems with one-way audio, you can set this to a specific address in the server. Note that '127.0.0.1' is always wrong here. Also note that placing in your external IP address will cause the chan_sccp module to not load. A manual edit of the /etc/asterisk/sccp.conf file will be needed to fix and reload the module. - : - - - - externip - - sccp-custom - - - External IP Address of the firewall, required in case the PBX is running on a separate host behind it. IP Address that we're going to notify in RTP media stream as the pbx source address. - / - - - - keepalive - 60 - sccp-custom - number - - - Time between Keep Alive checks. Valid range is 60-300 seconds. After much trial-and-error, the minimum (60) seems to work just fine. - - debug - NONE - - - - - - Debug: Enable debugging level in SCCP module. - - - - - - permit - 0.0.0.0/0.0.0.0 - - - Add Allow network - Allow network settings. Blank fields will be ignored, use Network 0.0.0.0. - - - - - deny - 0.0.0.0/0.0.0.0 - - - Add Deny network - All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. - - - - - localnet - 0.0.0.0/0.0.0.0 - - - Add local networks - Local network settings. Blank fields will be ignored used Network 0.0.0.0. - - - - - - language - English - - SCCP Language: This is the language for your hints and other features of the phone. If you don't have any languages installed or are using a single language, you can leave this blank. - - - netlang - English_United_States - - The Network locales allows the phone to play tones (ringing, busy etc.) native to the phone's country. - - - devlang - English_United_States - - The user locale allows the phone to display text (menu items, soft keys etc.) native to the phone's language. - - - - - - - firstdigittimeout - 16 - sccp-custom - number - - - First Digit Timeout: The amount of time after your first digit to start dialing automatically. This can be over-ridden with in your dialplan.xml or by using the 'immediate dial' button. - - - - digittimeout - 8 - sccp-custom - number - - - Digit Timeout: The amount of time to wait after the second (or subsequent) dialed digit. Override rules are the same as for firstdigittimeout. - - - - autoanswer_ring_time - 0 - sccp-custom - number - - - Autoanswer Ring Time: The amount of time the phones will ring when being called as Intercom or Paging mode. - - - - autoanswer_tone - 0x32 - sccp-custom - - Autoanswer Tone: The tone the phone plays back when it picks up the phone in autoanswer mode. Default is '0x32'. Silence is '0x00'. There are lots of tones, all expressed as '0XNN' where 'NN' is a hexadecimal number. - - - - remotehangup_tone - 0x32 - sccp-custom - - Remote Hangup Tone: The tone played by the phone when it received a remote hang-up signal. Use '0' to disable the tone. - - - - transfer_tone - 0x32 - sccp-custom - - Transfer Tone: The tone played when a call is transferred. Use '0' to disable the tone. - - - - callwaiting_tone - 0x2D - sccp-custom - - Call Waiting Tone: The tone played when a call is waiting. If you set this one to '0', you will not get a tone in your current call if a new call comes in, so you might want to disable call waiting for this line instead. - - echocancel - no - - - Echo Cancel: Echo Cancellation (On or Off). - - silencesuppression - no - - - Silence Suppression: Silence Suppression on the phone. - - private - yes - - - Private Calling Enabled: Place a call with privacy Options (no Caller ID) turned on. Needs to be supported in Asterisk to work through SIP and DAHDI trunks. - - directed_pickup_modeanswer - no - - - Directed Pickup Mode (Answer): If a call is sent with the "directed pickup" flag, the phone will answer when set to "Yes". - - callanswerorder - oldestfirst - - - Call Answer Order: Which call should be answered first? The most common choice is "oldestfirst", but other orders are supported. - - mwilamp - On - - - - - - Set the MWI lamp style when MWI active to on, off, wink, flash or blink - - mwioncall - no - - - Set the MWI on call. - - - - ntp_config_enabled - no - - - Enabling NTP settings in device configuration. - - - - ntp_server - pool.ntp.org - pool.ntp.org - - NTP Server name or IP - - ntp_server_mode - unicast - - - - - Configure NTP Server protocol time synchronization - - - - - - dateformat - - Date Format: The date format for the on-screen display. Can be one of the following: (D-M-YA, M.D.Y, Y/M/D) where 'D' is Day, 'M' is Month, 'Y' is Year, 'A' is 24-hour, 'a' is 12-hour, and the separators can be '.','-','/' - - - ntp_timezone - - Date Format: Time zone - - - - - - - - dev_servicesURL - - - - - - - - - - dev_authenticationURL - - - - - The above is simply a dummy authentication page. It literally contains one word: AUTHORIZED (it receives UserId, Password, and devicename in the url - if you truly wish to implement special auth) - - - - dev_idleURL - - - - - URL of CiscoIPPhoneImage. Requires a non-zero setting in idleTimeout. - - - - dev_informationURL - - - - - - - - dev_messagesURL - - - - - - - - dev_directoryURL - - - - This is the URL for a CiscoIPPhoneMenu which gets appended to the end of the Missed/Received/Placed calls. I don't use it (I find it makes more sense to put my phone book under services) - - - - dev_proxyServerURL - - - - - - - - - - dev_idleTimeout - 60 - sccp-custom - number - - - - - - - - - - sccp_tos - 0x68 - sccp-custom - - - sccp_cos - 0x4 - sccp-custom - - SCCP Type Of Service / Class Of Service: SCCP Type or Class of Service - this is modifiable, but don't. - - - - audio_tos - 0xB8 - sccp-custom - - - audio_cos - 0x6 - sccp-custom - - Audio Type Of Service / Class Of Service: Audio Type or Class of Service - this is modifiable, but don't. - - - - video_tos - 0x88 - sccp-custom - - - video_cos - 0x5 - sccp-custom - - Video Type Of Service / Class Of Service: Video Type or Class of Service - this is modifiable, but don't. - - - - - Help_id2 - Setting the hotline Feature on a device, will make it connect to a predefined extension as soon as the Receiver is picked up or the 'New Call' Button is pressed. No number has to be given. This works even on devices which have no entry in the config file or realtime database. - The hotline function can be used in : - - First time configurationThis will make it easier to register new devices and assign numbers - At a doorWhere you want people to be able to only call one number - For unprovisioned phonesTo only be able to call the helpdesk to get their phone set up - - - Be careful with this function. Especially not to the internet. So i would restring the deny/permit to 'internal' by default in that case. - - Allow =Specify a list of your networks, for example: 192.168.1.0 - deny =0.0.0.0/0.0.0.0 - permit =internal - hotline_context =sccp - hotline_label = hotline - - - - - - hotline_enabled - off - - - Hotline Enabled: This allows unregistered extensions to connect to the system and dial the number listed below. - - - - hotline_extension - *111 - sccp-custom - - Hotline Extension: The number that gets called when a hotline is picked up. hint - - - - hotline_label - Hot Line - sccp-custom - - Hotline Label: The label on the device - - - - hotline_context - default - sccp-custom - - Hotline Context: This is the context through which the phone will connect. It should probably match your other contest. The default is "from-internal" but "from-internal-xfer" would also make sense by limiting the options for the person using the phone. - - - - context - from-internal - sccp-custom - - Context: This is the context in which your phones will operate. It should match the context you are using for the rest of your phones (if you have any). The FreePBX default is 'from-internal' - - - - regcontext - sccpregistration - sccp-custom - - If regcontext is specified in sccp.conf chan-sccp-b will dynamically create and destroy a NoOp priority 1 extension for a given peer/line which registers with the server. If the context is not specified in extension.conf, then it will be dynamically created when an chan-sccp-b agent registers - - - musicclass - NONE - - form-control - Music Class: Available MOH Classes. These are the MOH classes listed in your current server. - - - dial_template - NONE - - sccp-custom - Help. - - - autoselectline_enabled - - no - - - Enables and Disables auto line selection. - - meetme - no - - - Enable/Disable conferencing via meetme (on/off), make sure you have one of the meetme apps mentioned below activated in module.conf - - - - meetmeopts - qxd - sccp-custom - - Other options (app_meetme: A,a,b,c,C,d,D,E,e,F,i,I,l,L,m,M,o,p,P,q,r,s,S,t,T,w,x,X,1) see meetme specific documentation - - - - autocall_select - - no - - - - - backgroundImageAccess - no - - - I'm guessing on this one, but on some devices, the background image on the display can be modified at the device. I think this is the thing that allows that to take. - - - - - - - tftp_path - /tftpboot - sccp-custom - - Path to tftp home directory - - - tftp_rewrite - - off - - - Support the use of regular-expression-based filename remapping - - - - devicetable - sccpdevice - - - sccp-custom - Device Table: This is the devicetable for your realtime configuration. Don't change this unless you know what you are doing and have made all the appropriate changes in the rest of your Asterisk config files. There are two reasonable settings for this - the sccpdevice table or the sccpdeviceconfig view. If you do not want to use the realtime database anymore, you can set this to blank. NOT RECOMMENDED. - - - - - linetable - sccpline - sccp-custom - - Line Table: This is the linetable for your realtime configuration. Don't change this unless you know what you are doing and have made all the appropriate changes in the rest of your Asterisk config files. If you do not want to use the realtime database anymore, you can set this to blank. NOT RECOMMENDED. - - - - createlangdir - no - - - Say 'yes' if you need to create cisco default language directory in tftp path. - - - - - - - - mac - 000000000 - sccp-custom - - The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX - - - - - type - 7911 - - hw_select sccp-custom - The type of phone: 7911, 7940, 7960, etc. Important note: the 'G' models are handled as the base model (e.g., 7962G is handled as 7962). In the Display mode, this field is read-only because the MAC address and the model number are a pair. - - - - addon - NONE - - hw_select sccp-custom - Addon: Addons are model specific and only work with certain base phones. This phone model is identified as being a phone that does not accept sidecars. Update devmodel if this is not correct. - - - - - - - - mac - 000000000 - sccp-custom - - - The MAC address of the phone - - - - type - 7911 - - - hw_select sccp-custom - The type of phone: 7911, 7940, 7960, etc. Important note: the 'G' models are handled as the base model (e.g., 7962G is handled as 7962). In the Display mode, this field is read-only because the MAC address and the model number are a pair. - - - - - - type - 79XX - sccp-custom - - - The type of phone: 7911, 7940, 7960, etc. Important note: the 'G' models are handled as the base model (e.g., 7962G is handled as 7962). In the Display mode, this field is read-only because the MAC address and the model number are a pair. - - - - - addon - NONE - sccp-custom - - - Addon: Addons are model specific and only work with certain base phones. This phone model is identified as being a phone that does not accept sidecars. Update devmodel if this is not correct. - - - - - - - - - description - 000000000 - sccp-custom - - The information in the upper right corner of the device screen - - - softkeyset - default - - System Default Softkey - - - tzoffset - 00 - - Time Zone offset - - - netlang - English_United_States - - The Network locales allows the phone to play tones (ringing, busy etc.) native to the phone's country. - - - devlang - English_United_States - - The user locale allows the phone to display text (menu items, soft keys etc.) native to the phone's language. - - - - backgroundImage - - sccp-custom - - For phones that can display background images - display this one. Default is [empty] - - - - ringtone - - sccp-custom - - The ringtone that the phone will default to. Can be overridden in the phone. The files RINGLIST.XML provice the basic phone ring tones, while DISTINCTIVERINGLIST.XML defines the list of possible ring tones for your other line types. They, along with the actual 'raw' ringtones, are stored in the /tftpboot/ringtones directory with the rest of the config files. - - - - - - - mac - 000000000 - sccp-custom - - - - - - - - transfer - no - - - Transfer allowed - - cfwdall - no - - - Activate the Callforward Softkeys. Default is On - - cfwdbusy - no - - - Activate the callforward busy softkeys. Default is On - - - useRedialMenu - - no - - - 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. - - - dndFeature - - On - - - Do Not Disturb. Default is Off - - - - dtmfmode - - outofband - - - Dual-Tone Multi-Frequency: outofband is the native cisco dtmf tone play - - - mwilamp - - On - - - - - - Set the MWI lamp style when MWI active to on, off, wink, flash or blink - - directed_pickup - yes - - - Enable Pickup function to direct pickup an extension. Default is On - - directed_pickup_modeanswer - yes - - - On (Default)= the call has been answered when picked up. Off = call manager way, the phone who picked up the call rings the call - - - - directed_pickup_context - - sccp-custom - - Context where direct pickup search for extensions. if not set current context will be use. - - - - - - - conf_allow - - yes - - - Allow the use of conference - - - conf_play_general_announce - - yes - - - Playback General Announcements (like: 'You are Entering/Leaving the conference') - - - conf_play_part_announce - - yes - - - Playback Personal/Participant Announcements, (like: 'You have been muted / You have been kicked') - - - conf_mute_on_entry - - no - - - Mute new participants from the start - - - conf_show_conflist - - yes - - - Automatically show conference list to the moderator - - - conf_music_on_hold_class - default - - form-control - Play music on hold of this class when no moderator is listening on the conference. If set to an empty string, no music on hold will be played. - - - - - - - - - permit - / - - - Add Allow network - Allow network settings. Blank fields will be ignored used Network 0.0.0.0. - - - - - deny - / - - - Add Deny network - All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. - - - nat - - Off - - - Device NAT support (default Off) - - - - directrtp - - Off - - - This option allow devices to do direct RTP sessions (default Off) - - - earlyrtp - - progress - - - - - The audio stream will be open in the progress and connected state. Valid options: NONE, progress, offhook, dial, ringout. Default may be Progress. - - - - - - dialtemplate_name - - form-control - - - - - - - - - dialtemplate - */10/* - title - - - text1 - - - - empty - Bellcore-Alerting - Bellcore-Inside - Bellcore-Outside - Bellcore-Busy - Bellcore-BusyVerify - Bellcore-Reorder - Bellcore-CallWaiting - Bellcore-Hold - Bellcore-Reminder - Bellcore-Confirmation - Bellcore-Stutter - Bellcore-Permanent - Bellcore-None - Cisco-Zip - Cisco-ZipZip - Cisco-BeepBonk - Bellcore-dr1 - Bellcore-dr2 - Bellcore-dr3 - Bellcore-dr4 - Bellcore-dr5 - Bellcore-dr6 - CallWaiting-2 - CallWaiting-3 - CallWaiting-4 - - Allow network settings. Blank fields will be ignored used Network 0.0.0.0. - - - - - - - Help_srst - You can also configure a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list. This proves especially useful in a remote site configuration where the phones and Asterisk are connected over a WAN network. SRST provides users with fallback support for the IP phones that cannot access the primary, secondary, or tertiary Asterisk Node in the CallManager List because of an Asterisk Node failure or loss of connectivity across the WAN. For the remote sites attached to multiple-service routers across the WAN, SRST ensures that your remote users receive continuous (although minimal) service by providing call handling support directly from the SRST router. - When IP phones lose contact with primary, secondary, and tertiary Asterisk Nodes (CM's), they must establish a connection to a local SRST router to sustain the call-processing capability necessary to place and receive calls. The IP phone retains the IP address of the local SRST router as a default router in the Network Configuration area of the Settings menu. The Settings menu supports a maximum of five default router entries; however, the cnf.xml accommodates a maximum of three entries. When a secondary Asterisk Node is not available on the network, the local SRST Router's IP address is retained as the standby connection for Asterisk Node during normal operation. - - - srst_Option - disable - - - - You enabled/configured a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list. - - srst_userModifiable - false - - - The user can change the personal SRST configuration on the device - - srst_isSecure - false - - - The user can change the personal SRST configuration on the device - - - - - - srst_Name - Enable - - You enabled configure a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list. - - - - - srst_ip - 3 - / - - - Add Server - - - - - srst_sip - 3 - / - - - Add Server - - - - diff --git a/sccpManClasses/extconfigs.class.php b/sccpManClasses/extconfigs.class.php index 4548215..18ec5dc 100644 --- a/sccpManClasses/extconfigs.class.php +++ b/sccpManClasses/extconfigs.class.php @@ -352,7 +352,8 @@ class extconfigs if (file_exists($src_path)) { copy($src_path, $dst); } else { - $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst); + // Set new default + $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst) '.v433'; copy($src_path, $dst); } } From be2b21f8cf74011329385f06a5991b80caa217de Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 07:45:09 +0200 Subject: [PATCH 34/49] Update extconfigs.class.php Fix missing . --- sccpManClasses/extconfigs.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sccpManClasses/extconfigs.class.php b/sccpManClasses/extconfigs.class.php index 18ec5dc..c969263 100644 --- a/sccpManClasses/extconfigs.class.php +++ b/sccpManClasses/extconfigs.class.php @@ -353,7 +353,7 @@ class extconfigs copy($src_path, $dst); } else { // Set new default - $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst) '.v433'; + $src_path = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/conf/' . basename($dst) . '.v433'; copy($src_path, $dst); } } From 89fe90d2cafaecf19798e6dea323a393cc26d187 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:23:23 +0200 Subject: [PATCH 35/49] Replace modal on save config Remove modal with close waiting on user input and replace with Toast --- assets/js/sccp_manager.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index e60ffc1..313a103 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -88,9 +88,6 @@ $(document).ready(function () { data: vdata, success: function (data) { if (data.status === true) { - if (data.message) { - var old_style = bs_alert(data.message, data.status, data.reload); - } if (data.table_reload === true) { $('table').bootstrapTable('refresh'); } @@ -106,8 +103,12 @@ $(document).ready(function () { if (data.search != null) { location.search = data.search; } - if (data.reload === true && old_style ===true ) { - location.reload(); + if (data.message) { + fpbxToast(_('Configuration saved. Reloading Module'),_('Configuration saved'), 'success'); + if (data.reload === true) { + //Need setTimout or reload will kill Toast + setTimeout(function(){location.reload();},500); + } } } else { bs_alert(data.message,data.status); From e6c5dd63a049091c11348c6321ff71439e677ac5 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:31:23 +0200 Subject: [PATCH 36/49] Replace Save and Continue modal Use Toast --- assets/js/sccp_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index 313a103..e0d8dff 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -55,7 +55,7 @@ $(document).ready(function () { if (data.message) { bs_alert(data.message,data.status); } else { - bs_alert('Data Save',data.status); + fpbxToast(_('Data saved'),_('Data saved'), 'success'); } } else { bs_alert(data.message,data.status); From 808e676972bbabd91c03c7eaa03f7f74d8bb16a8 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:43:21 +0200 Subject: [PATCH 37/49] Clean up model display Improve message and add newline --- views/advserver.model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/advserver.model.php b/views/advserver.model.php index 3ff44cf..22f6f4a 100644 --- a/views/advserver.model.php +++ b/views/advserver.model.php @@ -263,13 +263,13 @@ function SetColColorFirm(value, row, index) { if (row['validate'].split(';')[0] === 'no') { - return 'Not found '+ value; + return "File not found
    " + value; } return value; } function SetColColorTempl(value, row, index) { if (row['validate'].split(';')[1] === 'no') { - return 'Not found ' + value ; + return "File not found
    " + value ; } return value; From 09db30fe9fa1b94ef88cebafe7b24588f30851d2 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 11:47:09 +0200 Subject: [PATCH 38/49] Update Uninstaller Create Backup of SCCP tables Remove all tables Remove views and keys --- install.php | 8 ++-- uninstall.php | 102 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/install.php b/install.php index 0128f90..6f73ae7 100644 --- a/install.php +++ b/install.php @@ -45,7 +45,7 @@ $db_config = Get_DB_config($sccp_compatible); $sccp_db_ver = CheckSCCPManagerDBVersion(); // BackUp Old config -CreateBackUpConfig(); +createBackUpConfig(); RenameConfig(); InstallDB_updateSchema($db_config); @@ -708,7 +708,7 @@ function InstallDB_CreateSccpDeviceConfigView($sccp_compatible) } return true; } -function CreateBackUpConfig() +function createBackUpConfig() { global $amp_conf; outn("
  • " . _("Creating Config BackUp") . "
    • "); @@ -718,7 +718,7 @@ function CreateBackUpConfig() $dir = $cnf_int->get('ASTETCDIR'); $fsql = $dir.'/sccp_backup_'.date("Ymd").'.sql'; - $result = exec('mysqldump '.$amp_conf['AMPDBNAME'].' --password='.$amp_conf['AMPDBPASS'].' --user='.$amp_conf['AMPDBUSER'].' --single-transaction >'.$fsql, $output); + $result = exec('mysqldump '.$amp_conf['AMPDBNAME'].' --password='.$amp_conf['AMPDBPASS'].' --user='.$amp_conf['AMPDBUSER'].' --single-transaction >'.$fsql); try { $zip = new \ZipArchive(); @@ -744,7 +744,7 @@ function CreateBackUpConfig() outn("
  • " . _("Error Creating BackUp: ") . $filename ."
    • "); } unlink($fsql); - outn("
  • " . _("Create Config BackUp: ") . $filename ."
    • "); + outn("
  • " . _("Config backup created: ") . $filename ."
    • "); } function RenameConfig() diff --git a/uninstall.php b/uninstall.php index e3b2651..c4c7956 100644 --- a/uninstall.php +++ b/uninstall.php @@ -36,46 +36,80 @@ if (!defined('FREEPBX_IS_AUTH')) { global $db; $version = FreePBX::Config()->get('ASTVERSION'); +global $sqlTables; +$sqlTables = array('sccpbuttonconfig','sccpdevice','sccpline','sccpuser','sccpsettings','sccpdevmodel'); +createBackUpConfig(); -out('Removing all Sccp_manager tables'); -$tables = array('sccpdevmodel', 'sccpsettings'); -foreach ($tables as $table) { +function createBackUpConfig() +{ + global $amp_conf; + global $sqlTables; + outn("
  • " . _("Creating Config BackUp") . "
    • "); + $cnf_int = \FreePBX::Config(); + $backup_files = array('extensions','extconfig','res_mysql', 'res_config_mysql','sccp','sccp_hardware','sccp_extensions'); + $backup_ext = array('_custom.conf', '_additional.conf','.conf'); + $dir = $cnf_int->get('ASTETCDIR'); + + + $sqlTables = array('sccpbuttonconfig','sccpdevice','sccpline','sccpuser','sccpsettings','sccpdevmodel'); + $sqlTablesString = implode(' ',$sqlTables); + $sqlBuFile = $dir.'/sccp_backup_'.date("Ymd").'.sql'; + $result = exec("mysqldump {$amp_conf['AMPDBNAME']} {$sqlTablesString} + --password={$amp_conf['AMPDBPASS']} + --user={$amp_conf['AMPDBUSER']} + --single-transaction >{$sqlBuFile}"); + try { + $zip = new \ZipArchive(); + } catch (\Exception $e) { + outn("
    "); + outn("PHPx.x-zip not installed where x.x is the installed PHP version. Install it before continuing !"); + die_freepbx(); + } + $filename = $dir . "/sccp_uninstall_backup" . date("Ymd"). ".zip"; + if ($zip->open($filename, \ZIPARCHIVE::CREATE)) { + foreach ($backup_files as $file) { + foreach ($backup_ext as $b_ext) { + if (file_exists($dir . '/'.$file . $b_ext)) { + $zip->addFile($dir . '/'.$file . $b_ext); + } + } + } + if (file_exists($sqlBuFile)) { + $zip->addFile($sqlBuFile); + } + $zip->close(); + } else { + outn("
  • " . _("Error Creating BackUp: ") . $filename ."
    • "); + outn("
    "); + outn("PHPx.x-zip not installed where x.x is the installed PHP version. Install it before continuing !"); + die_freepbx(); + } + unlink($sqlBuFile); + outn("
  • " . _("Config backup created: ") . $filename ."
    • "); +} + +if (!empty($version)) { + $check = $db->getRow("SELECT 1 FROM `kvstore` LIMIT 0", DB_FETCHMODE_ASSOC); + if (!(DB::IsError($check))) { + outn("
  • " . _("Deleting keys FROM kvstore..") . "
    • "); + sql("DELETE FROM kvstore WHERE module = 'sccpsettings'"); + sql("DELETE FROM kvstore WHERE module = 'Sccp_manager'"); + } +} +outn("
  • " . _('Removing all Sccp_manager tables') . "
    • "); +foreach ($sqlTables as $table) { $sql = "DROP TABLE IF EXISTS {$table}"; $result = $db->query($sql); if (DB::IsError($result)) { die_freepbx($result->getDebugInfo()); } + $sql = "DROP VIEW IF EXISTS sccpdeviceconfig"; + $result = $db->query($sql); + if (DB::IsError($result)) { + die_freepbx($result->getDebugInfo()); + } unset($result); } -if (!empty($version)) { - // Woo, we have a version - $check = $db->getRow("SELECT 1 FROM `kvstore` LIMIT 0", DB_FETCHMODE_ASSOC); - if (!(DB::IsError($check))) { - //print_r("none, creating table :". $value); - echo "Deleting keys FROM kvstore.."; - sql("DELETE FROM kvstore WHERE module = 'sccpsettings'"); - sql("DELETE FROM kvstore WHERE module = 'Sccp_manager'"); - } - // By accessing the database, we have recreated sccpsettings table so now delete - // Need to rewrite this uninstaller. - $sql = "DROP TABLE IF EXISTS sccpsettings"; - $result = $db->query($sql); - if (DB::IsError($result)) { - die_freepbx($result->getDebugInfo()); - } - -/* Comment: Maybe save in sccpsettings, if the chan_sccp tables already existed in the database or if they were created by install.php */ -/* So that you know if it is safe to drop/delete them */ - -/* DROP VIEW IF EXISTS`sccpdeviceconfig`; - DROP TABLE IF EXISTS `sccpbuttonconfig`; - DROP TABLE IF EXISTS `sccpdevice`; - DROP TABLE IF EXISTS `sccpdevmodel`; - DROP TABLE IF EXISTS `sccpline`; - DROP TABLE IF EXISTS `sccpsettings`; - DROP TABLE IF EXISTS `sccpuser`; - * - */ -} - echo "done
    \n"; + outn("
  • " . _("Uninstall Complete") . "
    • "); + return true; ?> From 9ac0d59c66290ef226877f2f3cbf1137c1e3c0ce Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 12:18:40 +0200 Subject: [PATCH 39/49] Leave table deletion to FreePBX FreePBX and Director remove all tables that it has installed. If they do not exist, uninstaller gives errors --- uninstall.php | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/uninstall.php b/uninstall.php index c4c7956..b1375b6 100644 --- a/uninstall.php +++ b/uninstall.php @@ -95,21 +95,15 @@ if (!empty($version)) { sql("DELETE FROM kvstore WHERE module = 'sccpsettings'"); sql("DELETE FROM kvstore WHERE module = 'Sccp_manager'"); } -} -outn("
  • " . _('Removing all Sccp_manager tables') . "
    • "); -foreach ($sqlTables as $table) { - $sql = "DROP TABLE IF EXISTS {$table}"; - $result = $db->query($sql); - if (DB::IsError($result)) { - die_freepbx($result->getDebugInfo()); - } - $sql = "DROP VIEW IF EXISTS sccpdeviceconfig"; - $result = $db->query($sql); - if (DB::IsError($result)) { - die_freepbx($result->getDebugInfo()); - } - unset($result); -} - outn("
  • " . _("Uninstall Complete") . "
    • "); - return true; + } + // FreePbx removes all tables via module.xml, and uninstaller will error + // If the tables do not exist. + //outn("
  • " . _('Removing all Sccp_manager tables') . "
    • "); + //foreach ($sqlTables as $table) { + //$sql = "DROP TABLE IF EXISTS {$table}"; + //} + outn("
  • " . _('Removing all Sccp_manager views') . "
    • "); + $db->query("DROP VIEW IF EXISTS sccpdeviceconfig"); + + outn("
  • " . _("Uninstall Complete") . "
    • "); ?> From 1751e9dd9c4039d194ce548cf50c585b4f2f0dad Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 12:21:18 +0200 Subject: [PATCH 40/49] Remove old comments Remove old commented text and update comments --- uninstall.php | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/uninstall.php b/uninstall.php index b1375b6..37954c1 100644 --- a/uninstall.php +++ b/uninstall.php @@ -1,35 +1,6 @@ " . _("Create Config BackUp") . ""); - $cnf_int = \FreePBX::Config(); - $backup_files = array('extconfig','extconfig','res_mysql', 'res_config_mysql','sccp'); - $backup_ext = array('_custom.conf', '.conf'); - $dir = $cnf_int->get('ASTETCDIR'); - $zip = new \ZipArchive(); - $filename = $dir . "/sccp_uninstall_backup" . date("Ymd"). ".zip"; - if ($zip->open($filename, \ZIPARCHIVE::CREATE)) { - foreach ($backup_files as $file) { - foreach ($backup_ext as $b_ext) { - if (file_exists($dir . '/'.$file . $b_ext)) { - $zip->addFile($dir . '/'.$file . $b_ext); - } - } - } - $zip->close(); - } else { - outn("
  • " . _("Error Create BackUp: ") . $filename ."
    • "); - } - outn("
  • " . _("Create Config BackUp: ") . $filename ."
    • "); -} -*/ if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); } @@ -102,6 +73,7 @@ if (!empty($version)) { //foreach ($sqlTables as $table) { //$sql = "DROP TABLE IF EXISTS {$table}"; //} + // Still need to handle views as FreePBX does not know about these. outn("
  • " . _('Removing all Sccp_manager views') . "
    • "); $db->query("DROP VIEW IF EXISTS sccpdeviceconfig"); From 79f59de92e39ffbc058cdedcaee51d79da01f193 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 12:27:57 +0200 Subject: [PATCH 41/49] Update module.xml Update change log Increment version --- module.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module.xml b/module.xml index 9b1719f..dbb1c43 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.2.0.5 + 14.2.0.8 setup SCCP Connectivity Steve Lad, Alex GP @@ -19,6 +19,8 @@ * Version 14.1.0.1 * - Migrated to chan-sccp repo * Version 14.2.0.1 * - Retired old interface - min chan-sccp v433 * Version 14.2.0.2 * - Fix module database definition + * Version 14.2.0.5 * - Replace Modals with fpbxToast + * Version 14.2.0.8 * - Fix uninstaller and create backup https://github.com/chan-sccp/sccp_manager From d7bc3e500bf98c5558ad920bf3bde441515893ae Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 14:24:11 +0200 Subject: [PATCH 42/49] Replace more modals with Toast --- assets/js/sccp_manager.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index e0d8dff..9f373e9 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -153,23 +153,23 @@ $(document).ready(function () { } // console.log("delete : " + data); if (dev_cmd != '') { - if (confirm(_('Are you sure you wish to delete "' + dev_id.toString().toUpperCase() + '" inormation ?'))) { + if (confirm(_('Are you sure you wish to delete "' + dev_id.toString().toUpperCase() + '" information?'))) { $.ajax({ type: 'POST', url: 'ajax.php?module=sccp_manager&command=' + dev_cmd, command: dev_cmd, data: ext_data, success: function (data) { -// console.log(data); if (data.status === true) { - if (data.message) { - var old_style = bs_alert(data.message, data.status, data.reload); - } if (data.table_reload === true) { $('table').bootstrapTable('refresh'); } - if (data.reload === true && old_style === true ) { - location.reload(); + if (data.message) { + fpbxToast(data.message,_('Operation Result'), 'success'); + if (data.reload === true) { + //Need setTimout or reload will kill Toast + setTimeout(function(){location.reload();},500); + } } } else { bs_alert(data.message,data.status); @@ -628,7 +628,6 @@ $(document).ready(function () { if (Array.isArray(data.message)) { data.message.forEach(function (entry) { bs_alert(entry,data.status); - //fpbxToast(entry, 'error', 'error'); }); } else { if (data.message) { From 707371cb921fe8e528445d85ea8a205b24ca63c0 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 15:19:45 +0200 Subject: [PATCH 43/49] Fix update button labels Convert modal responses to Toast Correct reload parameters to stay on page and redraw table Correct output text --- Sccp_manager.class.php | 2 +- assets/js/sccp_manager.js | 13 +++++++------ sccpManTraits/ajaxHelper.php | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index c6f6767..fac1950 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -1182,7 +1182,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $buton_list = $this->dbinterface->HWextension_db_SccpTableData("get_sccpdevice_buttons", array('buttontype' => 'speeddial')); } if (empty($buton_list)) { - return array('Response' => ' Found 0 device ', 'data' => ''); + return array('Response' => ' 0 buttons found ', 'data' => ''); } $copy_fld = array('ref', 'reftype', 'instance', 'buttontype'); $user_list = $user_list = $this->dbinterface->get_db_SccpTableByID("SccpExtension", array(), 'name'); diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index 9f373e9..da86215 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -586,7 +586,7 @@ $(document).ready(function () { conf_msg = 'Reset Token on All device ?'; } if ($(this).data('id') === 'update_button_label') { - conf_msg = 'Update Butons Labels on All device ?'; + conf_msg = 'Update Button Labels on ALL devices ?'; } $('#table-sccp').bootstrapTable('getSelections').forEach(function (entry) { datas = datas + 'name[' + i + ']=' + entry['name'] + '&'; @@ -615,14 +615,15 @@ $(document).ready(function () { success: function (data) { // console.log(data); if (data.status === true) { - if (data.message) { - var old_style = bs_alert(data.message, data.status,data.reload); - } if (data.table_reload === true) { $('table').bootstrapTable('refresh'); } - if (data.reload === true && old_style === true) { - location.reload(); + if (data.message) { + fpbxToast(data.message,_('Operation Result'), 'success'); + if (data.reload === true) { + //Need setTimout or reload will kill Toast + setTimeout(function(){location.reload();},500); + } } } else { if (Array.isArray(data.message)) { diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php index 2c4b987..7d21724 100644 --- a/sccpManTraits/ajaxHelper.php +++ b/sccpManTraits/ajaxHelper.php @@ -185,8 +185,8 @@ trait ajaxHelper { } } $res = $this->updateSccpButtons($hw_list); - $msg .= $res['Response'] . ' raw: ' . $res['data'] . ' '; - return array('status' => true, 'message' => 'Update Butons Labels Complite ' . $msg, 'reload' => true); + $msg .= $res['Response'] . (empty($res['data']) ? '' : ' raw data: ' . $res['data'] . ' '); + return array('status' => true, 'message' => 'Update Buttons Labels Complete: ' . $msg, 'reload' => false, 'table_reload' => true); case 'model_add': $save_settings = array(); $key_name = array('model', 'vendor', 'dns', 'buttons', 'loadimage', 'loadinformationid', 'nametemplate'); From 5ea2c831152740b2690c01d8eae9cbe1c63d215b Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:00:03 +0200 Subject: [PATCH 44/49] Correct Device Reset page reload Stay on page with page reset Correct output Switch from modal to Toast --- assets/js/sccp_manager.js | 8 ++++---- sccpManTraits/ajaxHelper.php | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index da86215..1189908 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -580,10 +580,10 @@ $(document).ready(function () { var i = 0; var conf_msg = '??????'; if ($(this).data('id') === 'reset_dev') { - conf_msg = 'Reset All device ?'; + conf_msg = 'Reset ALL devices ?'; } if ($(this).data('id') === 'reset_token') { - conf_msg = 'Reset Token on All device ?'; + conf_msg = 'Reset Token on ALL devices ?'; } if ($(this).data('id') === 'update_button_label') { conf_msg = 'Update Button Labels on ALL devices ?'; @@ -628,11 +628,11 @@ $(document).ready(function () { } else { if (Array.isArray(data.message)) { data.message.forEach(function (entry) { - bs_alert(entry,data.status); + fpbxToast(data.message[1],_('Error Result'), 'warning'); }); } else { if (data.message) { - bs_alert(data.message,data.status); + fpbxToast(data.message,_('Error Result'), 'warning'); } else { if (data) { bs_alert(data,data.status); diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php index 7d21724..e8485b1 100644 --- a/sccpManTraits/ajaxHelper.php +++ b/sccpManTraits/ajaxHelper.php @@ -140,7 +140,7 @@ trait ajaxHelper { case 'reset_dev': $msg = ''; $msgr = array(); - $msgr[] = 'Reset command send'; + $msgr[] = "Reset command sent to device(s) "; if (!empty($request['name'])) { foreach ($request['name'] as $idv) { $msg = strpos($idv, 'SEP-'); @@ -153,13 +153,14 @@ trait ajaxHelper { $msgr[] = $msg . ' ' . $res['Response'] . ' ' . $res['data']; } } + if ($idv == 'all') { $dev_list = $this->aminterface->sccp_get_active_device(); foreach ($dev_list as $key => $data) { if ($cmd_id == 'reset_token') { if (($data['token'] == 'Rej') || ($data['status'] == 'Token ')) { $res = $this->aminterface->sccpDeviceReset($idv, 'tokenack'); - $msgr[] = 'Send Token reset to :' . $key; + $msgr[] = 'Sent Token reset to :' . $key; } } else { $res = $this->aminterface->sccpDeviceReset($idv, 'reset'); @@ -169,7 +170,7 @@ trait ajaxHelper { } } } - return array('status' => true, 'message' => $msgr, 'reload' => true); + return array('status' => (($res['Response'] == 'Error')? false : true ), 'message' => $msgr, 'reload' => false, 'table_reload' => true); break; case 'update_button_label': $msg = ''; From d2e9ac318468b85a1b3c657e52fe9515e673e6b3 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:17:18 +0200 Subject: [PATCH 45/49] Bug Fix Wrong response class in MessageClass --- sccpManClasses/amInterfaceClasses/Message.class.php | 2 +- sccpManClasses/aminterface.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sccpManClasses/amInterfaceClasses/Message.class.php b/sccpManClasses/amInterfaceClasses/Message.class.php index f28f53d..7963980 100644 --- a/sccpManClasses/amInterfaceClasses/Message.class.php +++ b/sccpManClasses/amInterfaceClasses/Message.class.php @@ -392,7 +392,7 @@ class SCCPTokenAckAction extends ActionMessage { parent::__construct('SCCPTokenAck'); $this->setKey('DeviceId', $DeviceName); - $this->setResponseHandler("SCCPGeneric"); + $this->setResponseHandler("Generic"); } } diff --git a/sccpManClasses/aminterface.class.php b/sccpManClasses/aminterface.class.php index b34c911..dac5f47 100644 --- a/sccpManClasses/aminterface.class.php +++ b/sccpManClasses/aminterface.class.php @@ -415,7 +415,7 @@ class aminterface $_action = new \FreePBX\modules\Sccp_manager\aminterface\SCCPDeviceRestartAction($devicename, $action); } $_response = $this->send($_action); - $result['data'] = 'Device :'.$devicename.' Result: '.$_response->getMessage(); + $result['data'] = 'Device: '.$devicename.' Result: '.$_response->getMessage(); $result['Response']=$_response->getKey('Response'); } return $result; From 61818026ff723af093895be0f4c96a608600d100 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:24:04 +0200 Subject: [PATCH 46/49] Update module.xml Update version after bug fix --- module.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module.xml b/module.xml index dbb1c43..dc22dbd 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.2.0.8 + 14.2.0.9 setup SCCP Connectivity Steve Lad, Alex GP @@ -21,6 +21,7 @@ * Version 14.2.0.2 * - Fix module database definition * Version 14.2.0.5 * - Replace Modals with fpbxToast * Version 14.2.0.8 * - Fix uninstaller and create backup + * Version 14.2.0.9 * - Bug Fix - incorrect response class for Reset Token Device https://github.com/chan-sccp/sccp_manager From fb8f4ec00eb6412e5a6a31b28ab45fdf408f139b Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 15 Jun 2021 08:56:19 +0200 Subject: [PATCH 47/49] Bug Fix - Default line not added on Device Create Default line was only set after Device edit and save, not after Device creation. --- Sccp_manager.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index fac1950..786536a 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -569,7 +569,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpdevice"); $hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid']; $hw_type = (empty($get_settings['sccp_device_typeid'])) ? 'sccpdevice' : $get_settings['sccp_device_typeid']; - $update_hw = ($hw_id == 'new') ? 'update' : 'clear'; + $update_hw = ($hw_id == 'new') ? 'add' : 'clear'; // Possible values are delete, replace, add, clear. $hw_prefix = 'SEP'; if (!empty($get_settings[$hdr_prefix . 'type'])) { $value = $get_settings[$hdr_prefix . 'type']; From 2b49bbc373521692d4c9920f50ddfe1ad215b210 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 15 Jun 2021 09:27:07 +0200 Subject: [PATCH 48/49] Change Stable Branch Link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c93240..5c37d4b 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ How to install sccp_manager Stable ``` -https://github.com/chan-sccp/sccp_manager/archive/refs/tags/Legacy-v2.tar.gz +https://github.com/chan-sccp/sccp_manager/archive/refs/heads/Legacy.zip ``` Develop. This version can be updated through module admin as modifications are made (pending fix by FreePbx) From 92ef25bc62d339f4f7425ba4107437c40eb906d9 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 15 Jun 2021 09:41:39 +0200 Subject: [PATCH 49/49] Change Version --- module.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module.xml b/module.xml index dc22dbd..eca5e99 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.2.0.9 + 14.2.0.10 setup SCCP Connectivity Steve Lad, Alex GP @@ -22,6 +22,7 @@ * Version 14.2.0.5 * - Replace Modals with fpbxToast * Version 14.2.0.8 * - Fix uninstaller and create backup * Version 14.2.0.9 * - Bug Fix - incorrect response class for Reset Token Device + * Version 14.2.0.10 * - Bug Fix - line not assigned on device creation https://github.com/chan-sccp/sccp_manager