From 90729f74aace8b0a9c92c6407215cdbb4a97b797 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Tue, 10 Aug 2021 07:08:10 +0200 Subject: [PATCH] Update for compatibility with PHP 7.4 PHP 7.4 gives warnings that are handled as exceptions --- sccpManClasses/Sccp.class.php.v433 | 1 + views/form.adddevice.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sccpManClasses/Sccp.class.php.v433 b/sccpManClasses/Sccp.class.php.v433 index f5d2517..cecbe41 100644 --- a/sccpManClasses/Sccp.class.php.v433 +++ b/sccpManClasses/Sccp.class.php.v433 @@ -217,6 +217,7 @@ class Sccp extends \FreePBX\modules\Core\Driver { public function getDefaultDeviceSettings($id, $displayname, &$flag) { // FreePBX required method + $settings = array(); $settingsFields = array('mailbox', 'incominglimit', 'context', 'directed_pickup_context', 'callgroup', 'pickupgroup', 'namedcallgroup', 'namedpickupgroup', 'adhocNumber', 'secondary_dialtone_digits', 'secondary_dialtone_tone', 'directed_pickup', 'pickup_modeanswer', 'transfer', 'echocancel', 'dnd', 'silencesuppression', 'musicclass', 'pin', 'allow', 'disallow'); diff --git a/views/form.adddevice.php b/views/form.adddevice.php index e05a403..a1d46c9 100644 --- a/views/form.adddevice.php +++ b/views/form.adddevice.php @@ -46,7 +46,7 @@ if (!empty($_REQUEST['id'])) { $def_val[$key] = array('keyword' => $key, 'data' => $val, 'seq' => 99); } // Do not store value and let defaults apply - continue; + break; } $def_val[$key] = array("keyword" => $key, "data" => $val, "seq" => "99"); // Need to assign defaultLine as not set in the db.