From c4c65240237a8e9a9dd5784e3e6f989d9a987a5c Mon Sep 17 00:00:00 2001 From: Mendel <44873735+rabbidiesel@users.noreply.github.com> Date: Fri, 26 Nov 2021 13:32:37 -0500 Subject: [PATCH 001/496] Updated Yealink t33g (#6158) * Update provision.php * Update y000000000124.cfg Added {$yealink_dnd_allow} so that you can remove DND from the phone --- app/provision/resources/classes/provision.php | 1 + resources/templates/provision/yealink/t33g/y000000000124.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index d629f6ac2f..02cbfe1ad2 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -435,6 +435,7 @@ include "root.php"; $templates['Yealink SIP-T29G'] = 'yealink/t29g'; $templates['yealink SIP-T29P'] = 'yealink/t29p'; $templates['Yealink SIP-T32G'] = 'yealink/t32g'; + $templates['Yealink SIP-T33G'] = 'yealink/t33g'; $templates['Yealink SIP-T38G'] = 'yealink/t38g'; $templates['Yealink SIP-T40P'] = 'yealink/t40p'; $templates['Yealink SIP-T41G'] = 'yealink/t41g'; diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg index ce88495c4e..d5b65ccf12 100644 --- a/resources/templates/provision/yealink/t33g/y000000000124.cfg +++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg @@ -1151,7 +1151,7 @@ features.no_answer_code= ####################################################################################### ## DND ## ####################################################################################### -features.dnd.allow= +features.dnd.allow = {$yealink_dnd_allow} features.dnd_mode= features.dnd.enable= From 9fe891e64ced18b30fb135752ed687f5f8a77056 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 12:32:19 -0700 Subject: [PATCH 002/496] Create cidr.php --- resources/cidr.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 resources/cidr.php diff --git a/resources/cidr.php b/resources/cidr.php new file mode 100644 index 0000000000..3d8f7a2ad8 --- /dev/null +++ b/resources/cidr.php @@ -0,0 +1,18 @@ + From 1aaf1aa2fa97bded3149a7d7379b0c56efbd33ea Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 12:34:02 -0700 Subject: [PATCH 003/496] Add the new cidr.php file. --- resources/require.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/require.php b/resources/require.php index 31a620650e..ade0bd7a3b 100644 --- a/resources/require.php +++ b/resources/require.php @@ -123,6 +123,7 @@ require_once "resources/functions.php"; if ($config_exists) { require "resources/pdo.php"; + require_once "resources/cidr.php"; if (file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/switch.php")) { require_once "resources/switch.php"; } From ef5e5175c40df9dbecdaa491a38bf8ec5ca10d25 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 12:34:38 -0700 Subject: [PATCH 004/496] Update cidr.php --- resources/cidr.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/resources/cidr.php b/resources/cidr.php index 3d8f7a2ad8..00efa89f0b 100644 --- a/resources/cidr.php +++ b/resources/cidr.php @@ -1,4 +1,28 @@ + Portions created by the Initial Developer are Copyright (C) 20018-2021 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ //check the domain cidr range if (isset($_SESSION['domain']["cidr"]) && !defined('STDIN')) { From 750177a51d16cb3ee1d8e0408e0669a02006b09c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 12:35:45 -0700 Subject: [PATCH 005/496] Remove cidr from the pdo.php file. This was an awkward place for this code so moved it into its own include. --- resources/pdo.php | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/resources/pdo.php b/resources/pdo.php index fbf18c265f..a165a3735b 100644 --- a/resources/pdo.php +++ b/resources/pdo.php @@ -347,35 +347,4 @@ if ($db_type == "pgsql") { $domain_uuid = uuid(); } -//check the domain cidr range - if (isset($_SESSION['domain']["cidr"]) && !defined('STDIN')) { - $found = false; - foreach($_SESSION['domain']["cidr"] as $cidr) { - if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) { - $found = true; - break; - } - } - if (!$found) { - echo "access denied"; - exit; - } - } - -//check the api cidr range - if (isset($_SESSION['api']["cidr"])) { - $found = false; - foreach($_SESSION['api']["cidr"] as $cidr) { - if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) { - $found = true; - break; - } - } - if (!$found) { - unset ($_REQUEST['key']); - unset ($_POST['key']); - unset ($_GET['key']); - } - } - ?> From 91f27219253e196674943f8f46f264b60a8fa17b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 13:11:20 -0700 Subject: [PATCH 006/496] Create auto_loader.php --- resources/classes/auto_loader.php | 101 ++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 resources/classes/auto_loader.php diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php new file mode 100644 index 0000000000..5075b96087 --- /dev/null +++ b/resources/classes/auto_loader.php @@ -0,0 +1,101 @@ + + Portions created by the Initial Developer are Copyright (C) 2008-2021 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ + +class auto_loader { + + public function __construct() { + spl_autoload_register(array($this, 'loader')); + } + + private function loader($class_name) { + //set the default value + $class_found = false; + + //sanitize the class name + $class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name); + + //save the log to the syslog server + if ($_REQUEST['debug'] == 'true') { + openlog("XML CDR", LOG_PID | LOG_PERROR, LOG_LOCAL0); + } + + //find the most relevant class name + if (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php")) { + //first priority + $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"; + $class_found = true; + if ($_REQUEST['debug'] == 'true') { + syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); + } + include $path; + } + elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php")) { + //second priority + $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php"; + $class_found = true; + if ($_REQUEST['debug'] == 'true') { + syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); + } + include $path; + } + elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php")) { + //third priority + $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php"; + $class_found = true; + if ($_REQUEST['debug'] == 'true') { + syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); + } + include $path; + } + + //use glob for a more exensive search for the classes (note: GLOB_BRACE doesn't work on some systems) + if (!$class_found && !class_exists($class_name)) { + //fourth priority + $results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php"); + $results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"); + $results = array_merge((array)$results_1,(array)$results_2); + unset($results_1, $results_2); + foreach ($results as &$class_file) { + if (!$class_found) { + $class_found = true; + if ($_REQUEST['debug'] == 'true') { + syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$class_file.", line: ".__line__); + } + include $class_file; + break; + } + } + unset($results); + } + + //save the log to the syslog server + if ($_REQUEST['debug'] == 'true') { + closelog(); + } + } +} + +?> From bfbfca96e3a3cfd002cab9f4dad8697ae5b14590 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 13:13:04 -0700 Subject: [PATCH 007/496] Use the new PHP auto_loader.php file. --- resources/require.php | 76 ++----------------------------------------- 1 file changed, 2 insertions(+), 74 deletions(-) diff --git a/resources/require.php b/resources/require.php index ade0bd7a3b..e60c640b0b 100644 --- a/resources/require.php +++ b/resources/require.php @@ -28,7 +28,7 @@ include "root.php"; //find and include the config.php file - $config_exists = false; + $config_exists = false; if (file_exists("/etc/fusionpbx/config.php")) { $config_exists = true; include "/etc/fusionpbx/config.php"; @@ -43,79 +43,7 @@ } //class auto loader - if (!class_exists('auto_loader')) { - class auto_loader { - public function __construct() { - spl_autoload_register(array($this, 'loader')); - } - private function loader($class_name) { - //set the default value - $class_found = false; - - //sanitize the class name - $class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name); - - //save the log to the syslog server - if ($_REQUEST['debug'] == 'true') { - openlog("XML CDR", LOG_PID | LOG_PERROR, LOG_LOCAL0); - } - - //find the most relevant class name - if (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php")) { - //first priority - $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"; - $class_found = true; - if ($_REQUEST['debug'] == 'true') { - syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); - } - include $path; - } - elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php")) { - //second priority - $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php"; - $class_found = true; - if ($_REQUEST['debug'] == 'true') { - syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); - } - include $path; - } - elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php")) { - //third priority - $path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php"; - $class_found = true; - if ($_REQUEST['debug'] == 'true') { - syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__); - } - include $path; - } - - //use glob for a more exensive search for the classes (note: GLOB_BRACE doesn't work on some systems) - if (!$class_found && !class_exists($class_name)) { - //fourth priority - $results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php"); - $results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php"); - $results = array_merge((array)$results_1,(array)$results_2); - unset($results_1, $results_2); - foreach ($results as &$class_file) { - if (!$class_found) { - $class_found = true; - if ($_REQUEST['debug'] == 'true') { - syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$class_file.", line: ".__line__); - } - include $class_file; - break; - } - } - unset($results); - } - - //save the log to the syslog server - if ($_REQUEST['debug'] == 'true') { - closelog(); - } - } - } - } + include "resources/classes/auto_loader.php"; $autoload = new auto_loader(); //additional includes From 7c6ed79d6c876e536d579329cfe68354a546a815 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 26 Nov 2021 21:30:39 -0700 Subject: [PATCH 008/496] usleep 1 million is 1 second --- resources/classes/event_socket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/classes/event_socket.php b/resources/classes/event_socket.php index 3ad74c2a98..d9b939b107 100644 --- a/resources/classes/event_socket.php +++ b/resources/classes/event_socket.php @@ -72,7 +72,7 @@ class event_socket { $kv = explode(':', $line, 2); $content[trim($kv[0])] = trim($kv[1]); } - usleep(100); + usleep(20000); if (feof($this->fp)) { break; From 486a3bbd05a3d514f1a869d3caec9b1b97a4a058 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 21:40:57 -0700 Subject: [PATCH 009/496] Add a field to store the conference email address. --- app/conferences/app_config.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index 20f8d1b824..d776c083e4 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -132,6 +132,11 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional pin number to secure access to the conference."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_email"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_profile"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference Profile is a collection of settings for the conference."; From 2bc46cf7a161a3bb00b196094118ccd4fe17fffa Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:01:51 -0700 Subject: [PATCH 010/496] Add a field to store the conference email address. --- app/conference_centers/app_config.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 64b92d72bc..ad168d3fa7 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -307,6 +307,11 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the participant PIN number."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "email_address"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "max_members"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Limit number of people in the conference."; From 9555c020d222415d7a223c3646f0a9df8140ad40 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:07:00 -0700 Subject: [PATCH 011/496] Change conference_email to conference_email_address. --- app/conferences/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index d776c083e4..ce64590108 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -132,7 +132,7 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional pin number to secure access to the conference."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_email"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_email_address"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; From 8d70f757b94c75f3fd37583cb26f527a4a50dd7b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:36:24 -0700 Subject: [PATCH 012/496] Add conference email address --- app/conferences/conference_edit.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 0bd7508cd3..747111fac1 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -57,6 +57,7 @@ $conference_name = $_POST["conference_name"]; $conference_extension = $_POST["conference_extension"]; $conference_pin_number = $_POST["conference_pin_number"]; + $conference_email_address = $_POST["conference_email_address"]; $conference_profile = $_POST["conference_profile"]; $conference_flags = $_POST["conference_flags"]; $conference_order = $_POST["conference_order"]; @@ -180,6 +181,9 @@ $array['conferences'][0]['conference_name'] = $conference_name; $array['conferences'][0]['conference_extension'] = $conference_extension; $array['conferences'][0]['conference_pin_number'] = $conference_pin_number; + if (permission_exists('conference_cdr_edit')) { + $array['conferences'][0]['conference_email_address'] = $conference_email_address; + } $array['conferences'][0]['conference_profile'] = $conference_profile; $array['conferences'][0]['conference_flags'] = $conference_flags; $array['conferences'][0]['conference_order'] = $conference_order; @@ -273,6 +277,7 @@ $conference_name = $row["conference_name"]; $conference_extension = $row["conference_extension"]; $conference_pin_number = $row["conference_pin_number"]; + $conference_email_address = $row["conference_email_address"]; $conference_profile = $row["conference_profile"]; $conference_flags = $row["conference_flags"]; $conference_order = $row["conference_order"]; @@ -385,6 +390,19 @@ echo "\n"; echo "\n"; + if (permission_exists('conference_cdr_edit')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-email_address']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "".$text['description-email_address']."\n"; + echo "\n"; + echo "\n"; + } + if (permission_exists('conference_user_add') || permission_exists('conference_user_edit')) { if ($action == "update") { echo " "; From 17b7312b730363fc77ecedec45183e5b856d771c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:38:23 -0700 Subject: [PATCH 013/496] Add conference email address. --- app/conferences/app_languages.php | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php index 712f3d98ca..1afa0db4bc 100644 --- a/app/conferences/app_languages.php +++ b/app/conferences/app_languages.php @@ -526,6 +526,48 @@ $text['description-pin']['ru-ru'] = "Дополнительный PIN номер $text['description-pin']['sv-se'] = "Frivilligt pin nummer för att säkra tillgången till konferensen."; $text['description-pin']['uk-ua'] = ""; +$text['label-email_address']['en-us'] = "Email Address"; +$text['label-email_address']['en-gb'] = "Email Address"; +$text['label-email_address']['ar-eg'] = "البريد الإليكتروني"; +$text['label-email_address']['de-at'] = "Email Address"; //copied from de-de +$text['label-email_address']['de-ch'] = "Email Address"; //copied from de-de +$text['label-email_address']['de-de'] = "Email Address"; +$text['label-email_address']['es-cl'] = "Email Address"; +$text['label-email_address']['es-mx'] = "Email Address"; //copied from es-cl +$text['label-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr +$text['label-email_address']['fr-fr'] = "Courriel"; +$text['label-email_address']['he-il'] = "אימייל"; +$text['label-email_address']['it-it'] = "Email Address"; +$text['label-email_address']['nl-nl'] = "E-mail Address"; +$text['label-email_address']['pl-pl'] = "Email Address"; +$text['label-email_address']['pt-br'] = "Email Address"; //copied from pt-pt +$text['label-email_address']['pt-pt'] = "Email Address"; +$text['label-email_address']['ro-ro'] = "Email Address"; +$text['label-email_address']['ru-ru'] = "Электронная Почта"; +$text['label-email_address']['sv-se'] = "E-post"; +$text['label-email_address']['uk-ua'] = "Електронна пошта"; + +$text['description-email_address']['en-us'] = "Optional conference email address."; +$text['description-email_address']['en-gb'] = "Optional conference email address."; +$text['description-email_address']['ar-eg'] = "البريد الإليكتروني"; +$text['description-email_address']['de-at'] = "Optional conference email address."; //copied from de-de +$text['description-email_address']['de-ch'] = "Optional conference email address."; //copied from de-de +$text['description-email_address']['de-de'] = "Optional conference email address."; +$text['description-email_address']['es-cl'] = "Optional conference email address."; +$text['description-email_address']['es-mx'] = "Optional conference email address."; //copied from es-cl +$text['description-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr +$text['description-email_address']['fr-fr'] = "Courriel"; +$text['description-email_address']['he-il'] = "אימייל"; +$text['description-email_address']['it-it'] = "Optional conference email address."; +$text['description-email_address']['nl-nl'] = "Optional conference E-mail Address"; +$text['description-email_address']['pl-pl'] = "Optional conference email address."; +$text['description-email_address']['pt-br'] = "Optional conference email address."; //copied from pt-pt +$text['description-email_address']['pt-pt'] = "Optional conference email address."; +$text['description-email_address']['ro-ro'] = "Optional conference email address."; +$text['description-email_address']['ru-ru'] = "Электронная Почта"; +$text['description-email_address']['sv-se'] = "E-post"; +$text['description-email_address']['uk-ua'] = "Електронна пошта"; + $text['confirm-delete-2']['en-us'] = "Do you really want to delete this?"; $text['confirm-delete-2']['en-gb'] = "Do you really want to delete this?"; $text['confirm-delete-2']['ar-eg'] = ""; From c204c6d4a9c21eab92649d79208103082061bf2c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:54:30 -0700 Subject: [PATCH 014/496] Update conference_edit.php --- app/conferences/conference_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 747111fac1..6ec9668e2e 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -181,7 +181,7 @@ $array['conferences'][0]['conference_name'] = $conference_name; $array['conferences'][0]['conference_extension'] = $conference_extension; $array['conferences'][0]['conference_pin_number'] = $conference_pin_number; - if (permission_exists('conference_cdr_edit')) { + if (permission_exists('conference_cdr_view')) { $array['conferences'][0]['conference_email_address'] = $conference_email_address; } $array['conferences'][0]['conference_profile'] = $conference_profile; @@ -390,7 +390,7 @@ echo "\n"; echo "\n"; - if (permission_exists('conference_cdr_edit')) { + if (permission_exists('conference_cdr_view')) { echo "\n"; echo "\n"; echo " ".$text['label-email_address']."\n"; From ee7dce921772301bfb65ec7c38cd5f630693fae2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:57:56 -0700 Subject: [PATCH 015/496] Add email address to the conference room. --- .../conference_room_edit.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 7b054b13a1..a543127e05 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -58,6 +58,7 @@ $conference_room_name = $_POST['conference_room_name']; $moderator_pin = $_POST["moderator_pin"]; $participant_pin = $_POST["participant_pin"]; + $email_address = $_POST["email_address"]; $profile = $_POST["profile"]; $record = $_POST["record"]; $user_uuid = $_POST["user_uuid"]; @@ -307,6 +308,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $array['conference_rooms'][0]['record'] = $record; $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; + if (permission_exists('conference_cdr_view')) { + $array['conference_rooms'][0]['email_address'] = $email_address; + } $array['conference_rooms'][0]['max_members'] = $max_members; $array['conference_rooms'][0]['start_datetime'] = $start_datetime; $array['conference_rooms'][0]['stop_datetime'] = $stop_datetime; @@ -367,6 +371,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; + if (permission_exists('conference_cdr_view')) { + $array['conference_rooms'][0]['email_address'] = $email_address; + } if (strlen($max_members) > 0) { $array['conference_rooms'][0]['max_members'] = $max_members; } @@ -453,6 +460,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $record = $row["record"]; $moderator_pin = $row["moderator_pin"]; $participant_pin = $row["participant_pin"]; + $email_address = $row["email_address"]; $max_members = $row["max_members"]; $start_datetime = $row["start_datetime"]; $stop_datetime = $row["stop_datetime"]; @@ -606,6 +614,19 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " "; echo " "; + if (permission_exists('conference_cdr_view')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-email_address']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "".$text['description-email_address']."\n"; + echo "\n"; + echo "\n"; + } + if (if_group("superadmin") || if_group("admin")) { echo " "; echo " ".$text['label-users'].""; From d18ce4bc8d5e30f6d784cd7e3eda402f8a6bad07 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 22:59:46 -0700 Subject: [PATCH 016/496] Add email_address to the conference center languages file. --- app/conference_centers/app_languages.php | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 7f10328487..322b859610 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -212,6 +212,48 @@ $text['description-conference_center_pin_length']['ru-ru'] = "Введите м $text['description-conference_center_pin_length']['sv-se'] = "Ange minimum PIN längd."; $text['description-conference_center_pin_length']['uk-ua'] = "Введіть мінімальну довжину PIN-коду."; +$text['label-email_address']['en-us'] = "Email Address"; +$text['label-email_address']['en-gb'] = "Email Address"; +$text['label-email_address']['ar-eg'] = "البريد الإليكتروني"; +$text['label-email_address']['de-at'] = "Email Address"; //copied from de-de +$text['label-email_address']['de-ch'] = "Email Address"; //copied from de-de +$text['label-email_address']['de-de'] = "Email Address"; +$text['label-email_address']['es-cl'] = "Email Address"; +$text['label-email_address']['es-mx'] = "Email Address"; //copied from es-cl +$text['label-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr +$text['label-email_address']['fr-fr'] = "Courriel"; +$text['label-email_address']['he-il'] = "אימייל"; +$text['label-email_address']['it-it'] = "Email Address"; +$text['label-email_address']['nl-nl'] = "E-mail Address"; +$text['label-email_address']['pl-pl'] = "Email Address"; +$text['label-email_address']['pt-br'] = "Email Address"; //copied from pt-pt +$text['label-email_address']['pt-pt'] = "Email Address"; +$text['label-email_address']['ro-ro'] = "Email Address"; +$text['label-email_address']['ru-ru'] = "Электронная Почта"; +$text['label-email_address']['sv-se'] = "E-post"; +$text['label-email_address']['uk-ua'] = "Електронна пошта"; + +$text['description-email_address']['en-us'] = "Optional conference email address."; +$text['description-email_address']['en-gb'] = "Optional conference email address."; +$text['description-email_address']['ar-eg'] = "البريد الإليكتروني"; +$text['description-email_address']['de-at'] = "Optional conference email address."; //copied from de-de +$text['description-email_address']['de-ch'] = "Optional conference email address."; //copied from de-de +$text['description-email_address']['de-de'] = "Optional conference email address."; +$text['description-email_address']['es-cl'] = "Optional conference email address."; +$text['description-email_address']['es-mx'] = "Optional conference email address."; //copied from es-cl +$text['description-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr +$text['description-email_address']['fr-fr'] = "Courriel"; +$text['description-email_address']['he-il'] = "אימייל"; +$text['description-email_address']['it-it'] = "Optional conference email address."; +$text['description-email_address']['nl-nl'] = "Optional conference E-mail Address"; +$text['description-email_address']['pl-pl'] = "Optional conference email address."; +$text['description-email_address']['pt-br'] = "Optional conference email address."; //copied from pt-pt +$text['description-email_address']['pt-pt'] = "Optional conference email address."; +$text['description-email_address']['ro-ro'] = "Optional conference email address."; +$text['description-email_address']['ru-ru'] = "Электронная Почта"; +$text['description-email_address']['sv-se'] = "E-post"; +$text['description-email_address']['uk-ua'] = "Електронна пошта"; + $text['label-conference_center_greeting']['en-us'] = "Greeting"; $text['label-conference_center_greeting']['en-gb'] = "Greeting"; $text['label-conference_center_greeting']['ar-eg'] = ""; From c87a87061ff4a85f9ad32c1c8f6d769d73e07f8b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:03:42 -0700 Subject: [PATCH 017/496] Change the type from number to text. --- app/conference_centers/conference_room_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index a543127e05..3cb4287516 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -620,7 +620,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-email_address']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo "".$text['description-email_address']."\n"; echo "\n"; From 8607ee1f0ddd37b2a76779e961882fd42d1ffc1e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:06:33 -0700 Subject: [PATCH 018/496] Change type from number to text and change the the permission. --- app/conferences/conference_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 6ec9668e2e..e83159aede 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -390,13 +390,13 @@ echo "\n"; echo "\n"; - if (permission_exists('conference_cdr_view')) { + if (permission_exists('conference_email_address')) { echo "\n"; echo "\n"; echo " ".$text['label-email_address']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo "".$text['description-email_address']."\n"; echo "\n"; From 4c6f154713c4a84e631d21c22a88f20534718279 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:07:56 -0700 Subject: [PATCH 019/496] Add new permission conference_email_address --- app/conferences/app_config.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index ce64590108..d02a0c1e08 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -82,10 +82,13 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_email_address"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_destinations"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; + //cache details $apps[$x]['cache']['key'] = "dialplan.\${domain_name}"; From bbc5cae019af9d8ead44aafce47265f51a0fde7f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:12:40 -0700 Subject: [PATCH 020/496] Update the permission --- app/conference_centers/conference_room_edit.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 3cb4287516..94baa7d4d8 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -308,7 +308,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $array['conference_rooms'][0]['record'] = $record; $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; - if (permission_exists('conference_cdr_view')) { + if (permission_exists('conference_room_email_address')) { $array['conference_rooms'][0]['email_address'] = $email_address; } $array['conference_rooms'][0]['max_members'] = $max_members; @@ -371,7 +371,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; - if (permission_exists('conference_cdr_view')) { + if (permission_exists('conference_room_email_address')) { $array['conference_rooms'][0]['email_address'] = $email_address; } if (strlen($max_members) > 0) { @@ -614,7 +614,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " "; echo " "; - if (permission_exists('conference_cdr_view')) { + if (permission_exists('conference_room_email_address')) { echo "\n"; echo "\n"; echo " ".$text['label-email_address']."\n"; From 8e7f46101ffb021442dee72a2ce551a8b0a1eb7d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:15:23 -0700 Subject: [PATCH 021/496] Add a new conference_room_email_address permission. --- app/conference_centers/app_config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index ad168d3fa7..665bfc7f47 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -102,6 +102,8 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_room_email_address"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_profile"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; From 1295da2dfe1b9ccf34e7722f33017843f54e4682 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 28 Nov 2021 23:19:37 -0700 Subject: [PATCH 022/496] Update the permission name. --- app/conferences/conference_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index e83159aede..15162376d2 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -181,7 +181,7 @@ $array['conferences'][0]['conference_name'] = $conference_name; $array['conferences'][0]['conference_extension'] = $conference_extension; $array['conferences'][0]['conference_pin_number'] = $conference_pin_number; - if (permission_exists('conference_cdr_view')) { + if (permission_exists('conference_email_address')) { $array['conferences'][0]['conference_email_address'] = $conference_email_address; } $array['conferences'][0]['conference_profile'] = $conference_profile; From 2dd10ef66dbd63b7c474ffc6b80b65c641553032 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:35:08 -0700 Subject: [PATCH 023/496] Add default settings for user and domain header (#6161) --- themes/default/app_config.php | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/themes/default/app_config.php b/themes/default/app_config.php index 64b6ba3d9d..c19bc5420c 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -55,14 +55,38 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set a secondary background color, for a gradient effect."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "18a0c698-738e-4d88-a592-115dde20730f"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_user_visible"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the username currently logged in."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "425427bb-ac21-4c8f-9ec3-ef8fecd78f8f"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_user_color_hover"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#fd9c03"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text hover color (and opacity) for header user name."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e46af53d-0dd7-4b2b-9806-f790a477f245"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_visible"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_domain_visible"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the name of the domain currently being managed."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b999bb99-2224-48f0-8a61-38c4f75c9869"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_domain_color_hover"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#fd9c03"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text hover color (and opacity) for header domain name."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4a92f422-934f-4ae9-b918-fa932cb1e089"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "logout_icon_visible"; From 70b876f5da7c49b6bdd620c658d69b783c5d66d8 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:35:40 -0700 Subject: [PATCH 024/496] Add user header and domain icon to menu.php (#6160) --- resources/classes/menu.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 95a275d263..31f4f08614 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1042,10 +1042,16 @@ if (!class_exists('menu')) { $html .= " \n"; $html .= "
    \n"; + //current user + if ($_SESSION['theme']['user_visible']['text'] == 'true') { + $html .= "
  • \n"; + $html .= " text['theme-label-user']."\">".$_SESSION['username'].""; + $html .= "
    • \n"; + } //domain name/selector if (isset($_SESSION['username']) && $_SESSION['username'] != '' && permission_exists('domain_select') && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') { $html .= "
  • \n"; - $html .= " ".escape($_SESSION['domain_name']).""; + $html .= " ".escape($_SESSION['domain_name']).""; $html .= "
    • \n"; } //logout icon From db0471726d5555ded12164d2e1cd654cf6570cc7 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:36:00 -0700 Subject: [PATCH 025/496] Add alert for unsaved changes in dashboard edit. (#6159) Also fixed bug for re-rendering the chart. --- core/dashboard/index.php | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/core/dashboard/index.php b/core/dashboard/index.php index 4c0c2f0eec..af98b4053f 100644 --- a/core/dashboard/index.php +++ b/core/dashboard/index.php @@ -170,7 +170,7 @@ \n"; + echo "
    \n"; echo "
    \n"; echo "
    ".$text['title-dashboard']."
    \n"; echo "
    \n"; @@ -313,16 +313,15 @@ preventOnFilter: true, ghostClass: 'ghost', onChange: function (evt) { - //re-render chart when dragged - if (evt.item.id != 'ring_group_forward' && evt.item.id != 'call_forward') { - let chart = eval(evt.item.id + "_chart"); + //check if chart exists + let chart_status = Chart.getChart(evt.item.id + "_chart"); + if(chart_status !== undefined && chart_status !== null) { let context = eval(evt.item.id + "_chart_context"); + let chart = Chart.getChart(context); let config = eval(evt.item.id + "_chart_config"); - - let chart_status = Chart.getChart(context); - if (chart_status != undefined) { - chart_status.destroy(); - } + + //re render the chart + chart.destroy(); chart.options.animation = { duration: 0 }; chart = new Chart(context, config); } @@ -336,6 +335,22 @@ document.getElementById('widget_order').value = widget_ids_list; }, }); + + var formSubmitting = false; + var setFormSubmitting = function() { formSubmitting = true; }; + + window.onload = function() { + window.addEventListener("beforeunload", function (e) { + var confirmationMessage = 'You have unsaved changes which will not be saved.'; + + if (formSubmitting) { + return undefined; + } + + (e || window.event).returnValue = confirmationMessage; + return confirmationMessage; + }); + }; Date: Tue, 30 Nov 2021 08:36:32 -0700 Subject: [PATCH 026/496] Add styles to user and domain header (#6162) --- themes/default/css.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/themes/default/css.php b/themes/default/css.php index 586fc87fa3..53341e94e3 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -391,6 +391,27 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); opacity: 0.30; } + /* header domain/user name */ + ul.navbar-nav > li.nav-item > a.header_user, + ul.navbar-nav > li.nav-item > a.header_domain { + font-family: ; + font-size: ; + color: ; + padding: 10px; + } + + ul.navbar-nav > li.nav-item:hover > a.header_user, + ul.navbar-nav > li.nav-item:focus > a.header_user, + ul.navbar-nav > li.nav-item:active > a.header_user { + color: ; + } + + ul.navbar-nav > li.nav-item:hover > a.header_domain, + ul.navbar-nav > li.nav-item:focus > a.header_domain, + ul.navbar-nav > li.nav-item:active > a.header_domain { + color: ; + } + /* domain name/selector */ a.domain_selector_domain { color: ; From 67821959897aeee25534efca38d79db3f703a8e1 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 30 Nov 2021 14:20:25 -0700 Subject: [PATCH 027/496] Update extension_edit.php --- app/extensions/extension_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 93eb6f052d..0bcf01edb0 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -631,7 +631,7 @@ //make sure the voicemail directory exists if (is_numeric($voicemail_id)) { if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)) { - mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770); + mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770, true); } } From a5848ab13b18f4f91a9cdd64a4c4d45286a2e1c9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 30 Nov 2021 14:58:59 -0700 Subject: [PATCH 028/496] Use current caller ID name and number to set the Outbound caller ID information. --- .../resources/switch/conf/dialplan/505_call-forward-all.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml index ca85eeedbf..42129ddef3 100644 --- a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml +++ b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml @@ -5,6 +5,8 @@ + + From 24a4644dad622a88c0119692040131cde44dc97e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 30 Nov 2021 15:00:05 -0700 Subject: [PATCH 029/496] Update 505_call-forward-all.xml --- .../resources/switch/conf/dialplan/505_call-forward-all.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml index 42129ddef3..15740e414b 100644 --- a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml +++ b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml @@ -5,8 +5,8 @@ - - + + From 4e7972aa4d3c761cefe8686898ec38fdc80bf1b1 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:39:15 -0700 Subject: [PATCH 030/496] Update menu.php (#6164) --- resources/classes/menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 31f4f08614..1adae9bb0c 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1058,7 +1058,7 @@ if (!class_exists('menu')) { if (isset($_SESSION['username']) && $_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") { $username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null); $html .= "
  • \n"; - $html .= " text['theme-label-logout']."\" onclick=\"modal_open('modal-logout','btn_logout');\">"; + $html .= " text['theme-label-logout']."\" onclick=\"modal_open('modal-logout','btn_logout');\">"; $html .= "
    • \n"; unset($username_full); } From 96f74c193609d6f83d7a8a741596731f19a2f636 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:39:39 -0700 Subject: [PATCH 031/496] Fix logout icon styling (#6165) --- themes/default/css.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/themes/default/css.php b/themes/default/css.php index 53341e94e3..1dd56beb17 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -412,26 +412,17 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); color: ; } - /* domain name/selector */ - a.domain_selector_domain { - color: ; - } - - a.domain_selector_domain:hover, - a.domain_selector_domain:focus, - a.domain_selector_domain:active { - color: ; - } - /* logout icon */ a.logout_icon { color: ; + padding: 14px 10px; } a.logout_icon:hover, a.logout_icon:focus, a.logout_icon:active { color: ; + background: } a#header_logout_icon { From 245ae82e9c10585e02501f87bf09bdc93a011fb1 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 21:31:15 -0700 Subject: [PATCH 032/496] Add conference_accountcode to the conference table. --- app/conferences/app_config.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index d02a0c1e08..edc49f2152 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -135,14 +135,18 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional pin number to secure access to the conference."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_profile"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference Profile is a collection of settings for the conference."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_email_address"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_profile"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_accountcode"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference Profile is a collection of settings for the conference."; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional accountcode for the conference."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_flags"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; From ba9f0ea98f8f59df25d7ff85facf1a7194701e94 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 21:33:03 -0700 Subject: [PATCH 033/496] Add accountcode translations. --- app/conferences/app_languages.php | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php index 1afa0db4bc..be488f5fe7 100644 --- a/app/conferences/app_languages.php +++ b/app/conferences/app_languages.php @@ -715,6 +715,27 @@ $text['description-flags']['ru-ru'] = "Дополнительные флаги $text['description-flags']['sv-se'] = "Valfria konferensflaggor. Exempel: mute|deaf|waste|moderator"; $text['description-flags']['uk-ua'] = ""; +$text['description-accountcode']['en-us'] = "Enter the account code here."; +$text['description-accountcode']['en-gb'] = "Enter the account code here."; +$text['description-accountcode']['ar-eg'] = ""; +$text['description-accountcode']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-accountcode']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-accountcode']['de-de'] = "Geben Sie den Account Code hier an."; +$text['description-accountcode']['es-cl'] = "Ingrese el código de cuenta aquí."; +$text['description-accountcode']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl +$text['description-accountcode']['fr-ca'] = "Entrez le code de compte ici."; +$text['description-accountcode']['fr-fr'] = "Entrez le code de compte ici."; +$text['description-accountcode']['he-il'] = ""; +$text['description-accountcode']['it-it'] = "Inserire qui l'account code."; +$text['description-accountcode']['nl-nl'] = "Voer de accountcode hier in."; +$text['description-accountcode']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; +$text['description-accountcode']['pt-br'] = "Insira o código de conta aqui."; +$text['description-accountcode']['pt-pt'] = "Introduza o código de conta aqui."; +$text['description-accountcode']['ro-ro'] = ""; +$text['description-accountcode']['ru-ru'] = "Введите здесь код счета."; +$text['description-accountcode']['sv-se'] = "Ange 'account code' här."; +$text['description-accountcode']['uk-ua'] = ""; + $text['label-user_list']['en-us'] = "User List"; $text['label-user_list']['en-gb'] = "User List"; $text['label-user_list']['ar-eg'] = ""; @@ -757,4 +778,25 @@ $text['label-flags']['ru-ru'] = "Флаги"; $text['label-flags']['sv-se'] = "Flaggor"; $text['label-flags']['uk-ua'] = ""; +$text['label-accountcode']['en-us'] = "Account Code"; +$text['label-accountcode']['en-gb'] = "Account Code"; +$text['label-accountcode']['ar-eg'] = ""; +$text['label-accountcode']['de-at'] = "Kontoschlüssel"; //copied from de-de +$text['label-accountcode']['de-ch'] = "Kontoschlüssel"; //copied from de-de +$text['label-accountcode']['de-de'] = "Kontoschlüssel"; +$text['label-accountcode']['es-cl'] = "Código de Cuenta"; +$text['label-accountcode']['es-mx'] = "Código de Cuenta"; //copied from es-cl +$text['label-accountcode']['fr-ca'] = "Centre de frais"; //copied from fr-fr +$text['label-accountcode']['fr-fr'] = "Centre de frais"; +$text['label-accountcode']['he-il'] = "קוד חשבון"; +$text['label-accountcode']['it-it'] = "Account Code"; +$text['label-accountcode']['nl-nl'] = "Accountcode"; +$text['label-accountcode']['pl-pl'] = "Numer konta billingowego"; +$text['label-accountcode']['pt-br'] = "Código de conta"; +$text['label-accountcode']['pt-pt'] = "Código de Conta"; +$text['label-accountcode']['ro-ro'] = ""; +$text['label-accountcode']['ru-ru'] = "Код Учетной Записи"; +$text['label-accountcode']['sv-se'] = "Kontokod"; +$text['label-accountcode']['uk-ua'] = ""; + ?> From 8b16dd0c4b53b2156897352b4e342e4682e031c8 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 21:43:16 -0700 Subject: [PATCH 034/496] Add conference accountcode. --- app/conferences/conference_edit.php | 50 ++++++++++++++++++----------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 15162376d2..4a3e83053a 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -57,9 +57,10 @@ $conference_name = $_POST["conference_name"]; $conference_extension = $_POST["conference_extension"]; $conference_pin_number = $_POST["conference_pin_number"]; - $conference_email_address = $_POST["conference_email_address"]; $conference_profile = $_POST["conference_profile"]; $conference_flags = $_POST["conference_flags"]; + $conference_email_address = $_POST["conference_email_address"]; + $conference_accountcode = $_POST["conference_accountcode"]; $conference_order = $_POST["conference_order"]; $conference_description = $_POST["conference_description"]; $conference_enabled = $_POST["conference_enabled"]; @@ -181,11 +182,12 @@ $array['conferences'][0]['conference_name'] = $conference_name; $array['conferences'][0]['conference_extension'] = $conference_extension; $array['conferences'][0]['conference_pin_number'] = $conference_pin_number; + $array['conferences'][0]['conference_profile'] = $conference_profile; + $array['conferences'][0]['conference_flags'] = $conference_flags; if (permission_exists('conference_email_address')) { $array['conferences'][0]['conference_email_address'] = $conference_email_address; } - $array['conferences'][0]['conference_profile'] = $conference_profile; - $array['conferences'][0]['conference_flags'] = $conference_flags; + $array['conferences'][0]['conference_accountcode'] = $conference_accountcode; $array['conferences'][0]['conference_order'] = $conference_order; $array['conferences'][0]['conference_description'] = $conference_description; $array['conferences'][0]['conference_enabled'] = $conference_enabled; @@ -277,9 +279,10 @@ $conference_name = $row["conference_name"]; $conference_extension = $row["conference_extension"]; $conference_pin_number = $row["conference_pin_number"]; - $conference_email_address = $row["conference_email_address"]; $conference_profile = $row["conference_profile"]; $conference_flags = $row["conference_flags"]; + $conference_email_address = $row["conference_email_address"]; + $conference_accountcode = $row["conference_accountcode"]; $conference_order = $row["conference_order"]; $conference_description = $row["conference_description"]; $conference_enabled = $row["conference_enabled"]; @@ -390,19 +393,6 @@ echo "\n"; echo "\n"; - if (permission_exists('conference_email_address')) { - echo "\n"; - echo "\n"; - echo " ".$text['label-email_address']."\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo "".$text['description-email_address']."\n"; - echo "\n"; - echo "\n"; - } - if (permission_exists('conference_user_add') || permission_exists('conference_user_edit')) { if ($action == "update") { echo " "; @@ -470,6 +460,30 @@ echo "\n"; echo "\n"; + if (permission_exists('conference_email_address')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-email_address']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo "".$text['description-email_address']."\n"; + echo "\n"; + echo "\n"; + } + + echo "\n"; + echo "\n"; + echo " ".$text['label-accountcode']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo "".$text['description-accountcode']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-order']."\n"; From 5e0461c07f9b1705ba1a1c95e523245c176f62c0 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 22:33:53 -0700 Subject: [PATCH 035/496] Add the accountcode to conference center room. --- app/conference_centers/app_config.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 665bfc7f47..81fc55fdb8 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -102,8 +102,6 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; - $apps[$x]['permissions'][$y]['name'] = "conference_room_email_address"; - $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_profile"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; @@ -155,6 +153,12 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "user"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_room_email_address"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_room_accountcode"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_enabled"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; @@ -309,11 +313,6 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the participant PIN number."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "email_address"; - $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; - $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "max_members"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Limit number of people in the conference."; @@ -362,6 +361,16 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "The user that created the conference session."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "email_address"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "accountcode"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional accountcode for the conference."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "enabled"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select to enable or disable the session."; From 639213f9784c8e55be2d87d26fddc9ad3d81171b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 22:35:40 -0700 Subject: [PATCH 036/496] Add accountcode --- app/conference_centers/app_languages.php | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index 322b859610..b40ede3c69 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -296,6 +296,48 @@ $text['description-conference_center_greeting']['ru-ru'] = "Выберите п $text['description-conference_center_greeting']['sv-se'] = "Välj hälsningsmeddelande som skall spelas upp före anslutning till konferensrummet."; $text['description-conference_center_greeting']['uk-ua'] = "Виберіть привітання, яке грає до вступу в конференц-зал."; +$text['label-accountcode']['en-us'] = "Account Code"; +$text['label-accountcode']['en-gb'] = "Account Code"; +$text['label-accountcode']['ar-eg'] = ""; +$text['label-accountcode']['de-at'] = "Kontoschlüssel"; //copied from de-de +$text['label-accountcode']['de-ch'] = "Kontoschlüssel"; //copied from de-de +$text['label-accountcode']['de-de'] = "Kontoschlüssel"; +$text['label-accountcode']['es-cl'] = "Código de Cuenta"; +$text['label-accountcode']['es-mx'] = "Código de Cuenta"; //copied from es-cl +$text['label-accountcode']['fr-ca'] = "Centre de frais"; //copied from fr-fr +$text['label-accountcode']['fr-fr'] = "Centre de frais"; +$text['label-accountcode']['he-il'] = "קוד חשבון"; +$text['label-accountcode']['it-it'] = "Account Code"; +$text['label-accountcode']['nl-nl'] = "Accountcode"; +$text['label-accountcode']['pl-pl'] = "Numer konta billingowego"; +$text['label-accountcode']['pt-br'] = "Código de conta"; +$text['label-accountcode']['pt-pt'] = "Código de Conta"; +$text['label-accountcode']['ro-ro'] = ""; +$text['label-accountcode']['ru-ru'] = "Код Учетной Записи"; +$text['label-accountcode']['sv-se'] = "Kontokod"; +$text['label-accountcode']['uk-ua'] = ""; + +$text['description-accountcode']['en-us'] = "Enter the account code here."; +$text['description-accountcode']['en-gb'] = "Enter the account code here."; +$text['description-accountcode']['ar-eg'] = ""; +$text['description-accountcode']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-accountcode']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-accountcode']['de-de'] = "Geben Sie den Account Code hier an."; +$text['description-accountcode']['es-cl'] = "Ingrese el código de cuenta aquí."; +$text['description-accountcode']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl +$text['description-accountcode']['fr-ca'] = "Entrez le code de compte ici."; +$text['description-accountcode']['fr-fr'] = "Entrez le code de compte ici."; +$text['description-accountcode']['he-il'] = ""; +$text['description-accountcode']['it-it'] = "Inserire qui l'account code."; +$text['description-accountcode']['nl-nl'] = "Voer de accountcode hier in."; +$text['description-accountcode']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; +$text['description-accountcode']['pt-br'] = "Insira o código de conta aqui."; +$text['description-accountcode']['pt-pt'] = "Introduza o código de conta aqui."; +$text['description-accountcode']['ro-ro'] = ""; +$text['description-accountcode']['ru-ru'] = "Введите здесь код счета."; +$text['description-accountcode']['sv-se'] = "Ange 'account code' här."; +$text['description-accountcode']['uk-ua'] = ""; + $text['label-conference_center_enabled']['en-us'] = "Enabled"; $text['label-conference_center_enabled']['en-gb'] = "Enabled"; $text['label-conference_center_enabled']['ar-eg'] = ""; From 484533d4c6b43a82aac8e95af30b8febcb871e2f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 22:39:29 -0700 Subject: [PATCH 037/496] Add accountcode to the conference room. --- .../conference_room_edit.php | 66 ++++++++++++------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 94baa7d4d8..91a4c1f05c 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -58,7 +58,7 @@ $conference_room_name = $_POST['conference_room_name']; $moderator_pin = $_POST["moderator_pin"]; $participant_pin = $_POST["participant_pin"]; - $email_address = $_POST["email_address"]; + $profile = $_POST["profile"]; $record = $_POST["record"]; $user_uuid = $_POST["user_uuid"]; @@ -74,6 +74,8 @@ $mute = $_POST["mute"]; $created = $_POST["created"]; $created_by = $_POST["created_by"]; + $email_address = $_POST["email_address"]; + $accountcode = $_POST["accountcode"]; $enabled = $_POST["enabled"]; $description = $_POST["description"]; @@ -308,9 +310,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $array['conference_rooms'][0]['record'] = $record; $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; - if (permission_exists('conference_room_email_address')) { - $array['conference_rooms'][0]['email_address'] = $email_address; - } $array['conference_rooms'][0]['max_members'] = $max_members; $array['conference_rooms'][0]['start_datetime'] = $start_datetime; $array['conference_rooms'][0]['stop_datetime'] = $stop_datetime; @@ -323,6 +322,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $array['conference_rooms'][0]['mute'] = $mute; $array['conference_rooms'][0]['created'] = 'now()'; $array['conference_rooms'][0]['created_by'] = $_SESSION['user_uuid']; + if (permission_exists('conference_room_email_address')) { + $array['conference_rooms'][0]['email_address'] = $email_address; + } + if (permission_exists('conference_room_accountcode')) { + $array['conference_rooms'][0]['accountcode'] = $accountcode; + } $array['conference_rooms'][0]['enabled'] = $enabled; $array['conference_rooms'][0]['description'] = $description; @@ -371,9 +376,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } $array['conference_rooms'][0]['moderator_pin'] = $moderator_pin; $array['conference_rooms'][0]['participant_pin'] = $participant_pin; - if (permission_exists('conference_room_email_address')) { - $array['conference_rooms'][0]['email_address'] = $email_address; - } if (strlen($max_members) > 0) { $array['conference_rooms'][0]['max_members'] = $max_members; } @@ -398,6 +400,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $array['conference_rooms'][0]['mute'] = $mute; } $array['conference_rooms'][0]['sounds'] = $sounds; + if (permission_exists('conference_room_email_address')) { + $array['conference_rooms'][0]['email_address'] = $email_address; + } + if (permission_exists('conference_room_accountcode')) { + $array['conference_rooms'][0]['accountcode'] = $accountcode; + } if (strlen($enabled) > 0) { $array['conference_rooms'][0]['enabled'] = $enabled; } @@ -460,7 +468,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $record = $row["record"]; $moderator_pin = $row["moderator_pin"]; $participant_pin = $row["participant_pin"]; - $email_address = $row["email_address"]; $max_members = $row["max_members"]; $start_datetime = $row["start_datetime"]; $stop_datetime = $row["stop_datetime"]; @@ -473,6 +480,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $mute = $row["mute"]; $created = $row["created"]; $created_by = $row["created_by"]; + $email_address = $row["email_address"]; + $accountcode = $row["accountcode"]; $enabled = $row["enabled"]; $description = $row["description"]; } @@ -614,19 +623,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " "; echo " "; - if (permission_exists('conference_room_email_address')) { - echo "\n"; - echo "\n"; - echo " ".$text['label-email_address']."\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo "".$text['description-email_address']."\n"; - echo "\n"; - echo "\n"; - } - if (if_group("superadmin") || if_group("admin")) { echo " "; echo " ".$text['label-users'].""; @@ -884,6 +880,32 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; } + if (permission_exists('conference_room_email_address')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-email_address']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo "".$text['description-email_address']."\n"; + echo "\n"; + echo "\n"; + } + + if (permission_exists('conference_room_accountcode')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-accountcode']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo "".$text['description-accountcode']."\n"; + echo "\n"; + echo "\n"; + } + if (permission_exists('conference_room_enabled')) { echo "\n"; echo "".$text['label-enabled']."\n"; From b802a28e076844c0fb61cb9206e9d567086d7959 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 22:45:20 -0700 Subject: [PATCH 038/496] Add permission conference_accountcode --- app/conferences/app_config.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index edc49f2152..f6ab373f3c 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -84,6 +84,10 @@ $y++; $apps[$x]['permissions'][$y]['name'] = "conference_email_address"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_accountcode"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_destinations"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; From 9c4826cc6e7e90500c4aefaa1877fdee9cfb0d19 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Dec 2021 22:51:07 -0700 Subject: [PATCH 039/496] Use the conference_accountcode permission. --- app/conferences/conference_edit.php | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 4a3e83053a..ba3a6bce00 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -187,7 +187,9 @@ if (permission_exists('conference_email_address')) { $array['conferences'][0]['conference_email_address'] = $conference_email_address; } - $array['conferences'][0]['conference_accountcode'] = $conference_accountcode; + if (permission_exists('conference_accountcode')) { + $array['conferences'][0]['conference_accountcode'] = $conference_accountcode; + } $array['conferences'][0]['conference_order'] = $conference_order; $array['conferences'][0]['conference_description'] = $conference_description; $array['conferences'][0]['conference_enabled'] = $conference_enabled; @@ -473,16 +475,18 @@ echo "\n"; } - echo "\n"; - echo "\n"; - echo " ".$text['label-accountcode']."\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo "".$text['description-accountcode']."\n"; - echo "\n"; - echo "\n"; + if (permission_exists('conference_accountcode')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-accountcode']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo "".$text['description-accountcode']."\n"; + echo "\n"; + echo "\n"; + } echo "\n"; echo "\n"; From a5a954d7fec7e7fc33a7f3e58ee519bf909ad349 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Dec 2021 11:59:04 -0700 Subject: [PATCH 040/496] System counts is currently global showing info on all domains not a good idea to share with admin currently. --- app/system/resources/dashboard/config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/system/resources/dashboard/config.php b/app/system/resources/dashboard/config.php index 30e53faeb9..0fcfffb62d 100644 --- a/app/system/resources/dashboard/config.php +++ b/app/system/resources/dashboard/config.php @@ -35,9 +35,9 @@ $y = 0; $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = 'a772d2a8-7c1f-4453-b77b-2e15b510a78d'; $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1'; $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'superadmin'; -$y++; -$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '127382ae-0dd1-45eb-869c-56a708220de5'; -$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1'; -$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin'; +//$y++; +//$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '127382ae-0dd1-45eb-869c-56a708220de5'; +//$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1'; +//$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin'; ?> From 76df5a03dcebc62f0dd3283c8215e4ab50852a39 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Dec 2021 15:49:04 -0700 Subject: [PATCH 041/496] Make the mkdir recursive --- app/voicemails/app_defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php index 1a76bde38f..c91f0fd3d3 100644 --- a/app/voicemails/app_defaults.php +++ b/app/voicemails/app_defaults.php @@ -39,7 +39,7 @@ if ($domains_processed == 1) { foreach($voicemails as $row) { if (is_numeric($row['voicemail_id'])) { if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'])) { - mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'], 0770); + mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'], 0770, true); } } } From a61cfa40209d74983c834ea302305b9e96b79b54 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Dec 2021 17:30:14 -0700 Subject: [PATCH 042/496] Remove mkdir (#6169) * Remove mkdir * Delete app/scripts/resources/scripts/app/messages/resources directory * Use curl instead of system curl. * Update file_cache.lua --- .../scripts/app/messages/resources/events.lua | 335 ------------------ .../scripts/app/messages/resources/send.lua | 73 ---- .../app/servers/resources/file_cache.lua | 3 +- .../resources/functions/record_message.lua | 1 - 4 files changed, 2 insertions(+), 410 deletions(-) delete mode 100644 app/scripts/resources/scripts/app/messages/resources/events.lua delete mode 100644 app/scripts/resources/scripts/app/messages/resources/send.lua diff --git a/app/scripts/resources/scripts/app/messages/resources/events.lua b/app/scripts/resources/scripts/app/messages/resources/events.lua deleted file mode 100644 index 12a3ee5770..0000000000 --- a/app/scripts/resources/scripts/app/messages/resources/events.lua +++ /dev/null @@ -1,335 +0,0 @@ --- --- Version: MPL 1.1 --- --- The contents of this file are subject to the Mozilla Public License Version --- 1.1 (the "License"); you may not use this file except in compliance with --- the License. You may obtain a copy of the License at --- http://www.mozilla.org/MPL/ --- --- Software distributed under the License is distributed on an "AS IS" basis, --- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --- for the specific language governing rights and limitations under the --- License. --- --- The Original Code is FusionPBX --- --- The Initial Developer of the Original Code is --- Mark J Crane --- Copyright (C) 2018 - - --- Start the script - -- - -- - ---prepare the api object - api = freeswitch.API(); - ---define the functions - require "resources.functions.trim"; - require "resources.functions.explode"; - require "resources.functions.base64"; - ---include the database class - local Database = require "resources.functions.database"; - ---set debug - debug["sql"] = false; - ---get the events - --serialize the data for the console - --freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n"); - --freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n"); - ---intialize settings - --from_user = ''; - ---get the event variables - uuid = event:getHeader("Core-UUID"); - from_user = event:getHeader("from_user"); - from_host = event:getHeader("from_host"); - to_user = event:getHeader("to_user"); - to_host = event:getHeader("to_host"); - content_type = event:getHeader("type"); - message_text = event:getBody(); - ---set required variables - if (from_user ~= nil and from_host ~= nil) then - message_from = from_user .. '@' .. from_host; - end - if (to_user ~= nil and to_host ~= nil) then - message_to = to_user .. '@' .. to_host; - end - message_type = 'message'; - ---connect to the database - dbh = Database.new('system'); - ---exits the script if we didn't connect properly - assert(dbh:connected()); - ---set debug - debug["sql"] = true; - ---include json library - local json - if (debug["sql"]) then - json = require "resources.functions.lunajson" - end - ---check if the from user exits - if (from_user ~= nil and from_host ~= nil) then - cmd = "user_exists id ".. from_user .." "..from_host; - freeswitch.consoleLog("notice", "[messages][from] user exists " .. cmd .. "\n"); - from_user_exists = api:executeString(cmd); - else - from_user_exists = 'false'; - end - ---check if the to user exits - if (to_user ~= nil and to_host ~= nil) then - cmd = "user_exists id ".. to_user .." "..to_host; - freeswitch.consoleLog("notice", "[messages][to] user exists " .. cmd .. "\n"); - to_user_exists = api:executeString(cmd); - else - to_user_exists = 'false'; - end - ---add the message - if (from_user_exists == 'true') then - --set the direction - message_direction = 'send'; - - --get the from user_uuid - cmd = "user_data ".. from_user .."@"..from_host.." var domain_uuid"; - domain_uuid = trim(api:executeString(cmd)); - - --get the from user_uuid - cmd = "user_data ".. from_user .."@"..from_host.." var user_uuid"; - user_uuid = trim(api:executeString(cmd)); - - --get the from contact_uuid - cmd = "user_data ".. to_user .."@"..to_host.." var contact_uuid"; - contact_uuid = trim(api:executeString(cmd)); - - --create a new uuid and add it to the uuid list - message_uuid = api:executeString("create_uuid"); - - --sql statement - sql = "INSERT INTO v_messages "; - sql = sql .."( "; - sql = sql .."domain_uuid, "; - sql = sql .."message_uuid, "; - sql = sql .."user_uuid, "; - if (contact_uuid ~= null and string.len(contact_uuid) > 0) then - sql = sql .."contact_uuid, "; - end - sql = sql .."message_direction, "; - sql = sql .."message_date, "; - sql = sql .."message_type, "; - if (message_from ~= null and string.len(message_from) > 0) then - sql = sql .."message_from, "; - end - sql = sql .."message_to, "; - sql = sql .."message_text "; - sql = sql ..") "; - sql = sql .."VALUES ( "; - sql = sql ..":domain_uuid, "; - sql = sql ..":message_uuid, "; - sql = sql ..":user_uuid, "; - if (contact_uuid ~= null and string.len(contact_uuid) > 0) then - sql = sql ..":contact_uuid, "; - end - sql = sql ..":message_direction, "; - sql = sql .."now(), "; - sql = sql ..":message_type, "; - if (message_from ~= null and string.len(message_from) > 0) then - sql = sql ..":message_from, "; - end - sql = sql ..":message_to, "; - sql = sql ..":message_text "; - sql = sql ..") "; - - --set the parameters - local params= {} - params['domain_uuid'] = domain_uuid; - params['message_uuid'] = message_uuid; - params['user_uuid'] = user_uuid; - if (contact_uuid ~= null and string.len(contact_uuid) > 0) then - params['contact_uuid'] = contact_uuid; - end - params['message_direction'] = message_direction; - params['message_type'] = message_type; - if (message_from ~= null) then - params['message_from'] = message_from; - end - params['message_to'] = message_to; - params['message_text'] = message_text; - - --show debug info - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[call_center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); - end - - --run the query - dbh:query(sql, params); - end - if (to_user_exists == 'true') then - --sql statement - sql = "INSERT INTO v_messages "; - sql = sql .."( "; - sql = sql .."domain_uuid, "; - sql = sql .."message_uuid, "; - sql = sql .."user_uuid, "; - if (contact_uuid ~= null and string.len(contact_uuid) > 0) then - sql = sql .."contact_uuid, "; - end - sql = sql .."message_direction, "; - sql = sql .."message_date, "; - sql = sql .."message_type, "; - if (message_from ~= null and string.len(message_from) > 0) then - sql = sql .."message_from, "; - end - sql = sql .."message_to, "; - sql = sql .."message_text "; - sql = sql ..") "; - sql = sql .."VALUES ( "; - sql = sql ..":domain_uuid, "; - sql = sql ..":message_uuid, "; - sql = sql ..":user_uuid, "; - if (contact_uuid ~= null and string.len(contact_uuid) > 0) then - sql = sql ..":contact_uuid, "; - end - sql = sql ..":message_direction, "; - sql = sql .."now(), "; - sql = sql ..":message_type, "; - if (message_from ~= null and string.len(message_from) > 0) then - sql = sql ..":message_from, "; - end - sql = sql ..":message_to, "; - sql = sql ..":message_text "; - sql = sql ..") "; - - --set the direction - message_direction = 'receive'; - - --get the from user_uuid - cmd = "user_data ".. to_user .."@"..to_host.." var domain_uuid"; - domain_uuid = trim(api:executeString(cmd)); - - --get the from user_uuid - cmd = "user_data ".. to_user .."@"..to_host.." var user_uuid"; - user_uuid = trim(api:executeString(cmd)); - - --get the from contact_uuid - cmd = "user_data ".. to_user .."@"..to_host.." var contact_uuid"; - contact_uuid = trim(api:executeString(cmd)); - - --create a new uuid and add it to the uuid list - message_uuid = api:executeString("create_uuid"); - - --set the parameters - local params= {} - params['domain_uuid'] = domain_uuid; - params['message_uuid'] = message_uuid; - params['user_uuid'] = user_uuid; - if (contact_uuid ~= null and string.len(message_from) > 0) then - params['contact_uuid'] = contact_uuid; - end - params['message_direction'] = message_direction; - params['message_type'] = message_type; - params['message_from'] = message_from; - params['message_to'] = message_to; - params['message_text'] = message_text; - - --show debug info - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[call_center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); - end - - --run the query - dbh:query(sql, params); - - else - - --get setttings needed to send the message - require "resources.functions.settings"; - settings = settings(domain_uuid); - if (settings['message'] ~= nil) then - http_method = ''; - if (settings['message']['http_method'] ~= nil) then - if (settings['message']['http_method']['text'] ~= nil) then - http_method = settings['message']['http_method']['text']; - end - end - - http_content_type = ''; - if (settings['message']['http_content_type'] ~= nil) then - if (settings['message']['http_content_type']['text'] ~= nil) then - http_content_type = settings['message']['http_content_type']['text']; - end - end - - http_destination = ''; - if (settings['message']['http_destination'] ~= nil) then - if (settings['message']['http_destination']['text'] ~= nil) then - http_destination = settings['message']['http_destination']['text']; - end - end - - http_auth_enabled = 'false'; - if (settings['message']['http_auth_enabled'] ~= nil) then - if (settings['message']['http_auth_enabled']['boolean'] ~= nil) then - http_auth_enabled = settings['message']['http_auth_enabled']['boolean']; - end - end - - http_auth_type = ''; - if (settings['message']['http_auth_type'] ~= nil) then - if (settings['message']['http_auth_type']['text'] ~= nil) then - http_auth_type = settings['message']['http_auth_type']['text']; - end - end - - http_auth_user = ''; - if (settings['message']['http_auth_user'] ~= nil) then - if (settings['message']['http_auth_user']['text'] ~= nil) then - http_auth_user = settings['message']['http_auth_user']['text']; - end - end - - http_auth_password = ''; - if (settings['message']['http_auth_password'] ~= nil) then - if (settings['message']['http_auth_password']['text'] ~= nil) then - http_auth_password = settings['message']['http_auth_password']['text']; - end - end - end - - --get the sip user outbound_caller_id - if (from_user ~= nil and from_host ~= nil) then - cmd = "user_data ".. from_user .."@"..from_host.." var outbound_caller_id_number"; - from = trim(api:executeString(cmd)); - else - from = ''; - end - - --replace variables for their value - http_destination = http_destination:gsub("${from}", from); - - --send to the provider using curl - if (to_user ~= nil) then - cmd = [[curl ]].. http_destination ..[[ ]] - cmd = cmd .. [[-H "Content-Type: ]]..http_content_type..[[" ]]; - if (http_auth_type == 'basic') then - cmd = cmd .. [[-H "Authorization: Basic ]]..base64.encode(http_auth_user..":"..http_auth_password)..[[" ]]; - end - cmd = cmd .. [[-d '{"to":"]]..to_user..[[","text":"]]..message_text..[["}']] - result = api:executeString("system "..cmd); - --status = os.execute (cmd); - - --debug - log the command - freeswitch.consoleLog("notice", "[message] " .. cmd.. "\n"); - end - - end diff --git a/app/scripts/resources/scripts/app/messages/resources/send.lua b/app/scripts/resources/scripts/app/messages/resources/send.lua deleted file mode 100644 index 0cb2e4ede7..0000000000 --- a/app/scripts/resources/scripts/app/messages/resources/send.lua +++ /dev/null @@ -1,73 +0,0 @@ --- FusionPBX --- Version: MPL 1.1 - --- The contents of this file are subject to the Mozilla Public License Version --- 1.1 (the "License"); you may not use this file except in compliance with --- the License. You may obtain a copy of the License at --- http://www.mozilla.org/MPL/ - --- Software distributed under the License is distributed on an "AS IS" basis, --- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --- for the specific language governing rights and limitations under the --- License. - --- The Original Code is FusionPBX - --- The Initial Developer of the Original Code is --- Mark J Crane --- Portions created by the Initial Developer are Copyright (C) 2018 --- the Initial Developer. All Rights Reserved. - ---get the argv values - script_name = argv[0]; - message_from = argv[1]; - message_to = argv[2]; - message_text = argv[3]; - ---send a message to the console - freeswitch.consoleLog("NOTICE",[[[message] from ]]..message_from); - freeswitch.consoleLog("NOTICE",[[[message] to ]] .. message_to); - freeswitch.consoleLog("NOTICE",[[[message] from ]]..message_text); - ---connect to the database - --local Database = require "resources.functions.database"; - --dbh = Database.new('system'); - ---include functions - require "resources.functions.trim"; - require "resources.functions.explode"; - --require "resources.functions.file_exists"; - ---create the api object - api = freeswitch.API(); - ---get the domain name for the destination - array = explode('@', message_to); - domain_name = array[2]; - freeswitch.consoleLog("NOTICE",[[[message] domain_name ]]..domain_name); - ---get the sip profile name - local sofia_contact = trim(api:executeString("sofia_contact */"..message_to)); - local array = explode("/", sofia_contact); - local sip_profile = array[2]; - ---send the sms message - local event = freeswitch.Event("CUSTOM", "SMS::SEND_MESSAGE"); - event:addHeader("proto", "sip"); - event:addHeader("dest_proto", "sip"); - event:addHeader("from", message_from); - event:addHeader("from_full", "sip:"..message_from); - event:addHeader("to", message_to); - event:addHeader("subject", "sip:"..message_to); - --event:addHeader("type", "text/html"); - event:addHeader("type", "text/plain"); - event:addHeader("hint", "the hint"); - event:addHeader("replying", "true"); - event:addHeader("sip_profile", sip_profile); - event:addBody(message_text); - ---send info to the console - freeswitch.consoleLog("info", event:serialize()); - ---send the event - event:fire(); diff --git a/app/scripts/resources/scripts/app/servers/resources/file_cache.lua b/app/scripts/resources/scripts/app/servers/resources/file_cache.lua index b6a3fa68f3..6ec4df29c4 100644 --- a/app/scripts/resources/scripts/app/servers/resources/file_cache.lua +++ b/app/scripts/resources/scripts/app/servers/resources/file_cache.lua @@ -79,7 +79,8 @@ if (row.method == "curl") then api_command_argument = api_command_argument:gsub(" ", "%%20"); url = [[http://]]..row.username..[[:]]..row.password..[[@]]..row.hostname..[[:]]..row.port..[[/webapi/luarun?app/servers/resources/clear_cache.lua%20]]..api_command_argument; - api:executeString("system curl " .. url ); + api = freeswitch.API(); + get_response = api:execute("curl", url); freeswitch.consoleLog("INFO", "[notice] curl ".. url .. " \n"); end end diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua index 8d8cd51031..cceb8c0f7d 100644 --- a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua +++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua @@ -537,7 +537,6 @@ if (storage_path == "http_cache") then result = session:recordFile(storage_path.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext, message_max_length, message_silence_threshold, message_silence_seconds); else - mkdir(voicemail_dir.."/"..voicemail_id); if (vm_message_ext == "mp3") then shout_exists = trim(api:execute("module_exists", "mod_shout")); if (shout_exists == "true" and transcribe_enabled == "false") or (shout_exists == "true" and transcribe_enabled == "true" and voicemail_transcription_enabled ~= "true") then From c94a7f50810eeff26eace9b7bbe0728eb7beba4c Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:42:23 -0500 Subject: [PATCH 043/496] [xml handler] Fix error channel (#6167) using !USER_BUSY gives an error `Could not locate channel type !USER_BUSY` --- .../app/xml_handler/resources/scripts/directory/directory.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua index c53ebb29c8..b3195f53e2 100644 --- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua +++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua @@ -384,7 +384,7 @@ continue = true; --set the dial_string if (do_not_disturb == "true") then - dial_string = "!USER_BUSY"; + dial_string = "error/user_busy"; elseif (string.len(row.dial_string) > 0) then dial_string = row.dial_string; else From 5e760a363f668b85f7b08ea8da541c1676a01b9b Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:45:01 -0500 Subject: [PATCH 044/496] [feature event] Don't update extension dial string (#6166) * [feature event] Don't update extension dial string * remove comma * [feature_event] dnd don't update follow me and forward all * cleaned up some code --- .../scripts/app/feature_event/index.lua | 129 +++++------------- 1 file changed, 33 insertions(+), 96 deletions(-) diff --git a/app/scripts/resources/scripts/app/feature_event/index.lua b/app/scripts/resources/scripts/app/feature_event/index.lua index 68fa615747..4d87b03215 100644 --- a/app/scripts/resources/scripts/app/feature_event/index.lua +++ b/app/scripts/resources/scripts/app/feature_event/index.lua @@ -51,51 +51,43 @@ --connect to the database local Database = require "resources.functions.database"; local Settings = require "resources.functions.lazy_settings" - local route_to_bridge = require "resources.functions.route_to_bridge" - local blf = require "resources.functions.blf" local cache = require "resources.functions.cache" local notify = require "app.feature_event.resources.functions.feature_event_notify" dbh = Database.new('system'); local settings = Settings.new(dbh, domain_name, domain_uuid); --set debug - debug["sql"] = true; + debug["sql"] = false; --include json library local json if (debug["sql"]) then json = require "resources.functions.lunajson" end - - local function empty(t) - return (not t) or (#t == 0) - end --get the events - --if (user == nil) then - --serialize the data for the console - --freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n"); - --freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n"); + --serialize the data for the console + --freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n"); + --freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n"); - --get the event variables - user = event:getHeader("user"); - host = event:getHeader("host"); - domain_name = event:getHeader("host"); - contact = event:getHeader("contact"); - feature_action = event:getHeader("Feature-Action"); - feature_enabled = event:getHeader("Feature-Enabled"); - action_name = event:getHeader("Action-Name"); - action_value = event:getHeader("Action-Value") - ring_count = event:getHeader("ringCount") + --get the event variables + user = event:getHeader("user"); + host = event:getHeader("host"); + domain_name = event:getHeader("host"); + contact = event:getHeader("contact"); + feature_action = event:getHeader("Feature-Action"); + feature_enabled = event:getHeader("Feature-Enabled"); + action_name = event:getHeader("Action-Name"); + action_value = event:getHeader("Action-Value") + ring_count = event:getHeader("ringCount") - --send to the log - --freeswitch.consoleLog("notice","[events] user: " .. user .. "\n"); - --freeswitch.consoleLog("notice","[events] host: " .. host .. "\n"); - --if (feature_action ~= nil) then freeswitch.consoleLog("notice","[events] feature_action: " .. feature_action .. "\n"); end - --if (feature_enabled ~= nil) then freeswitch.consoleLog("notice","[events] feature_enabled: " .. feature_enabled .. "\n"); end - --if (action_name ~= nil) then freeswitch.consoleLog("notice","[events] action_name: " .. action_name .. "\n"); end - --if (action_value ~= nil) then freeswitch.consoleLog("notice","[events] action_value: " .. action_value .. "\n"); end - --end + --send to the log + -- freeswitch.consoleLog("notice","[events] user: " .. user .. "\n"); + -- freeswitch.consoleLog("notice","[events] host: " .. host .. "\n"); + -- if (feature_action ~= nil) then freeswitch.consoleLog("notice","[events] feature_action: " .. feature_action .. "\n"); end + -- if (feature_enabled ~= nil) then freeswitch.consoleLog("notice","[events] feature_enabled: " .. feature_enabled .. "\n"); end + -- if (action_name ~= nil) then freeswitch.consoleLog("notice","[events] action_name: " .. action_name .. "\n"); end + -- if (action_value ~= nil) then freeswitch.consoleLog("notice","[events] action_value: " .. action_value .. "\n"); end --get the domain uuid from the host local sql = "select * from v_domains "; @@ -121,66 +113,29 @@ --DND if (sip_profiles ~= nil) then --DND enabled - if (feature_action == "SetDoNotDisturb" and feature_enabled == "true") then - --set a variable - dial_string = "!USER_BUSY"; - do_not_disturb = "true"; + if (feature_action == "SetDoNotDisturb") then + --set dnd + if(feature_enabled == "true") then + do_not_disturb = "true"; + else + do_not_disturb = "false"; + end --update the extension sql = "update v_extensions set "; - sql = sql .. "do_not_disturb = :do_not_disturb, "; - sql = sql .. "forward_all_enabled = 'false', "; - sql = sql .. "dial_string = :dial_string "; + sql = sql .. "do_not_disturb = :do_not_disturb "; sql = sql .. "where domain_uuid = :domain_uuid "; sql = sql .. "and extension_uuid = :extension_uuid "; - local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, do_not_disturb = do_not_disturb, dial_string = dial_string}; + local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, do_not_disturb = do_not_disturb}; if (debug["sql"]) then freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n"); end dbh:query(sql, params); - --update follow me - if (follow_me_uuid ~= nil) then - if (string.len(follow_me_uuid) > 0) then - local sql = "update v_follow_me set "; - sql = sql .. "follow_me_enabled = 'false' "; - sql = sql .. "where domain_uuid = :domain_uuid "; - sql = sql .. "and follow_me_uuid = :follow_me_uuid "; - local params = {domain_uuid = domain_uuid, follow_me_uuid = follow_me_uuid}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n"); - end - dbh:query(sql, params); - end - end - --send notify to the phone notify.dnd(user, host, sip_profiles, do_not_disturb); end - --DND disabled - if (feature_action == "SetDoNotDisturb" and feature_enabled == "false") then - --set a variable - do_not_disturb = "false"; - - --update the extension - sql = "update v_extensions set "; - sql = sql .. "do_not_disturb = :do_not_disturb, "; - sql = sql .. "forward_all_enabled = 'false', "; - sql = sql .. "dial_string = null "; - sql = sql .. "where domain_uuid = :domain_uuid "; - sql = sql .. "and extension_uuid = :extension_uuid "; - local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, do_not_disturb = do_not_disturb}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n"); - end - dbh:query(sql, params); - - --send notify to the phone - notify.dnd(user, host, sip_profiles, do_not_disturb); - - end - --Call Forward --Call Formward All enabled @@ -191,7 +146,6 @@ forward_immediate_destination = action_value; forward_immediate_enabled = "true"; - --set the dial string if feature_enabled == "true" then local destination_extension, destination_number_alias @@ -221,8 +175,7 @@ sql = "update v_extensions set "; sql = sql .. "do_not_disturb = 'false', "; sql = sql .. "forward_all_enabled = 'true', "; - sql = sql .. "forward_all_destination = :forward_all_destination, "; - sql = sql .. "dial_string = null "; + sql = sql .. "forward_all_destination = :forward_all_destination "; sql = sql .. "where domain_uuid = :domain_uuid "; sql = sql .. "and extension_uuid = :extension_uuid "; local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, forward_all_destination = forward_all_destination}; @@ -231,21 +184,6 @@ end dbh:query(sql, params); - --update follow me - if (follow_me_uuid ~= nil) then - if (string.len(follow_me_uuid) > 0) then - local sql = "update v_follow_me set "; - sql = sql .. "follow_me_enabled = 'false' "; - sql = sql .. "where domain_uuid = :domain_uuid "; - sql = sql .. "and follow_me_uuid = :follow_me_uuid "; - local params = {domain_uuid = domain_uuid, follow_me_uuid = follow_me_uuid}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n"); - end - dbh:query(sql, params); - end - end - --send notify to the phone notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination); end @@ -263,11 +201,10 @@ sql = sql .. "do_not_disturb = 'false', "; sql = sql .. "forward_all_enabled = 'false', "; if (forward_all_destination ~= nil) then - sql = sql .. "forward_all_destination = :forward_all_destination, "; + sql = sql .. "forward_all_destination = :forward_all_destination "; else - sql = sql .. "forward_all_destination = null, "; + sql = sql .. "forward_all_destination = null "; end - sql = sql .. "dial_string = null "; sql = sql .. "where domain_uuid = :domain_uuid "; sql = sql .. "and extension_uuid = :extension_uuid "; local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, forward_all_destination = forward_all_destination}; From a5e249db02bd0bb33f9b1c5769f4c669e6e7a369 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Dec 2021 18:14:46 -0700 Subject: [PATCH 045/496] Use PHP mkdir function. --- app/dialplan_inbound/app_defaults.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/dialplan_inbound/app_defaults.php b/app/dialplan_inbound/app_defaults.php index 911ff1f94e..94eb8378a8 100644 --- a/app/dialplan_inbound/app_defaults.php +++ b/app/dialplan_inbound/app_defaults.php @@ -52,7 +52,9 @@ //if the public directory doesn't exist then create it if ($domains_processed == 1) { if (strlen($_SESSION['switch']['dialplan']['dir']) > 0) { - if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public')) { event_socket_mkdir($_SESSION['switch']['dialplan']['dir'].'/public'); } + if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public')) { + mkdir($_SESSION['switch']['dialplan']['dir'].'/public', 0770, false); + } } } @@ -61,7 +63,7 @@ //make sure the public directory and xml file exist if (strlen($_SESSION['switch']['dialplan']['dir']) > 0) { if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public'.$_SESSION['domains'][$domain_uuid]['domain_name'])) { - event_socket_mkdir($_SESSION['switch']['dialplan']['dir'].'/public/'.$_SESSION['domains'][$domain_uuid]['domain_name']); + mkdir($_SESSION['switch']['dialplan']['dir'].'/public/'.$_SESSION['domains'][$domain_uuid]['domain_name'], 0770, false); } $file = $_SESSION['switch']['dialplan']['dir']."/public/".$_SESSION['domains'][$domain_uuid]['domain_name'].".xml"; if (!file_exists($file)) { @@ -76,4 +78,4 @@ } } -?> \ No newline at end of file +?> From dd106a68719b1adb8c22374621ed458347125710 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Dec 2021 19:03:55 -0700 Subject: [PATCH 046/496] Replace event_socket_mkdir with php mkdir. (#6170) --- app/extensions/app_defaults.php | 4 +++- app/extensions/resources/classes/extension.php | 4 ++-- app/fax/fax_edit.php | 13 +++++++------ app/fax/fax_files.php | 10 +++++----- app/music_on_hold/music_on_hold.php | 4 ++-- app/phrases/app_defaults.php | 2 +- app/recordings/app_defaults.php | 4 +++- app/recordings/recordings.php | 2 +- app/voicemail_greetings/voicemail_greetings.php | 2 +- app/xml_cdr/resources/classes/xml_cdr.php | 5 +++-- resources/switch.php | 8 ++++++-- 11 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app/extensions/app_defaults.php b/app/extensions/app_defaults.php index 412a2cf283..4be3bcd445 100644 --- a/app/extensions/app_defaults.php +++ b/app/extensions/app_defaults.php @@ -29,7 +29,9 @@ //create the directory if (strlen($_SESSION['switch']['extensions']['dir']) > 0) { - if (!is_dir($_SESSION['switch']['extensions']['dir'])) { event_socket_mkdir($_SESSION['switch']['extensions']['dir']); } + if (!is_dir($_SESSION['switch']['extensions']['dir'])) { + mkdir($_SESSION['switch']['extensions']['dir'], 0770, false); + } } //update the directory first and last names diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php index 8ee14f4a84..0548af145d 100644 --- a/app/extensions/resources/classes/extension.php +++ b/app/extensions/resources/classes/extension.php @@ -436,7 +436,7 @@ if (!class_exists('extension')) { $xml .= " \n"; if (!is_readable($_SESSION['switch']['extensions']['dir']."/".$row['user_context'])) { - event_socket_mkdir($_SESSION['switch']['extensions']['dir']."/".$row['user_context']); + mkdir($_SESSION['switch']['extensions']['dir']."/".$row['user_context'], 0770, false); } if (strlen($extension) > 0) { $fout = fopen($_SESSION['switch']['extensions']['dir']."/".$row['user_context']."/v_".$extension.".xml","w"); @@ -810,4 +810,4 @@ if (!class_exists('extension')) { } } -?> \ No newline at end of file +?> diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index ae11e2bdc1..8854dd43be 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -59,20 +59,21 @@ //make sure the directories exist if (!is_dir($_SESSION['switch']['storage']['dir'])) { - event_socket_mkdir($_SESSION['switch']['storage']['dir']); + mkdir($_SESSION['switch']['storage']['dir'], 0770, false); } if (!is_dir($fax_dir.'/'.$fax_extension)) { - event_socket_mkdir($fax_dir.'/'.$fax_extension); + mkdir($fax_dir.'/'.$fax_extension, 0770, false); } if (!is_dir($dir_fax_inbox)) { - event_socket_mkdir($dir_fax_inbox); + mkdir($dir_fax_inbox, 0770, false); } if (!is_dir($dir_fax_sent)) { - event_socket_mkdir($dir_fax_sent); + mkdir($dir_fax_sent, 0770, false); } if (!is_dir($dir_fax_temp)) { - event_socket_mkdir($dir_fax_temp); + mkdir($dir_fax_temp, 0770, false); } + } //set the action as an add or an update @@ -1086,4 +1087,4 @@ //show the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php index f4a806b8ef..fee8a386c7 100644 --- a/app/fax/fax_files.php +++ b/app/fax/fax_files.php @@ -171,19 +171,19 @@ //make sure the directories exist if (!is_dir($_SESSION['switch']['storage']['dir'])) { - event_socket_mkdir($_SESSION['switch']['storage']['dir']); + mkdir($_SESSION['switch']['storage']['dir'], 0770, false); } if (!is_dir($fax_dir.'/'.$fax_extension)) { - event_socket_mkdir($fax_dir.'/'.$fax_extension); + mkdir($fax_dir.'/'.$fax_extension, 0770, false); } if (!is_dir($dir_fax_inbox)) { - event_socket_mkdir($dir_fax_inbox); + mkdir($dir_fax_inbox, 0770, false); } if (!is_dir($dir_fax_sent)) { - event_socket_mkdir($dir_fax_sent); + mkdir($dir_fax_sent, 0770, false); } if (!is_dir($dir_fax_temp)) { - event_socket_mkdir($dir_fax_temp); + mkdir($dir_fax_temp, 0770, false); } } diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index c377e41046..6f28d0b191 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -275,7 +275,7 @@ //check target folder, move uploaded file if (!is_dir($stream_path)) { - event_socket_mkdir($stream_path); + mkdir($stream_path, 0770, false); } if (is_dir($stream_path)) { if (copy($stream_file_name_temp, $stream_path.'/'.$stream_file_name)) { @@ -666,4 +666,4 @@ fclose($fp); } -?> \ No newline at end of file +?> diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php index a88a52cb37..49cae0fae3 100644 --- a/app/phrases/app_defaults.php +++ b/app/phrases/app_defaults.php @@ -34,7 +34,7 @@ if ($domains_processed == 1) { foreach ($conf_lang_folders as $conf_lang_folder) { //create phrases folder, if necessary if (!file_exists($conf_lang_folder."/phrases/")) { - event_socket_mkdir($conf_lang_folder."/phrases/"); + mkdir($conf_lang_folder."/phrases/", 0770, false); } //parse language, open xml file $conf_lang = substr($conf_lang_folder, -2); diff --git a/app/recordings/app_defaults.php b/app/recordings/app_defaults.php index 800f387a41..9e89f3fc8a 100644 --- a/app/recordings/app_defaults.php +++ b/app/recordings/app_defaults.php @@ -26,7 +26,9 @@ //if the recordings directory doesn't exist then create it if (is_array($_SESSION['switch']['recordings']) && strlen($_SESSION['switch']['recordings']['dir']."/".$domain_name) > 0) { - if (!is_readable($_SESSION['switch']['recordings']['dir']."/".$domain_name)) { event_socket_mkdir($_SESSION['switch']['recordings']['dir']."/".$domain_name,02770,true); } + if (!is_readable($_SESSION['switch']['recordings']['dir']."/".$domain_name)) { + mkdir($_SESSION['switch']['recordings']['dir']."/".$domain_name, 0770, true); + } } //process one time diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index 05ca5ac758..f1db0f9a1c 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -122,7 +122,7 @@ //make sure the destination directory exists if (!is_dir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'])) { - event_socket_mkdir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name']); + mkdir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'], 0770, true); } //move the uploaded files diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 50e2111454..67e9745af3 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -182,7 +182,7 @@ if ($num_rows == 0 && !file_exists($v_greeting_dir.'/'.$file_name)) { //move the uploaded greeting - event_socket_mkdir($v_greeting_dir); + mkdir($v_greeting_dir, 0770, false); if ($file_ext == '.wav' || $file_ext == '.mp3') { move_uploaded_file($_FILES['file']['tmp_name'], $v_greeting_dir.'/'.$file_name); } diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php index 9e2499777a..f2872e0ecc 100644 --- a/app/xml_cdr/resources/classes/xml_cdr.php +++ b/app/xml_cdr/resources/classes/xml_cdr.php @@ -746,7 +746,8 @@ if (!class_exists('xml_cdr')) { catch(PDOException $e) { $tmp_dir = $_SESSION['switch']['log']['dir'].'/xml_cdr/failed/'; if(!file_exists($tmp_dir)) { - event_socket_mkdir($tmp_dir); + mkdir($tmp_dir, 0770, true); + } if ($_SESSION['cdr']['format']['text'] == "xml") { $tmp_file = $uuid.'.xml'; @@ -770,7 +771,7 @@ if (!class_exists('xml_cdr')) { if (strlen($uuid) > 0) { $tmp_dir = $_SESSION['switch']['log']['dir'].'/xml_cdr/archive/'.$start_year.'/'.$start_month.'/'.$start_day; if(!file_exists($tmp_dir)) { - event_socket_mkdir($tmp_dir); + mkdir($tmp_dir, 0770, true); } if ($_SESSION['cdr']['format']['text'] == "xml") { $tmp_file = $uuid.'.xml'; diff --git a/resources/switch.php b/resources/switch.php index 76652fcdb3..70f0f86e0b 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -964,7 +964,9 @@ if (!function_exists('save_sip_profile_xml')) { // make profile dir if needed $profile_dir = $_SESSION['switch']['conf']['dir']."/sip_profiles"; - if (!is_readable($profile_dir)) { event_socket_mkdir($profile_dir); } + if (!is_readable($profile_dir)) { + mkdir($profile_dir, 0770, false); + } //get the sip profiles from the database $sql = "select * from v_sip_profiles"; @@ -1021,7 +1023,9 @@ if (!function_exists('save_sip_profile_xml')) { } //if the directory does not exist then create it - if (!is_readable($profile_dir.'/'.$sip_profile_name)) { event_socket_mkdir($profile_dir.'/'.$sip_profile_name); } + if (!is_readable($profile_dir.'/'.$sip_profile_name)) { + mkdir($profile_dir.'/'.$sip_profile_name, 0770, false); + } } unset($result, $row); From 1f2ce0c4f17925b70628eb805a4ed46b1e58febc Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 3 Dec 2021 18:05:00 -0700 Subject: [PATCH 047/496] Update app_defaults.php --- core/dashboard/app_defaults.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php index 442155a7d6..60b5a61e0b 100644 --- a/core/dashboard/app_defaults.php +++ b/core/dashboard/app_defaults.php @@ -7,6 +7,10 @@ if ($domains_processed == 1) { unset($array); } + //make the default groups exist + $group = new groups; + $group->defaults(); + //get the groups $sql = "select * from v_groups "; $sql .= "where domain_uuid is null "; From cca7b364e516eb5e0700b86c7a3b0d5e51de9ebe Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 3 Dec 2021 23:28:01 -0700 Subject: [PATCH 048/496] Option to request accountcode when setting accountcode_enabled is set to true. (#6171) --- app/conference_centers/app_config.php | 10 ++++- .../scripts/app/conference_center/index.lua | 44 +++++++++++++++---- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 81fc55fdb8..a285469752 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -5,7 +5,7 @@ $apps[$x]['uuid'] = "8d083f5a-f726-42a8-9ffa-8d28f848f10e"; $apps[$x]['category'] = "Switch"; $apps[$x]['subcategory'] = ""; - $apps[$x]['version'] = "1.0"; + $apps[$x]['version'] = "1.1"; $apps[$x]['license'] = "Mozilla Public License 1.1"; $apps[$x]['url'] = "http://www.fusionpbx.com"; $apps[$x]['description']['en-us'] = "Conferences Centers allows one or more audio and video conference rooms."; @@ -205,6 +205,14 @@ $apps[$x]['default_settings'][$y]['default_setting_value'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Conference Sessions"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b1a4e1b7-8201-4637-b2fb-380b67112ea5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "conference_center"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "accountcode_enabled"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Request the account ID."; //cache details $apps[$x]['cache']['key'] = "dialplan.\${domain_name}"; diff --git a/app/scripts/resources/scripts/app/conference_center/index.lua b/app/scripts/resources/scripts/app/conference_center/index.lua index c0c6fbf278..c1d3585619 100644 --- a/app/scripts/resources/scripts/app/conference_center/index.lua +++ b/app/scripts/resources/scripts/app/conference_center/index.lua @@ -1,6 +1,6 @@ -- conference_center/index.lua -- Part of FusionPBX --- Copyright (C) 2013 - 2015 Mark J Crane +-- Copyright (C) 2013 - 2021 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -43,8 +43,9 @@ dbh = Database.new('system'); local settings = Settings.new(dbh, domain_name, domain_uuid); ---get the cache directory +--get the settings session_enabled = settings:get('conference_center', 'session_enabled', 'boolean'); + accountcode_enabled = settings:get('conference_center', 'accountcode_enabled', 'boolean'); --include json library local json @@ -581,6 +582,30 @@ member_type = "participant"; end + --get the accountcode + if (accountcode_enabled == 'true' and member_type == 'moderator') then + --request the accountcode + min_digits = 2; + max_digits = 20; + accountcode = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_id:#", "", "\\d+"); + --user_id = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-please_enter_extension_followed_by_pound.wav", "", "\\d+"); + + --update the account code + local sql = {} + table.insert(sql, "update v_conference_rooms "); + table.insert(sql, "set accountcode = :accountcode "); + table.insert(sql, "where conference_center_uuid = :conference_center_uuid "); + sql = table.concat(sql, "\n"); + local params = { + conference_center_uuid = conference_center_uuid; + accountcode = accountcode; + }; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[conference center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); + end + dbh:query(sql, params); + end + --close the database connection dbh:release(); @@ -600,12 +625,14 @@ end --check if the conference exists - cmd = "conference "..conference_room_uuid.."@"..domain_name.." xml_list"; - result = trim(api:executeString(cmd)); - if (string.sub(result, -9) == "not found") then - conference_exists = false; - else - conference_exists = true; + if (conference_room_uuid and domain_name) then + cmd = "conference "..conference_room_uuid.."@"..domain_name.." xml_list"; + result = trim(api:executeString(cmd)); + if (string.sub(result, -9) == "not found") then + conference_exists = false; + else + conference_exists = true; + end end --check if the conference is locked @@ -798,4 +825,3 @@ freeswitch.consoleLog("INFO","[conference center] conference " .. cmd .. "\n"); session:execute("conference", cmd); end - From 02b5aefe30dc453e91f7890ef6d82b826eee34b1 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 4 Dec 2021 23:20:45 -0700 Subject: [PATCH 049/496] Rename accountcode to account_code (#6172) --- app/conference_centers/app_config.php | 8 +- app/conference_centers/app_languages.php | 80 +++++++++---------- .../conference_room_edit.php | 20 ++--- app/conferences/app_config.php | 6 +- app/conferences/app_languages.php | 80 +++++++++---------- app/conferences/conference_edit.php | 16 ++-- 6 files changed, 105 insertions(+), 105 deletions(-) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index a285469752..426a31fa79 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -155,7 +155,7 @@ $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_email_address"; $y++; - $apps[$x]['permissions'][$y]['name'] = "conference_room_accountcode"; + $apps[$x]['permissions'][$y]['name'] = "conference_room_account_code"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; @@ -208,7 +208,7 @@ $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b1a4e1b7-8201-4637-b2fb-380b67112ea5"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "conference_center"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "accountcode_enabled"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "account_code_enabled"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; @@ -374,10 +374,10 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "accountcode"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "account_code"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional accountcode for the conference."; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional account code for the conference."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "enabled"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index b40ede3c69..628437d8b0 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -296,47 +296,47 @@ $text['description-conference_center_greeting']['ru-ru'] = "Выберите п $text['description-conference_center_greeting']['sv-se'] = "Välj hälsningsmeddelande som skall spelas upp före anslutning till konferensrummet."; $text['description-conference_center_greeting']['uk-ua'] = "Виберіть привітання, яке грає до вступу в конференц-зал."; -$text['label-accountcode']['en-us'] = "Account Code"; -$text['label-accountcode']['en-gb'] = "Account Code"; -$text['label-accountcode']['ar-eg'] = ""; -$text['label-accountcode']['de-at'] = "Kontoschlüssel"; //copied from de-de -$text['label-accountcode']['de-ch'] = "Kontoschlüssel"; //copied from de-de -$text['label-accountcode']['de-de'] = "Kontoschlüssel"; -$text['label-accountcode']['es-cl'] = "Código de Cuenta"; -$text['label-accountcode']['es-mx'] = "Código de Cuenta"; //copied from es-cl -$text['label-accountcode']['fr-ca'] = "Centre de frais"; //copied from fr-fr -$text['label-accountcode']['fr-fr'] = "Centre de frais"; -$text['label-accountcode']['he-il'] = "קוד חשבון"; -$text['label-accountcode']['it-it'] = "Account Code"; -$text['label-accountcode']['nl-nl'] = "Accountcode"; -$text['label-accountcode']['pl-pl'] = "Numer konta billingowego"; -$text['label-accountcode']['pt-br'] = "Código de conta"; -$text['label-accountcode']['pt-pt'] = "Código de Conta"; -$text['label-accountcode']['ro-ro'] = ""; -$text['label-accountcode']['ru-ru'] = "Код Учетной Записи"; -$text['label-accountcode']['sv-se'] = "Kontokod"; -$text['label-accountcode']['uk-ua'] = ""; +$text['label-account_code']['en-us'] = "Account Code"; +$text['label-account_code']['en-gb'] = "Account Code"; +$text['label-account_code']['ar-eg'] = ""; +$text['label-account_code']['de-at'] = "Kontoschlüssel"; //copied from de-de +$text['label-account_code']['de-ch'] = "Kontoschlüssel"; //copied from de-de +$text['label-account_code']['de-de'] = "Kontoschlüssel"; +$text['label-account_code']['es-cl'] = "Código de Cuenta"; +$text['label-account_code']['es-mx'] = "Código de Cuenta"; //copied from es-cl +$text['label-account_code']['fr-ca'] = "Centre de frais"; //copied from fr-fr +$text['label-account_code']['fr-fr'] = "Centre de frais"; +$text['label-account_code']['he-il'] = "קוד חשבון"; +$text['label-account_code']['it-it'] = "Account Code"; +$text['label-account_code']['nl-nl'] = "Account code"; +$text['label-account_code']['pl-pl'] = "Numer konta billingowego"; +$text['label-account_code']['pt-br'] = "Código de conta"; +$text['label-account_code']['pt-pt'] = "Código de Conta"; +$text['label-account_code']['ro-ro'] = ""; +$text['label-account_code']['ru-ru'] = "Код Учетной Записи"; +$text['label-account_code']['sv-se'] = "Kontokod"; +$text['label-account_code']['uk-ua'] = ""; -$text['description-accountcode']['en-us'] = "Enter the account code here."; -$text['description-accountcode']['en-gb'] = "Enter the account code here."; -$text['description-accountcode']['ar-eg'] = ""; -$text['description-accountcode']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de -$text['description-accountcode']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de -$text['description-accountcode']['de-de'] = "Geben Sie den Account Code hier an."; -$text['description-accountcode']['es-cl'] = "Ingrese el código de cuenta aquí."; -$text['description-accountcode']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl -$text['description-accountcode']['fr-ca'] = "Entrez le code de compte ici."; -$text['description-accountcode']['fr-fr'] = "Entrez le code de compte ici."; -$text['description-accountcode']['he-il'] = ""; -$text['description-accountcode']['it-it'] = "Inserire qui l'account code."; -$text['description-accountcode']['nl-nl'] = "Voer de accountcode hier in."; -$text['description-accountcode']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; -$text['description-accountcode']['pt-br'] = "Insira o código de conta aqui."; -$text['description-accountcode']['pt-pt'] = "Introduza o código de conta aqui."; -$text['description-accountcode']['ro-ro'] = ""; -$text['description-accountcode']['ru-ru'] = "Введите здесь код счета."; -$text['description-accountcode']['sv-se'] = "Ange 'account code' här."; -$text['description-accountcode']['uk-ua'] = ""; +$text['description-account_code']['en-us'] = "Enter the account code here."; +$text['description-account_code']['en-gb'] = "Enter the account code here."; +$text['description-account_code']['ar-eg'] = ""; +$text['description-account_code']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-account_code']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-account_code']['de-de'] = "Geben Sie den Account Code hier an."; +$text['description-account_code']['es-cl'] = "Ingrese el código de cuenta aquí."; +$text['description-account_code']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl +$text['description-account_code']['fr-ca'] = "Entrez le code de compte ici."; +$text['description-account_code']['fr-fr'] = "Entrez le code de compte ici."; +$text['description-account_code']['he-il'] = ""; +$text['description-account_code']['it-it'] = "Inserire qui l'account code."; +$text['description-account_code']['nl-nl'] = "Voer de account code hier in."; +$text['description-account_code']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; +$text['description-account_code']['pt-br'] = "Insira o código de conta aqui."; +$text['description-account_code']['pt-pt'] = "Introduza o código de conta aqui."; +$text['description-account_code']['ro-ro'] = ""; +$text['description-account_code']['ru-ru'] = "Введите здесь код счета."; +$text['description-account_code']['sv-se'] = "Ange 'account code' här."; +$text['description-account_code']['uk-ua'] = ""; $text['label-conference_center_enabled']['en-us'] = "Enabled"; $text['label-conference_center_enabled']['en-gb'] = "Enabled"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 91a4c1f05c..f7913f07c8 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -75,7 +75,7 @@ $created = $_POST["created"]; $created_by = $_POST["created_by"]; $email_address = $_POST["email_address"]; - $accountcode = $_POST["accountcode"]; + $account_code = $_POST["account_code"]; $enabled = $_POST["enabled"]; $description = $_POST["description"]; @@ -325,8 +325,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('conference_room_email_address')) { $array['conference_rooms'][0]['email_address'] = $email_address; } - if (permission_exists('conference_room_accountcode')) { - $array['conference_rooms'][0]['accountcode'] = $accountcode; + if (permission_exists('conference_room_account_code')) { + $array['conference_rooms'][0]['account_code'] = $account_code; } $array['conference_rooms'][0]['enabled'] = $enabled; $array['conference_rooms'][0]['description'] = $description; @@ -403,8 +403,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('conference_room_email_address')) { $array['conference_rooms'][0]['email_address'] = $email_address; } - if (permission_exists('conference_room_accountcode')) { - $array['conference_rooms'][0]['accountcode'] = $accountcode; + if (permission_exists('conference_room_account_code')) { + $array['conference_rooms'][0]['account_code'] = $account_code; } if (strlen($enabled) > 0) { $array['conference_rooms'][0]['enabled'] = $enabled; @@ -481,7 +481,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $created = $row["created"]; $created_by = $row["created_by"]; $email_address = $row["email_address"]; - $accountcode = $row["accountcode"]; + $account_code = $row["account_code"]; $enabled = $row["enabled"]; $description = $row["description"]; } @@ -893,15 +893,15 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; } - if (permission_exists('conference_room_accountcode')) { + if (permission_exists('conference_room_account_code')) { echo "\n"; echo "\n"; - echo " ".$text['label-accountcode']."\n"; + echo " ".$text['label-account_code']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
    \n"; - echo "".$text['description-accountcode']."\n"; + echo "".$text['description-account_code']."\n"; echo "\n"; echo "\n"; } diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index f6ab373f3c..d2a543b88d 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -84,7 +84,7 @@ $y++; $apps[$x]['permissions'][$y]['name'] = "conference_email_address"; $y++; - $apps[$x]['permissions'][$y]['name'] = "conference_accountcode"; + $apps[$x]['permissions'][$y]['name'] = "conference_account_code"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; @@ -148,9 +148,9 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional email address for the conference."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_accountcode"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_account_code"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional accountcode for the conference."; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional account code for the conference."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_flags"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php index be488f5fe7..ea72ddda08 100644 --- a/app/conferences/app_languages.php +++ b/app/conferences/app_languages.php @@ -715,26 +715,26 @@ $text['description-flags']['ru-ru'] = "Дополнительные флаги $text['description-flags']['sv-se'] = "Valfria konferensflaggor. Exempel: mute|deaf|waste|moderator"; $text['description-flags']['uk-ua'] = ""; -$text['description-accountcode']['en-us'] = "Enter the account code here."; -$text['description-accountcode']['en-gb'] = "Enter the account code here."; -$text['description-accountcode']['ar-eg'] = ""; -$text['description-accountcode']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de -$text['description-accountcode']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de -$text['description-accountcode']['de-de'] = "Geben Sie den Account Code hier an."; -$text['description-accountcode']['es-cl'] = "Ingrese el código de cuenta aquí."; -$text['description-accountcode']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl -$text['description-accountcode']['fr-ca'] = "Entrez le code de compte ici."; -$text['description-accountcode']['fr-fr'] = "Entrez le code de compte ici."; -$text['description-accountcode']['he-il'] = ""; -$text['description-accountcode']['it-it'] = "Inserire qui l'account code."; -$text['description-accountcode']['nl-nl'] = "Voer de accountcode hier in."; -$text['description-accountcode']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; -$text['description-accountcode']['pt-br'] = "Insira o código de conta aqui."; -$text['description-accountcode']['pt-pt'] = "Introduza o código de conta aqui."; -$text['description-accountcode']['ro-ro'] = ""; -$text['description-accountcode']['ru-ru'] = "Введите здесь код счета."; -$text['description-accountcode']['sv-se'] = "Ange 'account code' här."; -$text['description-accountcode']['uk-ua'] = ""; +$text['description-account_code']['en-us'] = "Enter the account code here."; +$text['description-account_code']['en-gb'] = "Enter the account code here."; +$text['description-account_code']['ar-eg'] = ""; +$text['description-account_code']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-account_code']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de +$text['description-account_code']['de-de'] = "Geben Sie den Account Code hier an."; +$text['description-account_code']['es-cl'] = "Ingrese el código de cuenta aquí."; +$text['description-account_code']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl +$text['description-account_code']['fr-ca'] = "Entrez le code de compte ici."; +$text['description-account_code']['fr-fr'] = "Entrez le code de compte ici."; +$text['description-account_code']['he-il'] = ""; +$text['description-account_code']['it-it'] = "Inserire qui l'account code."; +$text['description-account_code']['nl-nl'] = "Voer de accountcode hier in."; +$text['description-account_code']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE)."; +$text['description-account_code']['pt-br'] = "Insira o código de conta aqui."; +$text['description-account_code']['pt-pt'] = "Introduza o código de conta aqui."; +$text['description-account_code']['ro-ro'] = ""; +$text['description-account_code']['ru-ru'] = "Введите здесь код счета."; +$text['description-account_code']['sv-se'] = "Ange 'account code' här."; +$text['description-account_code']['uk-ua'] = ""; $text['label-user_list']['en-us'] = "User List"; $text['label-user_list']['en-gb'] = "User List"; @@ -778,25 +778,25 @@ $text['label-flags']['ru-ru'] = "Флаги"; $text['label-flags']['sv-se'] = "Flaggor"; $text['label-flags']['uk-ua'] = ""; -$text['label-accountcode']['en-us'] = "Account Code"; -$text['label-accountcode']['en-gb'] = "Account Code"; -$text['label-accountcode']['ar-eg'] = ""; -$text['label-accountcode']['de-at'] = "Kontoschlüssel"; //copied from de-de -$text['label-accountcode']['de-ch'] = "Kontoschlüssel"; //copied from de-de -$text['label-accountcode']['de-de'] = "Kontoschlüssel"; -$text['label-accountcode']['es-cl'] = "Código de Cuenta"; -$text['label-accountcode']['es-mx'] = "Código de Cuenta"; //copied from es-cl -$text['label-accountcode']['fr-ca'] = "Centre de frais"; //copied from fr-fr -$text['label-accountcode']['fr-fr'] = "Centre de frais"; -$text['label-accountcode']['he-il'] = "קוד חשבון"; -$text['label-accountcode']['it-it'] = "Account Code"; -$text['label-accountcode']['nl-nl'] = "Accountcode"; -$text['label-accountcode']['pl-pl'] = "Numer konta billingowego"; -$text['label-accountcode']['pt-br'] = "Código de conta"; -$text['label-accountcode']['pt-pt'] = "Código de Conta"; -$text['label-accountcode']['ro-ro'] = ""; -$text['label-accountcode']['ru-ru'] = "Код Учетной Записи"; -$text['label-accountcode']['sv-se'] = "Kontokod"; -$text['label-accountcode']['uk-ua'] = ""; +$text['label-account_code']['en-us'] = "Account Code"; +$text['label-account_code']['en-gb'] = "Account Code"; +$text['label-account_code']['ar-eg'] = ""; +$text['label-account_code']['de-at'] = "Kontoschlüssel"; //copied from de-de +$text['label-account_code']['de-ch'] = "Kontoschlüssel"; //copied from de-de +$text['label-account_code']['de-de'] = "Kontoschlüssel"; +$text['label-account_code']['es-cl'] = "Código de Cuenta"; +$text['label-account_code']['es-mx'] = "Código de Cuenta"; //copied from es-cl +$text['label-account_code']['fr-ca'] = "Centre de frais"; //copied from fr-fr +$text['label-account_code']['fr-fr'] = "Centre de frais"; +$text['label-account_code']['he-il'] = "קוד חשבון"; +$text['label-account_code']['it-it'] = "Account Code"; +$text['label-account_code']['nl-nl'] = "Accountcode"; +$text['label-account_code']['pl-pl'] = "Numer konta billingowego"; +$text['label-account_code']['pt-br'] = "Código de conta"; +$text['label-account_code']['pt-pt'] = "Código de Conta"; +$text['label-account_code']['ro-ro'] = ""; +$text['label-account_code']['ru-ru'] = "Код Учетной Записи"; +$text['label-account_code']['sv-se'] = "Kontokod"; +$text['label-account_code']['uk-ua'] = ""; ?> diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index ba3a6bce00..4d5c30212e 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -60,7 +60,7 @@ $conference_profile = $_POST["conference_profile"]; $conference_flags = $_POST["conference_flags"]; $conference_email_address = $_POST["conference_email_address"]; - $conference_accountcode = $_POST["conference_accountcode"]; + $conference_account_code = $_POST["conference_account_code"]; $conference_order = $_POST["conference_order"]; $conference_description = $_POST["conference_description"]; $conference_enabled = $_POST["conference_enabled"]; @@ -187,8 +187,8 @@ if (permission_exists('conference_email_address')) { $array['conferences'][0]['conference_email_address'] = $conference_email_address; } - if (permission_exists('conference_accountcode')) { - $array['conferences'][0]['conference_accountcode'] = $conference_accountcode; + if (permission_exists('conference_account_code')) { + $array['conferences'][0]['conference_account_code'] = $conference_account_code; } $array['conferences'][0]['conference_order'] = $conference_order; $array['conferences'][0]['conference_description'] = $conference_description; @@ -284,7 +284,7 @@ $conference_profile = $row["conference_profile"]; $conference_flags = $row["conference_flags"]; $conference_email_address = $row["conference_email_address"]; - $conference_accountcode = $row["conference_accountcode"]; + $conference_account_code = $row["conference_account_code"]; $conference_order = $row["conference_order"]; $conference_description = $row["conference_description"]; $conference_enabled = $row["conference_enabled"]; @@ -475,15 +475,15 @@ echo "\n"; } - if (permission_exists('conference_accountcode')) { + if (permission_exists('conference_account_code')) { echo "\n"; echo "\n"; - echo " ".$text['label-accountcode']."\n"; + echo " ".$text['label-account_code']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
    \n"; - echo "".$text['description-accountcode']."\n"; + echo "".$text['description-account_code']."\n"; echo "\n"; echo "\n"; } From 72c9aa5a61d95217b6bf6de10a5f39dc75506c13 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 5 Dec 2021 00:57:27 -0700 Subject: [PATCH 050/496] Conference Center - Change accountcode to account_code. --- .../scripts/app/conference_center/index.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/scripts/resources/scripts/app/conference_center/index.lua b/app/scripts/resources/scripts/app/conference_center/index.lua index c1d3585619..e4e288f20e 100644 --- a/app/scripts/resources/scripts/app/conference_center/index.lua +++ b/app/scripts/resources/scripts/app/conference_center/index.lua @@ -45,7 +45,7 @@ --get the settings session_enabled = settings:get('conference_center', 'session_enabled', 'boolean'); - accountcode_enabled = settings:get('conference_center', 'accountcode_enabled', 'boolean'); + account_code_enabled = settings:get('conference_center', 'account_code_enabled', 'boolean'); --include json library local json @@ -582,23 +582,23 @@ member_type = "participant"; end - --get the accountcode - if (accountcode_enabled == 'true' and member_type == 'moderator') then - --request the accountcode + --get the account code + if (account_code_enabled == 'true' and member_type == 'moderator') then + --request the account code min_digits = 2; max_digits = 20; - accountcode = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_id:#", "", "\\d+"); + account_code = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_id:#", "", "\\d+"); --user_id = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-please_enter_extension_followed_by_pound.wav", "", "\\d+"); --update the account code local sql = {} table.insert(sql, "update v_conference_rooms "); - table.insert(sql, "set accountcode = :accountcode "); + table.insert(sql, "set account_code = :account_code "); table.insert(sql, "where conference_center_uuid = :conference_center_uuid "); sql = table.concat(sql, "\n"); local params = { conference_center_uuid = conference_center_uuid; - accountcode = accountcode; + account_code = account_code; }; if (debug["sql"]) then freeswitch.consoleLog("notice", "[conference center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); From 38dea5f699bc8e37d36c4d205d780b1799ab536f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 5 Dec 2021 14:52:36 -0700 Subject: [PATCH 051/496] Prevent application duplicates and update the applications array. (#6173) * Prevent application duplicates and filter the applications before the content. * Don't allow the new spawn commands as they are as dangerous as system commands. * Update dialplan_valid false to include bg_spawn, spawn and spawn_stream. --- app/dialplans/dialplan_edit.php | 46 ++++++++++++++++++++++++++------- app/dialplans/dialplan_xml.php | 20 +++++++++++++- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php index 2f9812ae9d..2036c4ad08 100644 --- a/app/dialplans/dialplan_edit.php +++ b/app/dialplans/dialplan_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -86,10 +86,35 @@ $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { $result = event_socket_request($fp, 'api show application'); - $_SESSION['switch']['applications'] = explode("\n\n", $result); - $_SESSION['switch']['applications'] = explode("\n", $_SESSION['switch']['applications'][0]); + + $show_applications = explode("\n\n", $result); + $raw_applications = explode("\n", $show_applications[0]); unset($result); unset($fp); + + $previous_application = null; + foreach($raw_applications as $row) { + if (strlen($row) > 0) { + $application_array = explode(",", $row); + $application = $application_array[0]; + + if ( + $application != "name" + && $application != "system" + && $application != "bgsystem" + && $application != "spawn" + && $application != "bg_spawn" + && $application != "spawn_stream" + && stristr($application, "[") != true + ) { + if ($application != $previous_application) { + $applications[] = $application; + } + } + $previous_application = $application; + } + } + $_SESSION['switch']['applications'] = $applications; } else { $_SESSION['switch']['applications'] = Array(); } @@ -221,9 +246,15 @@ if (!preg_match("/system/i", $row["dialplan_detail_type"])) { $dialplan_detail_type = $row["dialplan_detail_type"]; } + if (!preg_match("/spawn/i", $row["dialplan_detail_type"])) { + $dialplan_detail_type = $row["dialplan_detail_type"]; + } if (!preg_match("/system/i", $row["dialplan_detail_data"])) { $dialplan_detail_data = $row["dialplan_detail_data"]; } + if (!preg_match("/spawn/i", $row["dialplan_detail_data"])) { + $dialplan_detail_data = $row["dialplan_detail_data"]; + } $array['dialplans'][$x]['dialplan_details'][$y]['domain_uuid'] = is_uuid($_POST["domain_uuid"]) ? $_POST["domain_uuid"] : null; $array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_tag'] = $row["dialplan_detail_tag"]; $array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_type'] = $dialplan_detail_type; @@ -860,13 +891,8 @@ //if (strlen($dialplan_detail_tag) == 0 || $dialplan_detail_tag == "action" || $dialplan_detail_tag == "anti-action") { echo " \n"; if (is_array($_SESSION['switch']['applications'])) { - foreach ($_SESSION['switch']['applications'] as $row) { - if (strlen($row) > 0) { - $application = explode(",", $row); - if ($application[0] != "name" && $application[0] != "system" && stristr($application[0], "[") != true) { - echo " \n"; - } - } + foreach ($_SESSION['switch']['applications'] as $application) { + echo " \n"; } } echo " \n"; diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php index 9c81b62b3b..88f7c0f308 100644 --- a/app/dialplans/dialplan_xml.php +++ b/app/dialplans/dialplan_xml.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2019 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -81,12 +81,30 @@ if (preg_match("/.*([\"\'])bgsystem([\"\']).*>/i", $dialplan_xml)) { $dialplan_valid = false; } + if (preg_match("/.*([\"\'])bg_spawn([\"\']).*>/i", $dialplan_xml)) { + $dialplan_valid = false; + } + if (preg_match("/.*([\"\'])spawn([\"\']).*>/i", $dialplan_xml)) { + $dialplan_valid = false; + } + if (preg_match("/.*([\"\'])spawn_stream([\"\']).*>/i", $dialplan_xml)) { + $dialplan_valid = false; + } if (preg_match("/.*{system.*/i", $dialplan_xml)) { $dialplan_valid = false; } if (preg_match("/.*{bgsystem.*/i", $dialplan_xml)) { $dialplan_valid = false; } + if (preg_match("/.*{bg_spawn.*/i", $dialplan_xml)) { + $dialplan_valid = false; + } + if (preg_match("/.*{spawn.*/i", $dialplan_xml)) { + $dialplan_valid = false; + } + if (preg_match("/.*{spawn_stream.*/i", $dialplan_xml)) { + $dialplan_valid = false; + } //disable xml entities and load the xml object to test if the xml is valid libxml_disable_entity_loader(true); From 378a5043f9f5d20d4c79727d3ea9306c57817dd4 Mon Sep 17 00:00:00 2001 From: MCohenAuravox <92817493+MCohenAuravox@users.noreply.github.com> Date: Mon, 6 Dec 2021 11:25:57 -0600 Subject: [PATCH 052/496] Create fax_outbox.php (#6068) New Outbox feature page --- app/fax/fax_outbox.php | 203 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 app/fax/fax_outbox.php diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php new file mode 100644 index 0000000000..ef82c092f0 --- /dev/null +++ b/app/fax/fax_outbox.php @@ -0,0 +1,203 @@ + + Portions created by the Initial Developer are Copyright (C) 2008-2021 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Mark J Crane +*/ + +//includes + include "root.php"; + require_once "resources/require.php"; + require_once "resources/check_auth.php"; + require_once "resources/paging.php"; + +//check permissions + if (permission_exists('fax_extension_view')) { + //access granted + } + else { + echo "access denied"; + exit; + } + +//add multi-lingual support + $language = new text; + $text = $language->get(); + +//create token + $object = new token; + $token = $object->create($_SERVER['PHP_SELF']); + +//additional includes + $document['title'] = 'Fax Outbox'; + require_once "resources/header.php"; + +//show the content + echo "
    \n"; + echo "
    Fax Outbox
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo "This is the Fax Outbox\n"; + echo "

    \n"; + + //echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo ""; + + echo "\n"; + echo "\n"; + + echo " "; + echo " "; + echo " "; + echo " "; + + echo "\n"; + + + //get fax extension + if (is_uuid($_REQUEST["id"])) { + $fax_uuid = $_REQUEST["id"]; + if (permission_exists('fax_extension_view_domain')) { + //show all fax extensions + $sql = "select fax_name, fax_extension from v_fax "; + $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "and fax_uuid = :fax_uuid "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['fax_uuid'] = $fax_uuid; + } + else { + //show only assigned fax extensions + $sql = "select fax_name, fax_extension from v_fax as f, v_fax_users as u "; + $sql .= "where f.fax_uuid = u.fax_uuid "; + $sql .= "and f.domain_uuid = :domain_uuid "; + $sql .= "and f.fax_uuid = :fax_uuid "; + $sql .= "and u.user_uuid = :user_uuid "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['fax_uuid'] = $fax_uuid; + $parameters['user_uuid'] = $_SESSION['user_uuid']; + } + $database = new database; + $row = $database->select($sql, $parameters, 'row'); + if (is_array($row) && @sizeof($row) != 0) { + //set database fields as variables + $fax_name = $row["fax_name"]; + $faxext = $row["fax_extension"]; + } + else { + if (!permission_exists('fax_extension_view_domain')) { + echo "access denied"; + exit; + } + } + unset($sql, $parameters, $row); + } + + + + $myId = $_SESSION['/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp']; + + $sql = "select * from v_fax_files "; + $sql .= "where fax_uuid = :fax_uuid "; + $sql .= "and domain_uuid = :domain_uuid "; + $sql .= "and fax_mode = 'tx' "; + $parameters['fax_uuid'] = $_REQUEST["id"]; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $database = new database; + $fax_files = $database->select($sql, $parameters, 'all'); + unset($sql, $parameters); + + +//Test if currently sending: +//set the command + $switch_cmd = 'show channels as json'; + +//create the event socket connection + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); + +//send the event socket command and get the array + if ($fp) { + $json = trim(event_socket_request($fp, 'api '.$switch_cmd)); + + $results = json_decode($json, "true"); + } + +if (isset($results["rows"])) { + + if (is_array($results["rows"]) && @sizeof($results["rows"]) != 0) { + $x = 0; + foreach ($results["rows"] as $row) { + + $file = basename($row['application_data']); + if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") { + $file_name = substr($file, 0, (strlen($file) -4)); + } + + + if (strlen($row['fax_base64']) <= 0) { + echo "\n"; + + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + } + $x++; + } + } +} + + echo "
    DestinationStatusPreviewPath
    ".$row['dest']."Sending...Fax PDF - ".$file_name."".$row['application_data']."
    \n"; + echo "
    \n"; + + echo "\n"; + + echo "\n"; + + + echo "\n"; + echo "\n"; + + + if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.tif')) { + rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.tif', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/sent/'.$myId.'.tif'); + } + + if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.pdf')) { + rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.pdf', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/sent/'.$myId.'.pdf'); + } + + + +//include the footer + require_once "resources/footer.php"; + +?> From 1c860c3114049a92358c856837fb00b2d92ff259 Mon Sep 17 00:00:00 2001 From: MCohenAuravox <92817493+MCohenAuravox@users.noreply.github.com> Date: Mon, 6 Dec 2021 11:36:40 -0600 Subject: [PATCH 053/496] Update fax.php (#6066) Add menu item for outbox feature * Add label-outbox * Use the label-outbox --- app/fax/app_languages.php | 21 +++++++++++++++++++++ app/fax/fax.php | 1 + 2 files changed, 22 insertions(+) diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php index 751e3ddf2d..32d5be0426 100644 --- a/app/fax/app_languages.php +++ b/app/fax/app_languages.php @@ -2164,6 +2164,27 @@ $text['label-copy']['ru-ru'] = "Copy"; $text['label-copy']['sv-se'] = "Copy"; $text['label-copy']['uk-ua'] = "Copy"; +$text['label-outbox']['en-us'] = "Outbox"; +$text['label-outbox']['en-gb'] = "Outbox"; +$text['label-outbox']['ar-eg'] = "Outbox"; +$text['label-outbox']['de-at'] = "Outbox"; +$text['label-outbox']['de-ch'] = "Outbox"; +$text['label-outbox']['de-de'] = "Outbox"; +$text['label-outbox']['es-cl'] = "Outbox"; +$text['label-outbox']['es-mx'] = "Outbox"; +$text['label-outbox']['fr-ca'] = "Outbox"; +$text['label-outbox']['fr-fr'] = "Outbox"; +$text['label-outbox']['he-il'] = "Outbox"; +$text['label-outbox']['it-it'] = "Outbox"; +$text['label-outbox']['nl-nl'] = "Outbox"; +$text['label-outbox']['pl-pl'] = "Outbox"; +$text['label-outbox']['pt-br'] = "Outbox"; +$text['label-outbox']['pt-pt'] = "Outbox"; +$text['label-outbox']['ro-ro'] = "Outbox"; +$text['label-outbox']['ru-ru'] = "Outbox"; +$text['label-outbox']['sv-se'] = "Outbox"; +$text['label-outbox']['uk-ua'] = "Outbox"; + $text['header-sent_faxes']['en-us'] = "Sent"; $text['header-sent_faxes']['en-gb'] = "Sent"; $text['header-sent_faxes']['ar-eg'] = ""; diff --git a/app/fax/fax.php b/app/fax/fax.php index 0cb4f845d0..2686c3f275 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -287,6 +287,7 @@ $box = 'inbox'; } echo " ".$text['label-inbox']."  "; + echo " ".$text['label-outbox'].  "; } if (permission_exists('fax_sent_view')) { echo " ".$text['label-sent']."  "; From ab9140e9608acfc47e8bc278a2cd5f34902b9914 Mon Sep 17 00:00:00 2001 From: MCohenAuravox <92817493+MCohenAuravox@users.noreply.github.com> Date: Mon, 6 Dec 2021 11:40:45 -0600 Subject: [PATCH 054/496] Update fax_send.php (#6067) Send redirects to new Outbox feature --- app/fax/fax_send.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index 722088ba87..5f7b313059 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -811,7 +811,8 @@ if (!function_exists('fax_split_dtmf')) { header("Location: fax_active.php?id=".$fax_uuid); } else { - header("Location: fax_files.php?id=".$fax_uuid."&box=sent"); + //header("Location: fax_files.php?id=".$fax_uuid."&box=sent"); + header("Location: fax_outbox.php?id=".$fax_uuid); } exit; } From 406cc25c70910aba4809b9d0c1765b7be087ac6c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 6 Dec 2021 17:17:22 -0700 Subject: [PATCH 055/496] Add a missing quote. --- app/fax/fax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/fax/fax.php b/app/fax/fax.php index 2686c3f275..aac3f9a9eb 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -287,7 +287,7 @@ $box = 'inbox'; } echo " ".$text['label-inbox']."  "; - echo " ".$text['label-outbox'].  "; + echo " ".$text['label-outbox']."  "; } if (permission_exists('fax_sent_view')) { echo " ".$text['label-sent']."  "; From 7d6a45eeb751d3270cdc69f4b2cf633905260559 Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Tue, 7 Dec 2021 01:03:58 -0500 Subject: [PATCH 056/496] Update ring_groups.php (#6175) --- app/ring_groups/ring_groups.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index a50f08c01a..cbe6d8a0bb 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -97,7 +97,7 @@ $parameters['domain_uuid'] = $domain_uuid; } if (isset($search)) { - $sql = "and ("; + $sql .= "and ("; $sql .= "lower(ring_group_name) like :search "; $sql .= "or lower(ring_group_extension) like :search "; $sql .= "or lower(ring_group_description) like :search "; @@ -127,7 +127,7 @@ $parameters['domain_uuid'] = $domain_uuid; } if (isset($search)) { - $sql = "and ("; + $sql .= "and ("; $sql .= "lower(ring_group_name) like :search "; $sql .= "or lower(ring_group_extension) like :search "; $sql .= "or lower(ring_group_description) like :search "; From ee29867e2b54ad5840ebebda772baa47e076d5d4 Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:14:06 -0500 Subject: [PATCH 057/496] grandstream ht801 fix fax mode (#6177) --- resources/templates/provision/grandstream/ht801/{$mac}.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml index cfb2471c88..caec1ab5b6 100644 --- a/resources/templates/provision/grandstream/ht801/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml @@ -1199,7 +1199,7 @@ {if isset($grandstream_fax_mode)} - 1 + {$grandstream_fax_mode} {else} 0 {/if} From 68238e9ce4910ec044c20d5b8513ad0b55b9d707 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 8 Dec 2021 13:49:15 -0700 Subject: [PATCH 058/496] Account for destination_prefix larger than one character. Also account for trunk prefix when not using the area code. --- app/destinations/resources/classes/destinations.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php index 38db669146..b91933c9ae 100644 --- a/app/destinations/resources/classes/destinations.php +++ b/app/destinations/resources/classes/destinations.php @@ -90,6 +90,11 @@ if (!class_exists('destinations')) { $destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|"; $destination_regex .= "^".$array['destination_number']."\$)"; } + elseif (isset($array['destination_prefix']) && isset($array['destination_trunk_prefix']) && isset($array['destination_number'])) { + $destination_regex = "(\+?".$array['destination_prefix'].$array['destination_number']."\$|"; + $destination_regex .= "^".$array['destination_trunk_prefix'].$array['destination_number']."\$|"; + $destination_regex .= "^".$array['destination_number']."\$)"; + } elseif (isset($array['destination_prefix']) && isset($array['destination_area_code']) && isset($array['destination_number'])) { $destination_regex = "(\+?".$array['destination_prefix'].$array['destination_area_code'].$array['destination_number']."\$|"; $destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|"; @@ -109,12 +114,13 @@ if (!class_exists('destinations')) { //add prefix if (strlen($destination_prefix) > 0) { - if (strlen($destination_prefix) > 0 && strlen($destination_prefix) < 4) { - $plus = (substr($destination_prefix, 0, 1) == "+") ? '' : '\+?'; + $destination_prefix = str_replace("+", "", $destination_prefix); + $plus = '\+?'; + if (strlen($destination_prefix) == 1) { $destination_prefix = $plus.$destination_prefix.'?'; } else { - $destination_prefix = '(?:'.$destination_prefix.')?'; + $destination_prefix = $plus.'(?:'.$destination_prefix.')?'; } } From 8eb0854e73e263312a15db4a6578a2e62f39d71d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 8 Dec 2021 17:55:21 -0700 Subject: [PATCH 059/496] Rename header_domain_visible back to domain_visible --- themes/default/app_config.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/default/app_config.php b/themes/default/app_config.php index c19bc5420c..b4c34ed0fe 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -31,6 +31,14 @@ //default settings $y=0; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e46af53d-0dd7-4b2b-9806-f790a477f245"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_visible"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the name of the domain currently being managed."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4c8df6ee-5858-40ee-b90f-b3b1d066a91c"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "background_color"; @@ -71,14 +79,6 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text hover color (and opacity) for header user name."; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e46af53d-0dd7-4b2b-9806-f790a477f245"; - $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_domain_visible"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the name of the domain currently being managed."; - $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b999bb99-2224-48f0-8a61-38c4f75c9869"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_domain_color_hover"; From b75366bfdcb5db303b1729ec4e92d33e2e838e20 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:32:33 -0700 Subject: [PATCH 060/496] Add permissions label to contacts (#6180) --- app/contacts/app_languages.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index a739bae454..6342d6bb37 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -6412,4 +6412,25 @@ $text['label-contact']['ru-ru'] = "Контакт"; $text['label-contact']['sv-se'] = "Kontakt"; $text['label-contact']['uk-ua'] = "Контакт"; -?> \ No newline at end of file +$text['label-permissions']['en-us'] = "Permissions"; +$text['label-permissions']['en-gb'] = "Permissions"; +$text['label-permissions']['ar-eg'] = ""; +$text['label-permissions']['de-at'] = "Berechtigungen"; //copied from de-de +$text['label-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de +$text['label-permissions']['de-de'] = "Berechtigungen"; +$text['label-permissions']['es-cl'] = "Permisos"; +$text['label-permissions']['es-mx'] = "Permisos"; //copied from es-cl +$text['label-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr +$text['label-permissions']['fr-fr'] = "Permissions"; +$text['label-permissions']['he-il'] = "הרשאות"; +$text['label-permissions']['it-it'] = "Permessi"; +$text['label-permissions']['nl-nl'] = ""; +$text['label-permissions']['pl-pl'] = "Uprawnienia"; +$text['label-permissions']['pt-br'] = "Permissões"; //copied from pt-pt +$text['label-permissions']['pt-pt'] = "Permissões"; +$text['label-permissions']['ro-ro'] = ""; +$text['label-permissions']['ru-ru'] = "Права"; +$text['label-permissions']['sv-se'] = "Rättigheter"; +$text['label-permissions']['uk-ua'] = "Привілеї"; + +?> From 4d4501fbcb8ffd24e6a0cee21c4cec4da381d8f3 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:03:37 -0700 Subject: [PATCH 061/496] Contacts version 2.0 (#6181) * Version update 2.0 Changes: - Using CSS Grid - Mobile Friendly - Responsive --- app/contacts/app_config.php | 2 +- app/contacts/contact_edit.php | 2732 ++++++++++++++++++++++++++------- 2 files changed, 2193 insertions(+), 541 deletions(-) diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php index c3294676e5..2c53e9ed50 100644 --- a/app/contacts/app_config.php +++ b/app/contacts/app_config.php @@ -5,7 +5,7 @@ $apps[$x]['uuid'] = "04481e0e-a478-c559-adad-52bd4174574c"; $apps[$x]['category'] = "CRM"; $apps[$x]['subcategory'] = ""; - $apps[$x]['version'] = "1.1"; + $apps[$x]['version'] = "2.0"; $apps[$x]['license'] = "Mozilla Public License 1.1"; $apps[$x]['contact_url'] = "http://www.fusionpbx.com"; $apps[$x]['description']['en-us'] = "Provides a place to store contact information for individuals and organizations."; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 1fb2746838..59e6fd2cfd 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -17,11 +17,8 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2018 - 2021 the Initial Developer. All Rights Reserved. - - Contributor(s): - Mark J Crane */ //includes @@ -30,7 +27,7 @@ require_once "resources/check_auth.php"; //check permissions - if (permission_exists('contact_edit')) { + if (permission_exists('contact_add') || permission_exists('contact_edit')) { //access granted } else { @@ -46,34 +43,14 @@ if (is_uuid($_REQUEST["id"])) { $action = "update"; $contact_uuid = $_REQUEST["id"]; + $id = $_REQUEST["id"]; } else { $action = "add"; } //get http post variables and set them to php variables - if (count($_POST) > 0) { - - //process the http post data by submitted action - if ($_POST['action'] != '' && is_uuid($_POST['contact_uuid'])) { - $array[0]['checked'] = 'true'; - $array[0]['uuid'] = $_POST['contact_uuid']; - - switch ($_POST['action']) { - case 'delete': - if (permission_exists('contact_delete')) { - $obj = new contacts; - $obj->delete($array); - - header('Location: contacts.php'); - exit; - } - } - } - - $user_uuid = $_POST["user_uuid"]; - $group_uuid = $_POST['group_uuid']; - $contact_type = $_POST["contact_type"]; + if (is_array($_POST)) { $contact_organization = $_POST["contact_organization"]; $contact_name_prefix = $_POST["contact_name_prefix"]; $contact_name_given = $_POST["contact_name_given"]; @@ -81,22 +58,39 @@ $contact_name_family = $_POST["contact_name_family"]; $contact_name_suffix = $_POST["contact_name_suffix"]; $contact_nickname = $_POST["contact_nickname"]; + + $contact_type = $_POST["contact_type"]; $contact_title = $_POST["contact_title"]; - $contact_category = $_POST["contact_category"]; $contact_role = $_POST["contact_role"]; + $contact_category = $_POST["contact_category"]; $contact_time_zone = $_POST["contact_time_zone"]; $contact_note = $_POST["contact_note"]; - $contact_users_delete = $_POST['contact_users_delete']; - $contact_groups_delete = $_POST['contact_groups_delete']; + + $last_mod_date = $_POST["last_mod_date"]; + $last_mod_user = $_POST["last_mod_user"]; + + //$contact_users = $_POST["contact_users"]; + //$contact_groups = $_POST["contact_groups"]; + $contact_user_uuid = $_POST["contact_user_uuid"]; + $contact_group_uuid = $_POST["contact_group_uuid"]; + + + $contact_phones = $_POST["contact_phones"]; + $contact_addresses = $_POST["contact_addresses"]; + $contact_emails = $_POST["contact_emails"]; + $contact_urls = $_POST["contact_urls"]; + $contact_relations = $_POST["contact_relations"]; + $contact_settings = $_POST["contact_settings"]; + $contact_attachments = $_POST["contact_attachments"]; + $contact_times = $_POST["contact_times"]; + $contact_notes = $_POST["contact_notes"]; } -//process the form data +//process the user data and save it to the database if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { - //set the uuid - if ($action == "update") { - $contact_uuid = $_POST["contact_uuid"]; - } + //debug info + //view_array($_POST, true); //validate the token $token = new token; @@ -106,20 +100,162 @@ exit; } + //process the http post data by submitted action + if ($_POST['action'] != '' && strlen($_POST['action']) > 0) { + + //prepare the array(s) + $x = 0; + foreach ($_POST['contact_users'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_users'][]['contact_user_uuid'] = $row['contact_user_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_groups'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_groups'][]['contact_group_uuid'] = $row['contact_group_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_phones'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_phones'][]['contact_phone_uuid'] = $row['contact_phone_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_addresses'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_addresses'][]['contact_address_uuid'] = $row['contact_address_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_emails'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_emails'][]['contact_email_uuid'] = $row['contact_email_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_urls'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_urls'][]['contact_url_uuid'] = $row['contact_url_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_relations'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_relations'][]['contact_relation_uuid'] = $row['contact_relation_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_settings'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_settings'][]['contact_setting_uuid'] = $row['contact_setting_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_attachments'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_attachments'][]['contact_attachment_uuid'] = $row['contact_attachment_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_times'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_times'][]['contact_time_uuid'] = $row['contact_time_uuid']; + $x++; + } + } + + $x = 0; + foreach ($_POST['contact_notes'] as $row) { + if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') { + $array['contacts'][$x]['checked'] = $row['checked']; + $array['contacts'][$x]['contact_notes'][]['contact_note_uuid'] = $row['contact_note_uuid']; + $x++; + } + } + + //send the array to the database class + switch ($_POST['action']) { + case 'copy': + if (permission_exists('contact_add')) { + $obj = new database; + $obj->copy($array); + } + break; + case 'delete': + if (permission_exists('contact_delete')) { + $obj = new database; + $obj->delete($array); + } + break; + case 'toggle': + if (permission_exists('contact_update')) { + $obj = new database; + $obj->toggle($array); + } + break; + } + + //redirect the user + if (in_array($_POST['action'], array('copy', 'delete', 'toggle'))) { + header('Location: contact_edit.php?id='.$id); + exit; + } + } + //check for all required data $msg = ''; - //if (strlen($contact_type) == 0) { $msg .= $text['message-required'].$text['label-contact_type']."
    \n"; } - //if (strlen($contact_organization) == 0) { $msg .= $text['message-required'].$text['label-contact_organization']."
    \n"; } - //if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_prefix']."
    \n"; } - //if (strlen($contact_name_given) == 0) { $msg .= $text['message-required'].$text['label-contact_name_given']."
    \n"; } - //if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required'].$text['label-contact_name_middle']."
    \n"; } - //if (strlen($contact_name_family) == 0) { $msg .= $text['message-required'].$text['label-contact_name_family']."
    \n"; } - //if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_suffix']."
    \n"; } - //if (strlen($contact_nickname) == 0) { $msg .= $text['message-required'].$text['label-contact_nickname']."
    \n"; } - //if (strlen($contact_title) == 0) { $msg .= $text['message-required'].$text['label-contact_title']."
    \n"; } - //if (strlen($contact_role) == 0) { $msg .= $text['message-required'].$text['label-contact_role']."
    \n"; } - //if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required'].$text['label-contact_time_zone']."
    \n"; } - //if (strlen($contact_note) == 0) { $msg .= $text['message-required'].$text['label-contact_note']."
    \n"; } + if (strlen($contact_type) == 0) { $msg .= $text['message-required']." ".$text['label-contact_type']."
    \n"; } + //if (strlen($contact_title) == 0) { $msg .= $text['message-required']." ".$text['label-contact_title']."
    \n"; } + //if (strlen($contact_role) == 0) { $msg .= $text['message-required']." ".$text['label-contact_role']."
    \n"; } + //if (strlen($contact_category) == 0) { $msg .= $text['message-required']." ".$text['label-contact_category']."
    \n"; } + //if (strlen($contact_organization) == 0) { $msg .= $text['message-required']." ".$text['label-contact_organization']."
    \n"; } + //if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_prefix']."
    \n"; } + //if (strlen($contact_name_given) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_given']."
    \n"; } + //if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_middle']."
    \n"; } + //if (strlen($contact_name_family) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_family']."
    \n"; } + //if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_suffix']."
    \n"; } + //if (strlen($contact_nickname) == 0) { $msg .= $text['message-required']." ".$text['label-contact_nickname']."
    \n"; } + //if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required']." ".$text['label-contact_time_zone']."
    \n"; } + //if (strlen($last_mod_date) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_date']."
    \n"; } + //if (strlen($last_mod_user) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_user']."
    \n"; } + //if (strlen($contact_phones) == 0) { $msg .= $text['message-required']." ".$text['label-contact_phones']."
    \n"; } + //if (strlen($contact_addresses) == 0) { $msg .= $text['message-required']." ".$text['label-contact_addresses']."
    \n"; } + //if (strlen($contact_emails) == 0) { $msg .= $text['message-required']." ".$text['label-contact_emails']."
    \n"; } + //if (strlen($contact_urls) == 0) { $msg .= $text['message-required']." ".$text['label-contact_urls']."
    \n"; } + //if (strlen($contact_settings) == 0) { $msg .= $text['message-required']." ".$text['label-contact_settings']."
    \n"; } + //if (strlen($contact_user_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_user_uuid']."
    \n"; } + //if (strlen($contact_group_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_group_uuid']."
    \n"; } + //if (strlen($contact_note) == 0) { $msg .= $text['message-required']." ".$text['label-contact_note']."
    \n"; } if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; require_once "resources/persist_form_var.php"; @@ -133,147 +269,269 @@ return; } - //add or update the database - if ($_POST["persistformvar"] != "true") { + //add the contact_uuid + if (!is_uuid($_POST["contact_uuid"])) { + $contact_uuid = uuid(); + } - //add the contact - if ($action == "add" && permission_exists('contact_add')) { - $contact_uuid = uuid(); - $array['contacts'][0]['contact_uuid'] = $contact_uuid; + //prepare the array + $array['contacts'][0]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_type'] = $contact_type; + $array['contacts'][0]['contact_title'] = $contact_title; + $array['contacts'][0]['contact_role'] = $contact_role; + $array['contacts'][0]['contact_category'] = $contact_category; + $array['contacts'][0]['contact_organization'] = $contact_organization; + $array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix; + $array['contacts'][0]['contact_name_given'] = $contact_name_given; + $array['contacts'][0]['contact_name_middle'] = $contact_name_middle; + $array['contacts'][0]['contact_name_family'] = $contact_name_family; + $array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix; + $array['contacts'][0]['contact_nickname'] = $contact_nickname; + $array['contacts'][0]['contact_time_zone'] = $contact_time_zone; + $array['contacts'][0]['last_mod_date'] = "now()"; + $array['contacts'][0]['last_mod_user'] = $_SESSION['user_uuid']; + $array['contacts'][0]['contact_note'] = $contact_note; - message::add($text['message-add']); + $y = 0; + if (isset($contact_user_uuid)) { + $array['contacts'][0]['contact_users'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_users'][$y]['contact_user_uuid'] = uuid(); + $array['contacts'][0]['contact_users'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_users'][$y]['user_uuid'] = $contact_user_uuid; + $y++; + } + + $y = 0; + if (isset($contact_group_uuid)) { + $array['contacts'][0]['contact_groups'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_groups'][$y]['contact_group_uuid'] = uuid(); + $array['contacts'][0]['contact_groups'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_groups'][$y]['group_uuid'] = $contact_group_uuid; + $y++; + } + + $y = 0; + if (is_array($contact_phones)) { + foreach ($contact_phones as $row) { + if (strlen($row['phone_number']) > 0) { + $array['contacts'][0]['contact_phones'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_phones'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_phones'][$y]['contact_phone_uuid'] = $row["contact_phone_uuid"]; + $array['contacts'][0]['contact_phones'][$y]['phone_label'] = $row["phone_label"]; + $array['contacts'][0]['contact_phones'][$y]['phone_number'] = $row["phone_number"]; + $array['contacts'][0]['contact_phones'][$y]['phone_extension'] = $row["phone_extension"]; + $array['contacts'][0]['contact_phones'][$y]['phone_speed_dial'] = $row["phone_speed_dial"]; + $array['contacts'][0]['contact_phones'][$y]['phone_type_voice'] = $row["phone_type_voice"]; + $array['contacts'][0]['contact_phones'][$y]['phone_type_fax'] = $row["phone_type_fax"]; + $array['contacts'][0]['contact_phones'][$y]['phone_type_video'] = $row["phone_type_video"]; + $array['contacts'][0]['contact_phones'][$y]['phone_type_text'] = $row["phone_type_text"]; + $array['contacts'][0]['contact_phones'][$y]['phone_primary'] = $row["phone_primary"]; + $array['contacts'][0]['contact_phones'][$y]['phone_description'] = $row["phone_description"]; + $y++; } + } + } - //update the contact - if ($action == "update") { - $array['contacts'][0]['contact_uuid'] = $contact_uuid; - - message::add($text['message-update']); + $y = 0; + if (is_array($contact_addresses)) { + foreach ($contact_addresses as $row) { + if (strlen($row['address_street']) > 0) { + $array['contacts'][0]['contact_addresses'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_addresses'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_addresses'][$y]['contact_address_uuid'] = $row["contact_address_uuid"]; + $array['contacts'][0]['contact_addresses'][$y]['address_label'] = $row["address_label"]; + $array['contacts'][0]['contact_addresses'][$y]['address_type'] = $row["address_type"]; + $array['contacts'][0]['contact_addresses'][$y]['address_street'] = $row["address_street"]; + $array['contacts'][0]['contact_addresses'][$y]['address_extended'] = $row["address_extended"]; + if (permission_exists('address_community')) { + $array['contacts'][0]['contact_addresses'][$y]['address_community'] = $row["address_community"]; + } + $array['contacts'][0]['contact_addresses'][$y]['address_locality'] = $row["address_locality"]; + $array['contacts'][0]['contact_addresses'][$y]['address_region'] = $row["address_region"]; + $array['contacts'][0]['contact_addresses'][$y]['address_postal_code'] = $row["address_postal_code"]; + $array['contacts'][0]['contact_addresses'][$y]['address_country'] = $row["address_country"]; + if (permission_exists('address_latitude')) { + $array['contacts'][0]['contact_addresses'][$y]['address_latitude'] = $row["address_latitude"]; + } + if (permission_exists('address_longitude')) { + $array['contacts'][0]['contact_addresses'][$y]['address_longitude'] = $row["address_longitude"]; + } + $array['contacts'][0]['contact_addresses'][$y]['address_primary'] = $row["address_primary"]; + $array['contacts'][0]['contact_addresses'][$y]['address_description'] = $row["address_description"]; + $y++; } + } + } - //create array - if (is_array($array) && @sizeof($array) != 0) { - $array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid']; - $array['contacts'][0]['contact_type'] = $contact_type; - $array['contacts'][0]['contact_organization'] = $contact_organization; - $array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix; - $array['contacts'][0]['contact_name_given'] = $contact_name_given; - $array['contacts'][0]['contact_name_middle'] = $contact_name_middle; - $array['contacts'][0]['contact_name_family'] = $contact_name_family; - $array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix; - $array['contacts'][0]['contact_nickname'] = $contact_nickname; - $array['contacts'][0]['contact_title'] = $contact_title; - $array['contacts'][0]['contact_category'] = $contact_category; - $array['contacts'][0]['contact_role'] = $contact_role; - $array['contacts'][0]['contact_time_zone'] = $contact_time_zone; - $array['contacts'][0]['contact_note'] = $contact_note; - $array['contacts'][0]['last_mod_date'] = 'now()'; - $array['contacts'][0]['last_mod_user'] = $_SESSION['username']; - - $p = new permissions; + $y = 0; + if (is_array($contact_emails)) { + foreach ($contact_emails as $row) { + if (strlen($row['email_address']) > 0) { + $array['contacts'][0]['contact_emails'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_emails'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_emails'][$y]['contact_email_uuid'] = $row["contact_email_uuid"]; + $array['contacts'][0]['contact_emails'][$y]['email_label'] = $row["email_label"]; + $array['contacts'][0]['contact_emails'][$y]['email_address'] = $row["email_address"]; + $array['contacts'][0]['contact_emails'][$y]['email_primary'] = $row["email_primary"]; + $array['contacts'][0]['contact_emails'][$y]['email_description'] = $row["email_description"]; + $y++; } + } + + } - //assign the contact to the user that added the contact - if ($action == "add" && !permission_exists('contact_user_add')) { - $user_uuid = $_SESSION["user_uuid"]; + $y = 0; + if (is_array($contact_urls)) { + foreach ($contact_urls as $row) { + if (strlen($row['url_address']) > 0) { + $array['contacts'][0]['contact_urls'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_urls'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_urls'][$y]['contact_url_uuid'] = $row["contact_url_uuid"]; + $array['contacts'][0]['contact_urls'][$y]['url_type'] = $row["url_type"]; + $array['contacts'][0]['contact_urls'][$y]['url_label'] = $row["url_label"]; + $array['contacts'][0]['contact_urls'][$y]['url_address'] = $row["url_address"]; + $array['contacts'][0]['contact_urls'][$y]['url_primary'] = $row["url_primary"]; + $array['contacts'][0]['contact_urls'][$y]['url_description'] = $row["url_description"]; + $y++; } + } + } - //add user to contact users table - if (is_uuid($user_uuid) && (permission_exists('contact_user_add') || $action == "add")) { - $contact_user_uuid = uuid(); - $array['contact_users'][0]['domain_uuid'] = $domain_uuid; - $array['contact_users'][0]['contact_user_uuid'] = $contact_user_uuid; - $array['contact_users'][0]['contact_uuid'] = $contact_uuid; - $array['contact_users'][0]['user_uuid'] = $user_uuid; - - $p->add('contact_user_add', 'temp'); + $y = 0; + if (is_array($contact_relations)) { + foreach ($contact_relations as $row) { + if (strlen($row['contact_relation_uuid']) > 0) { + $array['contacts'][0]['contact_relations'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_relations'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_relations'][$y]['contact_relation_uuid'] = $row["contact_relation_uuid"]; + $array['contacts'][0]['contact_relations'][$y]['relation_label'] = $row["relation_label"]; + $array['contacts'][0]['contact_relations'][$y]['relation_contact_uuid'] = $row["relation_contact_uuid"]; + $y++; } + } + } - //assign the contact to the group - if (is_uuid($group_uuid) && permission_exists('contact_group_add')) { - $contact_group_uuid = uuid(); - $array['contact_groups'][0]['contact_group_uuid'] = $contact_group_uuid; - $array['contact_groups'][0]['domain_uuid'] = $domain_uuid; - $array['contact_groups'][0]['contact_uuid'] = $contact_uuid; - $array['contact_groups'][0]['group_uuid'] = $group_uuid; - - $p->add('contact_group_add', 'temp'); + $y = 0; + if (is_array($contact_settings)) { + foreach ($contact_settings as $row) { + if (strlen($row['contact_setting_name']) > 0) { + $array['contacts'][0]['contact_settings'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; + $array['contacts'][0]['contact_settings'][$y]['contact_uuid'] = $contact_uuid; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_uuid'] = $row["contact_setting_uuid"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_category'] = $row["contact_setting_category"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_subcategory'] = $row["contact_setting_subcategory"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_name'] = $row["contact_setting_name"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_value'] = $row["contact_setting_value"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_order'] = $row["contact_setting_order"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_enabled'] = $row["contact_setting_enabled"]; + $array['contacts'][0]['contact_settings'][$y]['contact_setting_description'] = $row["contact_setting_description"]; + $y++; } + } + } - //execute - if (is_array($array) && @sizeof($array) != 0) { - $database = new database; - $database->app_name = 'contacts'; - $database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c'; - $database->save($array); - unset($array); - - $p->delete('contact_user_add', 'temp'); - $p->delete('contact_group_add', 'temp'); + $y = 0; + if (is_array($contact_attachments)) { + foreach ($contact_attachments as $row) { + if (strlen($row['attachment_description']) > 0) { + $array['contacts'][0]['contact_attachments'][$y]['contact_attachment_uuid'] = $row["contact_attachment_uuid"]; + $array['contacts'][0]['contact_attachments'][$y]['domain_uuid'] = $row["domain_uuid"]; + $array['contacts'][0]['contact_attachments'][$y]['contact_uuid'] = $row["contact_uuid"]; + $array['contacts'][0]['contact_attachments'][$y]['attachment_primary'] = $row["attachment_primary"]; + //$array['contacts'][0]['contact_attachments'][$y]['attachment_filename'] = $row["attachment_filename"]; + //$array['contacts'][0]['contact_attachments'][$y]['attachment_content'] = $row["attachment_content"]; + $array['contacts'][0]['contact_attachments'][$y]['attachment_description'] = $row["attachment_description"]; + //$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_date'] = $row["attachment_uploaded_date"]; + //$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_user_uuid'] = $row["attachment_uploaded_user_uuid"]; + //$array['contacts'][0]['contact_attachments'][$y]['attachment_size'] = $row["attachment_size"]; + $y++; } + } + } - //delete checked contact properties - $array = array(); - if (permission_exists('contact_phone_delete')) { $contact_properties['contact_phones'] = $_POST['contact_phones']; } - if (permission_exists('contact_address_delete')) { $contact_properties['contact_addresses'] = $_POST['contact_addresses']; } - if (permission_exists('contact_email_delete')) { $contact_properties['contact_emails'] = $_POST['contact_emails']; } - if (permission_exists('contact_url_delete')) { $contact_properties['contact_urls'] = $_POST['contact_urls']; } - //if (permission_exists('contact_extension_delete')) { $contact_properties['contact_extensions'] = $_POST['contact_extensions']; } - if (permission_exists('contact_relation_delete')) { $contact_properties['contact_relations'] = $_POST['contact_relations']; } - if (permission_exists('contact_note_delete')) { $contact_properties['contact_notes'] = $_POST['contact_notes']; } - if (permission_exists('contact_time_delete')) { $contact_properties['contact_times'] = $_POST['contact_times']; } - if (permission_exists('contact_setting_delete')) { $contact_properties['contact_settings'] = $_POST['contact_settings']; } - if (permission_exists('contact_attachment_delete')) { $contact_properties['contact_attachments'] = $_POST['contact_attachments']; } - - if (@sizeof($contact_properties) != 0) { - $obj = new contacts; - $obj->contact_uuid = $contact_uuid; - $obj->delete_properties($contact_properties); + $y = 0; + if (is_array($contact_times)) { + foreach ($contact_times as $row) { + if (strlen($row['time_start']) > 0) { + $array['contacts'][0]['contact_times'][$y]['contact_time_uuid'] = $row["contact_time_uuid"]; + $array['contacts'][0]['contact_times'][$y]['domain_uuid'] = $row["domain_uuid"]; + $array['contacts'][0]['contact_times'][$y]['contact_uuid'] = $row["contact_uuid"]; + $array['contacts'][0]['contact_times'][$y]['time_start'] = $row["time_start"]; + $array['contacts'][0]['contact_times'][$y]['time_stop'] = $row["time_stop"]; + $array['contacts'][0]['contact_times'][$y]['time_description'] = $row["time_description"]; + $y++; } + } + } - //remove checked users - if ( - $action == 'update' - && permission_exists('contact_user_delete') - && is_array($contact_users_delete) - && @sizeof($contact_users_delete) != 0 - ) { - $obj = new contacts; - $obj->contact_uuid = $contact_uuid; - $obj->delete_users($contact_users_delete); + $y = 0; + if (is_array($contact_notes)) { + foreach ($contact_notes as $row) { + if (strlen($row['contact_note']) > 0) { + $array['contacts'][0]['contact_notes'][$y]['contact_note_uuid'] = $row["contact_note_uuid"]; + $array['contacts'][0]['contact_notes'][$y]['domain_uuid'] = $row["domain_uuid"]; + $array['contacts'][0]['contact_notes'][$y]['contact_uuid'] = $row["contact_uuid"]; + $array['contacts'][0]['contact_notes'][$y]['contact_note'] = $row["contact_note"]; + $array['contacts'][0]['contact_notes'][$y]['last_mod_date'] = 'now()'; + $array['contacts'][0]['contact_notes'][$y]['last_mod_user'] = $_SESSION['username']; + $y++; } + } + } - //remove checked groups - if ( - $action == 'update' - && permission_exists('contact_group_delete') - && is_array($contact_groups_delete) - && @sizeof($contact_groups_delete) != 0 - ) { - $obj = new contacts; - $obj->contact_uuid = $contact_uuid; - $obj->delete_groups($contact_groups_delete); - } + //save the data + if (is_array($array) && @sizeof($array) != 0) { + //add the permission object + $p = new permissions; + $p->add('contact_add', 'temp'); + $p->add('contact_phone_add', 'temp'); + $p->add('contact_address_add', 'temp'); + $p->add('contact_user_add', 'temp'); + $p->add('contact_group_add', 'temp'); - //redirect the browser - header("Location: contact_edit.php?id=".urlencode($contact_uuid)); - exit; + //view_array($array); + $database = new database; + $database->app_name = 'contacts'; + $database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c'; + $database->save($array); + $message = $database->message; + unset($array); + + //view_array($message); + + $p->delete('contact_add', 'temp'); + $p->delete('contact_phone_add', 'temp'); + $p->delete('contact_address_add', 'temp'); + $p->delete('contact_user_add', 'temp'); + $p->delete('contact_group_add', 'temp'); + } + + //redirect the user + if (isset($action)) { + if ($action == "add") { + $_SESSION["message"] = $text['message-add']; + } + if ($action == "update") { + $_SESSION["message"] = $text['message-update']; + } + //header('Location: contacts.php'); + header('Location: contact_edit.php?id='.urlencode($contact_uuid)); + return; } } //pre-populate the form - if (count($_GET) > 0 && $_POST["persistformvar"] != "true") { - $contact_uuid = $_GET["id"]; + if (is_array($_GET) && $_POST["persistformvar"] != "true") { $sql = "select * from v_contacts "; - $sql .= "where domain_uuid = :domain_uuid "; - $sql .= "and contact_uuid = :contact_uuid "; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = :domain_uuid "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['contact_uuid'] = $contact_uuid; $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { - $contact_type = $row["contact_type"]; $contact_organization = $row["contact_organization"]; $contact_name_prefix = $row["contact_name_prefix"]; $contact_name_given = $row["contact_name_given"]; @@ -281,11 +539,27 @@ $contact_name_family = $row["contact_name_family"]; $contact_name_suffix = $row["contact_name_suffix"]; $contact_nickname = $row["contact_nickname"]; + + $contact_type = $row["contact_type"]; $contact_title = $row["contact_title"]; - $contact_category = $row["contact_category"]; $contact_role = $row["contact_role"]; + $contact_category = $row["contact_category"]; $contact_time_zone = $row["contact_time_zone"]; $contact_note = $row["contact_note"]; + + $last_mod_date = $row["last_mod_date"]; + $last_mod_user = $row["last_mod_user"]; + + //$contact_phones = $row["contact_phones"]; + //$contact_addresses = $row["contact_addresses"]; + //$contact_emails = $row["contact_emails"]; + //$contact_urls = $row["contact_urls"]; + //$contact_settings = $row["contact_settings"]; + //$contact_user_uuid = $row["contact_user_uuid"]; + + $contact_user_uuid = $row["contact_user_uuid"]; + $contact_group_uuid = $row["contact_group_uuid"]; + } unset($sql, $parameters, $row); } @@ -310,37 +584,42 @@ } //get the users assigned to this contact - $sql = "select u.username, u.user_uuid, a.contact_user_uuid from v_contacts as c, v_users as u, v_contact_users as a "; - $sql .= "where c.contact_uuid = :contact_uuid "; - $sql .= "and c.domain_uuid = :domain_uuid "; - $sql .= "and u.user_uuid = a.user_uuid "; - $sql .= "and c.contact_uuid = a.contact_uuid "; - $sql .= "order by u.username asc "; - $parameters['contact_uuid'] = $contact_uuid; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; - $contact_users_assigned = $database->select($sql, $parameters, 'all'); - unset($sql, $parameters); + if (is_uuid($contact_uuid)) { + $sql = "select c.domain_uuid, c.contact_uuid, u.username, u.user_uuid, a.contact_user_uuid "; + $sql .= "from v_contacts as c, v_users as u, v_contact_users as a "; + $sql .= "where c.contact_uuid = :contact_uuid "; + $sql .= "and c.domain_uuid = :domain_uuid "; + $sql .= "and u.user_uuid = a.user_uuid "; + $sql .= "and c.contact_uuid = a.contact_uuid "; + $sql .= "order by u.username asc "; + $parameters['contact_uuid'] = $contact_uuid; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $database = new database; + $contact_users_assigned = $database->select($sql, $parameters, 'all'); + unset($sql, $parameters); + } //get the assigned groups of this contact - $sql = "select g.*, cg.contact_group_uuid "; - $sql .= "from v_groups as g, v_contact_groups as cg "; - $sql .= "where cg.group_uuid = g.group_uuid "; - $sql .= "and cg.domain_uuid = :domain_uuid "; - $sql .= "and cg.contact_uuid = :contact_uuid "; - $sql .= "and cg.group_uuid <> :group_uuid "; - $sql .= "order by g.group_name asc "; - $parameters['domain_uuid'] = $domain_uuid; - $parameters['contact_uuid'] = $contact_uuid; - $parameters['group_uuid'] = $_SESSION["user_uuid"]; - $database = new database; - $contact_groups_assigned = $database->select($sql, $parameters, 'all'); - if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) { - foreach ($contact_groups_assigned as $field) { - $contact_groups[] = "'".$field['group_uuid']."'"; + if (is_uuid($contact_uuid)) { + $sql = "select g.*, cg.contact_group_uuid "; + $sql .= "from v_groups as g, v_contact_groups as cg "; + $sql .= "where cg.group_uuid = g.group_uuid "; + $sql .= "and cg.domain_uuid = :domain_uuid "; + $sql .= "and cg.contact_uuid = :contact_uuid "; + $sql .= "and cg.group_uuid <> :group_uuid "; + $sql .= "order by g.group_name asc "; + $parameters['domain_uuid'] = $domain_uuid; + $parameters['contact_uuid'] = $contact_uuid; + $parameters['group_uuid'] = $_SESSION["user_uuid"]; + $database = new database; + $contact_groups_assigned = $database->select($sql, $parameters, 'all'); + if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) { + foreach ($contact_groups_assigned as $field) { + $contact_groups[] = "'".$field['group_uuid']."'"; + } } + unset($sql, $parameters); } - unset($sql, $parameters); //get the available groups to this contact $sql = "select group_uuid, group_name from v_groups "; @@ -354,19 +633,265 @@ $contact_groups_available = $database->select($sql, $parameters, 'all'); unset($sql, $parameters, $contact_groups); +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_phones "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_phones = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_phone_uuid + if (!is_uuid($contact_phone_uuid)) { + $contact_phone_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_phones) || count($contact_phones) == 0) { + $x = is_array($contact_phones) ? count($contact_phones) : 0; + $contact_phones[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_phones[$x]['contact_uuid'] = $contact_uuid; + $contact_phones[$x]['contact_phone_uuid'] = uuid(); + $contact_phones[$x]['phone_label'] = ''; + $contact_phones[$x]['phone_number'] = ''; + $contact_phones[$x]['phone_extension'] = ''; + $contact_phones[$x]['phone_speed_dial'] = ''; + $contact_phones[$x]['phone_type_voice'] = ''; + $contact_phones[$x]['phone_type_fax'] = ''; + $contact_phones[$x]['phone_type_video'] = ''; + $contact_phones[$x]['phone_type_text'] = ''; + $contact_phones[$x]['phone_primary'] = ''; + $contact_phones[$x]['phone_description'] = ''; + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_addresses "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + $sql .= "order by address_street asc"; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_addresses = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_address_uuid + if (!is_uuid($contact_address_uuid)) { + $contact_address_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_addresses) || count($contact_addresses) == 0) { + $x = is_array($contact_addresses) ? count($contact_addresses) : 0; + $contact_addresses[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_addresses[$x]['contact_uuid'] = $contact_uuid; + $contact_addresses[$x]['contact_address_uuid'] = uuid(); + $contact_addresses[$x]['address_label'] = ''; + $contact_addresses[$x]['address_type'] = ''; + $contact_addresses[$x]['address_street'] = ''; + $contact_addresses[$x]['address_extended'] = ''; + $contact_addresses[$x]['address_community'] = ''; + $contact_addresses[$x]['address_locality'] = ''; + $contact_addresses[$x]['address_region'] = ''; + $contact_addresses[$x]['address_postal_code'] = ''; + $contact_addresses[$x]['address_country'] = ''; + $contact_addresses[$x]['address_latitude'] = ''; + $contact_addresses[$x]['address_longitude'] = ''; + $contact_addresses[$x]['address_primary'] = ''; + $contact_addresses[$x]['address_description'] = ''; + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_emails "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_emails = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_email_uuid + if (!is_uuid($contact_email_uuid)) { + $contact_email_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_emails) || count($contact_emails) == 0) { + $x = is_array($contact_emails) ? count($contact_emails) : 0; + $contact_emails[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_emails[$x]['contact_uuid'] = $contact_uuid; + $contact_emails[$x]['contact_email_uuid'] = uuid(); + $contact_emails[$x]['email_label'] = ''; + $contact_emails[$x]['email_address'] = ''; + $contact_emails[$x]['email_primary'] = ''; + $contact_emails[$x]['email_description'] = ''; + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_urls "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + $sql .= "order by url_address asc"; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_urls = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_url_uuid + if (!is_uuid($contact_url_uuid)) { + $contact_url_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_urls) || count($contact_urls) == 0) { + $x = is_array($contact_urls) ? count($contact_urls) : 0; + $contact_urls[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_urls[$x]['contact_uuid'] = $contact_uuid; + $contact_urls[$x]['contact_url_uuid'] = uuid(); + $contact_urls[$x]['url_type'] = ''; + $contact_urls[$x]['url_label'] = ''; + $contact_urls[$x]['url_address'] = ''; + $contact_urls[$x]['url_primary'] = ''; + $contact_urls[$x]['url_description'] = ''; + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_relations "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_relations = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_setting_uuid + if (!is_uuid($contact_relation_uuid)) { + $contact_relation_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_relations) || count($contact_relations) == 0) { + $x = is_array($contact_relations) ? count($contact_relations) : 0; + $contact_relations[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_relations[$x]['contact_uuid'] = $contact_uuid; + $contact_relations[$x]['contact_relation_uuid'] = uuid(); + $contact_relations[$x]['relation_label'] = ''; + $contact_relations[$x]['relation_contact_uuid'] = ''; + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_settings "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_settings = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_setting_uuid + if (!is_uuid($contact_setting_uuid)) { + $contact_setting_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_settings) || count($contact_settings) == 0) { + $x = is_array($contact_settings) ? count($contact_settings) : 0; + $contact_settings[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_settings[$x]['contact_uuid'] = $contact_uuid; + $contact_settings[$x]['contact_setting_uuid'] = uuid(); + $contact_settings[$x]['contact_setting_category'] = ''; + $contact_settings[$x]['contact_setting_subcategory'] = ''; + $contact_settings[$x]['contact_setting_name'] = ''; + $contact_settings[$x]['contact_setting_value'] = ''; + $contact_settings[$x]['contact_setting_order'] = ''; + $contact_settings[$x]['contact_setting_enabled'] = ''; + $contact_settings[$x]['contact_setting_description'] = ''; + } + +//get the contact attachments + if (is_uuid($contact_uuid)) { + $sql = "select *, length(decode(attachment_content,'base64')) as attachment_size from v_contact_attachments "; + $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "and contact_uuid = :contact_uuid "; + $sql .= "order by attachment_primary desc, attachment_filename asc "; + $parameters['domain_uuid'] = $domain_uuid; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_attachments = $database->select($sql, $parameters, 'all'); + unset($sql, $parameters); + } + +//get the child data + if (is_uuid($contact_uuid)) { + $sql = "select * from v_contact_times "; + $sql .= "where contact_uuid = :contact_uuid "; + //$sql .= "and domain_uuid = '".$domain_uuid."' "; + //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_times = $database->select($sql, $parameters, 'all'); + unset ($sql, $parameters); + } + +//add the $contact_time_uuid + if (!is_uuid($contact_time_uuid)) { + $contact_time_uuid = uuid(); + } + +//add an empty row + if (!is_array($contact_times)) { + $x = is_array($contact_times) ? count($contact_times) : 0; + $contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_times[$x]['contact_uuid'] = $contact_uuid; + $contact_times[$x]['contact_time_uuid'] = uuid(); + } + +//get the contact notes + $sql = "select * from v_contact_notes "; + $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "and contact_uuid = :contact_uuid "; + $sql .= "order by last_mod_date desc "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $contact_uuid; + $database = new database; + $contact_notes = $database->select($sql, $parameters, 'all'); + unset($sql, $parameters); + +//add an empty row + if (!is_array($contact_times)) { + $x = is_array($contact_times) ? count($contact_times) : 0; + $contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid']; + $contact_times[$x]['contact_uuid'] = $contact_uuid; + $contact_times[$x]['contact_time_uuid'] = uuid(); + } + //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); //show the header - if ($action == "update") { - $document['title'] = $text['title-contact-edit']; - } - else if ($action == "add") { - $document['title'] = $text['title-contact-add']; - } + $document['title'] = $text['title-contact-edit']; require_once "resources/header.php"; + //determine qr branding if ($_SESSION['theme']['qr_brand_type']['text'] == 'image' && $_SESSION['theme']['qr_brand_image']['text'] != '') { echo ""; @@ -434,20 +959,24 @@ echo ""; //show the content - echo "
    \n"; + echo "\n"; + echo "\n"; echo "
    \n"; - echo "
    "; - if ($action == "add") { - echo "".$text['header-contact-add'].""; - } - else if ($action == "update") { - echo "".$text['header-contact-edit'].""; - } - echo "
    \n"; + echo "
    ".$text['title-contact-edit']."
    \n"; echo "
    \n"; - echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-sm-dn','style'=>'margin-right: 15px;','link'=>'contacts.php']); - if ($action == "update") { + echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'contacts.php']); + if ($action == 'update') { + if (permission_exists('contact_phone_add')) { + echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); + } + if (permission_exists('contact_phone_delete')) { + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; margin-right: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]); + } + } + + //add edit + if (isset($id)) { if (permission_exists('contact_time_add')) { //detect timer state (and start time) $sql = "select "; @@ -467,16 +996,17 @@ unset($sql, $parameters); echo button::create(['type'=>'button','label'=>$text['button-timer'],'icon'=>'clock','style'=>$btn_style,'title'=>$time_start,'collapse'=>'hide-sm-dn','onclick'=>"window.open('contact_timer.php?domain_uuid=".urlencode($domain_uuid)."&contact_uuid=".urlencode($contact_uuid)."','contact_time_".escape($contact_uuid)."','width=300, height=375, top=30, left='+(screen.width - 350)+', menubar=no, scrollbars=no, status=no, toolbar=no, resizable=no');"]); } + echo button::create(['type'=>'button','label'=>$text['button-qr_code'],'icon'=>'qrcode','collapse'=>'hide-sm-dn','onclick'=>"$('#qr_code_container').fadeIn(400);"]); echo button::create(['type'=>'button','label'=>$text['button-vcard'],'icon'=>'address-card','collapse'=>'hide-sm-dn','link'=>'contacts_vcard.php?id='.urlencode($contact_uuid).'&type=download']); } - if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/invoices')) { - echo button::create(['type'=>'button','label'=>$text['button-invoices'],'icon'=>'file-invoice-dollar','collapse'=>'hide-sm-dn','link'=>'../invoices/invoices.php?id='.urlencode($contact_uuid)]); - } - if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/certificates')) { - echo button::create(['type'=>'button','label'=>$text['button-certificate'],'icon'=>'certificate','collapse'=>'hide-sm-dn','link'=>'../certificates/index.php?name='.urlencode($contact_name_given." ".$contact_name_family)]); - } - if ($action == "update" && permission_exists('user_edit') && is_uuid($contact_user_uuid)) { + //add edit + //if (isset($id)) { + //echo button::create(['type'=>'button','label'=>$text['button-notes'],'icon'=>'','collapse'=>'hide-xs','style'=>'margin-right: 0px;','link'=>"contact_notes.php?id=$id"]); + //} + + //add user + if (isset($id) && permission_exists('user_edit')) { echo button::create(['type'=>'button','label'=>$text['button-user'],'icon'=>'user','collapse'=>'hide-sm-dn','link'=>'../../core/users/user_edit.php?id='.urlencode($contact_user_uuid)]); } if ( @@ -521,388 +1051,1510 @@ )) { echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]); } - if (permission_exists('contact_add')) { - echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>($action != 'update' ?: 'margin-left: 15px;'),'collapse'=>'hide-sm-dn','onclick'=>"document.getElementById('frm').submit();"]); - } + echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'style'=>'margin-left: 15px;','id'=>'btn_save','collapse'=>'hide-xs']); echo "
    \n"; echo "
    \n"; echo "
    \n"; - if ( - $action == "update" && ( - permission_exists('contact_delete') || - permission_exists('contact_user_delete') || - permission_exists('contact_group_delete') || - permission_exists('contact_phone_delete') || - permission_exists('contact_address_delete') || - permission_exists('contact_email_delete') || - permission_exists('contact_url_delete') || - permission_exists('contact_relation_delete') || - permission_exists('contact_note_delete') || - permission_exists('contact_time_delete') || - permission_exists('contact_setting_delete') || - permission_exists('contact_attachment_delete') - )) { - echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]); - } - - if ($action == "add") { - echo $text['description-contact-add']."\n"; - } - else if ($action == "update") { - echo $text['description-contact-edit']."\n"; - } + echo $text['description-contact-edit']."\n"; echo "

    \n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; - if ($action == "update") { - echo ""; - echo "\n"; + echo "\n"; + $x++; } + unset($contact_notes); +} - echo "\n"; - echo "
    \n"; + if ($action == 'update') { + if (permission_exists('contact_add')) { + echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'copy','onclick'=>"modal_close();"])]); + } + if (permission_exists('contact_delete')) { + echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]); + } + } - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + } + if ($val == $contact_time_zone) { + echo " \n"; + } + else { + echo " \n"; + } + $previous_category = $category; + $x++; +} +echo " \n"; +echo " \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; +echo "
    \n"; +echo " ".$text['label-contact_note']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; +echo "
    \n"; +echo "  \n"; +echo "
    \n"; +echo "
    \n"; +echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; +echo " \n"; +unset($contact_note); - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; +if (permission_exists('contact_user_view') || permission_exists('contact_group_view')) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-permissions']."\n"; + echo "
    \n"; + echo "
    \n"; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - if (permission_exists('contact_user_edit')) { - echo " "; - echo " "; - echo " "; - echo " "; + } + echo " ".$text['description-groups']."\n"; + echo " \n"; + } + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; +} + +if (permission_exists('contact_phone_view')) { + $x = 0; + foreach($contact_phones as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-phone_numbers']."\n"; + if ($row['phone_primary'] == "1") { + echo " \n"; + } + if (permission_exists('contact_phone_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
    \n"; + echo " ".$text['label-phone_label']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_label']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-phone_type']."\n"; + echo "
    \n"; + echo "
    \n"; + echo "  \n"; + echo "  \n"; + echo "  \n"; + echo " \n"; + echo "
    \n"; + //echo $text['description-phone_type']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-phone_speed_dial']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_extension']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-phone_number']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_speed_dial']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-phone_extension']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_number']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-primary']."\n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + //echo $text['description-phone_primary']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-phone_description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_description']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + //if (is_array($contact_phones) && @sizeof($contact_phones) > 1 && permission_exists('contact_phone_delete')) { + // echo "
    \n"; + // echo " ".$text['label-action']."\n"; + // echo "
    \n"; + // echo "
    \n"; + // //echo " ".$text['label-action']."\n"; + // echo " \n"; + // //echo " \n"; + // echo " \n"; + // echo " \n"; + // echo "
    \n"; + //} + + echo "
    \n"; + $x++; + } +} + +if (permission_exists('contact_address_view')) { + foreach($contact_addresses as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-addresses']."\n"; + if ($row['address_primary'] == "1") { + echo " \n"; + } + if (permission_exists('contact_address_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + $map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code']; + echo " "; + echo " ".$text["; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
    \n"; + echo " ".$text['label-address_label']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_type']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_address']."\n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + if (permission_exists('address_community')) { + echo "
    \n"; + echo " ".$text['label-address_community']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; } - if (permission_exists('contact_group_view')) { - echo "
    "; - echo " "; - echo " "; - echo ""; + echo "
    \n"; + echo " ".$text['label-description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + if (is_array($contact_settings) && @sizeof($contact_settings) > 1 && permission_exists('contact_setting_delete')) { + if (is_uuid($row['contact_setting_uuid'])) { + echo "
    \n"; + echo " ".$text['label-enabled']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + } + else { + + } } - echo "\n"; - echo " \n"; - echo " \n"; - echo "\n"; + echo " \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; - echo "
    \n"; - echo " ".$text['label-contact_type']."\n"; - echo "\n"; - if (is_array($_SESSION["contact"]["type"])) { - sort($_SESSION["contact"]["type"]); - echo " \n"; +?> + + + +\n"; + +echo "
    \n"; +echo "
    \n"; +echo " ".$text['label-name']."\n"; +echo "
    \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_organization']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_name_prefix']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_name_given']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_name_middle']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_name_family']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_name_suffix']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_nickname']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; +echo "
    \n"; + +echo "
    \n"; +echo "  \n"; +echo "
    \n"; +echo "
    \n"; +echo "
    \n"; + +echo "
    \n"; + + +echo "
    \n"; +echo "
    \n"; +echo " ".$text['option-other']."\n"; +echo "
    \n"; +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_type']."\n"; +echo "
    \n"; +echo "
    \n"; +if (is_array($_SESSION["contact"]["type"])) { + sort($_SESSION["contact"]["type"]); + echo " \n"; +} +else { + echo " \n"; +} +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_title']."\n"; +echo "
    \n"; +echo "
    \n"; +if (is_array($_SESSION['contact']['contact_title'])) { + echo " \n"; +} +else { + echo " \n"; +} +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_role']."\n"; +echo "
    \n"; +echo "
    \n"; +if (is_array($_SESSION['contact']['contact_role'])) { + echo " \n"; +} +else { + echo " \n"; +} +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_category']."\n"; +echo "
    \n"; +echo "
    \n"; +if (is_array($_SESSION['contact']['contact_category'])) { + echo " \n"; +} +else { + echo " \n"; +} +echo "
    \n"; + +echo "
    \n"; +echo " ".$text['label-contact_time_zone']."\n"; +echo "
    \n"; +echo "
    \n"; +echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + $time_zone_offset_hours = str_replace("-", "", $time_zone_offset_hours); + $time_zone_offset_hours = "-".number_pad($time_zone_offset_hours, 2); } - echo "
    \n"; - echo " ".$text['label-contact_organization']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_name_prefix']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_name_given']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_name_middle']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_name_family']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_name_suffix']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_nickname']."\n"; - echo "\n"; - echo " \n"; - echo "
    \n"; - echo " ".$text['label-contact_title']."\n"; - echo "\n"; - if (is_array($_SESSION["contact"]["title"])) { - sort($_SESSION["contact"]["title"]); - echo " \n"; + echo " \n"; } - echo " \n"; - } - else { - echo " \n"; - } - echo "
    \n"; - echo " ".$text['label-contact_category']."\n"; - echo "\n"; - if (is_array($_SESSION["contact"]["category"])) { - sort($_SESSION["contact"]["category"]); - echo " \n"; - } - else { - echo " \n"; - } - echo "
    \n"; - echo " ".$text['label-contact_role']."\n"; - echo "\n"; - if (is_array($_SESSION["contact"]["role"])) { - sort($_SESSION["contact"]["role"]); - echo " \n"; - } - else { - echo " \n"; - } - echo "
    \n"; - echo " ".$text['label-contact_time_zone']."\n"; - echo "\n"; - echo " \n"; - echo "
    ".$text['label-users'].""; - echo " \n"; - if ($action == "update" && is_array($contact_users_assigned) && @sizeof($contact_users_assigned) != 0) { - echo " \n"; - echo " \n"; + echo " \n"; + foreach ($contact_users_assigned as $x => $field) { + echo "
    ".escape($field['username'])."\n"; if ($contact_users_assigned && permission_exists('contact_user_delete')) { - echo "
    \n"; + if (is_uuid($field['contact_user_uuid'])) { + echo "
    \n"; + //echo " \n"; + //echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + } + else { + echo "
    \n"; + } + echo "
    \n"; } - echo "
    \n"; - foreach ($contact_users_assigned as $x => $field) { - echo " \n"; - echo " \n"; - if ($contact_users_assigned && permission_exists('contact_user_delete')) { - if (is_uuid($field['contact_user_uuid'])) { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; } } - if (permission_exists('contact_user_add')) { - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; } - echo "
    ".$text['label-username']."\n"; - echo " ".$text['label-delete']."\n"; - echo " \n"; - echo "
    ".escape($field['username']).""; - echo " \n"; - echo " \n"; + echo " \n"; + } + } + if (permission_exists('contact_user_add')) { + echo "
    \n"; + echo " \n"; + if ($action == "update") { + echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]); + } + unset($users); + echo "
    \n"; + } + echo " ".$text['description-users']."\n"; + echo " \n"; + } + + if (permission_exists('contact_group_view')) { + echo "
    ".$text['label-groups']."
    "; + echo "
    "; + if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) { + echo "
    ".$text['label-group']."\n"; + if ($contact_groups_assigned && permission_exists('contact_group_delete')) { + //echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-delete']."\n"; + //echo " ".$text['label-delete']."\n"; + //echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + foreach ($contact_groups_assigned as $x => $field) { + if (strlen($field['group_name']) > 0) { + echo "
    ".escape($field['group_name'])."\n"; + if (permission_exists('contact_group_delete')) { + if (is_uuid($field['contact_group_uuid'])) { + echo "
    "; + //echo " \n"; + //echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; } else { - echo "
    		"; + echo "
    "; } - echo "
    \n"; - echo " \n"; + echo " \n"; + foreach ($contact_groups_available as $field) { + if ($field['group_name'] == "superadmin" && !if_group("superadmin")) { continue; } //only show superadmin group to superadmins + if ($field['group_name'] == "admin" && (!if_group("superadmin") && !if_group("admin"))) { continue; } //only show admin group to admins + echo " \n"; } - echo " "; + echo " "; if ($action == "update") { echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]); } - unset($users); - echo "
    \n"; - echo " ".$text['description-users']."\n"; - echo "
    ".$text['label-groups'].""; - echo " \n"; - if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) { - echo " \n"; - echo " \n"; - if ($contact_groups_assigned && permission_exists('contact_group_delete')) { - echo " \n"; - } - echo " \n"; - foreach ($contact_groups_assigned as $x => $field) { - if (strlen($field['group_name']) > 0) { - echo " \n"; - echo " \n"; - if (permission_exists('contact_group_delete')) { - if (is_uuid($field['contact_group_uuid'])) { - echo " \n"; + echo "
    \n"; + echo " ".$text['label-address_locality']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_region']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_postal_code']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_country']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + if (permission_exists('address_latitude')) { + echo "
    \n"; + echo " ".$text['label-address_latitude']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + } + + if (permission_exists('address_longitude')) { + echo "
    \n"; + echo " ".$text['label-address_longitude']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + } + + echo "
    \n"; + echo " ".$text['label-primary']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-address_description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + //if (is_array($contact_addresses) && @sizeof($contact_addresses) > 1 && permission_exists('contact_address_delete')) { + // if (is_uuid($row['contact_address_uuid'])) { + // echo "
    \n"; + // echo " ".$text['label-action']."\n"; + // echo "
    \n"; + // echo "
    \n"; + // echo " \n"; + // echo "
    \n"; + // } + //} + + echo " \n"; + $x++; + } +} + +if (permission_exists('contact_email_view')) { + $x = 0; + foreach($contact_emails as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-emails']."\n"; + if ($row['email_primary'] == "1") { + echo " \n"; + } + if (permission_exists('contact_email_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
    \n"; + echo " ".$text['label-email_label']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-email_address']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-primary']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo "
    \n"; + //echo $text['description-email_primary']."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-email_description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + //if (is_array($contact_emails) && @sizeof($contact_emails) > 1 && permission_exists('contact_email_delete')) { + // if (is_uuid($row['contact_email_uuid'])) { + // echo "
    \n"; + // echo " ".$text['label-action']."\n"; + // echo "
    \n"; + // echo "
    \n"; + // echo " \n"; + // echo "
    \n"; + // } + //} + echo "
    \n"; + $x++; + } +} + +if (permission_exists('contact_url_view')) { + $x = 0; + foreach($contact_urls as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-contact_url']."\n"; + if ($row['url_primary'] == "1") { + echo " \n"; + } + if (permission_exists('contact_url_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + //echo "
    \n"; } + echo " \n"; } } + unset($sql, $parameters, $result, $row); + echo " \n"; + echo " \n"; + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + $x++; + } + } +} - if (permission_exists('contact_group_add')) { - if (is_array($contact_groups_available) && @sizeof($contact_groups_available) != 0) { - echo " \n"; - echo " \n"; - echo " \n"; - } +if (permission_exists('contact_setting_view')) { + $x = 0; + foreach($contact_settings as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-contact_settings']."\n"; + if (permission_exists('contact_setting_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
    \n"; + echo " ".$text['label-contact_setting_category']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-contact_setting_subcategory']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-name']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-contact_setting_value']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-order']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; - echo "
    ".$text['label-group']."\n"; - echo " ".$text['label-delete']."\n"; - echo " \n"; - echo "
    ".escape($field['group_name']).""; - echo " \n"; - echo " \n"; - } - else { - echo " "; - } - echo " \n"; + //echo "
    \n"; + //echo " ".$text['label-url_type']."\n"; + //echo "
    \n"; + //echo "
    \n"; + //echo " \n"; + //echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-url_label']."\n"; + echo "
    \n"; + echo "
    \n";; + + //if there are no custom labels add defaults + if (is_array($_SESSION["contact"]["url_label"])) { + $contact_url_labels = $_SESSION["contact"]["url_label"]; + } + else { + $contact_url_labels[] = $text['option-work']; + $contact_url_labels[] = $text['option-personal']; + $contact_url_labels[] = $text['option-other']; + } + sort($contact_url_labels); + foreach($contact_url_labels as $label) { + $url_label_options[] = ""; + } + $url_label_found = (in_array($url_label, $_SESSION["contact"]["url_label"])) ? true : false; + + echo " \n"; + echo " \n"; + //echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-url_address']."\n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-primary']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-url_description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + if (is_array($contact_urls) && @sizeof($contact_urls) > 1 && permission_exists('contact_url_delete')) { + if (is_uuid($row['contact_url_uuid'])) { + echo " \n"; + } + } + //echo "
    \n"; + //echo " ".$text['description-contact_organization']."\n"; + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + $x++; + } +} + +if (permission_exists('contact_relation_view')) { + if (is_array($contact_relations)) { + + $x = 0; + foreach($contact_relations as $row) { + + $sql = "select contact_uuid, contact_organization, contact_name_given, contact_name_family from v_contacts "; + $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "and contact_uuid <> :contact_uuid "; + $sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + $parameters['contact_uuid'] = $row['contact_uuid']; + $database = new database; + $contacts = $database->select($sql, $parameters, 'all'); + + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-contact_relation_label']."\n"; + if (permission_exists('contact_relation_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-contact_relation_label']."\n"; + echo "
    \n"; + echo "
    \n"; + + + //if there are no custom labels add defaults + if (is_array($_SESSION["contact"]["relation_label"])) { + $relation_labels = $_SESSION["contact"]["url_label"]; + } + else { + $relation_labels[] = $text['label-contact_relation_option_parent']; + $relation_labels[] = $text['label-contact_relation_option_child']; + $relation_labels[] = $text['label-contact_relation_option_employee']; + $relation_labels[] = $text['label-contact_relation_option_member']; + $relation_labels[] = $text['label-contact_relation_option_associate']; + $relation_labels[] = $text['label-contact_relation_option_other']; + } + sort($relation_labels); + foreach($relation_labels as $label) { + $relation_label_options[] = ""; + } + $relation_label_found = (in_array($relation_label, $_SESSION["contact"]["relation_label"])) ? true : false; + echo " \n"; + //echo " \n"; + //echo " \n"; + //echo "
    \n"; + //echo $text['description-relation_label']."\n"; + echo "
    \n"; + + + echo "
    \n"; + echo " ".$text['label-contact_relation_contact']."\n"; + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; - echo " "; - if ($action == "update") { - echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]); - } - echo "
    \n"; - echo " ".$text['description-groups']."\n"; + echo "
    \n"; + echo " ".$text['label-enabled']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo " \n"; + $x++; + } +} + +if (permission_exists('contact_attachment_view')) { + $x = 0; + foreach($contact_attachments as $row) { + $attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION)); + $attachment_type_label = $attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png' ? $text['label-image'] : $text['label-file']; + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-attachments']."\n"; + if ($row['attachment_primary'] == "1") { + echo " \n"; + } + if (permission_exists('contact_attachment_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + //styles and attachment layer + echo "\n"; + echo "\n"; + + //script + echo "\n"; + + echo "
    \n"; + echo " ".$text['label-attachment']."\n"; + echo "
    \n"; + echo "
    \n"; + $attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION)); + //if ($action == 'update') { + echo "\n"; + if ($attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png') { + echo ""; + } + else { + echo "".escape($row['attachment_filename']).""; + } + //} + //else { + // $allowed_attachment_types = json_decode($_SESSION['contact']['allowed_attachment_types']['text'], true); + // echo " \n"; + // echo " ".strtoupper(implode(', ', array_keys($allowed_attachment_types))).""; + //} + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-attachment_filename']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " ".escape($row['attachment_filename']).""; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-attachment_size']."\n"; + echo "
    \n"; + echo "
    \n"; + echo strtoupper(byte_convert($row['attachment_size']))."\n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-primary']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; + $x++; + } +} + +if (permission_exists('contact_time_view')) { + $x = 0; + foreach ($contact_times as $row) { + echo "
    \n"; + echo "
    \n"; + echo " ".$text['header_contact_times']."\n"; + if (permission_exists('contact_time_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-time_start']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-time_stop']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo " ".$text['label-time_description']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo "
    \n"; + + echo "
    \n"; + echo "  \n"; + echo "
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; + $x++; + } + unset($contact_times); +} + +if (permission_exists('contact_note_view')) { + $x = 0; + foreach($contact_notes as $row) { + $contact_note = $row['contact_note']; + $contact_note = escape($contact_note); + $contact_note = str_replace("\n","
    ",$contact_note); + if (permission_exists('contact_note_add')) { + $list_row_url = "contact_note_edit.php?contact_uuid=".escape($row['contact_uuid'])."&id=".escape($row['contact_note_uuid']); + } + + echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-contact_notes']."\n"; + if (permission_exists('contact_note_delete')) { + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + } + echo "
    \n"; + echo "
    \n"; + + echo "
    \n"; echo " ".$text['label-contact_note']."\n"; - echo "
    		\n"; - echo " \n"; - echo "
    "; + echo "
    \n"; + echo " ".$text['label-note_user']."\n"; + echo "
    \n"; + echo "
    \n"; + echo "
    ".escape($row['last_mod_user']).": ".date("j M Y @ H:i:s", strtotime($row['last_mod_date']))."
    \n"; + echo "
    \n"; - echo "    		       \n"; - - if (permission_exists('contact_phone_view')) { require "contact_phones.php"; } - if (permission_exists('contact_address_view')) { require "contact_addresses.php"; } - if (permission_exists('contact_email_view')) { require "contact_emails.php"; } - if (permission_exists('contact_url_view')) { require "contact_urls.php"; } - if (permission_exists('contact_extension_view')) { require "contact_extensions.php"; } - if (permission_exists('contact_relation_view')) { require "contact_relations.php"; } - if (permission_exists('contact_note_view')) { require "contact_notes.php"; } - if (permission_exists('contact_time_view')) { require "contact_times.php"; } - if (permission_exists('contact_setting_view')) { require "contact_settings.php"; } - if (permission_exists('contact_attachment_view')) { require "contact_attachments.php"; } - - echo "
    \n"; - echo "

    "; - if ($action == "update") { - echo "\n"; - } +//close the grid + echo "
    \n"; + echo "

    "; + +//end the form echo "\n"; echo ""; -//hide the delete button when nothing to delete - if ( - $action == 'update' && - !permission_exists('contact_delete') && ( - (!is_array($contact_users_assigned) || @sizeof($contact_users_assigned) == 0) && - (!is_array($contact_groups_assigned) || @sizeof($contact_groups_assigned) == 0) && - (!is_array($contact_phones) || @sizeof($contact_phones) == 0) && - (!is_array($contact_addresses) || @sizeof($contact_addresses) == 0) && - (!is_array($contact_emails) || @sizeof($contact_emails) == 0) && - (!is_array($contact_urls) || @sizeof($contact_urls) == 0) && - (!is_array($contact_extensions) || @sizeof($contact_extensions) == 0) && - (!is_array($contact_relations) || @sizeof($contact_relations) == 0) && - (!is_array($contact_notes) || @sizeof($contact_notes) == 0) && - (!is_array($contact_times) || @sizeof($contact_times) == 0) && - (!is_array($contact_settings) || @sizeof($contact_settings) == 0) && - (!is_array($contact_attachments) || @sizeof($contact_attachments) == 0) - )) { - echo "\n"; - } - //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> From d9dddaebab7c2999e0e04c7e9328c6670557ee22 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Fri, 10 Dec 2021 13:29:05 -0700 Subject: [PATCH 062/496] Add required class to labels (#6183) --- app/contacts/contact_edit.php | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 59e6fd2cfd..2cc7b28919 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -415,7 +415,7 @@ $y = 0; if (is_array($contact_settings)) { foreach ($contact_settings as $row) { - if (strlen($row['contact_setting_name']) > 0) { + if (strlen($row['contact_setting_category']) > 0 && strlen($row['contact_setting_subcategory']) > 0 && strlen($row['contact_setting_name']) > 0) { $array['contacts'][0]['contact_settings'][$y]['domain_uuid'] = $_SESSION['domain_uuid']; $array['contacts'][0]['contact_settings'][$y]['contact_uuid'] = $contact_uuid; $array['contacts'][0]['contact_settings'][$y]['contact_setting_uuid'] = $row["contact_setting_uuid"]; @@ -1601,7 +1601,7 @@ if (permission_exists('contact_phone_view')) { //echo $text['description-phone_extension']."\n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-phone_number']."\n"; echo "
    \n"; echo "
    \n"; @@ -1808,7 +1808,7 @@ if (permission_exists('contact_address_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-address_address']."\n"; echo "
    \n"; echo "
    \n"; @@ -1944,7 +1944,7 @@ if (permission_exists('contact_email_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-email_address']."\n"; echo "
    \n"; echo "
    \n"; @@ -2058,11 +2058,10 @@ if (permission_exists('contact_url_view')) { //echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-url_address']."\n"; echo "
    \n"; echo "
    \n"; - echo " \n"; echo "
    \n"; @@ -2115,7 +2114,6 @@ if (permission_exists('contact_relation_view')) { $x = 0; foreach($contact_relations as $row) { - $sql = "select contact_uuid, contact_organization, contact_name_given, contact_name_family from v_contacts "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and contact_uuid <> :contact_uuid "; @@ -2127,7 +2125,9 @@ if (permission_exists('contact_relation_view')) { echo "
    \n"; echo "
    \n"; - echo " ".$text['label-contact_relation_label']."\n"; + echo " \n"; + echo " ".$text['label-contact_relation_label']."\n"; + echo " \n"; if (permission_exists('contact_relation_delete')) { echo "
    \n"; echo " \n"; @@ -2138,13 +2138,12 @@ if (permission_exists('contact_relation_view')) { } echo "
    \n"; echo "
    \n"; - - echo "
    \n"; + + echo "
    \n"; echo " ".$text['label-contact_relation_label']."\n"; echo "
    \n"; echo "
    \n"; - - + //if there are no custom labels add defaults if (is_array($_SESSION["contact"]["relation_label"])) { $relation_labels = $_SESSION["contact"]["url_label"]; @@ -2173,7 +2172,7 @@ if (permission_exists('contact_relation_view')) { echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_relation_contact']."\n"; echo "
    \n"; echo "
    \n"; @@ -2236,14 +2235,14 @@ if (permission_exists('contact_setting_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_setting_subcategory']."\n"; echo "
    \n"; echo "
    \n"; echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-name']."\n"; echo "
    \n"; echo "
    \n"; @@ -2425,7 +2424,7 @@ if (permission_exists('contact_attachment_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-description']."\n"; echo "
    \n"; echo "
    \n"; @@ -2461,7 +2460,7 @@ if (permission_exists('contact_time_view')) { echo "
    \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-time_start']."\n"; echo "
    \n"; echo "
    \n"; @@ -2519,7 +2518,7 @@ if (permission_exists('contact_note_view')) { echo "
    \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_note']."\n"; echo "
    \n"; echo "
    \n"; From abec5fb5e5aa12c05b9c6d1e76046fff8ad33bee Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 10 Dec 2021 18:55:02 -0700 Subject: [PATCH 063/496] Use the labels array which will always exist. --- app/contacts/contact_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 2cc7b28919..5196393e2c 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -2047,7 +2047,7 @@ if (permission_exists('contact_url_view')) { foreach($contact_url_labels as $label) { $url_label_options[] = ""; } - $url_label_found = (in_array($url_label, $_SESSION["contact"]["url_label"])) ? true : false; + $url_label_found = (in_array($url_label, $contact_url_labels)) ? true : false; echo " \n"; echo " \n"; echo (is_array($relation_label_options)) ? implode("\n", $relation_label_options) : null; From 3778e449f5887cb063365ffe84047b3e1aa5a63b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 10 Dec 2021 20:21:03 -0700 Subject: [PATCH 064/496] Change back to original fax_files.php as the fax_outbound.php is not ready. --- app/fax/fax_send.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index 5f7b313059..873dec34ab 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -811,8 +811,8 @@ if (!function_exists('fax_split_dtmf')) { header("Location: fax_active.php?id=".$fax_uuid); } else { - //header("Location: fax_files.php?id=".$fax_uuid."&box=sent"); - header("Location: fax_outbox.php?id=".$fax_uuid); + header("Location: fax_files.php?id=".$fax_uuid."&box=sent"); + //header("Location: fax_outbox.php?id=".$fax_uuid); } exit; } From 15c8f0bd167ec14671a67ac0266a7e5b1939ff7a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 10 Dec 2021 20:25:52 -0700 Subject: [PATCH 065/496] Code changes to get the code closer to consistent with the FusionPBX code base. Still needs the following. - Only show the current domain - Use the text from app languages to support multi-lingual. --- app/fax/fax_outbox.php | 149 ++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 84 deletions(-) diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php index ef82c092f0..d20a296c52 100644 --- a/app/fax/fax_outbox.php +++ b/app/fax/fax_outbox.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2021 + Portions created by the Initial Developer are Copyright (C) 2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -47,38 +47,7 @@ $object = new token; $token = $object->create($_SERVER['PHP_SELF']); -//additional includes - $document['title'] = 'Fax Outbox'; - require_once "resources/header.php"; - -//show the content - echo "
    \n"; - echo "
    Fax Outbox
    \n"; - echo "
    \n"; - echo "
    \n"; - - echo "This is the Fax Outbox\n"; - echo "

    \n"; - - //echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo ""; - - echo "\n"; - echo "\n"; - - echo " "; - echo " "; - echo " "; - echo " "; - - echo "\n"; - - - //get fax extension +//get fax extensions if (is_uuid($_REQUEST["id"])) { $fax_uuid = $_REQUEST["id"]; if (permission_exists('fax_extension_view_domain')) { @@ -104,8 +73,8 @@ $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { //set database fields as variables - $fax_name = $row["fax_name"]; - $faxext = $row["fax_extension"]; + $fax_name = $row["fax_name"]; + $fax_extension = $row["fax_extension"]; } else { if (!permission_exists('fax_extension_view_domain')) { @@ -115,10 +84,6 @@ } unset($sql, $parameters, $row); } - - - - $myId = $_SESSION['/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp']; $sql = "select * from v_fax_files "; $sql .= "where fax_uuid = :fax_uuid "; @@ -129,10 +94,8 @@ $database = new database; $fax_files = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); - -//Test if currently sending: -//set the command +//check if currently sending a fax $switch_cmd = 'show channels as json'; //create the event socket connection @@ -141,61 +104,79 @@ //send the event socket command and get the array if ($fp) { $json = trim(event_socket_request($fp, 'api '.$switch_cmd)); - $results = json_decode($json, "true"); } -if (isset($results["rows"])) { - - if (is_array($results["rows"]) && @sizeof($results["rows"]) != 0) { - $x = 0; - foreach ($results["rows"] as $row) { - - $file = basename($row['application_data']); - if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") { - $file_name = substr($file, 0, (strlen($file) -4)); - } - - - if (strlen($row['fax_base64']) <= 0) { - echo "\n"; +//additional includes + $document['title'] = 'Fax Outbox'; + require_once "resources/header.php"; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; +//show the content + echo "
    \n"; + echo "
    Fax Outbox
    \n"; + echo "
    \n"; + echo "
    \n"; + + echo "Show active faxes that are currently sending.\n"; + echo "

    \n"; + + //echo "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + //echo " "; + + echo "
    DestinationStatusPreviewPath
    ".$row['dest']."Sending...Fax PDF - ".$file_name."".$row['application_data']."
    \n"; + echo " \n"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " \n"; + +//loop through the faxes + if (isset($results["rows"])) { + if (is_array($results["rows"]) && @sizeof($results["rows"]) != 0) { + $x = 0; + foreach ($results["rows"] as $row) { + $file = basename($row['application_data']); + if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") { + $file_name = substr($file, 0, (strlen($file) -4)); + } + + if (strlen($row['fax_base64']) <= 0) { + echo " \n"; + echo " "; + echo " "; + echo " \n"; + echo " "; + echo " \n"; + } + $x++; } - $x++; } } -} - - echo "
    DestinationStatusPreviewPath
    ".escape($row['dest'])."Sending...\n"; + echo " Fax PDF - ".urlencode($file_name)."\n"; + echo " ".escape($row['application_data'])."
    \n"; - echo "
    \n"; - - echo "\n"; - + echo " \n"; + echo "
    \n"; + echo " \n"; echo "
    \n"; - echo "\n"; - echo "\n"; + //$my_id = $_SESSION['/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp']; + //if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.tif')) { + // rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.tif', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/sent/'.$my_id.'.tif'); + //} - if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.tif')) { - rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.tif', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/sent/'.$myId.'.tif'); - } - - if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.pdf')) { - rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/temp/'.$myId.'.pdf', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$faxext.'/sent/'.$myId.'.pdf'); - } - - + //if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.pdf')) { + // rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.pdf', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/sent/'.$my_id.'.pdf'); + //} //include the footer require_once "resources/footer.php"; From 75e4fd94ab071444fb0b5df64ba9c207466664e7 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 11 Dec 2021 10:07:52 -0700 Subject: [PATCH 066/496] Use global instead of ${domain_name}. --- app/dialplans/resources/classes/dialplan.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php index 76aa43a59a..d59578780f 100644 --- a/app/dialplans/resources/classes/dialplan.php +++ b/app/dialplans/resources/classes/dialplan.php @@ -280,9 +280,11 @@ //dialplan global if (isset($dialplan['extension']['@attributes']['global']) && $dialplan['extension']['@attributes']['global'] == "true") { $dialplan_global = true; + $dialplan_context = 'global'; } else { $dialplan_global = false; + $dialplan_context = $dialplan['@attributes']['name']; } //set the domain_uuid @@ -301,7 +303,7 @@ $array['dialplans'][$x]['app_uuid'] = $dialplan['extension']['@attributes']['app_uuid']; $array['dialplans'][$x]['dialplan_name'] = $dialplan['extension']['@attributes']['name']; $array['dialplans'][$x]['dialplan_number'] = $dialplan['extension']['@attributes']['number']; - $array['dialplans'][$x]['dialplan_context'] = $dialplan['@attributes']['name']; + $array['dialplans'][$x]['dialplan_context'] = $dialplan_context; if (strlen($dialplan['extension']['@attributes']['destination']) > 0) { $array['dialplans'][$x]['dialplan_destination'] = $dialplan['extension']['@attributes']['destination']; } From 59187fc64c5bb067c628f1c6714e29558270252f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 11 Dec 2021 10:50:28 -0700 Subject: [PATCH 067/496] Removing trailing white spaces and add previous_field_name variable. (#6182) --- app/contacts/contact_import.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index dfb92964fc..e36a62d94f 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -55,7 +55,7 @@ } //set the max php execution time - ini_set('max_execution_time',7200); + ini_set('max_execution_time', 7200); //get the http get values and set them as php variables $action = $_POST["action"]; @@ -77,7 +77,6 @@ move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']); $save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']); //system('chmod -R 744 '.$_SESSION['server']['temp']['dir'].'*'); - unset($_POST['txtCommand']); $file = $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']; $_SESSION['file'] = $file; } @@ -301,8 +300,10 @@ //set the starting identifiers $row_id = 0; $row_number = 1; + $previous_field_name = ''; //loop through the array + while (($line = fgets($handle, 4096)) !== false) { if ($from_row <= $row_number) { //format the data @@ -310,7 +311,7 @@ foreach ($fields as $key => $value) { //get the line $result = str_getcsv($line, $delimiter, $enclosure); - + //get the table and field name $field_array = explode(".",$value); $table_name = $field_array[0]; @@ -318,15 +319,22 @@ //echo "value: $value
    \n"; //echo "table_name: $table_name
    \n"; //echo "field_name: $field_name
    \n"; - + //get the parent table name $parent = get_parent($schema, $table_name); - + + if ($previous_field_name == $field_name) { + $field_name_sequence_count++; + } + else { + $field_name_sequence_count = 0; + } + //remove formatting from the phone number if ($field_name == "phone_number") { $result[$key] = preg_replace('{(?!^\+)[\D]}', '', $result[$key]); } - + //build the data array if (strlen($table_name) > 0) { if (strlen($parent) == 0) { @@ -337,12 +345,12 @@ if ($field_name != "username" && $field_name != "group_name") { $array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid; $array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key]; - if ($field_name == 'phone_number') { - $array[$parent][$row_id][$table_name][$y]['phone_label'] = $labels[$key]; + if (substr($field_name, 0, 6) == 'phone_') { + $array[$parent][$row_id][$table_name][$y][$key] = $labels[$key]; } } } - + if ($field_name == "group_name") { foreach ($groups as $field) { if ($field['group_name'] == $result[$key]) { @@ -353,7 +361,7 @@ } } } - + if ($field_name == "username") { foreach ($users as $field) { if ($field['username'] == $result[$key]) { @@ -365,9 +373,10 @@ } } } + $previous_field_name = $field; if (is_array($array[$parent][$row_id])) { $y++; } } - + //process a chunk of the array if ($row_id === 1000) { From 7422515bf419912934971e14a97b5d603e367bb9 Mon Sep 17 00:00:00 2001 From: Mendel <44873735+rabbidiesel@users.noreply.github.com> Date: Sat, 11 Dec 2021 13:03:09 -0500 Subject: [PATCH 068/496] Update app_config.php (#6179) Found that this is the variable that are on most yealink configs. --- app/yealink/app_config.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index df95ca0f86..cb0e0269ab 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -639,6 +639,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable phone to query the contact names from the remote phonebook when receiving incoming calls. 0-Disabled (default), 1-Enabled;"; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a921482c-40db-4aaf-85a8-71732a8b2033"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_remote_phonebook_enable"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Perform a remote phone book search for an incoming or outgoing call and display the matched results on the LCD screen. 0-Disabled;1-Enabled"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a703585-bee8-4b77-8e5b-7f1fb29958ff"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_local_directory_enable"; From 3b0d6b3d11e210e6991a1b438ff111163971961e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 11 Dec 2021 21:18:07 -0700 Subject: [PATCH 069/496] Contact import change how the array ordinal ID is determined. --- app/contacts/contact_import.php | 54 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index e36a62d94f..bf59c71014 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -207,8 +207,8 @@ foreach($schema as $row) { echo " \n"; foreach($row['fields'] as $field) { - if ($field == 'phone_label') { continue; } - if ($field == 'contact_url') { continue; } // can remove this after field is removed from the table + //if ($field == 'phone_label') { continue; } + //if ($field == 'contact_url') { continue; } // can remove this after field is removed from the table $selected = ''; if ($field == $line_field) { $selected = "selected='selected'"; @@ -220,9 +220,9 @@ echo " \n"; } echo " \n"; - echo " \n"; + //echo " \n"; echo " \n"; echo "\n"; $x++; @@ -300,10 +300,8 @@ //set the starting identifiers $row_id = 0; $row_number = 1; - $previous_field_name = ''; //loop through the array - while (($line = fgets($handle, 4096)) !== false) { if ($from_row <= $row_number) { //format the data @@ -320,16 +318,15 @@ //echo "table_name: $table_name
    \n"; //echo "field_name: $field_name
    \n"; + //add fields to the stack + $stack[$table_name][$field_name][] = null; + + //set the ordinal ID + $id = count($stack[$table_name][$field_name]) - 1; + //get the parent table name $parent = get_parent($schema, $table_name); - if ($previous_field_name == $field_name) { - $field_name_sequence_count++; - } - else { - $field_name_sequence_count = 0; - } - //remove formatting from the phone number if ($field_name == "phone_number") { $result[$key] = preg_replace('{(?!^\+)[\D]}', '', $result[$key]); @@ -343,11 +340,11 @@ } else { if ($field_name != "username" && $field_name != "group_name") { - $array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid; - $array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key]; - if (substr($field_name, 0, 6) == 'phone_') { - $array[$parent][$row_id][$table_name][$y][$key] = $labels[$key]; - } + $array[$parent][$row_id][$table_name][$id]['domain_uuid'] = $domain_uuid; + $array[$parent][$row_id][$table_name][$id][$field_name] = $result[$key]; + //if ($field_name == 'phone_number') { + // $array[$parent][$row_id][$table_name][$id]['phone_label'] = $labels[$key]; + //} } } @@ -355,9 +352,9 @@ foreach ($groups as $field) { if ($field['group_name'] == $result[$key]) { //$array[$parent][$row_id]['contact_group_uuid'] = uuid(); - $array[$parent][$row_id]['contact_groups'][$y]['domain_uuid'] = $domain_uuid; + $array[$parent][$row_id]['contact_groups'][$id]['domain_uuid'] = $domain_uuid; //$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid']; - $array[$parent][$row_id]['contact_groups'][$y]['group_uuid'] = $field['group_uuid']; + $array[$parent][$row_id]['contact_groups'][$id]['group_uuid'] = $field['group_uuid']; } } } @@ -365,21 +362,22 @@ if ($field_name == "username") { foreach ($users as $field) { if ($field['username'] == $result[$key]) { - //$array[$parent][$row_id]['contact_users'][$y]['contact_group_uuid'] = uuid(); - $array[$parent][$row_id]['contact_users'][$y]['domain_uuid'] = $domain_uuid; + //$array[$parent][$row_id]['contact_users'][$id]['contact_group_uuid'] = uuid(); + $array[$parent][$row_id]['contact_users'][$id]['domain_uuid'] = $domain_uuid; //$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid']; - $array[$parent][$row_id]['contact_users'][$y]['user_uuid'] = $field['user_uuid']; + $array[$parent][$row_id]['contact_users'][$id]['user_uuid'] = $field['user_uuid']; } } } } - $previous_field_name = $field; if (is_array($array[$parent][$row_id])) { $y++; } } + //debug information + //view_array($stack); + //process a chunk of the array if ($row_id === 1000) { - //save to the data $database = new database; $database->app_name = 'contacts'; @@ -392,12 +390,12 @@ //set the row id back to 0 $row_id = 0; } - + } //if ($from_row <= $row_number) + unset($stack); $row_number++; $row_id++; } //end while - fclose($handle); //save to the data From 7b088e187e84377904f97141cb04a56e0097a319 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 11 Dec 2021 21:18:18 -0700 Subject: [PATCH 070/496] Update contact_import.php --- app/contacts/contact_import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index bf59c71014..c4721d166d 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): From 5898923e73b665ea0d69bc0226aa5ab2ae25636f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 13 Dec 2021 10:00:20 -0700 Subject: [PATCH 071/496] Replace counting the array with adding a count inside the array. --- app/contacts/contact_import.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index c4721d166d..911033d448 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -319,10 +319,15 @@ //echo "field_name: $field_name
    \n"; //add fields to the stack - $stack[$table_name][$field_name][] = null; + if (isset($field_count[$table_name][$field_name])) { + $field_count[$table_name][$field_name]++; + } + else { + $field_count[$table_name][$field_name] = 0; + } //set the ordinal ID - $id = count($stack[$table_name][$field_name]) - 1; + $id = $field_count[$table_name][$field_name]; //get the parent table name $parent = get_parent($schema, $table_name); @@ -374,7 +379,7 @@ } //debug information - //view_array($stack); + //view_array($field_count); //process a chunk of the array if ($row_id === 1000) { @@ -392,12 +397,15 @@ } } //if ($from_row <= $row_number) - unset($stack); + unset($field_count); $row_number++; $row_id++; } //end while fclose($handle); + //debug information + //view_array($array); + //save to the data if (is_array($array)) { $database = new database; From 1a85403f23391725f77c3406770f4947a22b4506 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Mon, 13 Dec 2021 10:50:32 -0700 Subject: [PATCH 072/496] Fixed icon styling and required class (#6185) * Fixed icon styling and required class * Improved indentation. --- app/contacts/contact_edit.php | 337 +++++++++++++++++----------------- 1 file changed, 166 insertions(+), 171 deletions(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 5196393e2c..8f8217df0b 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -1217,7 +1217,6 @@ echo "
    \n"; echo "
    \n"; - echo "
    \n"; echo "
    \n"; echo " ".$text['option-other']."\n"; @@ -1233,7 +1232,7 @@ if (is_array($_SESSION["contact"]["type"])) { echo " \n"; } @@ -1264,7 +1263,7 @@ if (is_array($_SESSION['contact']['contact_title'])) { echo " \n"; sort($_SESSION['contact']['contact_title']); foreach($_SESSION['contact']['contact_title'] as $row) { - echo " \n"; + echo " \n"; } echo " \n"; } @@ -1282,7 +1281,7 @@ if (is_array($_SESSION['contact']['contact_role'])) { echo " \n"; sort($_SESSION['contact']['contact_role']); foreach($_SESSION['contact']['contact_role'] as $row) { - echo " \n"; + echo " \n"; } echo " \n"; } @@ -1300,7 +1299,7 @@ if (is_array($_SESSION['contact']['contact_category'])) { echo " \n"; sort($_SESSION['contact']['contact_category']); foreach($_SESSION['contact']['contact_category'] as $row) { - echo " \n"; + echo " \n"; } echo " \n"; } @@ -1381,31 +1380,31 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v echo "
    ".$text['label-users']."
    \n"; echo "
    "; if ($action == "update" && is_array($contact_users_assigned) && @sizeof($contact_users_assigned) != 0) { - echo "
    ".$text['label-username']."\n"; + echo "
    ".$text['label-username']."\n"; if ($contact_users_assigned && permission_exists('contact_user_delete')) { - //echo "
    \n"; - echo "
    \n"; - echo " ".$text['label-delete']."\n"; - //echo " ".$text['label-delete']."\n"; - //echo " \n"; - echo "
    \n"; + //echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-delete']."\n"; + //echo " ".$text['label-delete']."\n"; + //echo " \n"; + echo "
    \n"; } - echo "
    \n"; + echo "
    \n"; foreach ($contact_users_assigned as $x => $field) { echo "
    ".escape($field['username'])."\n"; if ($contact_users_assigned && permission_exists('contact_user_delete')) { if (is_uuid($field['contact_user_uuid'])) { - echo "
    \n"; - //echo " \n"; - //echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo "
    \n"; + //echo " \n"; + //echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; } else { - echo "
    \n"; + echo "
    \n"; } echo "
    \n"; } @@ -1418,7 +1417,7 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v echo " \n"; foreach ($users as $field) { if (in_array($field['user_uuid'], array_column($contact_users_assigned, 'user_uuid'))) { continue; } //skip users already assigned - echo " \n"; + echo " \n"; } echo " \n"; if ($action == "update") { @@ -1427,7 +1426,7 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v unset($users); echo "
    \n"; } - echo " ".$text['description-users']."\n"; + echo " ".$text['description-users']."\n"; echo "
    \n"; } @@ -1435,36 +1434,36 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v echo "
    ".$text['label-groups']."
    "; echo "
    "; if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) { - echo "
    ".$text['label-group']."\n"; + echo "
    ".$text['label-group']."\n"; if ($contact_groups_assigned && permission_exists('contact_group_delete')) { - //echo "
    \n"; - echo "
    \n"; - echo " ".$text['label-delete']."\n"; - //echo " ".$text['label-delete']."\n"; - //echo " \n"; - echo "
    \n"; + //echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-delete']."\n"; + //echo " ".$text['label-delete']."\n"; + //echo " \n"; + echo "
    \n"; } - echo "
    \n"; + echo "
    \n"; foreach ($contact_groups_assigned as $x => $field) { if (strlen($field['group_name']) > 0) { - echo "
    ".escape($field['group_name'])."\n"; + echo "
    ".escape($field['group_name'])."\n"; if (permission_exists('contact_group_delete')) { if (is_uuid($field['contact_group_uuid'])) { - echo "
    "; - //echo " \n"; - //echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo "
    "; + //echo " \n"; + //echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; } else { - echo "
    "; + echo "
    "; } - echo "
    \n"; + echo "
    \n"; } - echo "
    \n"; + echo "
    \n"; } } } @@ -1474,11 +1473,11 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v echo "
    \n"; echo " "; if ($action == "update") { @@ -1507,13 +1506,13 @@ if (permission_exists('contact_phone_view')) { echo "
    \n"; echo " ".$text['label-phone_numbers']."\n"; if ($row['phone_primary'] == "1") { - echo " \n"; + echo " \n"; } if (permission_exists('contact_phone_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; @@ -1527,57 +1526,57 @@ if (permission_exists('contact_phone_view')) { echo " ".$text['label-phone_label']."\n"; echo "
    \n"; echo "
    \n"; - echo " \n"; + echo " \n"; if ($row['phone_label'] == "work") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "home") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "mobile") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "main") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "fax") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "voicemail") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "text") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_label'] == "other") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; //echo $text['description-phone_label']."\n"; echo "
    \n"; @@ -1601,7 +1600,7 @@ if (permission_exists('contact_phone_view')) { //echo $text['description-phone_extension']."\n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-phone_number']."\n"; echo "
    \n"; echo "
    \n"; @@ -1622,21 +1621,21 @@ if (permission_exists('contact_phone_view')) { echo "
    \n"; echo "
    \n"; - echo " \n"; + echo " \n"; if ($row['phone_primary'] == "1") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['phone_primary'] == "0") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; //echo $text['description-phone_primary']."\n"; echo "
    \n"; @@ -1678,21 +1677,20 @@ if (permission_exists('contact_address_view')) { echo "
    \n"; echo " ".$text['label-addresses']."\n"; if ($row['address_primary'] == "1") { - echo " \n"; + echo " \n"; } if (permission_exists('contact_address_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } - echo "
    \n"; + echo "
    \n"; $map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code']; echo " "; echo " ".$text["; echo " \n"; echo "
    \n"; - echo "
    \n"; echo "
    \n"; @@ -1808,7 +1806,7 @@ if (permission_exists('contact_address_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-address_address']."\n"; echo "
    \n"; echo "
    \n"; @@ -1922,13 +1920,13 @@ if (permission_exists('contact_email_view')) { echo "
    \n"; echo " ".$text['label-emails']."\n"; if ($row['email_primary'] == "1") { - echo " \n"; + echo " \n"; } if (permission_exists('contact_email_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; @@ -1944,7 +1942,7 @@ if (permission_exists('contact_email_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-email_address']."\n"; echo "
    \n"; echo "
    \n"; @@ -1955,21 +1953,21 @@ if (permission_exists('contact_email_view')) { echo " ".$text['label-primary']."\n"; echo "
    \n"; echo "
    \n"; - echo " \n"; + echo " \n"; if ($row['email_primary'] == "1") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['email_primary'] == "0") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; //echo "
    \n"; //echo $text['description-email_primary']."\n"; echo "
    \n"; @@ -2009,13 +2007,13 @@ if (permission_exists('contact_url_view')) { echo "
    \n"; echo " ".$text['label-contact_url']."\n"; if ($row['url_primary'] == "1") { - echo " \n"; + echo " \n"; } if (permission_exists('contact_url_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; @@ -2058,10 +2056,11 @@ if (permission_exists('contact_url_view')) { //echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-url_address']."\n"; echo "
    \n"; echo "
    \n"; + echo " \n"; echo "
    \n"; @@ -2114,6 +2113,7 @@ if (permission_exists('contact_relation_view')) { $x = 0; foreach($contact_relations as $row) { + $sql = "select contact_uuid, contact_organization, contact_name_given, contact_name_family from v_contacts "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and contact_uuid <> :contact_uuid "; @@ -2125,25 +2125,24 @@ if (permission_exists('contact_relation_view')) { echo "
    \n"; echo "
    \n"; - echo " \n"; - echo " ".$text['label-contact_relation_label']."\n"; - echo " \n"; + echo " ".$text['label-contact_relation_label']."\n"; if (permission_exists('contact_relation_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; - - echo "
    \n"; + + echo "
    \n"; echo " ".$text['label-contact_relation_label']."\n"; echo "
    \n"; echo "
    \n"; - + + //if there are no custom labels add defaults if (is_array($_SESSION["contact"]["relation_label"])) { $relation_labels = $_SESSION["contact"]["url_label"]; @@ -2170,9 +2169,8 @@ if (permission_exists('contact_relation_view')) { //echo "
    \n"; //echo $text['description-relation_label']."\n"; echo "
    \n"; - - - echo "
    \n"; + + echo "
    \n"; echo " ".$text['label-contact_relation_contact']."\n"; echo "
    \n"; echo "
    \n"; @@ -2190,7 +2188,7 @@ if (permission_exists('contact_relation_view')) { $contact_name = $field['contact_organization']; } } - echo " \n"; + echo " \n"; } } unset($sql, $parameters, $result, $row); @@ -2216,10 +2214,10 @@ if (permission_exists('contact_setting_view')) { echo "
    \n"; echo " ".$text['label-contact_settings']."\n"; if (permission_exists('contact_setting_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; @@ -2228,21 +2226,21 @@ if (permission_exists('contact_setting_view')) { echo " \n"; echo " \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_setting_category']."\n"; echo "
    \n"; echo "
    \n"; echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_setting_subcategory']."\n"; echo "
    \n"; echo "
    \n"; echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-name']."\n"; echo "
    \n"; echo "
    \n"; @@ -2260,44 +2258,44 @@ if (permission_exists('contact_setting_view')) { echo " ".$text['label-order']."\n"; echo "
    \n"; echo "
    \n"; - echo " \n"; + echo " \n"; $i=0; while ($i<=999) { $selected = ($i == $row["contact_setting_order"]) ? "selected" : null; if (strlen($i) == 1) { - echo " \n"; + echo " \n"; } if (strlen($i) == 2) { - echo " \n"; + echo " \n"; } if (strlen($i) == 3) { - echo " \n"; + echo " \n"; } $i++; } - echo " \n"; + echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-enabled']."\n"; echo "
    \n"; echo "
    \n"; - echo " \n"; + echo " \n"; if ($row['contact_setting_enabled'] == "true") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } if ($row['contact_setting_enabled'] == "false") { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } - echo " \n"; + echo " \n"; echo "
    \n"; echo "
    \n"; @@ -2316,9 +2314,6 @@ if (permission_exists('contact_setting_view')) { echo " \n"; echo "
    \n"; } - else { - - } } echo "
    \n"; @@ -2341,16 +2336,16 @@ if (permission_exists('contact_attachment_view')) { echo "
    \n"; echo " ".$text['label-attachments']."\n"; if ($row['attachment_primary'] == "1") { - echo " \n"; + echo " \n"; } if (permission_exists('contact_attachment_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; @@ -2382,7 +2377,7 @@ if (permission_exists('contact_attachment_view')) { echo "
    \n"; echo " ".$text['label-attachment']."\n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; $attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION)); //if ($action == 'update') { echo "\n"; @@ -2424,7 +2419,7 @@ if (permission_exists('contact_attachment_view')) { echo " \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-description']."\n"; echo "
    \n"; echo "
    \n"; @@ -2449,18 +2444,18 @@ if (permission_exists('contact_time_view')) { echo "
    \n"; echo " ".$text['header_contact_times']."\n"; if (permission_exists('contact_time_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-time_start']."\n"; echo "
    \n"; echo "
    \n"; @@ -2507,18 +2502,18 @@ if (permission_exists('contact_note_view')) { echo "
    \n"; echo " ".$text['label-contact_notes']."\n"; if (permission_exists('contact_note_delete')) { - echo "
    \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; } echo "
    \n"; echo "
    \n"; - echo "
    \n"; + echo "
    \n"; echo " ".$text['label-contact_note']."\n"; echo "
    \n"; echo "
    \n"; From 6231a588ad34de7b9cc5d1555494af5eb1d64b7d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 13 Dec 2021 11:49:13 -0700 Subject: [PATCH 073/496] Update contact_import.php --- app/contacts/contact_import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index 911033d448..5e5ef5a715 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -318,6 +318,9 @@ //echo "table_name: $table_name
    \n"; //echo "field_name: $field_name
    \n"; + //get the parent table name + $parent = get_parent($schema, $table_name); + //add fields to the stack if (isset($field_count[$table_name][$field_name])) { $field_count[$table_name][$field_name]++; @@ -329,9 +332,6 @@ //set the ordinal ID $id = $field_count[$table_name][$field_name]; - //get the parent table name - $parent = get_parent($schema, $table_name); - //remove formatting from the phone number if ($field_name == "phone_number") { $result[$key] = preg_replace('{(?!^\+)[\D]}', '', $result[$key]); From dae6b760e43a307d7ae9813ab59ce8207cd627cf Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 13 Dec 2021 14:02:54 -0700 Subject: [PATCH 074/496] Use field_count instead of row_id. --- app/devices/device_imports.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php index 239fdda74f..f290b5688b 100644 --- a/app/devices/device_imports.php +++ b/app/devices/device_imports.php @@ -290,6 +290,17 @@ //get the parent table name $parent = get_parent($schema, $table_name); + //count the field names + if (isset($field_count[$table_name][$field_name])) { + $field_count[$table_name][$field_name]++; + } + else { + $field_count[$table_name][$field_name] = 0; + } + + //set the ordinal ID + $id = $field_count[$table_name][$field_name]; + //remove formatting from the phone number if ($field_name == "phone_number") { $result[$key] = preg_replace('{\D}', '', $result[$key]); @@ -310,14 +321,14 @@ } } else { - $array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid; - $array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key]; + $array[$parent][$row_id][$table_name][$id]['domain_uuid'] = $domain_uuid; + $array[$parent][$row_id][$table_name][$id][$field_name] = $result[$key]; } if ($field_name == "username") { foreach ($users as $field) { if ($field['username'] == $result[$key]) { - $array[$table_name][$row_id]['device_user_uuid'] = $field['user_uuid']; + $array[$parent][$table_name][$id]['device_user_uuid'] = $field['user_uuid']; } } } @@ -344,6 +355,9 @@ unset($sql, $parameters); } + //debug information + //view_array($field_count); + //process a chunk of the array if ($row_id === 1000) { @@ -359,16 +373,14 @@ } } //if ($from_row <= $row_id) + unset($field_count); $row_number++; $row_id++; } //end while fclose($handle); //debug info - //echo "
    \n";
-					//print_r($array);
-					//echo "
    \n"; - //exit; + //view_array($array); //save to the data if (is_array($array)) { From 35b982e569d060e75eab91ed3885435e201b63eb Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 13 Dec 2021 14:04:02 -0700 Subject: [PATCH 075/496] Change the comment text --- app/contacts/contact_import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index 5e5ef5a715..a3460bde54 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -321,7 +321,7 @@ //get the parent table name $parent = get_parent($schema, $table_name); - //add fields to the stack + //count the field names if (isset($field_count[$table_name][$field_name])) { $field_count[$table_name][$field_name]++; } From d62130cf1f9ef0552647b353b85d4c631ab01c3c Mon Sep 17 00:00:00 2001 From: Anthony <96078404+AntoniusDC@users.noreply.github.com> Date: Mon, 13 Dec 2021 17:11:38 -0700 Subject: [PATCH 076/496] Add theme default settings for operator panel (#6187) * Add theme default settings for operator panel --- app/basic_operator_panel/app_config.php | 18 ++++++++++++++++- themes/default/css.php | 26 ++++++++++++------------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/basic_operator_panel/app_config.php b/app/basic_operator_panel/app_config.php index 39cd6bf82a..c24e55c515 100644 --- a/app/basic_operator_panel/app_config.php +++ b/app/basic_operator_panel/app_config.php @@ -75,5 +75,21 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set if extensions are grouped by call_group when viewing all extensions."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b9d34460-db41-40d5-becd-5da037fa8942"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_inactive_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "rgba(255, 255, 255, 0.5)"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set background color (and opacity) of inactive extensions."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9cb6477d-0454-4b9c-b0fb-11c258d4f35f"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_inactive_border_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#b9c5d8"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set border color (and opacity) of inactive extensions."; + $y++; -?> \ No newline at end of file +?> diff --git a/themes/default/css.php b/themes/default/css.php index 1dd56beb17..f486977fb3 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -1959,12 +1959,12 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0 0 3px #e5e9f0; - -moz-box-shadow: 0 0 3px #e5e9f0; - box-shadow: 0 0 3px #e5e9f0; + -webkit-box-shadow: 0 0 3px ; + -moz-box-shadow: 0 0 3px ; + box-shadow: 0 0 10px ; border-width: 1px 3px; - border-color: #b9c5d8 #c5d1e5; - background-color: #e5eaf5; + border-color: ; + background-color: ; cursor: default; } @@ -1978,12 +1978,12 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0 0 3px #e5e9f0; - -moz-box-shadow: 0 0 3px #e5e9f0; - box-shadow: 0 0 3px #e5e9f0; + -webkit-box-shadow: 0 0 3px ; + -moz-box-shadow: 0 0 3px ; + box-shadow: 0 0 3px ; border-width: 1px 3px; - border-color: #b9c5d8 #c5d1e5; - background-color: #e5eaf5; + border-color: ; + background-color: ; cursor: not-allowed; } @@ -1999,7 +1999,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); top: 0; left: 0; right: 0; - background: rgba(255, 255, 255, 0.5); + background: ; } div.op_state_active { @@ -2020,7 +2020,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - background-color: #e5eaf5; + background-color: ; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; @@ -2051,7 +2051,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - background-color: #f0f2f6; + background-color: ; } td.op_state_ringing { From c8a8ea9bf4d4274264f6917a5135e84a10678eb4 Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Tue, 14 Dec 2021 10:22:24 -0500 Subject: [PATCH 077/496] [agent status] Add *22 followed by agent ID (#6184) * [agent status] Add *22 followed by agent ID * change break never to on-true --- .../resources/switch/conf/dialplan/200_agent_status.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml index 660e668bd2..3d9263e364 100644 --- a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml +++ b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml @@ -1,10 +1,10 @@ - + - + From 0fbecfa4acad92d395207787f5522edb12648ac9 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 14 Dec 2021 10:38:46 -0700 Subject: [PATCH 078/496] Update css.php (#6188) * Update css.php * Update app_config.php --- app/basic_operator_panel/app_config.php | 18 +++++++++++++----- themes/default/css.php | 23 ++++++++++++----------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/basic_operator_panel/app_config.php b/app/basic_operator_panel/app_config.php index c24e55c515..25678f519d 100644 --- a/app/basic_operator_panel/app_config.php +++ b/app/basic_operator_panel/app_config.php @@ -75,21 +75,29 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set if extensions are grouped by call_group when viewing all extensions."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9ccd174-5ae1-4f90-8ee2-b79a183a04f8"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_main_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set main background color (and opacity) of extensions"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b9d34460-db41-40d5-becd-5da037fa8942"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_inactive_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_sub_background_color"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "rgba(255, 255, 255, 0.5)"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#e5eaf5"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set background color (and opacity) of inactive extensions."; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set sub background color (and opacity) of extensions"; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9cb6477d-0454-4b9c-b0fb-11c258d4f35f"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_inactive_border_color"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_border_color"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "#b9c5d8"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set border color (and opacity) of inactive extensions."; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set border color (and opacity) of extensions"; $y++; ?> diff --git a/themes/default/css.php b/themes/default/css.php index f486977fb3..05f98caa4e 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -1959,11 +1959,11 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0 0 3px ; - -moz-box-shadow: 0 0 3px ; - box-shadow: 0 0 10px ; + -webkit-box-shadow: 0 0 3px ; + -moz-box-shadow: 0 0 3px ; + box-shadow: 0 0 3px ; border-width: 1px 3px; - border-color: ; + border-color: ; background-color: ; cursor: default; } @@ -1978,13 +1978,14 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -webkit-box-shadow: 0 0 3px ; - -moz-box-shadow: 0 0 3px ; - box-shadow: 0 0 3px ; + -webkit-box-shadow: 0 0 3px ; + -moz-box-shadow: 0 0 3px ; + box-shadow: 0 0 3px ; border-width: 1px 3px; - border-color: ; + border-color: ; background-color: ; cursor: not-allowed; + opacity: 0.5; } div.off_ext:after { @@ -1999,7 +2000,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); top: 0; left: 0; right: 0; - background: ; + background: ; } div.op_state_active { @@ -2020,7 +2021,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - background-color: ; + background-color: ; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; @@ -2051,7 +2052,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - background-color: ; + background-color: ; } td.op_state_ringing { From ad5a57a379191758f18aecf8c7105a2bb97677fa Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 14 Dec 2021 16:02:09 -0700 Subject: [PATCH 079/496] Add label users and group --- resources/app_languages.php | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/resources/app_languages.php b/resources/app_languages.php index 3b601c0355..f59bfad6cd 100644 --- a/resources/app_languages.php +++ b/resources/app_languages.php @@ -3714,6 +3714,27 @@ $text['label-groups']['sv-se'] = "Grupper"; $text['label-groups']['uk-ua'] = "Групи"; $text['label-groups']['tr-tr'] = "Gruplar"; +$text['label-group']['en-us'] = "Group"; +$text['label-group']['en-gb'] = "Group"; +$text['label-group']['ar-eg'] = ""; +$text['label-group']['de-at'] = "Gruppe"; //copied from de-de +$text['label-group']['de-ch'] = "Gruppe"; //copied from de-de +$text['label-group']['de-de'] = "Gruppe"; +$text['label-group']['es-cl'] = "Grupo"; +$text['label-group']['es-mx'] = "Grupo"; //copied from es-cl +$text['label-group']['fr-ca'] = "Group"; //copied from fr-fr +$text['label-group']['fr-fr'] = "Group"; +$text['label-group']['he-il'] = "קבוצה"; +$text['label-group']['it-it'] = "Gruppo"; +$text['label-group']['nl-nl'] = ""; +$text['label-group']['pl-pl'] = "Grupa"; +$text['label-group']['pt-br'] = "Grupo"; //copied from pt-pt +$text['label-group']['pt-pt'] = "Grupo"; +$text['label-group']['ro-ro'] = ""; +$text['label-group']['ru-ru'] = "Группа"; +$text['label-group']['sv-se'] = "Grupp"; +$text['label-group']['uk-ua'] = "Група"; + $text['label-recording']['en-us'] = "Recording"; $text['label-recording']['en-gb'] = "Recording"; $text['label-recording']['ar-eg'] = ""; @@ -4304,6 +4325,28 @@ $text['label-provider']['ru-ru'] = ""; $text['label-provider']['sv-se'] = ""; $text['label-provider']['uk-ua'] = ""; +$text['label-users']['en-us'] = "Users"; +$text['label-users']['en-gb'] = "Users"; +$text['label-users']['ar-eg'] = ""; +$text['label-users']['de-at'] = "Benutzer"; //copied from de-de +$text['label-users']['de-ch'] = "Benutzer"; //copied from de-de +$text['label-users']['de-de'] = "Benutzer"; +$text['label-users']['el-gr'] = "Χρήστες"; +$text['label-users']['es-cl'] = "Usuarios"; +$text['label-users']['es-mx'] = "Usuarios"; //copied from es-cl +$text['label-users']['fr-ca'] = "Utilisateurs"; //copied from fr-fr +$text['label-users']['fr-fr'] = "Utilisateurs"; +$text['label-users']['he-il'] = ""; +$text['label-users']['it-it'] = "Utenti"; +$text['label-users']['nl-nl'] = ""; +$text['label-users']['pl-pl'] = "Użytkownicy"; +$text['label-users']['pt-br'] = "Usuários"; +$text['label-users']['pt-pt'] = "Utilizadores"; +$text['label-users']['ro-ro'] = ""; +$text['label-users']['ru-ru'] = "Пользователи"; +$text['label-users']['sv-se'] = "Användare"; +$text['label-users']['uk-ua'] = "Користувачі"; + $text['label-user']['en-us'] = "User"; $text['label-user']['en-gb'] = "User"; $text['label-user']['ar-eg'] = ""; From 4b68118d3e10639560c3249d73cc193bbc06a8d2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 14 Dec 2021 16:23:47 -0700 Subject: [PATCH 080/496] Add group select --- app/destinations/destination_edit.php | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php index 325bd408f3..96d0b6a22b 100644 --- a/app/destinations/destination_edit.php +++ b/app/destinations/destination_edit.php @@ -102,6 +102,7 @@ $fax_uuid = $_POST["fax_uuid"]; $provider_uuid = $_POST["provider_uuid"]; $user_uuid = $_POST["user_uuid"]; + $group_uuid = $_POST["group_uuid"]; $destination_order= $_POST["destination_order"]; $destination_enabled = $_POST["destination_enabled"]; $destination_description = $_POST["destination_description"]; @@ -712,6 +713,9 @@ if (permission_exists('user_edit')) { $array['destinations'][$x]["user_uuid"] = $user_uuid; } + if (permission_exists('group_edit')) { + $array['destinations'][$x]["group_uuid"] = $group_uuid; + } $array['destinations'][$x]["destination_type"] = $destination_type; if (permission_exists('destination_condition_field')) { $array['destinations'][$x]["destination_condition_field"] = $destination_condition_field; @@ -896,6 +900,7 @@ $fax_uuid = $row["fax_uuid"]; $provider_uuid = $row["provider_uuid"]; $user_uuid = $row["user_uuid"]; + $group_uuid = $row["group_uuid"]; $currency = $row["currency"]; $destination_sell = $row["destination_sell"]; $destination_buy = $row["destination_buy"]; @@ -998,6 +1003,17 @@ unset($sql, $parameters); } +//get the groups list + if (permission_exists('group_edit')) { + $sql = "select group_uuid, domain_uuid, group_name, group_description from v_groups "; + $sql .= "where (domain_uuid is null or domain_uuid = :domain_uuid) "; + $sql .= "order by group_name asc "; + $parameters['domain_uuid'] = $domain_uuid; + $database = new database; + $groups = $database->select($sql, $parameters, 'all'); + unset($sql, $parameters); + } + //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); @@ -1306,6 +1322,28 @@ unset($users); echo "
    \n"; echo " ".$text['description-user']."\n"; + echo "\n"; + echo "\n"; + } + + if (permission_exists('group_edit')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-group']."\n"; + echo "\n"; + echo "\n"; + echo " "; + unset($groups); + echo "
    \n"; + echo " ".$text['description-group']."\n"; + echo "\n"; + echo "\n"; } echo "\n"; From 6e8fd019b25a4c47da9c683997c2426ba3f87a3c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 14 Dec 2021 21:49:29 -0700 Subject: [PATCH 081/496] Add group_uuid to the destinations table. --- app/destinations/app_config.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php index 4df7bf6a1e..3edec8a1d7 100644 --- a/app/destinations/app_config.php +++ b/app/destinations/app_config.php @@ -236,6 +236,14 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_users"; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid"; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "group_uuid"; + $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid"; + $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)"; + $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign"; + $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_groups"; + $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "group_uuid"; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "destination_type"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "destination_name"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; From b7aaf582eb47acd12fa594e2f715e05fb5635ae2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 09:40:14 -0700 Subject: [PATCH 082/496] Add device line label. (#6192) * Add device line label. --- app/devices/app_config.php | 4 ++++ app/devices/device_edit.php | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/devices/app_config.php b/app/devices/app_config.php index f4eca6aa62..475cbeaaf3 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -536,6 +536,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the outbound proxy."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "label"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the label."; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "display_name"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the display name."; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 4c8e5b60b9..9a3a99ca67 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. */ @@ -128,6 +128,7 @@ //$server_address = $_POST["server_address"]; //$outbound_proxy_primary = $_POST["outbound_proxy_primary"]; //$outbound_proxy_secondary = $_POST["outbound_proxy_secondary"]; + //$label = $_POST["label"]; //$display_name = $_POST["display_name"]; //$user_id = $_POST["user_id"]; //$auth_id = $_POST["auth_id"]; @@ -316,6 +317,7 @@ } else if ($new_line && isset($_SESSION['provision']['server_address_secondary'])) { $array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text']; } + $array['devices'][0]['device_lines'][$y]['label'] = $row["label"]; $array['devices'][0]['device_lines'][$y]['display_name'] = $row["display_name"]; $array['devices'][0]['device_lines'][$y]['user_id'] = $row["user_id"]; if (permission_exists('device_line_auth_id')) { @@ -547,6 +549,7 @@ $device_lines[$x]['outbound_proxy_secondary'] = $_SESSION['provision']['outbound_proxy_secondary']['text']; $device_lines[$x]['server_address_primary'] = $_SESSION['provision']['server_address_primary']['text']; $device_lines[$x]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text']; + $device_lines[$x]['label'] = ''; $device_lines[$x]['display_name'] = ''; $device_lines[$x]['user_id'] = ''; $device_lines[$x]['auth_id'] = ''; @@ -1041,6 +1044,7 @@ if (permission_exists('device_line_outbound_proxy_secondary')) { echo " ".$text['label-outbound_proxy_secondary']."\n"; } + echo " ".$text['label-label']."\n"; echo " ".$text['label-display_name']."\n"; echo " ".$text['label-user_id']."\n"; if (permission_exists('device_line_auth_id')) { @@ -1181,6 +1185,10 @@ echo " \n"; } + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; From 6eb6732cd37105964f57174737a54fcdd6de38a3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 13:11:13 -0700 Subject: [PATCH 083/496] Update app_defaults.php Minor change --- app/devices/app_defaults.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php index 8c750e2a94..dd1de2a75c 100644 --- a/app/devices/app_defaults.php +++ b/app/devices/app_defaults.php @@ -16,7 +16,7 @@ The Original Code is FusionPBX The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2016 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -26,13 +26,20 @@ if ($domains_processed == 1) { //set all lines to enabled (true) where null or empty string - $sql = "update v_device_lines set "; - $sql .= "enabled = 'true' "; - $sql .= "where enabled is null "; - $sql .= "or enabled = '' "; + $sql = "select device_line_uuid from v_device_lines "; + $sql .= "where enabled is null or enabled = '' "; $database = new database; - $database->execute($sql); - unset($sql); + $device_lines = $database->select($sql, null, 'all'); + if (is_array($device_lines) && @sizeof($device_lines) != 0) { + $sql = "update v_device_lines set "; + $sql .= "enabled = 'true' "; + $sql .= "where enabled is null "; + $sql .= "or enabled = '' "; + $database = new database; + $database->execute($sql); + unset($sql); + } + unset($sql, $device_lines); //set the device key vendor $sql = "select * from v_device_keys as k, v_devices as d "; From fcf53a0976227652496e79f68a28bbac4e32db7e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 14:37:02 -0700 Subject: [PATCH 084/496] Don't show this until its ready for production. --- app/fax/fax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/fax/fax.php b/app/fax/fax.php index aac3f9a9eb..d355b68a4a 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -287,7 +287,7 @@ $box = 'inbox'; } echo " ".$text['label-inbox']."  "; - echo " ".$text['label-outbox']."  "; + //echo " ".$text['label-outbox']."  "; } if (permission_exists('fax_sent_view')) { echo " ".$text['label-sent']."  "; From b2c8f976a7cce6be6215b3d6465901f62d7ddcf5 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 14:39:34 -0700 Subject: [PATCH 085/496] Add line_label and line_display_name default settings. (#6195) * Update app_config.php * Add device line_label and line_dislplay_name. --- app/extensions/extension_edit.php | 52 ++++++++++++++++++++++++++++++- app/provision/app_config.php | 16 ++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 0bcf01edb0..238827be20 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -537,6 +537,55 @@ $device_vendor = device::get_vendor($device_mac_address); } + //determine the name + if (strlen($effective_caller_id_name) > 0) { + $name = $effective_caller_id_name; + } + elseif (strlen($directory_first_name) > 0 && strlen($directory_last_name) > 0) { + $name = $directory_first_name.' '.$directory_last_name; + } + elseif (strlen($directory_first_name) > 0) { + $name = $directory_first_name; + } + elseif (strlen($directory_first_name) > 0) { + $name = $directory_first_name.' '.$directory_last_name; + } + else { + $name = ''; + } + + //get the dislplay label + if ($_SESSION['provision']['line_label']['text'] == 'auto') { + $line_label = $name; + } + else { + $line_label = $_SESSION['provision']['line_label']['text']; + $line_label = str_replace("\${name}", $name, $line_label); + $line_label = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_label); + $line_label = str_replace("\${first_name}", $directory_first_name, $line_label); + $line_label = str_replace("\${last_name}", $directory_last_name, $line_label); + $line_label = str_replace("\${user_id}", $extension, $line_label); + $line_label = str_replace("\${auth_id}", $extension, $line_label); + $line_label = str_replace("\${extension}", $extension, $line_label); + $line_label = str_replace("\${description}", $description, $line_label); + } + + //get the dislplay name + if ($_SESSION['provision']['line_display_name']['text'] == 'auto') { + $line_display_name = $name; + } + else { + $line_display_name = $_SESSION['provision']['line_display_name']['text']; + $line_display_name = str_replace("\${name}", $name, $display_name); + $line_display_name = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_display_name); + $line_display_name = str_replace("\${first_name}", $directory_first_name, $line_display_name); + $line_display_name = str_replace("\${last_name}", $directory_last_name, $line_display_name); + $line_display_name = str_replace("\${user_id}", $extension, $line_display_name); + $line_display_name = str_replace("\${auth_id}", $extension, $line_display_name); + $line_display_name = str_replace("\${extension}", $extension, $line_display_name); + $line_display_name = str_replace("\${description}", $description, $line_display_name); + } + //send a message to the user the device is not unique if (!$device_unique) { $message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null); @@ -562,7 +611,8 @@ $array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $_SESSION['provision']['outbound_proxy_secondary']['text']; $array["devices"][$j]["device_lines"][0]["server_address_primary"] = $_SESSION['provision']['server_address_primary']['text']; $array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $_SESSION['provision']['server_address_secondary']['text']; - $array["devices"][$j]["device_lines"][0]["display_name"] = strlen($effective_caller_id_name) > 0 ? $effective_caller_id_name : $extension; + $array["devices"][$j]["device_lines"][0]["display_label"] = $line_label; + $array["devices"][$j]["device_lines"][0]["display_name"] = $line_display_name; $array["devices"][$j]["device_lines"][0]["user_id"] = $extension; $array["devices"][$j]["device_lines"][0]["auth_id"] = $extension; $array["devices"][$j]["device_lines"][0]["password"] = $password; diff --git a/app/provision/app_config.php b/app/provision/app_config.php index 248bd849a3..25d4b0015b 100644 --- a/app/provision/app_config.php +++ b/app/provision/app_config.php @@ -151,6 +151,22 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4e2986cc-de12-49b9-9832-5ca53bb2098a"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_label"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "user_id"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97402737-ba86-4d4e-8847-5497d07ef6b5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_display_name"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9dc7f4a-0a19-40cb-829a-093bf81d00db"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_sip_port"; From 42b52ae8fc0bac21c89e00e2712c9ab596e8f29b Mon Sep 17 00:00:00 2001 From: Mendel <44873735+rabbidiesel@users.noreply.github.com> Date: Wed, 15 Dec 2021 16:41:12 -0500 Subject: [PATCH 086/496] Update dispaly_name to label on all Yealink Templates (#6196) * Use label instead of display name * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg --- .../provision/yealink/cp860/{$mac}.cfg | 12 +++++----- .../provision/yealink/cp920/{$mac}.cfg | 12 +++++----- .../provision/yealink/cp960/{$mac}.cfg | 12 +++++----- .../provision/yealink/t19p/{$mac}.cfg | 13 +++++------ .../provision/yealink/t20p/{$mac}.cfg | 13 +++++------ .../provision/yealink/t21p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t22p/{$mac}.cfg | 13 +++++------ .../provision/yealink/t23g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t23p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t26p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t27g/{$mac}.cfg | 13 +++++------ .../provision/yealink/t27p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t28p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t29g/{$mac}.cfg | 13 +++++------ .../provision/yealink/t2x/{$mac}.cfg | 2 +- .../provision/yealink/t31g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t32g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t33g/{$mac}.cfg | 9 ++++---- .../provision/yealink/t38g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t40g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t40p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t41p/{$mac}.cfg | 12 +++++----- .../provision/yealink/t41s/{$mac}.cfg | 2 +- .../provision/yealink/t42g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t42s/{$mac}.cfg | 12 +++++----- .../provision/yealink/t43u/{$mac}.cfg | 12 +++++----- .../provision/yealink/t46g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t46s/{$mac}.cfg | 12 +++++----- .../provision/yealink/t46u/{$mac}.cfg | 12 +++++----- .../provision/yealink/t48g/{$mac}.cfg | 13 +++++------ .../provision/yealink/t48s/{$mac}.cfg | 13 +++++------ .../provision/yealink/t49g/{$mac}.cfg | 12 +++++----- .../provision/yealink/t4x/{$mac}.cfg | 2 +- .../provision/yealink/t52s/{$mac}.cfg | 4 ++-- .../provision/yealink/t53/{$mac}.cfg | 22 +++++++++---------- .../provision/yealink/t53w/{$mac}.cfg | 22 +++++++++---------- .../provision/yealink/t54s/{$mac}.cfg | 2 +- .../provision/yealink/t54w/{$mac}.cfg | 2 +- .../provision/yealink/t56a/{$mac}.cfg | 12 +++++----- .../provision/yealink/t57w/{$mac}.cfg | 22 +++++++++---------- .../provision/yealink/t58a/{$mac}.cfg | 12 +++++----- .../provision/yealink/t58v/{$mac}.cfg | 2 +- .../provision/yealink/t5x/{$mac}.cfg | 2 +- .../provision/yealink/vp530/{$mac}.cfg | 2 +- .../provision/yealink/vp59/{$mac}.cfg | 2 +- .../provision/yealink/w52p/{$mac}.cfg | 10 ++++----- .../provision/yealink/w56p/{$mac}.cfg | 10 ++++----- .../provision/yealink/w60b/{$mac}.cfg | 16 +++++++------- 48 files changed, 249 insertions(+), 263 deletions(-) diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg index df70a6bf7a..ebe8b75c56 100644 --- a/resources/templates/provision/yealink/cp860/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1042,7 +1042,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1543,7 +1543,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2040,7 +2040,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2537,7 +2537,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg index 6726329ee3..4f5b781990 100644 --- a/resources/templates/provision/yealink/cp920/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -526,7 +526,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1041,7 +1041,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1543,7 +1543,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2042,7 +2042,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2540,7 +2540,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg index 687f53ae9f..c535a6ec8f 100644 --- a/resources/templates/provision/yealink/cp960/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -528,7 +528,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1043,7 +1043,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1544,7 +1544,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2040,7 +2040,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2537,7 +2537,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg index 402f7282ab..b5de465f4d 100644 --- a/resources/templates/provision/yealink/t19p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1029,7 +1029,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg index 43152be860..6a989f6a38 100644 --- a/resources/templates/provision/yealink/t20p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -706,7 +706,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1031,7 +1031,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1359,7 +1359,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1682,7 +1682,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2045,4 +2045,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg index d11c8a679f..7b40d38978 100644 --- a/resources/templates/provision/yealink/t21p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -528,7 +528,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1041,7 +1041,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1537,7 +1537,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2033,7 +2033,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2529,7 +2529,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg index 402f7282ab..b5de465f4d 100644 --- a/resources/templates/provision/yealink/t22p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1029,7 +1029,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} @@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} {/foreach} - diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index 30a654b5cf..1e9ca96c38 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg index f432568c91..eb61fc0e14 100644 --- a/resources/templates/provision/yealink/t23p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1013,7 +1013,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1489,7 +1489,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1965,7 +1965,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2441,7 +2441,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg index 0424805b83..9a2aab715e 100644 --- a/resources/templates/provision/yealink/t26p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1030,7 +1030,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg index 867997d05d..bf8bf55a59 100644 --- a/resources/templates/provision/yealink/t27g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1501,7 +1501,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1976,7 +1976,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2451,7 +2451,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3064,4 +3064,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index f67e0a4b0b..61be34b408 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1501,7 +1501,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1976,7 +1976,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2451,7 +2451,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg index 0424805b83..9a2aab715e 100644 --- a/resources/templates/provision/yealink/t28p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -379,7 +379,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -704,7 +704,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1030,7 +1030,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1358,7 +1358,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1681,7 +1681,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index 725072d368..d5420401ef 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3069,4 +3069,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t2x/{$mac}.cfg b/resources/templates/provision/yealink/t2x/{$mac}.cfg index 3ebd98af97..32e18247f5 100644 --- a/resources/templates/provision/yealink/t2x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t2x/{$mac}.cfg @@ -13,7 +13,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg index a05bfd1601..4b2c2065a4 100644 --- a/resources/templates/provision/yealink/t31g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg index 61d65c83f1..2fcb140a28 100644 --- a/resources/templates/provision/yealink/t32g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg index 52ce42a131..8e47d2daa4 100644 --- a/resources/templates/provision/yealink/t33g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg @@ -118,7 +118,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -689,7 +689,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1257,7 +1257,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1825,7 +1825,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2276,4 +2276,3 @@ account.4.acd.call_information= #bw.virtual_user.1.xsi.port= #bw.virtual_user.1.xsi.server_type= #bw.virtual_user.1.xsi.user= - diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg index 61d65c83f1..2fcb140a28 100644 --- a/resources/templates/provision/yealink/t38g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -370,7 +370,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 2. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 2. account.2.display_name = {$account.2.display_name} @@ -687,7 +687,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} @@ -1004,7 +1004,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 4. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 4. account.4.display_name = {$account.4.display_name} @@ -1324,7 +1324,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 5. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 5. account.5.display_name = {$account.5.display_name} @@ -1639,7 +1639,7 @@ account.6.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 6. -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} #Configure the display name of account 6. account.6.display_name = {$account.6.display_name} diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg index aedec45126..8f8b9f1ee2 100644 --- a/resources/templates/provision/yealink/t40g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1057,7 +1057,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1556,7 +1556,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2055,7 +2055,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2554,7 +2554,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg index 8602ce0f41..62f107dcb1 100644 --- a/resources/templates/provision/yealink/t40p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -533,7 +533,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1057,7 +1057,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1558,7 +1558,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2059,7 +2059,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2560,7 +2560,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg index 86b4884605..2cc4a21e69 100644 --- a/resources/templates/provision/yealink/t41p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -527,7 +527,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1040,7 +1040,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1536,7 +1536,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2032,7 +2032,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2528,7 +2528,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg index f89a4641e8..85c87d65a3 100644 --- a/resources/templates/provision/yealink/t41s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg @@ -18,7 +18,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index 02c95b98f5..dcd3e396a3 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg index d0ad16b777..5b53f481c5 100644 --- a/resources/templates/provision/yealink/t42s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1974,7 +1974,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2445,7 +2445,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t43u/{$mac}.cfg b/resources/templates/provision/yealink/t43u/{$mac}.cfg index 5ef8b0aa0c..8efdebad1c 100644 --- a/resources/templates/provision/yealink/t43u/{$mac}.cfg +++ b/resources/templates/provision/yealink/t43u/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -682,7 +682,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1250,7 +1250,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1818,7 +1818,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2386,7 +2386,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} @@ -2954,7 +2954,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index 5af5ab0e81..92caf56923 100644 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -542,7 +542,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1028,7 +1028,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1504,7 +1504,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1980,7 +1980,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2456,7 +2456,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg index 2f78171ac8..770382a85e 100644 --- a/resources/templates/provision/yealink/t46s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1030,7 +1030,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1511,7 +1511,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1987,7 +1987,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2463,7 +2463,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t46u/{$mac}.cfg b/resources/templates/provision/yealink/t46u/{$mac}.cfg index 123bc52211..2819755115 100644 --- a/resources/templates/provision/yealink/t46u/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46u/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} @@ -677,7 +677,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} @@ -1240,7 +1240,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} @@ -1803,7 +1803,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} @@ -2366,7 +2366,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} @@ -2929,7 +2929,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index 521d006b2a..c3e5f15479 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1027,7 +1027,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1979,7 +1979,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2455,7 +2455,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3078,4 +3078,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg index 3058905f95..e5fb1f2f90 100644 --- a/resources/templates/provision/yealink/t48s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -540,7 +540,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1026,7 +1026,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1503,7 +1503,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1975,7 +1975,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2447,7 +2447,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3057,4 +3057,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.6.key.{$row.device_key_id}.xml_phonebook = {/foreach} - diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg index 8936aed453..1822efc2fd 100644 --- a/resources/templates/provision/yealink/t49g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -541,7 +541,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1066,7 +1066,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1565,7 +1565,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2064,7 +2064,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2563,7 +2563,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg index 7dc01d9b7f..14e0cb1749 100644 --- a/resources/templates/provision/yealink/t4x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg @@ -14,7 +14,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$account.{$row.line_number}.display_name} +account.{$row.line_number}.label = {$account.{$row.line_number}.label} account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name} account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id} account.{$row.line_number}.password = {$account.{$row.line_number}.password} diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg index db8bdc0c6f..2945091c9b 100644 --- a/resources/templates/provision/yealink/t52s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg @@ -200,7 +200,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -266,7 +266,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg index 5ad109b6a3..c00cf68c6b 100644 --- a/resources/templates/provision/yealink/t53/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53/{$mac}.cfg @@ -113,7 +113,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -652,7 +652,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1179,7 +1179,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1706,7 +1706,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2232,7 +2232,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2772,7 +2772,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3299,7 +3299,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3826,7 +3826,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4353,7 +4353,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4880,7 +4880,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5314,5 +5314,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg index 05428c2ea2..5f601f2246 100644 --- a/resources/templates/provision/yealink/t53w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg @@ -113,7 +113,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -653,7 +653,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1181,7 +1181,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1709,7 +1709,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2236,7 +2236,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2777,7 +2777,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3305,7 +3305,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3833,7 +3833,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4361,7 +4361,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4889,7 +4889,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5324,5 +5324,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg index 59e0b3ff49..48c27929e5 100644 --- a/resources/templates/provision/yealink/t54s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg @@ -200,7 +200,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg index b28f886f07..a1500aaef1 100644 --- a/resources/templates/provision/yealink/t54w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg @@ -119,7 +119,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.password = {$row.password} diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg index 87b3ce9f74..5fa34e9f3e 100644 --- a/resources/templates/provision/yealink/t56a/{$mac}.cfg +++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg @@ -11,7 +11,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} {if isset($account.1.server.1.address)} @@ -484,7 +484,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -946,7 +946,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1409,7 +1409,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1875,7 +1875,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2344,7 +2344,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg index f0c5d53409..39af546c1f 100644 --- a/resources/templates/provision/yealink/t57w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg @@ -114,7 +114,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} @@ -653,7 +653,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -1180,7 +1180,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1707,7 +1707,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -2233,7 +2233,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2773,7 +2773,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} @@ -3300,7 +3300,7 @@ account.7.enable = 1 {else} account.7.enable = 0 {/if} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} account.7.auth_name = {$account.7.auth_id} account.7.password = {$account.7.password} @@ -3827,7 +3827,7 @@ account.8.enable = 1 {else} account.8.enable = 0 {/if} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} account.8.auth_name = {$account.8.auth_id} account.8.password = {$account.8.password} @@ -4354,7 +4354,7 @@ account.9.enable = 1 {else} account.9.enable = 0 {/if} -account.9.label = {$account.9.display_name} +account.9.label = {$account.9.label} account.9.display_name = {$account.9.display_name} account.9.auth_name = {$account.9.auth_id} account.9.password = {$account.9.password} @@ -4881,7 +4881,7 @@ account.10.enable = 1 {else} account.10.enable = 0 {/if} -account.10.label = {$account.10.display_name} +account.10.label = {$account.10.label} account.10.display_name = {$account.10.display_name} account.10.auth_name = {$account.10.auth_id} account.10.password = {$account.10.password} @@ -5315,5 +5315,3 @@ account.10.acd.call_information= ####################################################################################### pstn.account.10.enable= pstn.account.10.label= - - diff --git a/resources/templates/provision/yealink/t58a/{$mac}.cfg b/resources/templates/provision/yealink/t58a/{$mac}.cfg index 87b3ce9f74..5fa34e9f3e 100644 --- a/resources/templates/provision/yealink/t58a/{$mac}.cfg +++ b/resources/templates/provision/yealink/t58a/{$mac}.cfg @@ -11,7 +11,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} {if isset($account.1.server.1.address)} @@ -484,7 +484,7 @@ account.2.enable = 1 {else} account.2.enable = 0 {/if} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} account.2.auth_name = {$account.2.auth_id} account.2.password = {$account.2.password} @@ -946,7 +946,7 @@ account.3.enable = 1 {else} account.3.enable = 0 {/if} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} @@ -1409,7 +1409,7 @@ account.4.enable = 1 {else} account.4.enable = 0 {/if} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} @@ -1875,7 +1875,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2344,7 +2344,7 @@ account.6.enable = 1 {else} account.6.enable = 0 {/if} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} account.6.password = {$account.6.password} diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg index e57919a6ef..97f7edaa47 100644 --- a/resources/templates/provision/yealink/t58v/{$mac}.cfg +++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg @@ -14,7 +14,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} {if isset($row.server.1.address)} diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg index 757a7f53b4..d1f3df465b 100644 --- a/resources/templates/provision/yealink/t5x/{$mac}.cfg +++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg @@ -15,7 +15,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.password = {$row.password} diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg index ea28a079b2..1bf77c232d 100644 --- a/resources/templates/provision/yealink/vp530/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg @@ -13,7 +13,7 @@ account.1.enable = 1 {else} account.1.enable = 0 {/if} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg index e1c245547f..b1b5a7f10e 100644 --- a/resources/templates/provision/yealink/vp59/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg @@ -13,7 +13,7 @@ account.{$row.line_number}.enable = 1 {else} account.{$row.line_number}.enable = 0 {/if} -account.{$row.line_number}.label = {$row.display_name} +account.{$row.line_number}.label = {$row.label} account.{$row.line_number}.display_name = {$row.display_name} account.{$row.line_number}.auth_name = {$row.auth_id} account.{$row.line_number}.user_name = {$row.user_id} diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg index 0ddd832911..2f1a77748a 100644 --- a/resources/templates/provision/yealink/w52p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -347,7 +347,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 1. account.2.display_name = {$account.2.display_name} @@ -620,7 +620,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 1. account.3.display_name = {$account.3.display_name} @@ -893,7 +893,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 1. account.4.display_name = {$account.4.display_name} @@ -1168,7 +1168,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 1. account.5.display_name = {$account.5.display_name} diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg index 34a3c4bc49..7ee2288ff3 100644 --- a/resources/templates/provision/yealink/w56p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg @@ -15,7 +15,7 @@ account.1.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} #Configure the display name of account 1. account.1.display_name = {$account.1.display_name} @@ -332,7 +332,7 @@ account.2.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} #Configure the display name of account 1. account.2.display_name = {$account.2.display_name} @@ -590,7 +590,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} #Configure the display name of account 1. account.3.display_name = {$account.3.display_name} @@ -848,7 +848,7 @@ account.4.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} #Configure the display name of account 1. account.4.display_name = {$account.4.display_name} @@ -1108,7 +1108,7 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} #Configure the display name of account 1. account.5.display_name = {$account.5.display_name} diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg index 7146af437a..8890e0bac4 100644 --- a/resources/templates/provision/yealink/w60b/{$mac}.cfg +++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg @@ -10,7 +10,7 @@ #Basic Settings account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""} -account.1.label = {$account.1.display_name} +account.1.label = {$account.1.label} account.1.display_name = {$account.1.display_name} {if isset($account.1.server.1.address)} @@ -300,7 +300,7 @@ voice_mail.number.1 = {$voicemail_number} #Basic Settings account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""} -account.2.label = {$account.2.display_name} +account.2.label = {$account.2.label} account.2.display_name = {$account.2.display_name} {if isset($account.2.server.1.address)} @@ -546,7 +546,7 @@ voice_mail.number.2 = {$voicemail_number} #Basic Settings account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""} -account.3.label = {$account.3.display_name} +account.3.label = {$account.3.label} account.3.display_name = {$account.3.display_name} {if isset($account.3.server.1.address)} @@ -792,7 +792,7 @@ voice_mail.number.3 = {$voicemail_number} #Basic Settings account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""} -account.4.label = {$account.4.display_name} +account.4.label = {$account.4.label} account.4.display_name = {$account.4.display_name} {if isset($account.4.server.1.address)} @@ -1038,7 +1038,7 @@ voice_mail.number.4 = {$voicemail_number} #Basic Settings account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""} -account.5.label = {$account.5.display_name} +account.5.label = {$account.5.label} account.5.display_name = {$account.5.display_name} {if isset($account.5.server.1.address)} @@ -1303,7 +1303,7 @@ network.internet_port.gateway = #Basic Settings account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""} -account.6.label = {$account.6.display_name} +account.6.label = {$account.6.label} account.6.display_name = {$account.6.display_name} {if isset($account.6.server.1.address)} @@ -1568,7 +1568,7 @@ network.internet_port.gateway = #Basic Settings account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""} -account.7.label = {$account.7.display_name} +account.7.label = {$account.7.label} account.7.display_name = {$account.7.display_name} {if isset($account.7.server.1.address)} @@ -1833,7 +1833,7 @@ network.internet_port.gateway = #Basic Settings account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""} -account.8.label = {$account.8.display_name} +account.8.label = {$account.8.label} account.8.display_name = {$account.8.display_name} {if isset($account.8.server.1.address)} From 45f48b23a88ea10a9e9156b1aea3feab41fa3bab Mon Sep 17 00:00:00 2001 From: yois615 <38441801+yois615@users.noreply.github.com> Date: Wed, 15 Dec 2021 16:43:12 -0500 Subject: [PATCH 087/496] [directory] Use effective_caller_id_name when directory_first_name blank (#6193) The database contains directory_first_name entries that are blank, and the table does not populate properly. Use effective_caller_id_name when a nil or blank entry is found. --- app/scripts/resources/scripts/directory.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/resources/scripts/directory.lua b/app/scripts/resources/scripts/directory.lua index 280ac98299..20d5eec761 100644 --- a/app/scripts/resources/scripts/directory.lua +++ b/app/scripts/resources/scripts/directory.lua @@ -393,7 +393,7 @@ --directory[x] = row; --variables effective_caller_id_name = row.effective_caller_id_name; - if (row.directory_first_name) then + if (row.directory_first_name ~= nil) and (row.directory_first_name ~= "") then first_name = row.directory_first_name; last_name = row.directory_last_name; else From 0e7438fdbcc0fbb7f7ea474ce4e556607810dc8d Mon Sep 17 00:00:00 2001 From: Antonio Fernandez Date: Wed, 15 Dec 2021 16:43:50 -0500 Subject: [PATCH 088/496] updated the snom timezone description (#6194) The old timezone URL is no longer valid. I've updated the default description with the new correct URL. --- app/snom/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/snom/app_config.php b/app/snom/app_config.php index 828c1b9b37..a2a87d16bf 100644 --- a/app/snom/app_config.php +++ b/app/snom/app_config.php @@ -37,7 +37,7 @@ $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "USA-7"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "http://wiki.snom.com/Settings/timezone"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "https://service.snom.com/display/wiki/timezone"; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9945982a-f366-11e9-a713-2a2ae2dbcce4"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; From 84fdf89b34cd054ac0dfa03f7a5cd241e1cb3cfd Mon Sep 17 00:00:00 2001 From: yois615 <38441801+yois615@users.noreply.github.com> Date: Wed, 15 Dec 2021 16:45:04 -0500 Subject: [PATCH 089/496] bind_digit_action for B-leg during internal call (#6157) The existing code only binds properly when one leg is not internal. Here we use LUA to bind the bleg for internal calls. --- .../conf/dialplan/085_bind_digit_action.xml | 5 +++ .../resources/scripts/bind_digit_bleg.lua | 39 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 app/scripts/resources/scripts/bind_digit_bleg.lua diff --git a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml index 1352817763..497fa6a745 100644 --- a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml +++ b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml @@ -16,5 +16,10 @@     + + + + +     diff --git a/app/scripts/resources/scripts/bind_digit_bleg.lua b/app/scripts/resources/scripts/bind_digit_bleg.lua new file mode 100644 index 0000000000..173504c03b --- /dev/null +++ b/app/scripts/resources/scripts/bind_digit_bleg.lua @@ -0,0 +1,39 @@ +-- +-- FusionPBX +-- Version: MPL 1.1 +-- +-- The contents of this file are subject to the Mozilla Public License Version +-- 1.1 (the "License"); you may not use this file except in compliance with +-- the License. You may obtain a copy of the License at +-- http://www.mozilla.org/MPL/ +-- +-- Software distributed under the License is distributed on an "AS IS" basis, +-- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +-- for the specific language governing rights and limitations under the +-- License. +-- +-- The Original Code is FusionPBX +-- +-- The Initial Developer of the Original Code is +-- Mark J Crane +-- Copyright (C) 2021 +-- the Initial Developer. All Rights Reserved. +-- +-- Contributor(s): +-- Joseph A Nadiv + +--include config.lua + require "resources.functions.config"; + +--create the api object + api = freeswitch.API(); + require "resources.functions.channel_utils"; + +--get context variable + local context = argv[1]; + +--bind to bleg + session:execute("bind_digit_action", "local,*1,exec:execute_extension,dx XML ".. context .. ",self,self"); + session:execute("bind_digit_action", "local,*3,exec:execute_extension,cf XML ".. context .. ",self,self"); + session:execute("bind_digit_action", "local,*4,exec:execute_extension,att_xfer XML ".. context .. ",self,self"); + session:execute("digit_action_set_realm", "local"); From ab457e5ee90f947a5c21f900b1e5242e3eabdec9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 14:54:24 -0700 Subject: [PATCH 090/496] Default the line_label and line_display_name to auto. --- app/provision/app_config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/provision/app_config.php b/app/provision/app_config.php index 25d4b0015b..1cb294b530 100644 --- a/app/provision/app_config.php +++ b/app/provision/app_config.php @@ -155,7 +155,7 @@ $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_label"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "user_id"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "auto"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; @@ -163,7 +163,7 @@ $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_display_name"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "auto"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; From d88ab02270bbcf6d73f0a1ce6d6e8a0057af3420 Mon Sep 17 00:00:00 2001 From: Mendel <44873735+rabbidiesel@users.noreply.github.com> Date: Wed, 15 Dec 2021 16:58:05 -0500 Subject: [PATCH 091/496] Rabbidiesel polycom (#6197) * Update provision.php * Update y000000000124.cfg Added {$yealink_dnd_allow} so that you can remove DND from the phone * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}.cfg * Update {$mac}-registration.cfg --- resources/templates/provision/polycom/3.x/{$mac}.cfg | 2 +- resources/templates/provision/polycom/4.x/{$mac}.cfg | 2 +- resources/templates/provision/polycom/5.x/{$mac}.cfg | 2 +- resources/templates/provision/polycom/6.x/{$mac}.cfg | 2 +- .../provision/polycom/8030/{$mac}-registration.cfg | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/templates/provision/polycom/3.x/{$mac}.cfg b/resources/templates/provision/polycom/3.x/{$mac}.cfg index c049239c40..69452d6565 100644 --- a/resources/templates/provision/polycom/3.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/3.x/{$mac}.cfg @@ -4,7 +4,7 @@ {foreach $lines as $row} reg.{$row.line_number}.displayName="{$row.display_name}" reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}" - reg.{$row.line_number}.label="{$row.display_name}" + reg.{$row.line_number}.label="{$row.label}" reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}" reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}" diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg index 9f9c538e53..ed3a54904c 100644 --- a/resources/templates/provision/polycom/4.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg @@ -4,7 +4,7 @@ {foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}" reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}" - reg.{$row.line_number}.label="{$row.display_name}" + reg.{$row.line_number}.label="{$row.label}" reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}" reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}" diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg index b59e5a4030..b688611f50 100644 --- a/resources/templates/provision/polycom/5.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg @@ -3,7 +3,7 @@ Date: Wed, 15 Dec 2021 15:02:17 -0700 Subject: [PATCH 092/496] Correct the name dislplay_label to label. --- app/extensions/extension_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 238827be20..ce0f9c32c3 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -611,7 +611,7 @@ $array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $_SESSION['provision']['outbound_proxy_secondary']['text']; $array["devices"][$j]["device_lines"][0]["server_address_primary"] = $_SESSION['provision']['server_address_primary']['text']; $array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $_SESSION['provision']['server_address_secondary']['text']; - $array["devices"][$j]["device_lines"][0]["display_label"] = $line_label; + $array["devices"][$j]["device_lines"][0]["label"] = $line_label; $array["devices"][$j]["device_lines"][0]["display_name"] = $line_display_name; $array["devices"][$j]["device_lines"][0]["user_id"] = $extension; $array["devices"][$j]["device_lines"][0]["auth_id"] = $extension; From a80a22f797ea48c36509eb815905cdbce723702f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 15:06:13 -0700 Subject: [PATCH 093/496] Default the device line label to the extension number --- app/extensions/extension_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index ce0f9c32c3..375e165bdb 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -556,7 +556,7 @@ //get the dislplay label if ($_SESSION['provision']['line_label']['text'] == 'auto') { - $line_label = $name; + $line_label = $extension; } else { $line_label = $_SESSION['provision']['line_label']['text']; From 4852db3870b06141df3536e65b9b510184248daa Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 16:02:59 -0700 Subject: [PATCH 094/496] Minor version update 4.5.32 --- core/software/resources/classes/software.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/software/resources/classes/software.php b/core/software/resources/classes/software.php index 6c3256719d..ca306c99f6 100644 --- a/core/software/resources/classes/software.php +++ b/core/software/resources/classes/software.php @@ -12,7 +12,7 @@ if (!class_exists('software')) { * version */ public static function version() { - return '4.5.31'; + return '4.5.32'; } /** From 27540bb42c58c74e0874f532734427d33ac49e0a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 15 Dec 2021 19:36:05 -0700 Subject: [PATCH 095/496] Fix the display_name --- app/extensions/extension_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 375e165bdb..a677eb471f 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -576,7 +576,7 @@ } else { $line_display_name = $_SESSION['provision']['line_display_name']['text']; - $line_display_name = str_replace("\${name}", $name, $display_name); + $line_display_name = str_replace("\${name}", $name, $line_display_name); $line_display_name = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_display_name); $line_display_name = str_replace("\${first_name}", $directory_first_name, $line_display_name); $line_display_name = str_replace("\${last_name}", $directory_last_name, $line_display_name); From 0e8eeb0cc3c2750d975a7e79e83905e4b3fe6527 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 17 Dec 2021 10:34:12 -0700 Subject: [PATCH 096/496] If the Label is empty use the extension number as the label. --- app/devices/app_defaults.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php index dd1de2a75c..5d57908410 100644 --- a/app/devices/app_defaults.php +++ b/app/devices/app_defaults.php @@ -41,6 +41,20 @@ if ($domains_processed == 1) { } unset($sql, $device_lines); + //set label to user_id if the label is null + $sql = "select device_line_uuid from v_device_lines "; + $sql .= "where label is null "; + $database = new database; + $device_lines = $database->select($sql, null, 'all'); + if (is_array($device_lines) && @sizeof($device_lines) != 0) { + foreach($device_lines as $row) { + $sql = "update v_device_lines "; + $sql .= "set label = user_id "; + $sql .= "where label is null "; + $database->execute($sql); + } + } + //set the device key vendor $sql = "select * from v_device_keys as k, v_devices as d "; $sql .= "where d.device_uuid = k.device_uuid "; From 5f88e3ca875e91c3f039f35e97f2530dc8f2b49f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 17 Dec 2021 15:13:07 -0700 Subject: [PATCH 097/496] Fix call block hold music to play the hold music. Allows defining hold_music in the dialplan for a custom music on hold. --- app/scripts/resources/scripts/app/call_block/index.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/scripts/resources/scripts/app/call_block/index.lua b/app/scripts/resources/scripts/app/call_block/index.lua index 4f9a16b849..deae7e3f1c 100644 --- a/app/scripts/resources/scripts/app/call_block/index.lua +++ b/app/scripts/resources/scripts/app/call_block/index.lua @@ -51,6 +51,7 @@ context = session:getVariable("context"); call_block = session:getVariable("call_block"); extension_uuid = session:getVariable("extension_uuid"); + hold_music = session:getVariable("hold_music"); end --set default variables @@ -172,9 +173,9 @@ end if (call_block_app ~= nil and call_block_app == 'hold') then if (session:ready()) then - session:execute("respond", '600'); session:execute('set', 'call_block_uuid='..call_block_uuid); session:execute('set', 'call_block_app=hold'); + session:execute("playback", hold_music); freeswitch.consoleLog("notice", "[call_block] caller id number " .. caller_id_number .. " action: Hold\n"); end end From 02a12591ddb5d750469dddfcb4a233a60c751c97 Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 20 Dec 2021 13:40:52 -0500 Subject: [PATCH 098/496] Replace duplicate uuid (#6208) * Replace duplicate uuid * Replace duplicate uuid --- app/xml_cdr/app_config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php index 28095dbdec..95647f06d2 100644 --- a/app/xml_cdr/app_config.php +++ b/app/xml_cdr/app_config.php @@ -376,7 +376,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ab7e165f-dbca-403c-ab87-88378be5bace"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "133980e3-b303-446c-a26a-74fd043f5a96"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "missed_calls_chart_border_width"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; @@ -408,7 +408,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "72c549b5-2456-4b80-b821-ce9d8d69252d"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6c30efe1-51a6-4281-96eb-1d942bdabec6"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "recent_calls_chart_border_width"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; From 6b85733e5d5c35dcb9b9715ba379d92dca6fd8cd Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 20 Dec 2021 13:43:44 -0500 Subject: [PATCH 099/496] Replace duplicate uuid (#6207) --- app/system/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/app_config.php b/app/system/app_config.php index b448360f82..a32c5c8c74 100644 --- a/app/system/app_config.php +++ b/app/system/app_config.php @@ -162,7 +162,7 @@ $apps[$x]['default_settings'][$y]['default_setting_order'] = "10"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d82957f6-c546-4453-ac27-dd05ee4f57e6"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "acb9d242-5f93-4bb7-a135-64eeefa15fd0"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "disk_usage_chart_main_background_color"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; From c3ebda937848c1964c0806006e8f2b52655ac3fc Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 20 Dec 2021 15:05:11 -0700 Subject: [PATCH 100/496] Music on hold need recursive true because its creating the directory and another one with the sample rate. --- app/music_on_hold/music_on_hold.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 6f28d0b191..d2969f22e2 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -275,7 +275,7 @@ //check target folder, move uploaded file if (!is_dir($stream_path)) { - mkdir($stream_path, 0770, false); + mkdir($stream_path, 0770, true); } if (is_dir($stream_path)) { if (copy($stream_file_name_temp, $stream_path.'/'.$stream_file_name)) { From dbd48081225a947d3921327c3bdd626d6454bb6b Mon Sep 17 00:00:00 2001 From: Anthony <96078404+AntoniusDC@users.noreply.github.com> Date: Thu, 23 Dec 2021 11:18:47 -0700 Subject: [PATCH 101/496] Update css.php (#6211) --- themes/default/css.php | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/default/css.php b/themes/default/css.php index 05f98caa4e..af19b224e1 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -2001,6 +2001,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); left: 0; right: 0; background: ; + opacity: 0.5; } div.op_state_active { From 98240a2227f7c009605c05483b61bfdf6986ab7b Mon Sep 17 00:00:00 2001 From: Anthony <96078404+AntoniusDC@users.noreply.github.com> Date: Thu, 23 Dec 2021 11:21:16 -0700 Subject: [PATCH 102/496] Adding country code to contact edit. (#6210) * Adding country code to the contact edit. * Adding country code languages for contact edit. * Update contact_phone_edit.php --- app/contacts/app_config.php | 19 ++++++++----- app/contacts/app_languages.php | 44 +++++++++++++++++++++++++++++ app/contacts/contact_edit.php | 16 +++++++++-- app/contacts/contact_phone_edit.php | 16 ++++++++++- 4 files changed, 84 insertions(+), 11 deletions(-) diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php index 2c53e9ed50..54e2cea01a 100644 --- a/app/contacts/app_config.php +++ b/app/contacts/app_config.php @@ -459,6 +459,10 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "contact_uuid"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number"; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_type_voice"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for voice calls."; @@ -475,13 +479,13 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for text messages."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary"; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_country_code"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number."; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the country code."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_number"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; @@ -491,10 +495,11 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the extension."; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial"; - $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; - $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial."; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_description"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description."; diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index 6342d6bb37..ea4304ed4f 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -1937,6 +1937,28 @@ $text['label-phone_speed_dial']['ru-ru'] = "Быстрый Набор"; $text['label-phone_speed_dial']['sv-se'] = "Snabb Nummer"; $text['label-phone_speed_dial']['uk-ua'] = ""; +$text['label-phone_country_code']['en-us'] = "Country Code"; +$text['label-phone_country_code']['en-gb'] = "Country Code"; +$text['label-phone_country_code']['ar-eg'] = ""; +$text['label-phone_country_code']['de-at'] = ""; //copied from de-de +$text['label-phone_country_code']['de-ch'] = ""; //copied from de-de +$text['label-phone_country_code']['de-de'] = ""; +$text['label-phone_country_code']['el-gr'] = ""; +$text['label-phone_country_code']['es-cl'] = ""; +$text['label-phone_country_code']['es-mx'] = ""; +$text['label-phone_country_code']['fr-ca'] = ""; +$text['label-phone_country_code']['fr-fr'] = ""; +$text['label-phone_country_code']['he-il'] = ""; +$text['label-phone_country_code']['it-it'] = ""; +$text['label-phone_country_code']['nl-nl'] = ""; +$text['label-phone_country_code']['pl-pl'] = ""; +$text['label-phone_country_code']['pt-br'] = ""; +$text['label-phone_country_code']['pt-pt'] = ""; +$text['label-phone_country_code']['ro-ro'] = ""; +$text['label-phone_country_code']['ru-ru'] = ""; +$text['label-phone_country_code']['sv-se'] = ""; +$text['label-phone_country_code']['uk-ua'] = ""; + $text['label-phone_numbers']['en-us'] = "Numbers"; $text['label-phone_numbers']['en-gb'] = "Numbers"; $text['label-phone_numbers']['ar-eg'] = ""; @@ -4445,6 +4467,28 @@ $text['description-phone_speed_dial']['ru-ru'] = "Введите номер бы $text['description-phone_speed_dial']['sv-se'] = "Ange snabbknappens nummer."; $text['description-phone_speed_dial']['uk-ua'] = ""; +$text['description-phone_country_code']['en-us'] = "Enter the country code."; +$text['description-phone_country_code']['en-gb'] = "Enter the country code."; +$text['description-phone_country_code']['ar-eg'] = ""; +$text['description-phone_country_code']['de-at'] = ""; +$text['description-phone_country_code']['de-ch'] = ""; +$text['description-phone_country_code']['de-de'] = ""; +$text['description-phone_country_code']['el-gr'] = ""; +$text['description-phone_country_code']['es-cl'] = ""; +$text['description-phone_country_code']['es-mx'] = ""; +$text['description-phone_country_code']['fr-ca'] = ""; +$text['description-phone_country_code']['fr-fr'] = ""; +$text['description-phone_country_code']['he-il'] = ""; +$text['description-phone_country_code']['it-it'] = ""; +$text['description-phone_country_code']['nl-nl'] = ""; +$text['description-phone_country_code']['pl-pl'] = ""; +$text['description-phone_country_code']['pt-br'] = ""; +$text['description-phone_country_code']['pt-pt'] = ""; +$text['description-phone_country_code']['ro-ro'] = ""; +$text['description-phone_country_code']['ru-ru'] = ""; +$text['description-phone_country_code']['sv-se'] = ""; +$text['description-phone_country_code']['uk-ua'] = ""; + $text['description-phone_number']['en-us'] = "Enter the phone number."; $text['description-phone_number']['en-gb'] = "Enter the phone number."; $text['description-phone_number']['ar-eg'] = ""; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 8f8217df0b..44c4033fe3 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -319,13 +319,14 @@ $array['contacts'][0]['contact_phones'][$y]['contact_uuid'] = $contact_uuid; $array['contacts'][0]['contact_phones'][$y]['contact_phone_uuid'] = $row["contact_phone_uuid"]; $array['contacts'][0]['contact_phones'][$y]['phone_label'] = $row["phone_label"]; - $array['contacts'][0]['contact_phones'][$y]['phone_number'] = $row["phone_number"]; - $array['contacts'][0]['contact_phones'][$y]['phone_extension'] = $row["phone_extension"]; - $array['contacts'][0]['contact_phones'][$y]['phone_speed_dial'] = $row["phone_speed_dial"]; $array['contacts'][0]['contact_phones'][$y]['phone_type_voice'] = $row["phone_type_voice"]; $array['contacts'][0]['contact_phones'][$y]['phone_type_fax'] = $row["phone_type_fax"]; $array['contacts'][0]['contact_phones'][$y]['phone_type_video'] = $row["phone_type_video"]; $array['contacts'][0]['contact_phones'][$y]['phone_type_text'] = $row["phone_type_text"]; + $array['contacts'][0]['contact_phones'][$y]['phone_speed_dial'] = $row["phone_speed_dial"]; + $array['contacts'][0]['contact_phones'][$y]['phone_country_code'] = $row["phone_country_code"]; + $array['contacts'][0]['contact_phones'][$y]['phone_number'] = $row["phone_number"]; + $array['contacts'][0]['contact_phones'][$y]['phone_extension'] = $row["phone_extension"]; $array['contacts'][0]['contact_phones'][$y]['phone_primary'] = $row["phone_primary"]; $array['contacts'][0]['contact_phones'][$y]['phone_description'] = $row["phone_description"]; $y++; @@ -657,6 +658,7 @@ $contact_phones[$x]['contact_uuid'] = $contact_uuid; $contact_phones[$x]['contact_phone_uuid'] = uuid(); $contact_phones[$x]['phone_label'] = ''; + $contact_phones[$x]['phone_country_code'] = ''; $contact_phones[$x]['phone_number'] = ''; $contact_phones[$x]['phone_extension'] = ''; $contact_phones[$x]['phone_speed_dial'] = ''; @@ -1600,6 +1602,14 @@ if (permission_exists('contact_phone_view')) { //echo $text['description-phone_extension']."\n"; echo "
    \n"; + echo "
    \n"; + echo " ".$text['label-phone_country_code']."\n"; + echo "
    \n"; + echo "
    \n"; + echo " \n"; + //echo $text['description-phone_country_code']."\n"; + echo "
    \n"; + echo "
    \n"; echo " ".$text['label-phone_number']."\n"; echo "
    \n"; diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index d184461e26..9f73f22d4a 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -66,6 +66,7 @@ $phone_label = $_POST["phone_label"]; $phone_label_custom = $_POST["phone_label_custom"]; $phone_speed_dial = $_POST["phone_speed_dial"]; + $phone_country_code = $_POST["phone_country_code"]; $phone_number = $_POST["phone_number"]; $phone_extension = $_POST["phone_extension"]; $phone_primary = $_POST["phone_primary"]; @@ -166,6 +167,7 @@ $array['contact_phones'][0]['phone_type_text'] = $phone_type_text ? 1 : null; $array['contact_phones'][0]['phone_label'] = $phone_label; $array['contact_phones'][0]['phone_speed_dial'] = $phone_speed_dial; + $array['contact_phones'][0]['phone_country_code'] = $phone_country_code; $array['contact_phones'][0]['phone_number'] = $phone_number; $array['contact_phones'][0]['phone_extension'] = $phone_extension; $array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0; @@ -202,6 +204,7 @@ $phone_type_text = $row["phone_type_text"]; $phone_label = $row["phone_label"]; $phone_speed_dial = $row["phone_speed_dial"]; + $phone_country_code = $row["phone_country_code"]; $phone_number = $row["phone_number"]; $phone_extension = $row["phone_extension"]; $phone_primary = $row["phone_primary"]; @@ -319,6 +322,17 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-phone_country_code']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo $text['description-phone_country_code']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-phone_number']."\n"; @@ -380,4 +394,4 @@ //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> From fac27cc565d1cf677f3b638e2e3389a0ed216420 Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Thu, 23 Dec 2021 11:44:57 -0700 Subject: [PATCH 103/496] Add dashboard column span (#6212) * Add dashboard column span * Update app_config.php * Update index.php --- core/dashboard/app_config.php | 5 +++ core/dashboard/dashboard_edit.php | 22 +++++++++++ core/dashboard/index.php | 63 ++++++++++++++++++++++++++----- 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/core/dashboard/app_config.php b/core/dashboard/app_config.php index 3c2492e90a..8e8923c7fd 100644 --- a/core/dashboard/app_config.php +++ b/core/dashboard/app_config.php @@ -72,6 +72,11 @@ $apps[$x]['db'][$y]['fields'][$z]['search_by'] = ''; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard path.'; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_column_span'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; + $apps[$x]['db'][$y]['fields'][$z]['search_by'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard column span.'; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_order'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; $apps[$x]['db'][$y]['fields'][$z]['search_by'] = ''; diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index 8ddfd2cb73..86e8f41c5a 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -55,6 +55,7 @@ $dashboard_name = $_POST["dashboard_name"]; $dashboard_path = $_POST["dashboard_path"]; $dashboard_groups = $_POST["dashboard_groups"]; + $dashboard_column_span = $_POST["dashboard_column_span"]; $dashboard_order = $_POST["dashboard_order"]; $dashboard_enabled = $_POST["dashboard_enabled"]; $dashboard_description = $_POST["dashboard_description"]; @@ -151,6 +152,7 @@ $array['dashboard'][0]['dashboard_uuid'] = $dashboard_uuid; $array['dashboard'][0]['dashboard_name'] = $dashboard_name; $array['dashboard'][0]['dashboard_path'] = $dashboard_path; + $array['dashboard'][0]['dashboard_column_span'] = $dashboard_column_span; $array['dashboard'][0]['dashboard_order'] = $dashboard_order; $array['dashboard'][0]['dashboard_enabled'] = $dashboard_enabled; $array['dashboard'][0]['dashboard_description'] = $dashboard_description; @@ -194,6 +196,7 @@ $sql .= " dashboard_uuid, "; $sql .= " dashboard_name, "; $sql .= " dashboard_path, "; + $sql .= " dashboard_column_span, "; $sql .= " dashboard_order, "; $sql .= " cast(dashboard_enabled as text), "; $sql .= " dashboard_description "; @@ -206,6 +209,7 @@ $dashboard_name = $row["dashboard_name"]; $dashboard_path = $row["dashboard_path"]; $dashboard_groups = $row["dashboard_groups"]; + $dashboard_column_span = $row["dashboard_column_span"]; $dashboard_order = $row["dashboard_order"]; $dashboard_enabled = $row["dashboard_enabled"]; $dashboard_description = $row["dashboard_description"]; @@ -374,6 +378,24 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-dashboard_column_span']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo $text['description-dashboard_column_span']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-dashboard_order']."\n"; diff --git a/core/dashboard/index.php b/core/dashboard/index.php index af98b4053f..71755f06b1 100644 --- a/core/dashboard/index.php +++ b/core/dashboard/index.php @@ -70,6 +70,7 @@ $sql .= "dashboard_uuid, \n"; $sql .= "dashboard_name, \n"; $sql .= "dashboard_path, \n"; + $sql .= "dashboard_column_span, \n"; $sql .= "dashboard_order, \n"; $sql .= "cast(dashboard_enabled as text), \n"; $sql .= "dashboard_description \n"; @@ -209,7 +210,7 @@ } .widget { - /*background-color: #eee*/ + /*background-color: #eee;*/ } .widgets { @@ -224,18 +225,56 @@ @media (max-width: 575px) { .widgets { grid-template-columns: repeat(1, 1fr); } .col-num { grid-column: span 1; } + } /* Screen larger than 550px? 2 columns */ @media (min-width: 575px) { .widgets { grid-template-columns: repeat(2, 1fr); } .col-num { grid-column: span 2; } + 2) { + $dashboard_column_span = 2; + } + echo "#".$dashboard_name." {\n"; + echo " grid-column: span ".$dashboard_column_span.";\n"; + echo "}\n"; + } + } + ?> } /* Screen larger than 1300px? 3 columns */ @media (min-width: 1300px) { .widgets { grid-template-columns: repeat(3, 1fr); } .col-num { grid-column: span 2; } + } /* Screen larger than 1500px? 4 columns */ @@ -295,8 +334,8 @@ } .hud_box .hud_box:hover { - transform: none; box-shadow: none; + transform: none; } .ghost { @@ -306,6 +345,7 @@ Date: Thu, 23 Dec 2021 12:55:26 -0700 Subject: [PATCH 104/496] Add dashboard_column_span label and description (#6213) --- core/dashboard/app_languages.php | 42 +++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/core/dashboard/app_languages.php b/core/dashboard/app_languages.php index a93a61bf53..b63fa12db5 100644 --- a/core/dashboard/app_languages.php +++ b/core/dashboard/app_languages.php @@ -205,6 +205,46 @@ $text['description-dashboard_groups']['sv-se'] = ''; $text['description-dashboard_groups']['uk-ua'] = ''; + $text['label-dashboard_column_span']['en-us'] = 'Column Span'; + $text['label-dashboard_column_span']['ar-eg'] = ''; + $text['label-dashboard_column_span']['de-at'] = ''; + $text['label-dashboard_column_span']['de-ch'] = ''; + $text['label-dashboard_column_span']['de-de'] = ''; + $text['label-dashboard_column_span']['es-cl'] = ''; + $text['label-dashboard_column_span']['es-mx'] = ''; + $text['label-dashboard_column_span']['fr-ca'] = ''; + $text['label-dashboard_column_span']['fr-fr'] = ''; + $text['label-dashboard_column_span']['he-il'] = ''; + $text['label-dashboard_column_span']['it-it'] = ''; + $text['label-dashboard_column_span']['nl-nl'] = ''; + $text['label-dashboard_column_span']['pl-pl'] = ''; + $text['label-dashboard_column_span']['pt-br'] = ''; + $text['label-dashboard_column_span']['pt-pt'] = ''; + $text['label-dashboard_column_span']['ro-ro'] = ''; + $text['label-dashboard_column_span']['ru-ru'] = ''; + $text['label-dashboard_column_span']['sv-se'] = ''; + $text['label-dashboard_column_span']['uk-ua'] = ''; + + $text['description-dashboard_column_span']['en-us'] = 'Enter the dashboard widget column span.'; + $text['description-dashboard_column_span']['ar-eg'] = ''; + $text['description-dashboard_column_span']['de-at'] = ''; + $text['description-dashboard_column_span']['de-ch'] = ''; + $text['description-dashboard_column_span']['de-de'] = ''; + $text['description-dashboard_column_span']['es-cl'] = ''; + $text['description-dashboard_column_span']['es-mx'] = ''; + $text['description-dashboard_column_span']['fr-ca'] = ''; + $text['description-dashboard_column_span']['fr-fr'] = ''; + $text['description-dashboard_column_span']['he-il'] = ''; + $text['description-dashboard_column_span']['it-it'] = ''; + $text['description-dashboard_column_span']['nl-nl'] = ''; + $text['description-dashboard_column_span']['pl-pl'] = ''; + $text['description-dashboard_column_span']['pt-br'] = ''; + $text['description-dashboard_column_span']['pt-pt'] = ''; + $text['description-dashboard_column_span']['ro-ro'] = ''; + $text['description-dashboard_column_span']['ru-ru'] = ''; + $text['description-dashboard_column_span']['sv-se'] = ''; + $text['description-dashboard_column_span']['uk-ua'] = ''; + $text['label-dashboard_order']['en-us'] = 'Order'; $text['label-dashboard_order']['ar-eg'] = ''; $text['label-dashboard_order']['de-at'] = ''; @@ -346,4 +386,4 @@ $text['label-welcome']['ru-ru'] = "Добро пожаловать:"; $text['label-welcome']['sv-se'] = "Välkommen:"; $text['label-welcome']['uk-ua'] = "Ласкаво просимо:"; -?> \ No newline at end of file +?> From 44c6ee2be2249b092ae9e55c7ce22c64444579e7 Mon Sep 17 00:00:00 2001 From: Anthony <96078404+AntoniusDC@users.noreply.github.com> Date: Thu, 23 Dec 2021 15:07:53 -0700 Subject: [PATCH 105/496] Fixing contact edit order (#6214) * Fixing contact edit order. * Update contact_edit.php * Update contact_phone_edit.php * Update contact_phone_edit.php --- app/contacts/app_languages.php | 174 ++++++++++++++-------------- app/contacts/contact_edit.php | 8 +- app/contacts/contact_phone_edit.php | 8 +- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index ea4304ed4f..c288bca4ca 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -1849,27 +1849,27 @@ $text['label-shared']['ru-ru'] = "Общий"; $text['label-shared']['sv-se'] = "Delad"; $text['label-shared']['uk-ua'] = ""; -$text['label-primary']['en-us'] = "Primary"; -$text['label-primary']['en-gb'] = "Primary"; -$text['label-primary']['ar-eg'] = ""; -$text['label-primary']['de-at'] = "Primär"; //copied from de-de -$text['label-primary']['de-ch'] = "Primär"; //copied from de-de -$text['label-primary']['de-de'] = "Primär"; -$text['label-primary']['el-gr'] = "Κύρια"; -$text['label-primary']['es-cl'] = "Primário"; -$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl -$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr -$text['label-primary']['fr-fr'] = "Primaire"; -$text['label-primary']['he-il'] = "ראשי"; -$text['label-primary']['it-it'] = "Primario"; -$text['label-primary']['nl-nl'] = "Primair"; -$text['label-primary']['pl-pl'] = "Główny"; -$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt -$text['label-primary']['pt-pt'] = "Primário"; -$text['label-primary']['ro-ro'] = ""; -$text['label-primary']['ru-ru'] = "Основной"; -$text['label-primary']['sv-se'] = "Primär"; -$text['label-primary']['uk-ua'] = ""; +$text['label-phone_label']['en-us'] = "Label"; +$text['label-phone_label']['en-gb'] = "Label"; +$text['label-phone_label']['ar-eg'] = ""; +$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de +$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de +$text['label-phone_label']['de-de'] = "Kennzeichnung"; +$text['label-phone_label']['el-gr'] = "Ετικέτα"; +$text['label-phone_label']['es-cl'] = "Etiqueta"; +$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl +$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr +$text['label-phone_label']['fr-fr'] = "Etiquette"; +$text['label-phone_label']['he-il'] = ""; +$text['label-phone_label']['it-it'] = "Etichetta"; +$text['label-phone_label']['nl-nl'] = "Etiket"; +$text['label-phone_label']['pl-pl'] = "Etykieta"; +$text['label-phone_label']['pt-br'] = "Identificador"; +$text['label-phone_label']['pt-pt'] = "Etiqueta"; +$text['label-phone_label']['ro-ro'] = ""; +$text['label-phone_label']['ru-ru'] = "Метка"; +$text['label-phone_label']['sv-se'] = "Etikett"; +$text['label-phone_label']['uk-ua'] = "Назва"; $text['label-phone_type']['en-us'] = "Type"; $text['label-phone_type']['en-gb'] = "Type"; @@ -2003,28 +2003,6 @@ $text['label-phone_number']['ru-ru'] = "Номер"; $text['label-phone_number']['sv-se'] = "Nummer"; $text['label-phone_number']['uk-ua'] = "Номер"; -$text['label-phone_label']['en-us'] = "Label"; -$text['label-phone_label']['en-gb'] = "Label"; -$text['label-phone_label']['ar-eg'] = ""; -$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de -$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de -$text['label-phone_label']['de-de'] = "Kennzeichnung"; -$text['label-phone_label']['el-gr'] = "Ετικέτα"; -$text['label-phone_label']['es-cl'] = "Etiqueta"; -$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl -$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr -$text['label-phone_label']['fr-fr'] = "Etiquette"; -$text['label-phone_label']['he-il'] = ""; -$text['label-phone_label']['it-it'] = "Etichetta"; -$text['label-phone_label']['nl-nl'] = "Etiket"; -$text['label-phone_label']['pl-pl'] = "Etykieta"; -$text['label-phone_label']['pt-br'] = "Identificador"; -$text['label-phone_label']['pt-pt'] = "Etiqueta"; -$text['label-phone_label']['ro-ro'] = ""; -$text['label-phone_label']['ru-ru'] = "Метка"; -$text['label-phone_label']['sv-se'] = "Etikett"; -$text['label-phone_label']['uk-ua'] = "Назва"; - $text['label-phone_extension']['en-us'] = "Extension"; $text['label-phone_extension']['en-gb'] = "Extension"; $text['label-phone_extension']['ar-eg'] = ""; @@ -2047,6 +2025,28 @@ $text['label-phone_extension']['ru-ru'] = "Внутренний Номер"; $text['label-phone_extension']['sv-se'] = "Anknytning"; $text['label-phone_extension']['uk-ua'] = "Розширення"; +$text['label-primary']['en-us'] = "Primary"; +$text['label-primary']['en-gb'] = "Primary"; +$text['label-primary']['ar-eg'] = ""; +$text['label-primary']['de-at'] = "Primär"; //copied from de-de +$text['label-primary']['de-ch'] = "Primär"; //copied from de-de +$text['label-primary']['de-de'] = "Primär"; +$text['label-primary']['el-gr'] = "Κύρια"; +$text['label-primary']['es-cl'] = "Primário"; +$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl +$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr +$text['label-primary']['fr-fr'] = "Primaire"; +$text['label-primary']['he-il'] = "ראשי"; +$text['label-primary']['it-it'] = "Primario"; +$text['label-primary']['nl-nl'] = "Primair"; +$text['label-primary']['pl-pl'] = "Główny"; +$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt +$text['label-primary']['pt-pt'] = "Primário"; +$text['label-primary']['ro-ro'] = ""; +$text['label-primary']['ru-ru'] = "Основной"; +$text['label-primary']['sv-se'] = "Primär"; +$text['label-primary']['uk-ua'] = ""; + $text['label-phone_description']['en-us'] = "Description"; $text['label-phone_description']['en-gb'] = "Description"; $text['label-phone_description']['ar-eg'] = ""; @@ -4401,6 +4401,28 @@ $text['description-shared']['ru-ru'] = "Разделите этот контак $text['description-shared']['sv-se'] = "Dela denna kontakt med andra användare i domänen."; $text['description-shared']['uk-ua'] = ""; +$text['description-phone_label']['en-us'] = "Select or enter a custom label."; +$text['description-phone_label']['en-gb'] = "Select or enter a custom label."; +$text['description-phone_label']['ar-eg'] = ""; +$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de +$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de +$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung."; +$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα"; +$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada."; +$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl +$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr +$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée."; +$text['description-phone_label']['he-il'] = ""; +$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata."; +$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in."; +$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę."; +$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado"; +$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado."; +$text['description-phone_label']['ro-ro'] = ""; +$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку."; +$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett."; +$text['description-phone_label']['uk-ua'] = ""; + $text['description-phone_type']['en-us'] = "Define the number type or purpose."; $text['description-phone_type']['en-gb'] = "Define the number type or purpose."; $text['description-phone_type']['ar-eg'] = ""; @@ -4423,28 +4445,6 @@ $text['description-phone_type']['ru-ru'] = "Определите тип или $text['description-phone_type']['sv-se'] = "Definiera nummertypen eller nummerändamålet."; $text['description-phone_type']['uk-ua'] = ""; -$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact."; -$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact."; -$text['description-phone_primary']['ar-eg'] = ""; -$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de -$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de -$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen."; -$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή"; -$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto."; -$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl -$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr -$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact."; -$text['description-phone_primary']['he-il'] = ""; -$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto."; -$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact"; -$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu."; -$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato"; -$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato."; -$text['description-phone_primary']['ro-ro'] = ""; -$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта."; -$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt."; -$text['description-phone_primary']['uk-ua'] = ""; - $text['description-phone_speed_dial']['en-us'] = "Enter the speed dial number."; $text['description-phone_speed_dial']['en-gb'] = "Enter the speed dial number."; $text['description-phone_speed_dial']['ar-eg'] = ""; @@ -4511,28 +4511,6 @@ $text['description-phone_number']['ru-ru'] = "Введите номер теле $text['description-phone_number']['sv-se'] = "Ange telefonnummer."; $text['description-phone_number']['uk-ua'] = ""; -$text['description-phone_label']['en-us'] = "Select or enter a custom label."; -$text['description-phone_label']['en-gb'] = "Select or enter a custom label."; -$text['description-phone_label']['ar-eg'] = ""; -$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de -$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de -$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung."; -$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα"; -$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada."; -$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl -$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr -$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée."; -$text['description-phone_label']['he-il'] = ""; -$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata."; -$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in."; -$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę."; -$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado"; -$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado."; -$text['description-phone_label']['ro-ro'] = ""; -$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку."; -$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett."; -$text['description-phone_label']['uk-ua'] = ""; - $text['description-phone_extension']['en-us'] = "Enter the extension."; $text['description-phone_extension']['en-gb'] = "Enter the extension."; $text['description-phone_extension']['ar-eg'] = ""; @@ -4555,6 +4533,28 @@ $text['description-phone_extension']['ru-ru'] = "Введите Внутренн $text['description-phone_extension']['sv-se'] = "Ange anknytningen."; $text['description-phone_extension']['uk-ua'] = ""; +$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact."; +$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact."; +$text['description-phone_primary']['ar-eg'] = ""; +$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de +$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de +$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen."; +$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή"; +$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto."; +$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl +$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr +$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact."; +$text['description-phone_primary']['he-il'] = ""; +$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto."; +$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact"; +$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu."; +$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato"; +$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato."; +$text['description-phone_primary']['ro-ro'] = ""; +$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта."; +$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt."; +$text['description-phone_primary']['uk-ua'] = ""; + $text['description-phone_description']['en-us'] = "Enter the description."; $text['description-phone_description']['en-gb'] = "Enter the description."; $text['description-phone_description']['ar-eg'] = ""; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 44c4033fe3..f0487a1d82 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -658,14 +658,14 @@ $contact_phones[$x]['contact_uuid'] = $contact_uuid; $contact_phones[$x]['contact_phone_uuid'] = uuid(); $contact_phones[$x]['phone_label'] = ''; - $contact_phones[$x]['phone_country_code'] = ''; - $contact_phones[$x]['phone_number'] = ''; - $contact_phones[$x]['phone_extension'] = ''; - $contact_phones[$x]['phone_speed_dial'] = ''; $contact_phones[$x]['phone_type_voice'] = ''; $contact_phones[$x]['phone_type_fax'] = ''; $contact_phones[$x]['phone_type_video'] = ''; $contact_phones[$x]['phone_type_text'] = ''; + $contact_phones[$x]['phone_speed_dial'] = ''; + $contact_phones[$x]['phone_country_code'] = ''; + $contact_phones[$x]['phone_number'] = ''; + $contact_phones[$x]['phone_extension'] = ''; $contact_phones[$x]['phone_primary'] = ''; $contact_phones[$x]['phone_description'] = ''; } diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index 9f73f22d4a..938973ca7c 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -59,12 +59,12 @@ //get http post variables and set them to php variables if (is_array($_POST) && @sizeof($_POST) != 0) { + $phone_label = $_POST["phone_label"]; + $phone_label_custom = $_POST["phone_label_custom"]; $phone_type_voice = $_POST["phone_type_voice"]; $phone_type_fax = $_POST["phone_type_fax"]; $phone_type_video = $_POST["phone_type_video"]; $phone_type_text = $_POST["phone_type_text"]; - $phone_label = $_POST["phone_label"]; - $phone_label_custom = $_POST["phone_label_custom"]; $phone_speed_dial = $_POST["phone_speed_dial"]; $phone_country_code = $_POST["phone_country_code"]; $phone_number = $_POST["phone_number"]; @@ -161,11 +161,11 @@ if (is_array($array) && @sizeof($array) != 0) { $array['contact_phones'][0]['contact_uuid'] = $contact_uuid; $array['contact_phones'][0]['domain_uuid'] = $domain_uuid; + $array['contact_phones'][0]['phone_label'] = $phone_label; $array['contact_phones'][0]['phone_type_voice'] = $phone_type_voice ? 1 : null; $array['contact_phones'][0]['phone_type_fax'] = $phone_type_fax ? 1 : null; $array['contact_phones'][0]['phone_type_video'] = $phone_type_video ? 1 : null; $array['contact_phones'][0]['phone_type_text'] = $phone_type_text ? 1 : null; - $array['contact_phones'][0]['phone_label'] = $phone_label; $array['contact_phones'][0]['phone_speed_dial'] = $phone_speed_dial; $array['contact_phones'][0]['phone_country_code'] = $phone_country_code; $array['contact_phones'][0]['phone_number'] = $phone_number; @@ -198,11 +198,11 @@ $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { + $phone_label = $row["phone_label"]; $phone_type_voice = $row["phone_type_voice"]; $phone_type_fax = $row["phone_type_fax"]; $phone_type_video = $row["phone_type_video"]; $phone_type_text = $row["phone_type_text"]; - $phone_label = $row["phone_label"]; $phone_speed_dial = $row["phone_speed_dial"]; $phone_country_code = $row["phone_country_code"]; $phone_number = $row["phone_number"]; From 9f49748d279586a409ca85f932823f7724599c62 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:36:18 -0700 Subject: [PATCH 106/496] Update app_defaults.php --- core/dashboard/app_defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php index 60b5a61e0b..fdb1cfab28 100644 --- a/core/dashboard/app_defaults.php +++ b/core/dashboard/app_defaults.php @@ -88,7 +88,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'dashboard'; $database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7'; - $database->save($array); + $database->save($array, false); //$result = $database->message; //view_array($result); } From f56132e1a6981929d8278cc751c35685206ff4e2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:37:19 -0700 Subject: [PATCH 107/496] Update app_defaults.php --- core/users/app_defaults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php index 4531950819..115739a413 100644 --- a/core/users/app_defaults.php +++ b/core/users/app_defaults.php @@ -174,7 +174,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'default_setting'; $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09'; - $database->save($array); + $database->save($array, false); unset($array); //remove the temporary permission @@ -226,7 +226,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; - $database->save($array); + $database->save($array, false); unset($array); //remove the temporary permission From f6748d8f139b8f192045ce6338deeefcff4e80d4 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:39:14 -0700 Subject: [PATCH 108/496] Update app_defaults.php --- core/groups/app_defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/groups/app_defaults.php b/core/groups/app_defaults.php index 00ae1727ea..0569277e27 100644 --- a/core/groups/app_defaults.php +++ b/core/groups/app_defaults.php @@ -93,7 +93,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'groups'; $database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84'; - $database->save($array); + $database->save($array, false); unset($array); } From 5c4da3262ed8d15ea602f71b8eca8616d0ac3d6b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:39:43 -0700 Subject: [PATCH 109/496] Update app_defaults.php --- core/permissions/app_defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/permissions/app_defaults.php b/core/permissions/app_defaults.php index 6a232db6bb..c8fe870433 100644 --- a/core/permissions/app_defaults.php +++ b/core/permissions/app_defaults.php @@ -39,7 +39,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'permissions'; $database->app_uuid = 'ce1498a0-46e2-487d-85de-4eec7122a984'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions From 67be72b452ec3777e1b4471e296532ad6ae0a908 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:42:16 -0700 Subject: [PATCH 110/496] Database save method set to false. (#6215) * When database save set to false for app_defaults.php --- app/access_controls/app_defaults.php | 4 ++-- app/call_centers/app_defaults.php | 6 +++--- app/conference_profiles/app_defaults.php | 6 +++--- app/contacts/app_defaults.php | 8 ++++---- app/dialplans/app_defaults.php | 2 +- app/email_templates/app_defaults.php | 2 +- app/extensions/app_defaults.php | 2 +- app/ivr_menus/app_defaults.php | 4 ++-- app/modules/app_defaults.php | 4 ++-- app/music_on_hold/app_defaults.php | 2 +- app/phrases/app_defaults.php | 4 ++-- app/provision/app_defaults.php | 4 ++-- app/recordings/app_defaults.php | 4 ++-- app/ring_groups/app_defaults.php | 4 ++-- app/settings/app_defaults.php | 4 ++-- app/sip_profiles/app_defaults.php | 4 ++-- app/sofia_global_settings/app_defaults.php | 2 +- app/vars/app_defaults.php | 8 ++++---- app/voicemail_greetings/app_defaults.php | 8 ++++---- 19 files changed, 41 insertions(+), 41 deletions(-) diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php index 15000ff578..e96c4612cb 100644 --- a/app/access_controls/app_defaults.php +++ b/app/access_controls/app_defaults.php @@ -77,7 +77,7 @@ $database = new database; $database->app_name = 'access_controls'; $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('access_control_add', 'temp'); @@ -114,7 +114,7 @@ $database = new database; $database->app_name = 'access_controls'; $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('access_control_node_add', 'temp'); diff --git a/app/call_centers/app_defaults.php b/app/call_centers/app_defaults.php index 3dbbeef4f0..786dffde4e 100644 --- a/app/call_centers/app_defaults.php +++ b/app/call_centers/app_defaults.php @@ -55,7 +55,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'call_centers'; $database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370'; - $database->save($array); + $database->save($array, false); $response = $database->message; unset($array); @@ -153,7 +153,7 @@ if ($domains_processed == 1) { } } unset ($prep_statement); - + //save the array to the database if (is_array($array)) { //add the dialplan permission @@ -165,7 +165,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'call_centers'; $database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370'; - $database->save($array); + $database->save($array, false); $message = $database->message; //remove the temporary permission diff --git a/app/conference_profiles/app_defaults.php b/app/conference_profiles/app_defaults.php index c542c04455..eab37bfe66 100644 --- a/app/conference_profiles/app_defaults.php +++ b/app/conference_profiles/app_defaults.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2016 + Portions created by the Initial Developer are Copyright (C) 2016 - 2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -72,7 +72,7 @@ $database = new database; $database->app_name = 'conference_profiles'; $database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('conference_profile_add', 'temp'); @@ -99,7 +99,7 @@ $database = new database; $database->app_name = 'conference_profiles'; $database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('conference_profile_param_add', 'temp'); diff --git a/app/contacts/app_defaults.php b/app/contacts/app_defaults.php index 4d87492e89..b037cacee0 100644 --- a/app/contacts/app_defaults.php +++ b/app/contacts/app_defaults.php @@ -87,7 +87,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'contacts'; $database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('contact_email_add', 'temp'); @@ -148,7 +148,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'contacts'; $database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('contact_url_add', 'temp'); @@ -213,7 +213,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'contacts'; $database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c'; - $database->save($array); + $database->save($array, false); unset($array); $array['contact_groups'][0]['contact_group_uuid'] = $row["contact_group_uuid"]; @@ -233,4 +233,4 @@ if ($domains_processed == 1) { } -?> \ No newline at end of file +?> diff --git a/app/dialplans/app_defaults.php b/app/dialplans/app_defaults.php index 69d196d71d..7204225cae 100644 --- a/app/dialplans/app_defaults.php +++ b/app/dialplans/app_defaults.php @@ -140,7 +140,7 @@ $database = new database; $database->app_name = 'dialplans'; $database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('dialplan_add', 'temp'); diff --git a/app/email_templates/app_defaults.php b/app/email_templates/app_defaults.php index aca702e5b6..fa91451d6a 100644 --- a/app/email_templates/app_defaults.php +++ b/app/email_templates/app_defaults.php @@ -517,7 +517,7 @@ $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; - $database->save($array); + $database->save($array, false); //$message = $database->message; //remove the temporary permission diff --git a/app/extensions/app_defaults.php b/app/extensions/app_defaults.php index 4be3bcd445..e99ffa02c7 100644 --- a/app/extensions/app_defaults.php +++ b/app/extensions/app_defaults.php @@ -57,7 +57,7 @@ $database = new database; $database->app_name = 'extensions'; $database->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('extension_edit', 'temp'); diff --git a/app/ivr_menus/app_defaults.php b/app/ivr_menus/app_defaults.php index 4075d60551..2438c76cb7 100644 --- a/app/ivr_menus/app_defaults.php +++ b/app/ivr_menus/app_defaults.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2019 + Portions created by the Initial Developer are Copyright (C) 2019 - 2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -59,7 +59,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'ivr_menus'; $database->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('ivr_menu_edit', 'temp'); diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php index 7c4f6ce271..b189d7755d 100644 --- a/app/modules/app_defaults.php +++ b/app/modules/app_defaults.php @@ -53,7 +53,7 @@ $database = new database; $database->app_name = 'modules'; $database->app_uuid = '5eb9cba1-8cb6-5d21-e36a-775475f16b5e'; - $database->save($array); + $database->save($array, false); unset($array); } } @@ -69,4 +69,4 @@ } } -?> \ No newline at end of file +?> diff --git a/app/music_on_hold/app_defaults.php b/app/music_on_hold/app_defaults.php index d1b9ba2cad..816c54ff5a 100644 --- a/app/music_on_hold/app_defaults.php +++ b/app/music_on_hold/app_defaults.php @@ -100,7 +100,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'app_name'; $database->app_uuid = 'app_uuid'; - $database->save($array); + $database->save($array, false); unset($array); $p->add('music_on_hold_delete', 'temp'); diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php index 49cae0fae3..5db786bf80 100644 --- a/app/phrases/app_defaults.php +++ b/app/phrases/app_defaults.php @@ -90,7 +90,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'phrases'; $database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('phrase_detail_edit', 'temp'); @@ -128,7 +128,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'phrases'; $database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba'; - $database->save($array); + $database->save($array, false); unset($array); $p->delete('phrase_detail_edit', 'temp'); diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index 377fddc7d2..211235abd3 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -50,7 +50,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'provision'; $database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('device_add', 'temp'); @@ -76,7 +76,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'provision'; $database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3'; - $database->save($array); + $database->save($array, false); unset($array); //grant temporary permissions diff --git a/app/recordings/app_defaults.php b/app/recordings/app_defaults.php index 9e89f3fc8a..95e2733382 100644 --- a/app/recordings/app_defaults.php +++ b/app/recordings/app_defaults.php @@ -64,7 +64,7 @@ $database = new database; $database->app_name = 'recordings'; $database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('recording_edit', 'temp'); @@ -109,7 +109,7 @@ $database = new database; $database->app_name = 'recordings'; $database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('recording_edit', 'temp'); diff --git a/app/ring_groups/app_defaults.php b/app/ring_groups/app_defaults.php index 64787d82bc..030e868554 100644 --- a/app/ring_groups/app_defaults.php +++ b/app/ring_groups/app_defaults.php @@ -56,7 +56,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'ring_groups'; $database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('ring_group_edit', 'temp'); @@ -65,4 +65,4 @@ if ($domains_processed == 1) { } -?> \ No newline at end of file +?> diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php index dd429260b7..a8d79466c4 100644 --- a/app/settings/app_defaults.php +++ b/app/settings/app_defaults.php @@ -60,7 +60,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'settings'; $database->app_uuid = 'b6b1b2e5-4ba5-044c-8a5c-18709a15eb60'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('setting_add', 'temp'); @@ -81,7 +81,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'settings'; $database->app_uuid = 'b6b1b2e5-4ba5-044c-8a5c-18709a15eb60'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('setting_edit', 'temp'); diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php index b077ba4a42..9c9a2635ff 100644 --- a/app/sip_profiles/app_defaults.php +++ b/app/sip_profiles/app_defaults.php @@ -125,7 +125,7 @@ $database = new database; $database->app_name = 'sip_profiles'; $database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions @@ -201,7 +201,7 @@ $database = new database; $database->app_name = 'sip_profiles'; $database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions diff --git a/app/sofia_global_settings/app_defaults.php b/app/sofia_global_settings/app_defaults.php index 536031bb7f..2b69295326 100644 --- a/app/sofia_global_settings/app_defaults.php +++ b/app/sofia_global_settings/app_defaults.php @@ -36,7 +36,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'sofia_global_settings'; $database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 3f7ccb49b3..5e15dc1b8b 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -81,7 +81,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'vars'; $database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8'; - $database->save($array); + $database->save($array, false); $message = $database->message; //revoke temporary permissions @@ -183,7 +183,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'vars'; $database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete("var_add", "temp"); @@ -226,7 +226,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'vars'; $database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete("var_add", "temp"); @@ -241,4 +241,4 @@ if ($domains_processed == 1) { save_var_xml(); } -?> \ No newline at end of file +?> diff --git a/app/voicemail_greetings/app_defaults.php b/app/voicemail_greetings/app_defaults.php index 96c31a4c41..7c233f1d4e 100644 --- a/app/voicemail_greetings/app_defaults.php +++ b/app/voicemail_greetings/app_defaults.php @@ -57,7 +57,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'voicemail_greetings'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('voicemail_greeting_edit', 'temp'); @@ -99,7 +99,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'voicemail_greetings'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('voicemail_greeting_edit', 'temp'); @@ -141,7 +141,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'voicemail_greetings'; $database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('voicemail_greeting_edit', 'temp'); @@ -151,4 +151,4 @@ if ($domains_processed == 1) { } } -?> \ No newline at end of file +?> From 7ef28525c825c097552b897176b83540d8235edd Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:44:19 -0700 Subject: [PATCH 111/496] Update app_defaults.php --- core/software/app_defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/software/app_defaults.php b/core/software/app_defaults.php index 103149fc8c..8c1bb537fb 100644 --- a/core/software/app_defaults.php +++ b/core/software/app_defaults.php @@ -55,7 +55,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'software'; $database->app_uuid = 'b88c795f-7dea-4fc8-9ab7-edd555242cff'; - $database->save($array); + $database->save($array, false); unset($array); //remove the temporary permission From 0e5558522eb4e5bdbcbf025559977468bb31f60b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 12:44:49 -0700 Subject: [PATCH 112/496] Update app_defaults.php --- core/notifications/app_defaults.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/notifications/app_defaults.php b/core/notifications/app_defaults.php index e94092ae4b..ce54510cc5 100644 --- a/core/notifications/app_defaults.php +++ b/core/notifications/app_defaults.php @@ -43,7 +43,7 @@ if ($domains_processed == 1) { $database = new database; $database->app_name = 'notifications'; $database->app_uuid = 'e746fbcb-f67f-4e0e-ab64-c414c01fac11'; - $database->save($array); + $database->save($array, false); unset($array); //revoke temporary permissions $p->delete('notification_add', 'temp'); @@ -53,4 +53,4 @@ if ($domains_processed == 1) { } -?> \ No newline at end of file +?> From d94390a1579319985295e42b249b4662e7e7d183 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 24 Dec 2021 13:13:41 -0700 Subject: [PATCH 113/496] Update user_logs.php --- core/user_logs/resources/classes/user_logs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/user_logs/resources/classes/user_logs.php b/core/user_logs/resources/classes/user_logs.php index b654a06416..be19e55f3e 100644 --- a/core/user_logs/resources/classes/user_logs.php +++ b/core/user_logs/resources/classes/user_logs.php @@ -98,7 +98,7 @@ if (!class_exists('user_logs')) { $database->app_name = 'authentication'; $database->app_uuid = 'a8a12918-69a4-4ece-a1ae-3932be0e41f1'; $database->uuid($user_log_uuid); - $database->save($array); + $database->save($array, false); $message = $database->message; //remove the temporary permission From 975180f24855bd2b556bae16ee68b292aaafa53b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 27 Dec 2021 16:20:30 -0700 Subject: [PATCH 114/496] User dialplan mkdir in the user_record dialplan. --- app/dialplans/resources/switch/conf/dialplan/050_user_record.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml index 43e987af5f..9e41ff6be8 100644 --- a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml +++ b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml @@ -46,6 +46,7 @@ + From eefd5e78ef6af47cee046e66b3b8725000d7c815 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 29 Dec 2021 11:44:49 -0700 Subject: [PATCH 115/496] Add from send_mail function consistently. (#6216) * Update send_mail.lua * send_mail send nil email_from * Update index.lua * Update send_email.lua * Use the lua send_mail function. * Update index.lua * Update index.lua * Replace freeswitch.email with send_email lua function. * Replace email.lua with the send_mail function. --- .../scripts/app/conference_center/index.lua | 25 ++++-- .../scripts/app/emergency_notify/index.lua | 21 ++--- .../scripts/app/failure_handler/index.lua | 3 +- .../app/fax/resources/scripts/queue/tasks.lua | 2 +- .../resources/scripts/app/hangup/index.lua | 1 + .../scripts/app/ring_groups/index.lua | 10 ++- .../resources/functions/send_email.lua | 1 + app/scripts/resources/scripts/fax_retry.lua | 76 +++++++++++-------- .../scripts/resources/functions/send_mail.lua | 8 +- 9 files changed, 88 insertions(+), 59 deletions(-) diff --git a/app/scripts/resources/scripts/app/conference_center/index.lua b/app/scripts/resources/scripts/app/conference_center/index.lua index e4e288f20e..e374a97b76 100644 --- a/app/scripts/resources/scripts/app/conference_center/index.lua +++ b/app/scripts/resources/scripts/app/conference_center/index.lua @@ -110,10 +110,11 @@ link_address = http_protocol.."://"..domain_name..project_path; --prepare the headers - headers = '{"X-FusionPBX-Domain-UUID":"'..domain_uuid..'",'; - headers = headers..'"X-FusionPBX-Domain-Name":"'..domain_name..'",'; - headers = headers..'"X-FusionPBX-Call-UUID":"na",'; - headers = headers..'"X-FusionPBX-Email-Type":"conference"}'; + headers = {} + headers["X-FusionPBX-Domain-UUID"] = domain_uuid; + headers["X-FusionPBX-Domain-Name"] = domain_name; + headers["X-FusionPBX-Call-UUID"] = 'na'; + headers["X-FusionPBX-Email-Type"] = 'conference'; --remove quotes from caller id name and number caller_id_name = caller_id_name:gsub("'", "'"); @@ -152,14 +153,22 @@ --send the email if (string.len(attachment) > 4) then - cmd = "luarun email.lua "..email.." "..email.." '"..headers.."' '"..subject.."' '"..body.."' '"..attachment.."'"; + send_mail(headers, + email, + email, + {subject, body}, + attachment + ); else - cmd = "luarun email.lua "..email.." "..email.." '"..headers.."' '"..subject.."' '"..body.."'"; + send_mail(headers, + email, + email, + {subject, body} + ); end if (debug["info"]) then - freeswitch.consoleLog("notice", "[voicemail] cmd: " .. cmd .. "\n"); + freeswitch.consoleLog("notice", "[voicemail] cmd: " .. email .. " " .. subject .. " " .. body .. "\n"); end - result = api:executeString(cmd); end end diff --git a/app/scripts/resources/scripts/app/emergency_notify/index.lua b/app/scripts/resources/scripts/app/emergency_notify/index.lua index 805b2a89d6..ef201fd366 100644 --- a/app/scripts/resources/scripts/app/emergency_notify/index.lua +++ b/app/scripts/resources/scripts/app/emergency_notify/index.lua @@ -65,10 +65,11 @@ end --prepare the headers - headers = '{"X-FusionPBX-Domain-UUID":"'..domain_uuid..'",'; - headers = headers..'"X-FusionPBX-Domain-Name":"'..domain_name..'",'; - headers = headers..'"X-FusionPBX-Call-UUID":"'..uuid..'",'; - headers = headers..'"X-FusionPBX-Email-Type":"emergency_call"}'; + local headers = {} + headers["X-FusionPBX-Domain-UUID"] = domain_uuid; + headers["X-FusionPBX-Domain-Name"] = domain_name; + headers["X-FusionPBX-Call-UUID"] = uuid; + headers["X-FusionPBX-Email-Type"] = 'emergency_call'; --remove quotes from caller id name and number caller_id_name = caller_id_name:gsub("'", "'"); @@ -103,12 +104,12 @@ body = trim(body); --send the email - cmd = "luarun email.lua "..to_email.." "..from_email.." "..headers.." '"..subject.."' '"..body.."'"; - if (debug["info"]) then - freeswitch.consoleLog("notice", "[emergency call] cmd: " .. cmd .. "\n"); - end - api = freeswitch.API(); - result = api:executeString(cmd); + send_mail(headers, + from_email, + to_email, + {subject, body} + ); + end --handle originate_disposition diff --git a/app/scripts/resources/scripts/app/failure_handler/index.lua b/app/scripts/resources/scripts/app/failure_handler/index.lua index 01cb8f69b8..02de99fbc6 100644 --- a/app/scripts/resources/scripts/app/failure_handler/index.lua +++ b/app/scripts/resources/scripts/app/failure_handler/index.lua @@ -102,8 +102,9 @@ body = body:gsub("\n", ""); body = trim(body); - --send the emails + --send the email send_mail(headers, + nil, missed_call_data, {subject, body} ); diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua index f2f9621eea..df6dc57580 100644 --- a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua +++ b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua @@ -255,7 +255,7 @@ local function send_mail_task(task, message, call_uuid, file) ["X-FusionPBX-Email-Type"] = 'email2fax'; } - return send_mail(mail_x_headers, task.reply_address, message, file) + return send_mail(mail_x_headers, nil, task.reply_address, message, file) end local function read_file(name, mode) diff --git a/app/scripts/resources/scripts/app/hangup/index.lua b/app/scripts/resources/scripts/app/hangup/index.lua index 54ca8d6d31..20338c01f7 100644 --- a/app/scripts/resources/scripts/app/hangup/index.lua +++ b/app/scripts/resources/scripts/app/hangup/index.lua @@ -104,6 +104,7 @@ --send the emails send_mail(headers, + missed_call_data, missed_call_data, {subject, body} ); diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua index 11aa2e5b96..dc872f0774 100644 --- a/app/scripts/resources/scripts/app/ring_groups/index.lua +++ b/app/scripts/resources/scripts/app/ring_groups/index.lua @@ -372,14 +372,16 @@ body = trim(body); --send the email - if (debug["info"]) then - freeswitch.consoleLog("notice", "[missed call]: "..mail_to.." '"..subject.."' '"..body.."'\n"); - end - send_mail(headers, + nil, mail_to, {subject, body} ); + + --send the debug info + if (debug["info"]) then + freeswitch.consoleLog("notice", "[missed call]: "..mail_to.." '"..subject.."' '"..body.."'\n"); + end end end end diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua index ea144fdb93..9bfa111a01 100644 --- a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua +++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua @@ -225,6 +225,7 @@ --send the email send_mail(headers, + nil, voicemail_mail_to, {subject, body}, (voicemail_file == "attach") and file diff --git a/app/scripts/resources/scripts/fax_retry.lua b/app/scripts/resources/scripts/fax_retry.lua index 86145ff12f..2ea25f673a 100644 --- a/app/scripts/resources/scripts/fax_retry.lua +++ b/app/scripts/resources/scripts/fax_retry.lua @@ -16,7 +16,7 @@ -- -- The Initial Developer of the Original Code is -- Mark J Crane --- Copyright (C) 2010 - 2019 +-- Copyright (C) 2010 - 2021 -- the Initial Developer. All Rights Reserved. -- -- Contributor(s): @@ -153,10 +153,10 @@ ignore_early_media = "false"; if (settings['fax']['variable'] ~= nil) then for i, var in ipairs(settings.fax.variable) do - --freeswitch.consoleLog("notice", "variable #" .. i .. ": " .. var .. "\n"); - if (var == "ignore_early_media=true") then - ignore_early_media = "true"; - end + --freeswitch.consoleLog("notice", "variable #" .. i .. ": " .. var .. "\n"); + if (var == "ignore_early_media=true") then + ignore_early_media = "true"; + end end end end @@ -487,10 +487,15 @@ freeswitch.consoleLog("INFO","[FAX] mailto_address: ".. email_address .."\n"); freeswitch.consoleLog("INFO","[FAX] hangup_cause_q850: '" .. hangup_cause_q850 .. "'\n"); --- build headers +-- set the type email_type = "email2fax"; - x_headers = 'X-Headers: {"X-FusionPBX-Email-Type":"'..email_type..'",'; - x_headers = x_headers..'"X-FusionPBX-Domain-UUID":"'..domain_uuid..'"}'; + +--prepare the headers + headers = {} + headers["X-FusionPBX-Domain-UUID"] = domain_uuid; + headers["X-FusionPBX-Domain-Name"] = domain_name; + headers["X-FusionPBX-Email-Type"] = email_type; + headers["X-FusionPBX-Email-From"] = from_address; -- if the fax failed then try again if (fax_success == "0") then @@ -570,12 +575,14 @@ freeswitch.consoleLog("INFO", "[FAX] RETRY_STATS FAILURE BAD NUMBER: GATEWAY[".. fax_uri .."]"); email_address = email_address:gsub("\\,", ","); - freeswitch.email(email_address, - email_address, - "To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_invalid.."\n"..x_headers, - email_body_fail_invalid, - fax_file - ); + + --send the email + send_mail(headers, + from_address, + email_address, + {email_subject_fail_invalid, email_body_fail_invalid}, + fax_file + ); --busy number elseif (fax_retry_attempts == 17) then @@ -583,12 +590,14 @@ freeswitch.consoleLog("INFO", "[FAX] RETRY STATS FAILURE BUSY: GATEWAY[".. fax_uri .."], BUSY NUMBER"); email_address = email_address:gsub("\\,", ","); - freeswitch.email(email_address, - email_address, - "To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_busy.."\n"..x_headers, - email_body_fail_busy, - fax_file - ); + + --send the email + send_mail(headers, + from_address, + email_address, + {email_subject_fail_busy, email_body_fail_busy}, + fax_file + ); else --the fax failed completely. send a message @@ -596,12 +605,14 @@ freeswitch.consoleLog("INFO", "[FAX] RETRY STATS FAILURE: GATEWAY[".. fax_uri .."], tried 5 combinations without success"); email_address = email_address:gsub("\\,", ","); - freeswitch.email(email_address, - email_address, - "To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_default.."\n"..x_headers, - email_body_fail_default, - fax_file - ); + + --send the email + send_mail(headers, + from_address, + email_address, + {email_subject_fail_default, email_body_fail_default}, + fax_file + ); fax_retry_attempts = fax_retry_attempts + 1; @@ -644,12 +655,13 @@ freeswitch.consoleLog("INFO", "[FAX] RETRY STATS SUCCESS: GATEWAY[".. fax_uri .."] VARS[" .. fax_trial .. "]"); email_address = email_address:gsub("\\,", ","); - freeswitch.email(email_address, - email_address, - "To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_success_default.."\n"..x_headers, - email_body_success_default, - fax_file:gsub(".tif",".pdf",x) - ); + --send the email + send_mail(headers, + from_address, + email_address, + {email_subject_success_default, email_body_success_default}, + fax_file:gsub(".tif",".pdf") + ); if (settings['fax']['keep_local']['boolean'] ~= "nil") then if (settings['fax']['keep_local']['boolean'] == "false") then diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua index c99ce9be3f..649f3c5efb 100644 --- a/app/scripts/resources/scripts/resources/functions/send_mail.lua +++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua @@ -8,7 +8,7 @@ local settings = Settings.new(db, domain_name, domain_uuid) local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false"; if (email_queue_enabled == 'true') then - function send_mail(headers, email_address, email_message, email_file) + function send_mail(headers, email_from, email_address, email_message, email_file) --include json library local json @@ -31,8 +31,10 @@ if (email_queue_enabled == 'true') then local db = dbh or Database.new('system'); local settings = Settings.new(db, domain_name, domain_uuid); - local email_from = settings:get('email', 'smtp_from', 'text'); - local from_name = settings:get('email', 'smtp_from_name', 'text'); + if (email_from == nil or email_from == "") then + local email_from = settings:get('email', 'smtp_from', 'text'); + local from_name = settings:get('email', 'smtp_from_name', 'text'); + end if (email_from == nil or email_from == "") then email_from = address; From 2c7cfbe44f66caf02c35087ea0f5a48b729b0c1d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 29 Dec 2021 14:29:17 -0700 Subject: [PATCH 116/496] Account for bridge variables and more advanced agent contact string. If using the { and } with the contact string it would add an extra } bracket. The following changes remove the extra bracket and account for more of the bridge variables. --- .../scripts/configuration/callcenter.conf.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua index 3321d80186..5a10f01b86 100644 --- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua +++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua @@ -206,24 +206,27 @@ if (string.find(agent_contact, 'call_timeout') == nil) then --add the call_timeout pos = string.find(agent_contact, "}"); - first = string.sub(agent_contact, 0, pos); + first = string.sub(agent_contact, 0, pos -1); + last = string.sub(agent_contact, pos); + agent_contact = first..[[,domain_name=]]..domain_name..[[,domain_uuid=]]..domain_uuid..[[,sip_h_caller_destination=${caller_destination},call_timeout=]]..agent_call_timeout..last; + else + --add the call_timeout + pos = string.find(agent_contact, "}"); + first = string.sub(agent_contact, 0, pos - 1); last = string.sub(agent_contact, pos); agent_contact = first..[[,sip_h_caller_destination=${caller_destination},call_timeout=]]..agent_call_timeout..last; - else - --the string has the call timeout - agent_contact = agent_contact; end - else + else --found pos = string.find(agent_contact, "}"); - first = string.sub(agent_contact, 0, pos); + first = string.sub(agent_contact, 0, pos - 1); last = string.sub(agent_contact, pos); if (string.find(agent_contact, 'call_timeout') == nil) then --add the call_timeout and confirm - agent_contact = first..','..confirm..',sip_h_caller_destination=${caller_destination},call_timeout='..agent_call_timeout..last; + agent_contact = first..','..confirm..',sip_h_caller_destination=${caller_destination},domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination},call_timeout='..agent_call_timeout..last; else --add confirm - agent_contact = tmp_first..',sip_h_caller_destination=${caller_destination},'..confirm..tmp_last; + agent_contact = tmp_first..',domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination},'..confirm..tmp_last; end end end From 71147dcb7eff57862efd66f09d27b98b19f5625e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 29 Dec 2021 15:08:28 -0700 Subject: [PATCH 117/496] Have the email.lua function use the send_mail function. --- app/scripts/resources/scripts/email.lua | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/scripts/resources/scripts/email.lua b/app/scripts/resources/scripts/email.lua index ab521830f6..37c4403e0b 100644 --- a/app/scripts/resources/scripts/email.lua +++ b/app/scripts/resources/scripts/email.lua @@ -1,6 +1,6 @@ -- email.lua -- Part of FusionPBX --- Copyright (C) 2010 Mark J Crane +-- Copyright (C) 2010 - 291 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -38,6 +38,9 @@ --Example --luarun email.lua to@domain.com from@domain.com 'headers' 'subject' 'body' +--- include libs + local send_mail = require 'resources.functions.send_mail' + --get the argv values script_name = argv[0]; to = argv[1]; @@ -58,19 +61,19 @@ --send the email if (file == nil) then - freeswitch.email(to, + send_mail(headers, from, - "To: "..to.."\nFrom: "..from.."\nX-Headers: "..headers.."\nSubject: "..subject, - body - ); + to, + {subject, body} + ); else if (convert_cmd == nil) then - freeswitch.email(to, + send_mail(headers, from, - "To: "..to.."\nFrom: "..from.."\nX-Headers: "..headers.."\nSubject: "..subject, - body, + to, + {subject, body}, file - ); + ); else freeswitch.email(to, from, @@ -83,7 +86,3 @@ end end ---delete the file - if (delete == "true") then - os.remove(file); - end From 05cae1be62f0378683b824d3daa608d4f57e5f7e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 29 Dec 2021 15:30:15 -0700 Subject: [PATCH 118/496] Remove local so the email_from has a value outside the if statement. --- .../resources/scripts/resources/functions/send_mail.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua index 649f3c5efb..703ddd1cd4 100644 --- a/app/scripts/resources/scripts/resources/functions/send_mail.lua +++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua @@ -32,8 +32,8 @@ if (email_queue_enabled == 'true') then local settings = Settings.new(db, domain_name, domain_uuid); if (email_from == nil or email_from == "") then - local email_from = settings:get('email', 'smtp_from', 'text'); - local from_name = settings:get('email', 'smtp_from_name', 'text'); + email_from = settings:get('email', 'smtp_from', 'text'); + from_name = settings:get('email', 'smtp_from_name', 'text'); end if (email_from == nil or email_from == "") then From 4c7f6d0a6bfe64576733545bed8de5fbb4f96ce7 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 30 Dec 2021 10:19:47 -0700 Subject: [PATCH 119/496] Change mkdir to recursive. --- app/fax/fax_edit.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index 8854dd43be..cc97110e05 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2021 the Initial Developer. All Rights Reserved. Contributor(s): @@ -51,7 +51,7 @@ $fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name']; //get the fax extension - if (strlen($fax_extension) > 0) { + if (is_numeric($fax_extension) > 0) { //set the fax directories. example /usr/local/freeswitch/storage/fax/329/inbox $dir_fax_inbox = $fax_dir.'/'.$fax_extension.'/inbox'; $dir_fax_sent = $fax_dir.'/'.$fax_extension.'/sent'; @@ -59,19 +59,19 @@ //make sure the directories exist if (!is_dir($_SESSION['switch']['storage']['dir'])) { - mkdir($_SESSION['switch']['storage']['dir'], 0770, false); + mkdir($_SESSION['switch']['storage']['dir'], 0770, true); } if (!is_dir($fax_dir.'/'.$fax_extension)) { - mkdir($fax_dir.'/'.$fax_extension, 0770, false); + mkdir($fax_dir.'/'.$fax_extension, 0770, true); } if (!is_dir($dir_fax_inbox)) { - mkdir($dir_fax_inbox, 0770, false); + mkdir($dir_fax_inbox, 0770, true); } if (!is_dir($dir_fax_sent)) { - mkdir($dir_fax_sent, 0770, false); + mkdir($dir_fax_sent, 0770, true); } if (!is_dir($dir_fax_temp)) { - mkdir($dir_fax_temp, 0770, false); + mkdir($dir_fax_temp, 0770, true); } } From 335d58a106fabee949c271aa4bfe55165bd40321 Mon Sep 17 00:00:00 2001 From: Ben <70598281+cranben@users.noreply.github.com> Date: Thu, 30 Dec 2021 15:38:10 -0700 Subject: [PATCH 120/496] Add new Yealink t48u template. (#6218) * Add new Yealink t48u template. * Create favorite_setting.xml * Create y000000000000.boot * Create super_search.xml * Create webitemslevel.cfg * Create y000000000108.cfg * Delete webitemslevel.cfg * Rename y000000000108.cfg to y000000000109.cfg --- .../yealink/t48u/favorite_setting.xml | 8 + .../provision/yealink/t48u/super_search.xml | 7 + .../provision/yealink/t48u/y000000000000.boot | 7 + .../provision/yealink/t48u/y000000000109.cfg | 1953 ++++++++++ .../provision/yealink/t48u/{$mac}.cfg | 3382 +++++++++++++++++ 5 files changed, 5357 insertions(+) create mode 100644 resources/templates/provision/yealink/t48u/favorite_setting.xml create mode 100644 resources/templates/provision/yealink/t48u/super_search.xml create mode 100644 resources/templates/provision/yealink/t48u/y000000000000.boot create mode 100644 resources/templates/provision/yealink/t48u/y000000000109.cfg create mode 100644 resources/templates/provision/yealink/t48u/{$mac}.cfg diff --git a/resources/templates/provision/yealink/t48u/favorite_setting.xml b/resources/templates/provision/yealink/t48u/favorite_setting.xml new file mode 100644 index 0000000000..ba7275358e --- /dev/null +++ b/resources/templates/provision/yealink/t48u/favorite_setting.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/templates/provision/yealink/t48u/super_search.xml b/resources/templates/provision/yealink/t48u/super_search.xml new file mode 100644 index 0000000000..31f9f2bf47 --- /dev/null +++ b/resources/templates/provision/yealink/t48u/super_search.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/templates/provision/yealink/t48u/y000000000000.boot b/resources/templates/provision/yealink/t48u/y000000000000.boot new file mode 100644 index 0000000000..f937e7d73d --- /dev/null +++ b/resources/templates/provision/yealink/t48u/y000000000000.boot @@ -0,0 +1,7 @@ +#!version:1.0.0.1 +## The header above must appear as-is in the first line + +include:config "y000000000108.cfg" +include:config "{$mac}.cfg" + +overwrite_mode = {$yealink_overwrite_mode} diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg new file mode 100644 index 0000000000..f21d0215a1 --- /dev/null +++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg @@ -0,0 +1,1953 @@ +#!version:1.0.0.1 + +##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## + +####################################################################################### +## Network CDP ## +####################################################################################### +static.network.cdp.enable = +static.network.cdp.packet_interval = + + + +####################################################################################### +## Network IPv6 ## +####################################################################################### +static.network.ipv6_static_dns_enable = +static.network.ipv6_icmp_v6.enable = +static.network.ipv6_secondary_dns = +static.network.ipv6_primary_dns = +static.network.ipv6_internet_port.gateway = +static.network.ipv6_internet_port.ip = +static.network.ipv6_internet_port.type = +static.network.ipv6_prefix = + + + +####################################################################################### +## Network WiFi ## +####################################################################################### +##static.wifi.X.label= +##static.wifi.X.ssid= +##static.wifi.X.priority= +##static.wifi.X.security_mode= +##static.wifi.X.cipher_type= +##static.wifi.X.password= +##static.wifi.X.eap_type= +##static.wifi.X.eap_user_name= +##static.wifi.x.eap_password= +##(X ranges from 1 to 5) +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support these parameters. + +static.wifi.enable = {$yealink_wifi_enable} +static.wifi.1.label = {$yealink_wifi_1_label} +static.wifi.1.ssid = {$yealink_wifi_1_ssid} +static.wifi.1.priority = {$yealink_wifi_1_priority} +static.wifi.1.security_mode = {$yealink_wifi_1_security} +static.wifi.1.cipher_type = {$yealink_wifi_1_cipher} +static.wifi.1.password = {$yealink_wifi_1_password} +static.wifi.1.eap_type = {$yealink_wifi_1_type} +static.wifi.1.eap_user_name = {$yealink_wifi_1_username} +static.wifi.1.eap_password = {$yealink_wifi_1_password} +static.wifi.show_scan_prompt = {$yealink_wifi_scan_prompt} + +##V83 Add +static.wifi.function.enable = + + +##V84 SP4 ADD +static.network.wifi.ip_address_mode= +static.network.wifi.preference = +static.network.wifi.internet_port.type = +static.network.wifi.internet_port.ip= +static.network.wifi.internet_port.mask= +static.network.wifi.internet_port.gateway= +static.network.wifi.static_dns_enable= +static.network.wifi.primary_dns= +static.network.wifi.secondary_dns= +static.network.wifi.ipv6_internet_port.type= +static.network.wifi.ipv6_internet_port.ip= +static.network.wifi.ipv6_prefix= +static.network.wifi.ipv6_internet_port.gateway= +static.network.wifi.ipv6_static_dns_enable= +static.network.wifi.ipv6_primary_dns= +static.network.wifi.ipv6_secondary_dns= +static.network.wifi.ipv6_icmp_v6.enable= +####################################################################################### +## Network Internet ## +####################################################################################### +static.network.ip_address_mode = {$yealink_ip_address_mode} +static.network.span_to_pc_port = +static.network.vlan.pc_port_mode = +static.network.static_dns_enable = +static.network.pc_port.enable = +{if isset($dns_server_primary)}static.network.primary_dns = {$dns_server_primary}{/if} +{if isset($dns_server_secondary)}static.network.secondary_dns = {$dns_server_secondary}{/if} +static.network.internet_port.gateway = +static.network.internet_port.mask = +static.network.internet_port.ip = +static.network.internet_port.type = + +##V83 Add +static.network.preference = + + +####################################################################################### +## Network Advanced ## +####################################################################################### +static.network.dhcp_host_name = +static.network.dhcp.option60type = +static.network.mtu_value = +static.network.qos.audiotos = +static.network.port.min_rtpport = +static.network.port.max_rtpport = +static.network.qos.signaltos = + +static.wui.http_enable = +static.wui.https_enable = +static.network.port.https = +static.network.port.http = + +static.network.pc_port.speed_duplex = +static.network.internet_port.speed_duplex = + +##V83 Add +static.network.redundancy.mode = +static.network.redundancy.failback.timeout = + + + +####################################################################################### +## Network LLDP ## +####################################################################################### +static.network.lldp.enable = {$yealink_lldp_enable} +static.network.lldp.packet_interval = + + + +####################################################################################### +## Network VLAN ## +####################################################################################### +static.network.vlan.dhcp_enable = +static.network.vlan.dhcp_option = +static.network.vlan.vlan_change.enable = + +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} + +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + +#static.network.vlan.pc_port_enable = + +static.network.vlan.internet_port_priority = {$yealink_vlan_cos} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} + +{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + + +####################################################################################### +## Network VPN ## +####################################################################################### +static.network.vpn_enable = {$yealink_network_vpn_enable} +static.openvpn.url = {$yealink_openvpn_url} + + +####################################################################################### +## Network 802.1x ## +####################################################################################### +static.network.802_1x.mode = +static.network.802_1x.identity = +static.network.802_1x.md5_password = +static.network.802_1x.client_cert_url = +static.network.802_1x.root_cert_url = +static.network.802_1x.eap_fast_provision_mode = +static.network.802_1x.anonymous_identity = +static.network.802_1x.proxy_eap_logoff.enable = + + +static.auto_provision.custom.protect = +static.auto_provision.custom.sync = +static.auto_provision.custom.sync.path = +static.auto_provision.custom.upload_method = + + + + +####################################################################################### +## ZERO Touch ## +####################################################################################### +static.zero_touch.enable = +static.zero_touch.wait_time = +static.features.hide_zero_touch_url.enable = +static.zero_touch.network_fail_delay_times = +static.zero_touch.network_fail_wait_times = + + +####################################################################################### +## Autop URL ## +####################################################################################### +static.auto_provision.server.url = {$yealink_provision_url} +static.auto_provision.server.username = {$http_auth_username} +static.auto_provision.server.password = {$http_auth_password} + + +####################################################################################### +## Autop Weekly ## +####################################################################################### +static.auto_provision.weekly.enable = +static.auto_provision.weekly.dayofweek = +static.auto_provision.weekly.end_time = +static.auto_provision.weekly.begin_time = +static.auto_provision.weekly_upgrade_interval = + +####################################################################################### +## Autop Repeat ## +####################################################################################### +static.auto_provision.repeat.enable = +static.auto_provision.repeat.minutes = + +####################################################################################### +## Autop DHCP ## +####################################################################################### +static.auto_provision.dhcp_option.list_user_options = +static.auto_provision.dhcp_option.enable = + +##V83 Add +static.auto_provision.dhcp_option.list_user6_options = + +####################################################################################### +## Autop Mode ## +####################################################################################### +static.auto_provision.power_on = + + + +####################################################################################### +## Flexible Autop ## +####################################################################################### +static.auto_provision.flexible.end_time = +static.auto_provision.flexible.begin_time = +static.auto_provision.flexible.interval = +static.auto_provision.flexible.enable = + +####################################################################################### +## Autoprovision Other ## +####################################################################################### +static.auto_provision.prompt.enable = +static.auto_provision.attempt_expired_time = +static.auto_provision.attempt_before_failed = +static.network.attempt_expired_time = +static.auto_provision.update_file_mode = +static.auto_provision.retry_delay_after_file_transfer_failed= +static.auto_provision.inactivity_time_expire = +static.auto_provision.dns_resolv_timeout = +static.auto_provision.dns_resolv_nretry = +static.auto_provision.dns_resolv_nosys = +static.auto_provision.user_agent_mac.enable = +static.auto_provision.server.type = +features.action_uri_force_autop = +static.auto_provision.url_wildcard.pn = +static.auto_provision.reboot_force.enable = +static.auto_provision.dhcp_option.option60_value = +static.custom_mac_cfg.url = +static.auto_provision.aes_key_in_file = +static.auto_provision.aes_key_16.mac = +static.auto_provision.aes_key_16.com = +features.custom_version_info = +##V83 Add +static.auto_provision.authentication.expired_time = +static.auto_provision.connect.keep_alive = + +##V84 Add +static.auto_provision.config_version.mac= +static.auto_provision.config_version.com= + + +####################################################################################### +## Autop PNP ## +####################################################################################### +static.auto_provision.pnp_enable = + + + +####################################################################################### +## Autop Code ## +####################################################################################### +##static.autoprovision.X.name +##static.autoprovision.X.code +##static.autoprovision.X.url +##static.autoprovision.X.user +##static.autoprovision.X.password +##static.autoprovision.X.com_aes +##static.autoprovision.X.mac_aes +##Autop Code(X ranges from 1 to 50) + +static.autoprovision.1.name = +static.autoprovision.1.code = +static.autoprovision.1.url = +static.autoprovision.1.user = +static.autoprovision.1.password = +static.autoprovision.1.com_aes = +static.autoprovision.1.mac_aes = + + + +####################################################################################### +## TR069 ## +####################################################################################### + +static.managementserver.enable = +static.managementserver.username = +static.managementserver.password = +static.managementserver.url = +static.managementserver.periodic_inform_enable = 0 +static.managementserver.periodic_inform_interval = 60 +static.managementserver.connection_request_password = +static.managementserver.connection_request_username = + + + +####################################################################################### +## Firmware Update ## +####################################################################################### +static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t46u} + + +####################################################################################### +## Confguration ## +####################################################################################### +features.reset_by_long_press_enable = +features.factory_pwd_enable = +static.configuration.url = +static.features.custom_factory_config.enable = +static.custom_factory_configuration.url = + + +####################################################################################### +## SYSLOG ## +####################################################################################### +static.syslog.enable = +static.syslog.server = +static.syslog.level = +static.syslog.server_port = +static.syslog.transport_type = +static.syslog.facility = +static.syslog.prepend_mac_address.enable = +static.local_log.enable = +static.local_log.level = +static.local_log.max_file_size = + + + +####################################################################################### +## Log Backup ## +####################################################################################### +static.auto_provision.local_log.backup.enable = +static.auto_provision.local_log.backup.path = +static.auto_provision.local_log.backup.upload_period = +static.auto_provision.local_log.backup.append = +static.auto_provision.local_log.backup.bootlog.upload_wait_time= +static.auto_provision.local_log.backup.append.max_file_size = +static.auto_provision.local_log.backup.append.limit_mode= + + + +####################################################################################### +## User Mode ## +####################################################################################### +static.security.var_enable = +static.web_item_level.url = + + +####################################################################################### +## Quick Login ## +####################################################################################### +wui.quick_login = + + +####################################################################################### +## Security ## +####################################################################################### +static.phone_setting.reserve_certs_enable = +features.relog_offtime = +static.security.default_ssl_method = {$yealink_security_default_ssl_method} +static.security.cn_validation = +static.security.dev_cert = +static.security.ca_cert = +static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if} + +static.security.user_password = {$var_name}:{$var_password} +static.security.user_password = {$admin_name}:{$admin_password} +static.security.user_password = {$user_name}:{$user_password} +static.security.user_name.var = {$var_name} +static.security.user_name.admin = {$admin_name} +static.security.user_name.user = {$user_name} + +##V83 Add +static.security.default_access_level = +phone_setting.reserve_certs_config.enable = + + +####################################################################################### +## Watch Dog ## +####################################################################################### +static.watch_dog.enable = + +####################################################################################### +## Server Certificates ## +####################################################################################### +static.server_certificates.url = +static.server_certificates.delete = + +####################################################################################### +## Trusted Certificates ## +####################################################################################### +static.trusted_certificates.url = +static.trusted_certificates.delete = + + + +####################################################################################### +## Secure Domain List ## +####################################################################################### +wui.secure_domain_list = + + +####################################################################################### +## Encryption ## +####################################################################################### +static.auto_provision.encryption.directory = +static.auto_provision.encryption.call_log = +static.auto_provision.encryption.config = + + + + +####################################################################################### +## Trnasfer ## +####################################################################################### +dialplan.transfer.mode = {$yealink_transfer_mode} +transfer.on_hook_trans_enable = {$yealink_transfer_onhook} +transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf} +transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook} +transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended} +phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +features.conference.with_previous_call.enable = +features.local_conf.combine_with_one_press.enable= +phone_setting.call_appearance.conference_via_new_linekey= + + + +####################################################################################### +## Anonymous ## +####################################################################################### +features.anonymous_response_code= + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +phone_setting.incoming_call_when_dialing.priority= +phone_setting.hold_or_swap.mode= +features.play_held_tone.interval= +features.play_held_tone.delay= +features.play_held_tone.enable= +features.play_hold_tone.interval= +features.ignore_incoming_call.enable= +force.voice.ring_vol= +features.mute.autoanswer_mute.enable= +features.play_hold_tone.delay = +phone_setting.end_call_net_disconnect.enable = +features.custom_auto_answer_tone.enable= +default_input_method.dialing= +features.speaker_mode.enable= +features.headset_mode.enable= +features.handset_mode.enable= +features.conference.local.enable = +features.off_hook_answer.enable= +features.caller_name_type_on_dialing= +phone_setting.show_code403= +phone_setting.ring_for_tranfailed= +features.password_dial.length= +features.password_dial.prefix= +features.password_dial.enable= +features.group_listen_in_talking_enable= +phone_setting.call_info_display_method = 0 +phone_setting.called_party_info_display.enable = 1 +features.headset_training= +features.headset_prior= +features.dtmf.replace_tran = +features.dtmf.transfer = +phone_setting.ringing_timeout= +phone_setting.ringback_timeout= + +features.keep_mute.enable= +linekey.1.shortlabel= +features.config_dsskey_length.shorten = +transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode} +features.auto_linekeys.enable= +phone_setting.call_appearance.calls_per_linekey= +features.linekey_call_with_default_account= +##V83 Add +features.station_name.value = +features.station_name.scrolling_display = +voice.headset.autoreset_spk_vol = +voice.handset.autoreset_spk_vol = +voice.handfree.autoreset_spk_vol = +features.headset.ctrl_call.enable = +phone_setting.incoming_call.reject.enable = + +features.play_mute_tone.enable= +features.play_mute_tone.interval= + +features.call_out_directory_by_off_hook.enable= +features.congestion_tone.codelist= + + +##V84 Add +phone_setting.icon.delete= +phone_setting.icon.url= + +##V84 SP4 Add +voice.handset.tia4965.enable = +voice.headset.tia4965.enable = + +####################################################################################### +## Custom Softkey ## +####################################################################################### +phone_setting.custom_softkey_enable= +custom_softkey_talking.url= +custom_softkey_ring_back.url= +custom_softkey_dialing.url= +custom_softkey_connecting.url= +custom_softkey_call_in.url= +custom_softkey_call_failed.url= + +##V83 Add +features.homescreen_softkey.acd.enable = +features.homescreen_softkey.hoteling.enable = +phone_setting.custom_softkey.apply_to_states = +features.custom_softkey_dynamic.enable = + + +####################################################################################### +## Features Bluetooth ## +####################################################################################### +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter. +features.bluetooth_enable= +features.bluetooth_adapter_name= +##V83 Add +static.bluetooth.function.enable = + +##V84 Add +bluetooth.a2dp_sink= +bluetooth.connect_confirm.enable= + +####################################################################################### +## Features USB Record ## +####################################################################################### +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter. +features.usb_call_recording.enable = {$yealink_usb_record_enable} +features.auto_recording.enable = + +features.idle_recording.enable= + +####################################################################################### +## Features USB ## +####################################################################################### +##V83 Add +static.usb.power.enable = + +##V84 Add +static.usbdisk.function.enable= + +####################################################################################### +## Codec ## +####################################################################################### +voice.g726.aal2.enable= + + +####################################################################################### +## DTMF ## +####################################################################################### +features.dtmf.min_interval= +features.dtmf.volume= +features.dtmf.duration = + +####################################################################################### +## Tones ## +####################################################################################### +voice.tone.autoanswer = +voice.tone.message = +voice.tone.stutter = +voice.tone.info = +voice.tone.dialrecall = +voice.tone.callwaiting = +voice.tone.congestion = +voice.tone.busy = +voice.tone.ring = +voice.tone.dial = +voice.tone.country = +voice.side_tone = +features.partition_tone = +voice.tone.secondary_dial= +####################################################################################### +## Tones V83 stutterdial dnd fwd vm ## +####################################################################################### + +voice.tone.stutterdial= +voice.tone.stutter_dial_tone.apply_to_dnd.enable= +voice.tone.stutter_dial_tone.apply_to_fwd.enable= +voice.tone.stutter_dial_tone.apply_to_fwd.enable= + +####################################################################################### +## Jitter Buffer ## +####################################################################################### +voice.jib.normal= +voice.jib.max = +voice.jib.min = +voice.jib.adaptive = + +voice.jib.wifi.normal= +voice.jib.wifi.max= +voice.jib.wifi.min= +voice.jib.wifi.adaptive= + +####################################################################################### +## Echo Cancellation ## +####################################################################################### +voice.echo_cancellation = +voice.cng = +voice.vad = + +##V84 Add +voice.ans_nb.enable= +voice.tns.enable= + +################################################################ +# SIP Backup Server ## +################################################################ +static.network.dns.ttl_enable = +static.network.dns.last_cache_expired.enable= +static.network.dns.last_cache_expired +static.network.dns.query_timeout = +static.network.dns.retry_times = +sip.dns_transport_type= +sip.skip_redundant_failover_addr= + + +################################################################ +# SIP Basic Config ## +################################################################ +sip.use_out_bound_in_dialog= +sip.unreg_with_socket_close= +phone_setting.disable_account_without_username.enable= +features.auto_answer.first_call_only= + +##V84 Add +phone_setting.call_display_name.mode= + +################################################################ +# SIP Advanced config ## +################################################################ +sip.request_validation.event= +sip.sdp_early_answer_or_offer= +sip.cid_source.preference= +sip.request_validation.digest.realm= +sip.request_validation.digest.list= +sip.request_validation.source.list= +sip.send_keepalive_by_socket= +sip.reliable_protocol.timerae.enable= +sip.requesturi.e164.addglobalprefix= +sip.trust_ctrl = {$yealink_trust_ctrl} +sip.mac_in_ua= + +sip.timer_t1= +sip.timer_t2= +sip.timer_t4= + +sip.listen_mode= + +{if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if} + +sip.tls_listen_port= +sip.tcp_port_random_mode= +sip.escape_characters.enable= +sip.notify_reboot_enable= +sip.send_response_by_request= +sip.disp_incall_to_info= +features.call_invite_format= +phone_setting.early_media.rtp_sniffer.timeout= +sip.reg_surge_prevention = + +################################################################ +# V84 new add sip.escape_characters.enable= ## +################################################################ +sip.reserve_characters= + + +##V83 Add +sip.dhcp.option120.mode = + +################################################################ +# NAT&ICE ## +################################################################ +static.sip.nat_turn.enable= +static.sip.nat_turn.username= +static.sip.nat_turn.password= +static.sip.nat_turn.server= +static.sip.nat_turn.port= + +static.sip.nat_stun.enable={if isset($stun_server)}1{else}0{/if} + +static.sip.nat_stun.server= {$stun_server} +static.sip.nat_stun.port= {if isset($stun_port)}{$stun_port}{else}3478{/if} + + +static.ice.enable= + +static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if} + +static.network.static_nat.addr= {$yealink_static_nat} + +####################################################################################### +## DNS ## +####################################################################################### +dns_cache_a.1.name = +dns_cache_a.1.ip = +dns_cache_a.1.ttl = +dns_cache_srv.1.name = +dns_cache_srv.1.port = +dns_cache_srv.1.priority = +dns_cache_srv.1.target = +dns_cache_srv.1.weight = +dns_cache_srv.1.ttl = +dns_cache_naptr.1.name = +dns_cache_naptr.1.order = +dns_cache_naptr.1.preference = +dns_cache_naptr.1.replace = +dns_cache_naptr.1.service = +dns_cache_naptr.1.ttl = + +####################################################################################### +## RTP ## +####################################################################################### +features.rtp_symmetric.enable= + + +####################################################################################### +## RTCP-XR ## +####################################################################################### +voice.rtcp.enable= +voice.rtcp_cname= +voice.rtcp_xr.enable= +phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable= +phone_setting.vq_rtcpxr_display_round_trip_delay.enable= +phone_setting.vq_rtcpxr_display_moscq.enable= +phone_setting.vq_rtcpxr_display_moslq.enable = +phone_setting.vq_rtcpxr_display_packets_lost.enable= +phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable= +phone_setting.vq_rtcpxr_display_jitter.enable= +phone_setting.vq_rtcpxr_display_remote_codec.enable= +phone_setting.vq_rtcpxr_display_local_codec.enable= +phone_setting.vq_rtcpxr_display_remote_call_id.enable= +phone_setting.vq_rtcpxr_display_local_call_id.enable= +phone_setting.vq_rtcpxr_display_stop_time.enable= +phone_setting.vq_rtcpxr_display_start_time.enable= +phone_setting.vq_rtcpxr_interval_period= +phone_setting.vq_rtcpxr_delay_threshold_critical= +phone_setting.vq_rtcpxr_delay_threshold_warning= +phone_setting.vq_rtcpxr_moslq_threshold_critical= +phone_setting.vq_rtcpxr_moslq_threshold_warning= +phone_setting.vq_rtcpxr.interval_report.enable= +phone_setting.vq_rtcpxr.states_show_on_gui.enable= +phone_setting.vq_rtcpxr.states_show_on_web.enable= +phone_setting.vq_rtcpxr.session_report.enable= + + +####################################################################################### +## Contact ## +####################################################################################### + +static.directory_setting.url= https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml + +super_search.url = {$yealink_super_search_url} + +local_contact.data.url= +local_contact.data.delete= + +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter +phone_setting.contact_photo_display.enable= + +phone_setting.incoming_call.horizontal_roll_interval= + +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T5XW Models support the parameter +local_contact.data_photo_tar.url= +local_contact.photo.url= +local_contact.image.url= + +##Only T48G/S Models support the parameter +local_contact.icon_image.url= +local_contact.icon.url= + +search_in_dialing.local_directory.enable = +search_in_dialing.local_directory.priority = + +####################################################################################### +## Remote Phonebook ## +####################################################################################### +##remote_phonebook.data.X.url +##remote_phonebook.data.X.name +#remote_phonebook.data.X.username= +#remote_phonebook.data.X.password= +##(X ranges from 1 to 5) + +{if isset($yealink_remote_phonebook_1_name) } +remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name} +{else} +remote_phonebook.data.1.name = Users +{/if} +{if isset($yealink_remote_phonebook_1_url) } +remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url} +{else} +remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users +{/if} + +{if isset($yealink_remote_phonebook_2_name) } +remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name} +{else} +remote_phonebook.data.2.name = Groups +{/if} +{if isset($yealink_remote_phonebook_2_url) } +remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url} +{else} +remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups +{/if} + +{if isset($yealink_remote_phonebook_3_name) } +remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name} +{else} +remote_phonebook.data.3.name = Extensions +{/if} +{if isset($yealink_remote_phonebook_3_url) } +remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url} +{else} +remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions +{/if} + +remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name} +remote_phonebook.data.4.url = {$yealink_remote_phonebook_4_url} + +remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name} +remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url} + +features.remote_phonebook.enable = {$yealink_remote_phonebook_enable} + +####################################################################################### +## LDAP ## +####################################################################################### +ldap.enable = {$ldap_enable} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} +ldap.base = {$ldap_base} +ldap.port = {$ldap_port} +ldap.host = {$ldap_host} +ldap.customize_label= +ldap.incoming_call_special_search.enable= +ldap.tls_mode= +ldap.search_type= +ldap.numb_display_mode= +ldap.ldap_sort = {$ldap_sort} +ldap.call_in_lookup = {$ldap_call_in_lookup} +ldap.version = {$ldap_version} +ldap.display_name = {$ldap_display_name} +ldap.numb_attr = {$ldap_numb_attr} +ldap.name_attr = {$ldap_name_attr} +ldap.max_hits = {$ldap_max_hits} +ldap.number_filter = {$ldap_number_filter} +ldap.name_filter = {$ldap_name_filter} +ldap.call_out_lookup = {$ldap_dial_lookup} +directory_setting.ldap.enable = +directory_setting.ldap.priority = +search_in_dialing.ldap.enable = +search_in_dialing.ldap.priority = + +##V84 SP4 ADD +ldap.custom_extra_attr_name= +ldap.display_extra_attr= +ldap.extra_attr= + + + + +####################################################################################### +## History ## +####################################################################################### +static.auto_provision.local_calllog.write_delay.terminated= +static.auto_provision.local_calllog.backup.path= +static.auto_provision.local_calllog.backup.enable= +super_search.recent_call= +features.call_out_history_by_off_hook.enable= +features.save_call_history= +features.call_log_show_num= +search_in_dialing.history.enable= +search_in_dialing.history.priority= +directory_setting.history.enable= +directory_setting.history.priority +features.save_init_num_to_history.enable= 0 +features.redial_via_local_sip_server.enable= + +##V83 Add +features.calllog_detailed_information = + +##V84 Add +features.call_log_merge.enable= + + +####################################################################################### +## Contact Backup ## +####################################################################################### +static.auto_provision.local_contact.backup.path = +static.auto_provision.local_contact.backup.enable= + + +####################################################################################### +## Contact Other ## +####################################################################################### +directory.search_type= +directory_setting.local_directory.enable = +directory_setting.local_directory.priority = + +##V83 Add +phone_setting.search.highlight_keywords.enable = + +####################################################################################### +## Favorites ## +####################################################################################### +##V83 Add +local_contact.favorite.enable = +phone_setting.favorite_sequence_type = + +####################################################################################### +## Programablekey ## +####################################################################################### +#programablekey.X.type +#programablekey.X.line +#programablekey.X.value +#programablekey.X.xml_phonebook +#programablekey.X.history_type +#programablekey.X.label(X ranges from 1 to 4) +#programablekey.X.extension +##Programablekey X ranges(T48G/T48S/T46G/T46S: X=1-10, 12-14;T42G/T42S/T41P/T41S/T40P/T40G: X=1-10, 13;T29G/T27P/T27G: X=1-14;T23P/T23G/T21(P) E2: 1-10, 14;T19(P) E2: X=1-9, 13, 14;)## + +{foreach $keys["programmable"] as $row} +programablekey.{$row.device_key_id}.type = {$row.device_key_type} +{if $row.device_key_type == "22" || $row.device_key_type == "47"} +programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line} +{else} +programablekey.{$row.device_key_id}.line = {$row.device_key_line} +programablekey.{$row.device_key_id}.value = {$row.device_key_value} +{/if} +programablekey.{$row.device_key_id}.extension = {$row.device_key_extension} +programablekey.{$row.device_key_id}.label = {$row.device_key_label} +programablekey.1.pickup_value ={$row.device_key_extension} +programablekey.1.history_type = +{/foreach} + +##V83 Add +programablekey.type_range.custom = + +####################################################################################### +## Linekey ## +####################################################################################### +##linekey.X.line +##linekey.X.value +##linekey.X.extension +##linekey.X.type +##linekey.X.xml_phonebook +##linekey.X.shortlabel +##linekey.X.label +##LineKeyX ranges(T48U/T57W/T48G/S: X ranges from 1 to 29. T53W/T54W/T54S/T46G/T46S/T29G/T46U: X ranges from 1 to 27. T42G/T42S/T41P/T41S/T41U: X ranges from 1 to 15. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T52S/T27P/T27G/T43U: X ranges from 1 to 21. T21(P) E2: X ranges from 1 to 2.)## +## Not support T19P_E2 + +{foreach $keys['line'] as $row} +#Configure Line Key {$row.device_key_id} +linekey.{$row.device_key_id}.line = {$row.device_key_line} +linekey.{$row.device_key_id}.value = {$row.device_key_value} +{if $row.device_key_type == "1" || $row.device_key_type == "16"} +linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension} +{else} +linekey.{$row.device_key_id}.extension = {$row.device_key_extension} +{/if} +linekey.{$row.device_key_id}.type = {$row.device_key_type} +linekey.{$row.device_key_id}.xml_phonebook = +linekey.{$row.device_key_id}.label = {$row.device_key_label} + +{/foreach} + +linekey.type_range.custom = + + +####################################################################################### +## Dsskey ## +####################################################################################### +features.block_linekey_in_menu.enable = +features.shorten_linekey_label.enable = +features.flash_url_dsskey_led.enable = +features.config_dsskey_length = {$yealink_dsskey_length} +phone_setting.page_tip = +features.keep_switch_page_key.enable= + +##phone_setting.idle_dsskey_and_title.transparency(Only support T5XW/T54S/T52S/T48G/T48S/T48U) +phone_setting.idle_dsskey_and_title.transparency= + +##V83 Add +phone_setting.keytype_sequence = +phone_setting.dsskey_label.display_method = +local.dsskey_type_config.mode = + + +####################################################################################### +## Expansion Key ## +####################################################################################### +##expansion_module.X.key.Y.type +##expansion_module.X.key.Y.line +##expansion_module.X.key.Y.value +##expansion_module.X.key.Y.extension +##expansion_module.X.key.Y.label +##expansion_module.X.key.Y.xml_phonebook +## Expansion Key X ranges(SIP-T5XW/T54S/T52S/T43U/T46U/T48U: X ranges from 1 to 3, Y ranges from 1 to 60; SIP-T48G/T48S/T46G/T46S:X ranges from 1 to 6, Y ranges from 1 to 40; SIP-T29G/T27P/T27G:X ranges from 1 to 6, Y ranges from 1 to 20, 22 to 40 (Ext key 21 cannot be configured).)## +## Only SIP-T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T27P/T27G/T43U/T46U/T48U Models support the parameter. + +#expansion_module.1.key.1.type = +#expansion_module.1.key.1.label = +#expansion_module.1.key.1.value = +#expansion_module.1.key.1.line = +#expansion_module.1.key.1.pickup_value = +#expansion_module.1.key.1.extension = +#expansion_module.1.key.1.xml_phonebook = +#expansion_module.page_tip.blf_call_in.led = +#expansion_module.page_tip.blf_call_in.enable = + +{foreach $keys["expansion"] as $row} +expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type} +expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line} +expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} +expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} +expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} +expansion_module.1.key.{$row.device_key_id}.xml_phonebook = +{/foreach} +{foreach $keys["expansion-1"] as $row} +expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type} +expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line} +expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} +expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} +expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} +expansion_module.1.key.{$row.device_key_id}.xml_phonebook = +{/foreach} +{foreach $keys["expansion-2"] as $row} +expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id}.xml_phonebook = +{/foreach} + + +####################################################################################### +## EDK ## +####################################################################################### +##EDK Soft Keys(X ranges from 1 to 10) + +features.enhanced_dss_keys.enable= +edk.id_mode.enable= +softkey.1.position= +softkey.1.use.dialing= +softkey.1.softkey_id= +softkey.1.use.dialtone= +softkey.1.use.conferenced= +softkey.1.use.held= +softkey.1.use.hold= +softkey.1.use.transfer_ring_back= +softkey.1.use.ring_back= +softkey.1.use.call_failed= +softkey.1.use.on_talk= +softkey.1.use.transfer_connecting= +softkey.1.use.connecting= +softkey.1.use.incoming_call= +softkey.1.use.idle= +softkey.1.action= +softkey.1.label= +softkey.1.enable= +edk.edklist.1.action= +edk.edklist.1.mname= +edk.edklist.1.enable= +edk.edkprompt.1.enable= +edk.edkprompt.1.label= +edk.edkprompt.1.type= +edk.edkprompt.1.userfeedback= + +##V84 Add +##edk.edkprompt.X.title= +(X ranges from 1 to 9) +edk.edkprompt.1.title= + + +####################################################################################### +## XML ## +####################################################################################### +push_xml.server= +push_xml.sip_notify= +push_xml.block_in_calling= +default_input_method.xml_browser_input_screen= + +##V83 Add +hoteling.authentication_mode = +push_xml.phonebook.search.delay = +features.xml_browser.loading_tip.delay = +features.xml_browser.pwd = +features.xml_browser.user_name = +push_xml.password = +push_xml.username = + + +####################################################################################### +## Forward ## +####################################################################################### +features.fwd.allow = {$yealink_fwd_allow} +features.fwd_mode= +forward.no_answer.enable= +forward.busy.enable= +forward.always.enable= +forward.no_answer.timeout= +forward.no_answer.on_code= +forward.no_answer.off_code= +forward.busy.off_code= +forward.busy.on_code= +forward.always.off_code = {$yealink_forward_always_off_code} +forward.always.on_code = {$yealink_forward_always_on_code} +forward.no_answer.target= +forward.busy.target= +forward.always.target= + +features.forward.emergency.authorized_number= +features.forward.emergency.enable= +forward.idle_access_always_fwd.enable= +features.forward_call_popup.enable= + +##V83 Add +features.forward.no_answer.show_ring_times = + +##V84 Add +features.no_answer_code= + + +####################################################################################### +## DND ## +####################################################################################### +features.dnd.allow= +features.dnd_mode= +features.dnd.enable= + +features.dnd.off_code = *79 +features.dnd.on_code = *78 + +features.dnd.emergency_authorized_number= +features.dnd.emergency_enable = 1 +features.dnd.large_icon.enable= + +##V83 Add +features.keep_dnd.enable = + +####################################################################################### +## Phone Lock ## +####################################################################################### +phone_setting.phone_lock.enable = {$yealink_lock_enable} +phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type} +phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin} +phone_setting.emergency.number = {$yealink_emergency_number} +phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout} + + +####################################################################################### +## Hotdesking ## +####################################################################################### +phone_setting.logon_wizard= +phone_setting.logon_wizard_forever_wait= + +hotdesking.startup_register_name_enable= +hotdesking.startup_username_enable= +hotdesking.startup_password_enable= +hotdesking.startup_sip_server_enable= +hotdesking.startup_outbound_enable= + +hotdesking.dsskey_register_name_enable= +hotdesking.dsskey_username_enable= +hotdesking.dsskey_password_enable= +hotdesking.dsskey_sip_server_enable= +hotdesking.dsskey_outbound_enable= + + +####################################################################################### +## Voice Mail ## +####################################################################################### +features.voice_mail_alert.enable= +features.voice_mail_popup.enable = {$yealink_voice_mail_popup_enable} +features.voice_mail_tone_enable= +features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable} + + + +####################################################################################### +## Text Message ## +####################################################################################### +features.text_message.enable= +features.text_message_popup.enable= + + + + + +####################################################################################### +## Audio Intercom ## +####################################################################################### +features.intercom.mode= +features.intercom.subscribe.enable= +features.intercom.led.enable= +features.intercom.feature_access_code= +features.blf.intercom_mode.enable= +features.intercom.ptt_mode.enable= + +features.redial_tone= +features.key_tone= +features.send_key_tone= + +features.intercom.allow= +features.intercom.barge= +features.intercom.tone= +features.intercom.mute= + + +voice.handset_send= +voice.handfree_send = +voice.headset_send = +features.intercom.headset_prior.enable= +features.ringer_device.is_use_headset= +features.intercom.barge_in_dialing.enable= + + + +####################################################################################### +## Feature General ## +####################################################################################### +features.ip_call.auto_answer.enable= +features.show_default_account= +features.call.dialtone_time_out= +features.missed_call_popup.enable = {$yealink_missed_call_popup_enable} +features.auto_answer_tone.enable= +features.play_hold_tone.enable= +features.key_as_send= +features.send_pound_key= +features.busy_tone_delay= +features.hotline_delay= +features.hotline_number= +features.direct_ip_call_enable = {$yealink_direct_ip_call_enable} +features.call_num_filter= +features.call_completion_enable= +features.allow_mute= +features.auto_answer_delay= +features.normal_refuse_code= +features.dnd_refuse_code= +features.upload_server= +features.dtmf.repetition= +features.dtmf.hide_delay= +features.dtmf.hide = {$yealink_dtmf_hide} +features.play_local_dtmf_tone_enable = +features.reboot_in_talk_enable = +features.fwd_diversion_enable= + +call_waiting.enable = {$yealink_call_waiting} +call_waiting.tone = {$yealink_call_waiting_tone} +call_waiting.off_code= +call_waiting.on_code= + +auto_redial.times= +auto_redial.interval= +auto_redial.enable= + +sip.rfc2543_hold = {$yealink_rfc2543_hold} +sip.use_23_as_pound= +forward.international.enable= +phone_setting.headsetkey_mode= +phone_setting.is_deal180= +phone_setting.change_183_to_180= + +##V84 Add +features.touch_tone= + +####################################################################################### +## Action URL&URI ## +####################################################################################### +features.csta_control.enable= +features.action_uri.enable= +features.action_uri_limit_ip= +features.show_action_uri_option= +action_url.call_remote_canceled= +action_url.remote_busy= +action_url.cancel_callout= +action_url.handfree= +action_url.headset= +action_url.unheld= +action_url.held= +action_url.transfer_failed= +action_url.transfer_finished= +action_url.answer_new_incoming_call= +action_url.reject_incoming_call= +action_url.forward_incoming_call= +action_url.ip_change= +action_url.idle_to_busy= +action_url.busy_to_idle= +action_url.call_terminated= +action_url.missed_call= +action_url.unmute= +action_url.mute= +action_url.unhold= +action_url.hold= +action_url.always_fwd_off = +action_url.always_fwd_on = +action_url.attended_transfer_call = +action_url.blind_transfer_call = +action_url.busy_fwd_off = +action_url.busy_fwd_on = +action_url.call_established = +action_url.call_waiting_off = +action_url.call_waiting_on = +action_url.dnd_off = +action_url.dnd_on = +action_url.incoming_call = +action_url.no_answer_fwd_off = +action_url.no_answer_fwd_on = +action_url.off_hook = +action_url.on_hook = +action_url.outgoing_call = +action_url.register_failed = +action_url.registered = +action_url.setup_autop_finish = +action_url.setup_completed = +action_url.transfer_call = +action_url.unregistered = + +##V84 Add +action_url.peripheral_information= + + + +####################################################################################### +## Power LED ## +####################################################################################### +phone_setting.hold_and_held_power_led_flash_enable= +phone_setting.mute_power_led_flash_enable= +phone_setting.talk_and_dial_power_led_enable= +phone_setting.mail_power_led_flash_enable = 1 +phone_setting.ring_power_led_flash_enable= +phone_setting.common_power_led_enable= +phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable} + + +####################################################################################### +## Time&Date ## +####################################################################################### +lcl.datetime.date.format = +auto_dst.url = {$yealink_auto_dst_url} +local_time.manual_time_enable = +local_time.manual_ntp_srv_prior = +local_time.time_format = {$yealink_time_format} +local_time.date_format = {$yealink_date_format} +local_time.dhcp_time = {$yealink_dhcp_time} + +local_time.summer_time = {$yealink_summer_time} +local_time.dst_time_type = {$yealink_dst_type} +local_time.start_time = {$yealink_time_zone_start_time} +local_time.end_time = {$yealink_time_zone_end_time} +local_time.offset_time = {$yealink_offset_time} +local_time.interval = {$yealink_time_update} + +local_time.ntp_server1 = {$ntp_server_primary} +local_time.ntp_server2 = {$ntp_server_secondary} +local_time.time_zone = {$yealink_time_zone} +local_time.time_zone_name = {$yealink_time_zone_name} + + +####################################################################################### +## Multicast Paging ## +####################################################################################### +##multicast.listen_address.X.label +##multicast.paging_address.X.channel +##multicast.listen_address.X.ip_address +##multicast.paging_address.X.ip_address +##multicast.paging_address.X.label +##multicast.listen_address.X.channel +##multicast.listen_address.X.volume +##Multicast(X ranges from 1 to 31.) + +multicast.codec= + +multicast.paging_address.1.channel= +multicast.paging_address.1.label= +multicast.paging_address.1.ip_address= +multicast.receive_priority.enable= +multicast.receive_priority.priority= + +multicast.receive.use_speaker= +multicast.receive.enhance_volume= +multicast.receive.ignore_dnd.priority= + +multicast.listen_address.1.channel= +multicast.listen_address.1.label= +multicast.listen_address.1.ip_address= +multicast.listen_address.1.volume= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +##Not support T19P_E2 +static.features.default_account= + +##Logo File Format: .dob +##Resolution: SIP-T42G/T42S/T41P/T41S/T41U: <=192*64 2 gray scale;SIP-T43U/SIP-T27P/G: <=240*120 2 gray scale;SIP-T40P/T40G/T23P/T23G/T21(P) E2/T19(P) E2: <=132*64 2 gray scale## +phone_setting.lcd_logo.mode= +lcd_logo.delete= +lcd_logo.url= + +phone_setting.contrast= +phone_setting.backlight_time = {$yealink_backlight_time} +phone_setting.inactive_backlight_level = 1 +phone_setting.active_backlight_level= +phone_setting.predial_autodial = 1 + +ringtone.url= {$yealink_ringtone_url} +ringtone.delete= {$yealink_ringtone_delete} +phone_setting.ring_type= {$yealink_ring_type} +phone_setting.inter_digit_time= {$yealink_inter_digit_time} + +##Only T54S Model supports the parameter +phone_setting.idle_clock_display.enable = + +####################################################################################### +## Digitmap ## +####################################################################################### +dialplan.digitmap.enable= +dialplan.digitmap.string= +dialplan.digitmap.no_match_action= +dialplan.digitmap.interdigit_short_timer= +dialplan.digitmap.interdigit_long_timer= +dialplan.digitmap.apply_to.press_send= +dialplan.digitmap.apply_to.forward= +dialplan.digitmap.apply_to.history_dial= +dialplan.digitmap.apply_to.directory_dial= +dialplan.digitmap.apply_to.on_hook_dial= +dialplan.digitmap.active.on_hook_dialing= + +##V83 Add +dialplan.digitmap.apply_to.prefix_key = + +##V84 ADD +features.local_calllog.received.replace_rule= + + + + +####################################################################################### +## Emergency Dialplan ## +####################################################################################### +dialplan.emergency.enable= +dialplan.emergency.1.value= +dialplan.emergency.server.1.address= +dialplan.emergency.server.1.transport_type= +dialplan.emergency.server.1.port= +dialplan.emergency.1.server_priority= +dialplan.emergency.custom_asserted_id= +dialplan.emergency.asserted_id_source= +dialplan.emergency.asserted_id.sip_account= +dialplan.emergency.held.request_element.1.name= +dialplan.emergency.held.request_element.1.value= +dialplan.emergency.held.request_type= +dialplan.emergency.held.server_url= + + + +####################################################################################### +## Dialplan ## +####################################################################################### +dialplan_replace_rule.url= +dialplan.replace.line_id.1= +dialplan.replace.replace.1= +dialplan.replace.prefix.1= +phone_setting.dialnow_delay= +dialplan_dialnow.url= +dialplan.dialnow.line_id.1= +dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1} +dialplan.block_out.line_id.1= +dialplan.block_out.number.1= +dialplan.area_code.line_id = +dialplan.area_code.max_len = 15 +dialplan.area_code.min_len = 1 +dialplan.area_code.code= + +####################################################################################### +## Rings Settings ## +####################################################################################### +distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1} +distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1} + +####################################################################################### +## IME Settings ## +####################################################################################### +directory.search_default_input_method= +directory.edit_default_input_method= +gui_input_method.url= + +##V83 Add +##Only T48G/T48S Models support the parameter +phone_setting.virtual_keyboard.enable = + +####################################################################################### +## Language Settings ## +####################################################################################### +wui_lang.url= +wui_lang_note.url= +wui_lang.delete= +gui_input_method.delete= +gui_lang.url= +gui_lang.delete= +lang.gui= {$yealink_language_gui} +lang.wui= + + +####################################################################################### +## Screensaver ## +####################################################################################### +screensaver.type= +screensaver.delete= +screensaver.upload_url= +features.blf_active_backlight.enable= +screensaver.display_clock.enable= +screensaver.clock_move_interval= +screensaver.picture_change_interval= +screensaver.wait_time= {$yealink_screensaver_wait} +screensaver.xml_browser.url= + + + +####################################################################################### +## Power Saving ## +####################################################################################### +features.power_saving.enable= +features.power_saving.power_led_flash.on_time= +features.power_saving.power_led_flash.off_time= +features.power_saving.office_hour.monday= +features.power_saving.office_hour.tuesday= +features.power_saving.office_hour.wednesday= +features.power_saving.office_hour.thursday= +features.power_saving.office_hour.friday= +features.power_saving.office_hour.saturday= +features.power_saving.office_hour.sunday = +features.power_saving.user_input_ext.idle_timeout= +features.power_saving.off_hour.idle_timeout= +features.power_saving.office_hour.idle_timeout= +features.power_saving.intelligent_mode= + + +####################################################################################### +## Backgrounds Settings ## +####################################################################################### +##File Formate: +##SIP-T57W/T54W/T54S/T52S/T48S/T48G/T46G/T46S/T29G/T46U/T48U: .jpg/.png/.bmp/.jpeg; +##Resolution: +##SIP-T57W/T48S/T48G/T48U/T46U:<=2.0 megapixels; +##for SIP-T54W/T46G/T46S/T29G: <=1.8 megapixels;SIP-T54S/T52S:<=4.2 megapixels; +##Single File Size: <=5MB +##2MB of space should bereserved for the phone + +wallpaper_upload.url = {$yealink_t46u_wallpaper} +{if isset($yealink_t46u_wallpaper_filename)} +phone_setting.backgrounds = Config:{$yealink_t46u_wallpaper_filename} +{else} +phone_setting.backgrounds = Config:yealink_t46u_wallpaper.png +{/if} + +## phone_setting.backgrounds_with_dsskey_unfold(Only support T48U/T48G/S) +phone_setting.backgrounds_with_dsskey_unfold= + +##expansion_module.backgrounds(Only support T5XW/T54S/T52S/T43U/T46U/T48U) +expansion_module.backgrounds= + + +####################################################################################### +## BSFT Setting ## +####################################################################################### +bw.enable = + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +phone_setting.auto_blf_list_enable = 1 +phone_setting.blf_list_sequence_type = 1 + +blf.enhanced.parked.enable= +blf.enhanced.parked.led = +blf.enhanced.parked.talking.action = +blf.enhanced.parked.callin.action = +blf.enhanced.parked.idle.action = + +blf.enhanced.talking.enable= +blf.enhanced.talking.led= +blf.enhanced.talking.talking.action = +blf.enhanced.talking.callin.action = +blf.enhanced.talking.idle.action = + +blf.enhanced.callout.enable = +blf.enhanced.callout.led= +blf.enhanced.callout.talking.action = +blf.enhanced.callout.callin.action = +blf.enhanced.callout.idle.action = + +blf.enhanced.callin.enable = +blf.enhanced.callin.led= +blf.enhanced.callin.talking.action = +blf.enhanced.callin.callin.action= +blf.enhanced.callin.idle.action= + +blf.enhanced.idle.enable = 0 +blf.enhanced.idle.led= +blf.enhanced.idle.talking.action= +blf.enhanced.idle.callin.action= +blf.enhanced.idle.idle.action= + +features.blf_list_version = 0 +sip.sub_refresh_random= +sip.terminate_notify_sub_delay_time= + +features.blf_led_mode = {$yealink_blf_led_mode} +features.blf_pickup_only_send_code= + +##V84 Add +blf.enhanced.dnd.enable= +blf.enhanced.dnd.led= +blf.enhanced.hold.enable= +blf.enhanced.hold.led= + +features.blf.show_callinfo.enable= + +##V84 SP4 ADD +blf.normal_barge_in_code= +blf.whisper_barge_in_code= +blf.listen_barge_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +features.auto_release_bla_line= +features.barge_in_via_username.enable= + + + +####################################################################################### +## Call Park ## +####################################################################################### +features.call_park.enable= +features.call_park.park_mode= +features.call_park.park_code= +features.call_park.park_retrieve_code= +features.call_park.direct_send.enable= +features.call_park.park_visual_notify_enable= +features.call_park.park_ring= +features.call_park.group_enable= +features.call_park.group_park_code= +sip.call_park_without_blf= +features.call_park.line_restriction.enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +acd.enable= +acd.auto_available_timer= + + + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +bw.xsi.enable= +sip.authentication_for_xsi = +default_input_method.xsi_password= + + +####################################################################################### +## Broadsoft Network Directory ## +####################################################################################### +bw.xsi.directory.enable= +bw.calllog_and_dir = +bw.xsi.call_log.enable= +bw_phonebook.custom= +bw_phonebook.enterprise_common_enable= +bw_phonebook.enterprise_common_displayname= +bw_phonebook.enterprise_enable= +bw_phonebook.enterprise_displayname= +bw_phonebook.group_common_enable= +bw_phonebook.group_common_displayname= +bw_phonebook.personal_enable= +bw_phonebook.personal_displayname= +bw_phonebook.group_enable= +bw_phonebook.group_displayname = +directory.update_time_interval= +bw.xsi.directory.alphabetized_by_lastname.enable= +directory_setting.bw_directory.enable = +directory_setting.bw_directory.priority = +search_in_dialing.bw_directory.enable = +search_in_dialing.bw_directory.priority = +##V83 Add +bw.xsi.directory.update.enable = + +####################################################################################### +## Broadsoft Network Calllog ## +####################################################################################### +##V83 Add +bw.xsi.call_log.delete.enable = +bw.xsi.call_log.multiple_accounts.enable = +phone_setting.ring_duration = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable} +features.pickup.group_pickup_enable = +features.pickup.direct_pickup_code = ** +features.pickup.group_pickup_code = +features.pickup.blf_audio_enable = +features.pickup.blf_visual_enable = +features.pickup_display.method = + +##V84 Add +features.pickup.blf_audio.list= +features.pickup.blf_visual.list= + + +####################################################################################### +## Alert Info ## +####################################################################################### +features.alert_info_tone = + + +####################################################################################### +## Broadsoft Visual Voice Mail ## +####################################################################################### +bw.voice_mail.visual.enable= +voice_mail.message_key.mode= +bw.voice_mail.visual.display_videomail.enable= + + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +bw.call_recording.mode = + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +features.call_decline.enable = + + +####################################################################################### +## BLF Ring Type ## +####################################################################################### +features.blf.ring_type = + + + +####################################################################################### +## Features Sync ## +####################################################################################### +features.feature_key_sync.enable = {$yealink_feature_key_sync} +features.forward.feature_key_sync.local_processing.enable = +features.forward.feature_key_sync.enable = +features.dnd.feature_key_sync.local_processing.enable = +features.dnd.feature_key_sync.enable = +call_waiting.mode = + + +####################################################################################### +## Broadsoft UC ## +####################################################################################### +##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter +bw.xmpp.enable = +features.uc_password = +features.uc_username = +bw.xmpp.presence_icon.mode = +bw.xmpp.change_presence.force_manual.enable = +bw.xmpp.change_presence.enable = +phone_setting.dsskey_directory_auto.enable = +features.uc_dir.match_tail_number= +directory_setting.bw_uc_buddies.enable = +directory_setting.bw_uc_buddies.priority = +search_in_dialing.bw_uc_buddies.enable = +search_in_dialing.bw_uc_buddies.priority = + +##V83 Add +phone_setting.uc_favorite_sequence_type = + +####################################################################################### +## Broadsoft Emergency Call ## +####################################################################################### +##V83 Add +bw.emergency_calling.enable = + + + +####################################################################################### +## Metaswitch Setting ## +####################################################################################### +meta.enable = +meta.login_mode = +meta.comm_portal.server.username = +meta.comm_portal.server.password = +meta.comm_portal.server.url = +meta.comm_portal.enable = +meta.comm_portal.contacts.update_interval = +meta.comm_portal.acd.enable= +meta.comm_portal.replace_local_call_list.enable= +meta.comm_portal.contacts.group.mlhgs.label= +meta.comm_portal.contacts.group.extensions.label= +meta.comm_portal.contacts.group.contacts.label= +meta.comm_portal.contacts.group.mlhgs.enable= +meta.comm_portal.contacts.group.extensions.enable= +meta.comm_portal.contacts.group.contacts.enable= +meta.comm_portal.call_list.enable= +meta.comm_portal.contacts.enable= +meta.comm_portal.message.enable= +meta.comm_portal.logout.enable = +meta.comm_portal.keep_alive_interval_time = + +##V83 Add +directory_setting.meta_directory.enable= +directory_setting.meta_directory.priority= +directory_setting.meta_call_log.enable= +directory_setting.meta_call_log.priority= +search_in_dialing.meta_call_log.priority = +search_in_dialing.meta_call_log.enable = +search_in_dialing.meta_directory.priority = +search_in_dialing.meta_directory.enable = + + + +####################################################################################### +## Genbend Setting ## +####################################################################################### +gb.sopi.enable= +gb.sopi.gab.enable= +gb.sopi.pab.enable= +features.pab.soupuser= +features.pab.enable= +gb.sopi.pab.match_in_calling.enable= +gb.sopi.gab.retain_search_filter= +gb.sopi.service_url= +gb.sopi.password= +gb.sopi.username= +directory_setting.gb_gab_directory.priority = +directory_setting.gb_gab_directory.enable = +directory_setting.gb_pab_directory.enable = +directory_setting.gb_pab_directory.priority = +search_in_dialing.gb_pab_directory.priority = +search_in_dialing.gb_pab_directory.enable = + + +####################################################################################### +## Loopback Call ## +####################################################################################### +##V83 Add +sip.loopback.enable = +sip.loopback_type = +sip.pkt_loopback_mode +sip.loopback.auto_answer.mode = +sip.pkt_loopback_encapsulated_payload = +sip.pkt_loopback_directed_payload = + + +####################################################################################### +## V84 add ## +####################################################################################### +google_contact_server.enable= + +static.features.network_test.check_policy= +static.features.network_test.enable= +static.features.network_test.host= +static.features.network_test.period= +static.features.network_unavailable_test.period= + +phone_setting.warnings_display.mode= + +bw.flexible_seating.remember_password.ldap.enable= + +vcaccount.enable= + +####################################################################################### +## V84 T5XW add VPM-Acoustic Shield ## +####################################################################################### +features.acoustic_shield.level = +features.acoustic_shield.mode = + + + +####################################################################################### +## V84 SP4 add ## +####################################################################################### + +phone_setting.search_t9.enable = +phone_setting.mail_power_led_flash_enable = +ldap.anonymous_bind_operation.enable = +google_contact_server.display_mode = +gb.presence.line = +gb.presence.enable = +gb.emergency_instant_messages.enable = +gb.emergency_instant_messages.displaytimeout = +features.transfer_keep_session2_after_failed.enable= +features.intercom.mode = +features.emergency_instant_messages.ring_type = +features.dtmf.transfer = +features.dtmf.replace_tran = +features.call_park.performby_holdhardkey.enable = +features.blf_extension.mode = +features.auto_answer.ring_type = +directory_setting.presence_list.priority = +directory_setting.presence_list.enable = +dialplan.transfer.mode = +dialplan.emergency.held.secondary.server_url = +custom.features.dsskey_lock_type = +blf.enhanced.dnd.led = +blf.enhanced.dnd.enable = +auto_provision.pnp_check_url.enable = + +acd.logout_fixed_display.enable= +acd.available_fixed_display.enable = +acd.disp_code_fixed_display.enable = +acd.trace_fixed_display.enable = + +features.parked_call_monitor.blf_visual_enable= +features.parked_call_monitor.blf_audio_enable= +features.parked_call_monitor.blf.ring_type= + diff --git a/resources/templates/provision/yealink/t48u/{$mac}.cfg b/resources/templates/provision/yealink/t48u/{$mac}.cfg new file mode 100644 index 0000000000..2819755115 --- /dev/null +++ b/resources/templates/provision/yealink/t48u/{$mac}.cfg @@ -0,0 +1,3382 @@ +#!version:1.0.0.1 + +##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## +##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)## + +####################################################################################### +## Transfer ## +####################################################################################### +account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.1.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.1.anonymous_call.server_base_only = +account.1.send_anonymous_rejection_code = +account.1.anonymous_reject_offcode = +account.1.anonymous_reject_oncode = +account.1.reject_anonymous_call= +account.1.anonymous_call_offcode = +account.1.anonymous_call_oncode = +account.1.anonymous_call = 0 +account.1.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.1.music_server_uri= +account.1.music_on_hold_type= +account.1.auto_label.rule= +account.1.auto_label.enable= +account.1.number_of_linekey= +account.1.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.1.codec.ilbc_15_2kbps.priority= +account.1.codec.ilbc_15_2kbps.enable= + +account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.1.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.1.codec.opus.para= 106 + +account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.1.codec.G722_1_24kpbs.priority= +account.1.codec.G722_1_24kpbs.enable= +account.1.codec.G722_1c_24kpbs.priority= +account.1.codec.G722_1c_24kpbs.enable= +account.1.codec.G722_1c_32kpbs.priority= +account.1.codec.G722_1c_32kpbs.enable= +account.1.codec.G722_1c_48kpbs.priority= +account.1.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account Register ## +################################################################ +{if isset($account.1.password) } +account.1.enable = 1 +{else} +account.1.enable = 0 +{/if} +account.1.label = {$account.1.label} +account.1.display_name = {$account.1.display_name} +account.1.auth_name = {$account.1.auth_id} + +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} +account.1.user_name = {$account.1.user_id} +{/if} + +account.1.password = {$account.1.password} +account.1.sip_server.1.address= {$account.1.server_address} +account.1.sip_server_port = {$account.1.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + +account.1.sip_server.1.expires= {$account.1.register_expires} +account.1.sip_server.1.retry_counts= 3 + +account.1.sip_server.2.address= {$account.1.server.2.address} +account.1.sip_server.2.port= {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + +account.1.sip_server.2.expires= {$account.1.register_expires} +account.1.sip_server.2.retry_counts= 3 + +account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if} + +account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary} +account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = {$account.1.sip_port} +{/if} + +account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = {$account.1.sip_port} +{/if} + +account.1.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.1.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.1.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.1.nat.udp_update_enable= +account.1.nat.udp_update_time= +account.1.nat.rport= {$yealink_rport} + +account.1.dtmf.type= {$yealink_dtmf_type} +account.1.dtmf.info_type= +account.1.dtmf.dtmf_payload= +account.1.100rel_enable= + +account.1.subscribe_register= +account.1.cid_source= {$yealink_cid_source} +account.1.enable_user_equal_phone= +account.1.srtp_encryption= {$yealink_srtp_encryption} +account.1.ptime= +account.1.register_line= +account.1.register_mac= +account.1.reg_fail_retry_interval= +account.1.unregister_on_reboot= + +account.1.session_timer.refresher= +account.1.session_timer.expires= +account.1.session_timer.enable= {$yealink_session_timer} + +account.1.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.1.sip_server_type= + +##V83 Add +account.1.srtp.unencrypted_rtcp.enable = +account.1.srtp.unencrypted_rtp.enable = +account.1.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.1.outbound_proxy.1.register_on_enable= +account.1.outbound_proxy.1.failback_timeout= +account.1.outbound_proxy.1.failback_mode= +account.1.outbound_proxy.1.retry_counts= +account.1.outbound_proxy.1.only_signal_with_registered= +account.1.outbound_proxy.1.failback_subscribe.enable= +account.1.outbound_proxy.1.invite_retry_counts= + +account.1.sip_server.1.register_on_enable= +account.1.sip_server.1.failback_timeout= +account.1.sip_server.1.failback_mode= +account.1.sip_server.1.failback_subscribe.enable= +account.1.sip_server.1.only_signal_with_registered= +account.1.sip_server.1.invite_retry_counts= + +account.1.outbound_proxy.2.register_on_enable= +account.1.outbound_proxy.2.failback_timeout= +account.1.outbound_proxy.2.failback_mode= +account.1.outbound_proxy.2.retry_counts= +account.1.outbound_proxy.2.only_signal_with_registered= +account.1.outbound_proxy.2.failback_subscribe.enable= +account.1.outbound_proxy.2.invite_retry_counts= + +account.1.sip_server.2.register_on_enable= +account.1.sip_server.2.failback_timeout= +account.1.sip_server.2.failback_mode= +account.1.sip_server.2.failback_subscribe.enable= +account.1.sip_server.2.only_signal_with_registered= +account.1.sip_server.2.invite_retry_counts= + +account.1.static_cache_pri= +account.1.dns_cache_type= +account.1.naptr_build= +account.1.fallback.timeout= +account.1.fallback.redundancy_type= +account.1.reg_failed_retry_max_time= +account.1.reg_failed_retry_min_time= +account.1.redundancy_with_reg_fail.enable = + +##V83 Add +account.1.sip_server.1.outbound_proxy_enable = +account.1.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.1.contact_take_line_param= +account.1.update_ack_while_dialing= +account.1.srtp_lifetime= +account.1.third_part_request_with_route.enable= +account.1.insert_outbound_in_route.enable= +account.1.path.enable= +account.1.sub_fail_retry_interval= +account.1.transfer_refer_to_contact_header.enable= +account.1.hold_use_inactive= +account.1.gruu.enable= +account.1.dial_tone= +account.1.call_id_mode= +account.1.subscribe_expires_overlap= +account.1.register_expires_overlap= +account.1.call_info= +account.1.custom_ua= +account.1.mwi_parse_terminated= +account.1.check_cseq.enable= +account.1.check_to_tag.enable= +account.1.vq_rtcpxr.collector_server_port= +account.1.vq_rtcpxr.collector_server_host= +account.1.vq_rtcpxr.collector_name= +account.1.compact_header_enable= +account.1.cp_source= 2 +account.1.cid_source_ppi= 1 +account.1.cid_source_privacy= 1 +account.1.reg_with_pani_header.enable = +account.1.alert_info= +account.1.picture_info_enable= 1 + +##V83 Add +account.1.invite_with_pani_header.enable = + +##V84 Add +account.1.invite_with_rpid_header.enable= + +account.1.auto_answer_mute_enable + +##V84 SP4 Add +account.1.share_line.enable_private_code = +account.1.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.1.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.1.timeout_fwd.off_code= +account.1.timeout_fwd.on_code= +account.1.timeout_fwd.timeout= +account.1.timeout_fwd.target= +account.1.timeout_fwd.enable= +account.1.busy_fwd.off_code= +account.1.busy_fwd.on_code= +account.1.busy_fwd.target= +account.1.busy_fwd.enable= +account.1.always_fwd.off_code= +account.1.always_fwd.on_code= +account.1.always_fwd.target= +account.1.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.1.dnd.enable= +account.1.dnd.off_code= +account.1.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.1.subscribe_mwi= 1 +account.1.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.1.subscribe_mwi_expires= 3600 +account.1.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.1.auto_dial_enable= +account.1.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.1.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.1.dialplan.digitmap.enable= +account.1.dialplan.digitmap.string= +account.1.dialplan.digitmap.no_match_action= +account.1.dialplan.digitmap.interdigit_short_timer= +account.1.dialplan.digitmap.interdigit_long_timer= +account.1.dialplan.digitmap.apply_to.press_send= +account.1.dialplan.digitmap.apply_to.forward= +account.1.dialplan.digitmap.apply_to.history_dial= +account.1.dialplan.digitmap.apply_to.directory_dial= +account.1.dialplan.digitmap.apply_to.on_hook_dial= +account.1.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.1.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.1.blf.blf_list_uri= +account.1.blf_list_barge_in_code= +account.1.blf_list_code= +account.1.blf_list_retrieve_call_parked_code= +account.1.blf.subscribe_period= +account.1.blf.match_host.enable= +account.1.out_dialog_blf_enable= +account.1.blf.subscribe_event= + +##V84 Add +account.1.blf_list_call_parked_code= +account.1.blf_list_call_parked_list= + +##V84 SP4 ADD +account.1.blf_list_whisper_code= +account.1.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.1.shared_line= +account.1.line_seize.expires= +account.1.shared_line_one_touch_bargein.enable= +account.1.shared_line_one_touch_retrieve.enable= +account.1.sca_manage_interface_display_time= +account.1.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.1.bla_number= +account.1.bla_subscribe_period= +account.1.bla.notify_with_expire.enable= +account.1.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.1.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.1.acd.enable= 0 +account.1.acd.available= 0 +account.1.acd.unavailable_reason_enable= 0 +account.1.acd.initial_state= 1 +account.1.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.1.reason_code.1= +account.1.reason_code_name.1= 0 +account.1.bw_disp_code.1= +account.1.bw_disp_code_name.1= +account.1.supervisor_info_code.1= +account.1.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.1.call_center.call_info_enable= 0 +account.1.call_center.show_call_info_time= 30 +account.1.call_center.disp_code_enable= 0 +account.1.call_center.trace_enable= 0 +account.1.call_center.emergency_enable= 0 +account.1.call_center.queue_status_enable= 0 +account.1.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.1.hoteling.enable= 0 +account.1.hoteling.user_id= 0 +account.1.hoteling.password= 0 +account.1.hoteling.expires= 0 +account.1.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.1.xsi.user = +account.1.xsi.password = +account.1.xsi.host = +account.1.xsi.server_type = +account.1.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.1.direct_pickup_code = +account.1.group_pickup_code = +account.1.dialoginfo_callpickup = 0 +account.1.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.1.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.1.conf_uri = {if $nway_conference == 'true'}nway{$account.1.auth_id}@{$account.1.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.1.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.1.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.1.flexible_seating.enable= +account.1.hoteling.pin= +account.1.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.1.features.forward.feature_key_sync.local_processing.enable= +account.1.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.1.dnd.feature_key_sync.enable= +account.1.feature_key_sync.enable= +account.1.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.1.acd.available_url= +account.1.acd.away_url = +account.1.acd.refresh_url = +account.1.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +bw.virtual_user.1.enable= +bw.virtual_user.1.label= +bw.virtual_user.1.xsi.dnd.enable= +bw.virtual_user.1.xsi.host= +bw.virtual_user.1.xsi.password= +bw.virtual_user.1.xsi.port= +bw.virtual_user.1.xsi.server_type= +bw.virtual_user.1.xsi.user= + +####################################################################################### +## Transfer ## +####################################################################################### +account.2.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.2.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.2.anonymous_call.server_base_only = +account.2.send_anonymous_rejection_code = +account.2.anonymous_reject_offcode = +account.2.anonymous_reject_oncode = +account.2.reject_anonymous_call= +account.2.anonymous_call_offcode = +account.2.anonymous_call_oncode = +account.2.anonymous_call = 0 +account.2.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.2.music_server_uri= +account.2.music_on_hold_type= +account.2.auto_label.rule= +account.2.auto_label.enable= +account.2.number_of_linekey= +account.2.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.2.codec.ilbc_15_2kbps.priority= +account.2.codec.ilbc_15_2kbps.enable= + +account.2.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.2.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.2.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.2.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.2.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.2.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.2.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.2.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.2.codec.opus.para= 106 + +account.2.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.2.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.2.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.2.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.2.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.2.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.2.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.2.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.2.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.2.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.2.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.2.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.2.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.2.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.2.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.2.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.2.codec.G722_1_24kpbs.priority= +account.2.codec.G722_1_24kpbs.enable= +account.2.codec.G722_1c_24kpbs.priority= +account.2.codec.G722_1c_24kpbs.enable= +account.2.codec.G722_1c_32kpbs.priority= +account.2.codec.G722_1c_32kpbs.enable= +account.2.codec.G722_1c_48kpbs.priority= +account.2.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account2 Register ## +################################################################ +{if isset($account.2.password) } +account.2.enable = 1 +{else} +account.2.enable = 0 +{/if} +account.2.label = {$account.2.label} +account.2.display_name = {$account.2.display_name} +account.2.auth_name = {$account.2.auth_id} + +{if isset($account.2.server.1.address)} +account.2.user_name = {$account.2.user_id}@{$account.2.server_address} +{else} +account.2.user_name = {$account.2.user_id} +{/if} + +account.2.password = {$account.2.password} +account.2.sip_server.1.address= {$account.2.server_address} +account.2.sip_server_port = {$account.2.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if} +{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if} +{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if} +{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if} + +account.2.sip_server.1.expires= {$account.2.register_expires} +account.2.sip_server.1.retry_counts= 3 + +account.2.sip_server.2.address= {$account.2.server.2.address} +account.2.sip_server.2.port= {$account.2.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if} +{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if} +{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if} +{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if} + +account.2.sip_server.2.expires= {$account.2.register_expires} +account.2.sip_server.2.retry_counts= 3 + +account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if} + +account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary} +account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.2.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.2.outbound_proxy.1.port = {$account.2.sip_port} +{/if} + +account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.2.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.2.outbound_proxy.2.port = {$account.2.sip_port} +{/if} + +account.2.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.2.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.2.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.2.nat.udp_update_enable= +account.2.nat.udp_update_time= +account.2.nat.rport= {$yealink_rport} + +account.2.dtmf.type= {$yealink_dtmf_type} +account.2.dtmf.info_type= +account.2.dtmf.dtmf_payload= +account.2.100rel_enable= + +account.2.subscribe_register= +account.2.cid_source= {$yealink_cid_source} +account.2.enable_user_equal_phone= +account.2.srtp_encryption= {$yealink_srtp_encryption} +account.2.ptime= +account.2.register_line= +account.2.register_mac= +account.2.reg_fail_retry_interval= +account.2.unregister_on_reboot= + +account.2.session_timer.refresher= +account.2.session_timer.expires= +account.2.session_timer.enable= {$yealink_session_timer} + +account.2.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.2.sip_server_type= + +##V83 Add +account.2.srtp.unencrypted_rtcp.enable = +account.2.srtp.unencrypted_rtp.enable = +account.2.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.2.outbound_proxy.1.register_on_enable= +account.2.outbound_proxy.1.failback_timeout= +account.2.outbound_proxy.1.failback_mode= +account.2.outbound_proxy.1.retry_counts= +account.2.outbound_proxy.1.only_signal_with_registered= +account.2.outbound_proxy.1.failback_subscribe.enable= +account.2.outbound_proxy.1.invite_retry_counts= + +account.2.sip_server.1.register_on_enable= +account.2.sip_server.1.failback_timeout= +account.2.sip_server.1.failback_mode= +account.2.sip_server.1.failback_subscribe.enable= +account.2.sip_server.1.only_signal_with_registered= +account.2.sip_server.1.invite_retry_counts= + +account.2.outbound_proxy.2.register_on_enable= +account.2.outbound_proxy.2.failback_timeout= +account.2.outbound_proxy.2.failback_mode= +account.2.outbound_proxy.2.retry_counts= +account.2.outbound_proxy.2.only_signal_with_registered= +account.2.outbound_proxy.2.failback_subscribe.enable= +account.2.outbound_proxy.2.invite_retry_counts= + +account.2.sip_server.2.register_on_enable= +account.2.sip_server.2.failback_timeout= +account.2.sip_server.2.failback_mode= +account.2.sip_server.2.failback_subscribe.enable= +account.2.sip_server.2.only_signal_with_registered= +account.2.sip_server.2.invite_retry_counts= + +account.2.static_cache_pri= +account.2.dns_cache_type= +account.2.naptr_build= +account.2.fallback.timeout= +account.2.fallback.redundancy_type= +account.2.reg_failed_retry_max_time= +account.2.reg_failed_retry_min_time= +account.2.redundancy_with_reg_fail.enable = + +##V83 Add +account.2.sip_server.1.outbound_proxy_enable = +account.2.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.2.contact_take_line_param= +account.2.update_ack_while_dialing= +account.2.srtp_lifetime= +account.2.third_part_request_with_route.enable= +account.2.insert_outbound_in_route.enable= +account.2.path.enable= +account.2.sub_fail_retry_interval= +account.2.transfer_refer_to_contact_header.enable= +account.2.hold_use_inactive= +account.2.gruu.enable= +account.2.dial_tone= +account.2.call_id_mode= +account.2.subscribe_expires_overlap= +account.2.register_expires_overlap= +account.2.call_info= +account.2.custom_ua= +account.2.mwi_parse_terminated= +account.2.check_cseq.enable= +account.2.check_to_tag.enable= +account.2.vq_rtcpxr.collector_server_port= +account.2.vq_rtcpxr.collector_server_host= +account.2.vq_rtcpxr.collector_name= +account.2.compact_header_enable= +account.2.cp_source= 2 +account.2.cid_source_ppi= 1 +account.2.cid_source_privacy= 1 +account.2.reg_with_pani_header.enable = +account.2.alert_info= +account.2.picture_info_enable= 1 + +##V83 Add +account.2.invite_with_pani_header.enable = + +##V84 Add +account.2.invite_with_rpid_header.enable= + +account.2.auto_answer_mute_enable + +##V84 SP4 Add +account.2.share_line.enable_private_code = +account.2.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.2.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.2.timeout_fwd.off_code= +account.2.timeout_fwd.on_code= +account.2.timeout_fwd.timeout= +account.2.timeout_fwd.target= +account.2.timeout_fwd.enable= +account.2.busy_fwd.off_code= +account.2.busy_fwd.on_code= +account.2.busy_fwd.target= +account.2.busy_fwd.enable= +account.2.always_fwd.off_code= +account.2.always_fwd.on_code= +account.2.always_fwd.target= +account.2.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.2.dnd.enable= +account.2.dnd.off_code= +account.2.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.2.subscribe_mwi= 1 +account.2.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.2.subscribe_mwi_expires= 3600 +account.2.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.2.auto_dial_enable= +account.2.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.2.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.2.dialplan.digitmap.enable= +account.2.dialplan.digitmap.string= +account.2.dialplan.digitmap.no_match_action= +account.2.dialplan.digitmap.interdigit_short_timer= +account.2.dialplan.digitmap.interdigit_long_timer= +account.2.dialplan.digitmap.apply_to.press_send= +account.2.dialplan.digitmap.apply_to.forward= +account.2.dialplan.digitmap.apply_to.history_dial= +account.2.dialplan.digitmap.apply_to.directory_dial= +account.2.dialplan.digitmap.apply_to.on_hook_dial= +account.2.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.2.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.2.blf.blf_list_uri= +account.2.blf_list_barge_in_code= +account.2.blf_list_code= +account.2.blf_list_retrieve_call_parked_code= +account.2.blf.subscribe_period= +account.2.blf.match_host.enable= +account.2.out_dialog_blf_enable= +account.2.blf.subscribe_event= + +##V84 Add +account.2.blf_list_call_parked_code= +account.2.blf_list_call_parked_list= + +##V84 SP4 ADD +account.2.blf_list_whisper_code= +account.2.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.2.shared_line= +account.2.line_seize.expires= +account.2.shared_line_one_touch_bargein.enable= +account.2.shared_line_one_touch_retrieve.enable= +account.2.sca_manage_interface_display_time= +account.2.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.2.bla_number= +account.2.bla_subscribe_period= +account.2.bla.notify_with_expire.enable= +account.2.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.2.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.2.acd.enable= 0 +account.2.acd.available= 0 +account.2.acd.unavailable_reason_enable= 0 +account.2.acd.initial_state= 1 +account.2.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.2.reason_code.1= +account.2.reason_code_name.1= 0 +account.2.bw_disp_code.1= +account.2.bw_disp_code_name.1= +account.2.supervisor_info_code.1= +account.2.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.2.call_center.call_info_enable= 0 +account.2.call_center.show_call_info_time= 30 +account.2.call_center.disp_code_enable= 0 +account.2.call_center.trace_enable= 0 +account.2.call_center.emergency_enable= 0 +account.2.call_center.queue_status_enable= 0 +account.2.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.2.hoteling.enable= 0 +account.2.hoteling.user_id= 0 +account.2.hoteling.password= 0 +account.2.hoteling.expires= 0 +account.2.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.2.xsi.user = +account.2.xsi.password = +account.2.xsi.host = +account.2.xsi.server_type = +account.2.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.2.direct_pickup_code = +account.2.group_pickup_code = +account.2.dialoginfo_callpickup = 0 +account.2.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.2.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.2.conf_uri = {if $nway_conference == 'true'}nway{$account.2.user_id}@{$account.2.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.2.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.2.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.2.flexible_seating.enable= +account.2.hoteling.pin= +account.2.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.2.features.forward.feature_key_sync.local_processing.enable= +account.2.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.2.dnd.feature_key_sync.enable= +account.2.feature_key_sync.enable= +account.2.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.2.acd.available_url= +account.2.acd.away_url = +account.2.acd.refresh_url = +account.2.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +#bw.virtual_user.1.enable= +#bw.virtual_user.1.label= +#bw.virtual_user.1.xsi.dnd.enable= +#bw.virtual_user.1.xsi.host= +#bw.virtual_user.1.xsi.password= +#bw.virtual_user.1.xsi.port= +#bw.virtual_user.1.xsi.server_type= +#bw.virtual_user.1.xsi.user= + +####################################################################################### +## Transfer ## +####################################################################################### +account.3.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.3.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.3.anonymous_call.server_base_only = +account.3.send_anonymous_rejection_code = +account.3.anonymous_reject_offcode = +account.3.anonymous_reject_oncode = +account.3.reject_anonymous_call= +account.3.anonymous_call_offcode = +account.3.anonymous_call_oncode = +account.3.anonymous_call = 0 +account.3.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.3.music_server_uri= +account.3.music_on_hold_type= +account.3.auto_label.rule= +account.3.auto_label.enable= +account.3.number_of_linekey= +account.3.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.3.codec.ilbc_15_2kbps.priority= +account.3.codec.ilbc_15_2kbps.enable= + +account.3.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.3.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.3.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.3.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.3.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.3.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.3.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.3.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.3.codec.opus.para= 106 + +account.3.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.3.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.3.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.3.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.3.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.3.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.3.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.3.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.3.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.3.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.3.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.3.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.3.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.3.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.3.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.3.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.3.codec.G722_1_24kpbs.priority= +account.3.codec.G722_1_24kpbs.enable= +account.3.codec.G722_1c_24kpbs.priority= +account.3.codec.G722_1c_24kpbs.enable= +account.3.codec.G722_1c_32kpbs.priority= +account.3.codec.G722_1c_32kpbs.enable= +account.3.codec.G722_1c_48kpbs.priority= +account.3.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account3 Register ## +################################################################ +{if isset($account.3.password) } +account.3.enable = 1 +{else} +account.3.enable = 0 +{/if} +account.3.label = {$account.3.label} +account.3.display_name = {$account.3.display_name} +account.3.auth_name = {$account.3.auth_id} + +{if isset($account.3.server.1.address)} +account.3.user_name = {$account.3.user_id}@{$account.3.server_address} +{else} +account.3.user_name = {$account.3.user_id} +{/if} + +account.3.password = {$account.3.password} +account.3.sip_server.1.address= {$account.3.server_address} +account.3.sip_server_port = {$account.3.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if} +{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if} +{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if} +{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if} + +account.3.sip_server.1.expires= {$account.3.register_expires} +account.3.sip_server.1.retry_counts= 3 + +account.3.sip_server.2.address= {$account.3.server.2.address} +account.3.sip_server.2.port= {$account.3.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if} +{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if} +{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if} +{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if} + +account.3.sip_server.2.expires= {$account.3.register_expires} +account.3.sip_server.2.retry_counts= 3 + +account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if} + +account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary} +account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.3.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.3.outbound_proxy.1.port = {$account.3.sip_port} +{/if} + +account.3.outbound_proxy.2.address= {$account.3.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.3.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.3.outbound_proxy.2.port = {$account.3.sip_port} +{/if} + +account.3.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.3.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.3.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.3.nat.udp_update_enable= +account.3.nat.udp_update_time= +account.3.nat.rport= {$yealink_rport} + +account.3.dtmf.type= {$yealink_dtmf_type} +account.3.dtmf.info_type= +account.3.dtmf.dtmf_payload= +account.3.100rel_enable= + +account.3.subscribe_register= +account.3.cid_source= {$yealink_cid_source} +account.3.enable_user_equal_phone= +account.3.srtp_encryption= {$yealink_srtp_encryption} +account.3.ptime= +account.3.register_line= +account.3.register_mac= +account.3.reg_fail_retry_interval= +account.3.unregister_on_reboot= + +account.3.session_timer.refresher= +account.3.session_timer.expires= +account.3.session_timer.enable= {$yealink_session_timer} + +account.3.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.3.sip_server_type= + +##V83 Add +account.3.srtp.unencrypted_rtcp.enable = +account.3.srtp.unencrypted_rtp.enable = +account.3.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.3.outbound_proxy.1.register_on_enable= +account.3.outbound_proxy.1.failback_timeout= +account.3.outbound_proxy.1.failback_mode= +account.3.outbound_proxy.1.retry_counts= +account.3.outbound_proxy.1.only_signal_with_registered= +account.3.outbound_proxy.1.failback_subscribe.enable= +account.3.outbound_proxy.1.invite_retry_counts= + +account.3.sip_server.1.register_on_enable= +account.3.sip_server.1.failback_timeout= +account.3.sip_server.1.failback_mode= +account.3.sip_server.1.failback_subscribe.enable= +account.3.sip_server.1.only_signal_with_registered= +account.3.sip_server.1.invite_retry_counts= + +account.3.outbound_proxy.2.register_on_enable= +account.3.outbound_proxy.2.failback_timeout= +account.3.outbound_proxy.2.failback_mode= +account.3.outbound_proxy.2.retry_counts= +account.3.outbound_proxy.2.only_signal_with_registered= +account.3.outbound_proxy.2.failback_subscribe.enable= +account.3.outbound_proxy.2.invite_retry_counts= + +account.3.sip_server.2.register_on_enable= +account.3.sip_server.2.failback_timeout= +account.3.sip_server.2.failback_mode= +account.3.sip_server.2.failback_subscribe.enable= +account.3.sip_server.2.only_signal_with_registered= +account.3.sip_server.2.invite_retry_counts= + +account.3.static_cache_pri= +account.3.dns_cache_type= +account.3.naptr_build= +account.3.fallback.timeout= +account.3.fallback.redundancy_type= +account.3.reg_failed_retry_max_time= +account.3.reg_failed_retry_min_time= +account.3.redundancy_with_reg_fail.enable = + +##V83 Add +account.3.sip_server.1.outbound_proxy_enable = +account.3.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.3.contact_take_line_param= +account.3.update_ack_while_dialing= +account.3.srtp_lifetime= +account.3.third_part_request_with_route.enable= +account.3.insert_outbound_in_route.enable= +account.3.path.enable= +account.3.sub_fail_retry_interval= +account.3.transfer_refer_to_contact_header.enable= +account.3.hold_use_inactive= +account.3.gruu.enable= +account.3.dial_tone= +account.3.call_id_mode= +account.3.subscribe_expires_overlap= +account.3.register_expires_overlap= +account.3.call_info= +account.3.custom_ua= +account.3.mwi_parse_terminated= +account.3.check_cseq.enable= +account.3.check_to_tag.enable= +account.3.vq_rtcpxr.collector_server_port= +account.3.vq_rtcpxr.collector_server_host= +account.3.vq_rtcpxr.collector_name= +account.3.compact_header_enable= +account.3.cp_source= 2 +account.3.cid_source_ppi= 1 +account.3.cid_source_privacy= 1 +account.3.reg_with_pani_header.enable = +account.3.alert_info= +account.3.picture_info_enable= 1 + +##V83 Add +account.3.invite_with_pani_header.enable = + +##V84 Add +account.3.invite_with_rpid_header.enable= + +account.3.auto_answer_mute_enable + +##V84 SP4 Add +account.3.share_line.enable_private_code = +account.3.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.3.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.3.timeout_fwd.off_code= +account.3.timeout_fwd.on_code= +account.3.timeout_fwd.timeout= +account.3.timeout_fwd.target= +account.3.timeout_fwd.enable= +account.3.busy_fwd.off_code= +account.3.busy_fwd.on_code= +account.3.busy_fwd.target= +account.3.busy_fwd.enable= +account.3.always_fwd.off_code= +account.3.always_fwd.on_code= +account.3.always_fwd.target= +account.3.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.3.dnd.enable= +account.3.dnd.off_code= +account.3.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.3.subscribe_mwi= 1 +account.3.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.3.subscribe_mwi_expires= 3600 +account.3.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.3.auto_dial_enable= +account.3.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.3.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.3.dialplan.digitmap.enable= +account.3.dialplan.digitmap.string= +account.3.dialplan.digitmap.no_match_action= +account.3.dialplan.digitmap.interdigit_short_timer= +account.3.dialplan.digitmap.interdigit_long_timer= +account.3.dialplan.digitmap.apply_to.press_send= +account.3.dialplan.digitmap.apply_to.forward= +account.3.dialplan.digitmap.apply_to.history_dial= +account.3.dialplan.digitmap.apply_to.directory_dial= +account.3.dialplan.digitmap.apply_to.on_hook_dial= +account.3.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.3.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.3.blf.blf_list_uri= +account.3.blf_list_barge_in_code= +account.3.blf_list_code= +account.3.blf_list_retrieve_call_parked_code= +account.3.blf.subscribe_period= +account.3.blf.match_host.enable= +account.3.out_dialog_blf_enable= +account.3.blf.subscribe_event= + +##V84 Add +account.3.blf_list_call_parked_code= +account.3.blf_list_call_parked_list= + +##V84 SP4 ADD +account.3.blf_list_whisper_code= +account.3.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.3.shared_line= +account.3.line_seize.expires= +account.3.shared_line_one_touch_bargein.enable= +account.3.shared_line_one_touch_retrieve.enable= +account.3.sca_manage_interface_display_time= +account.3.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.3.bla_number= +account.3.bla_subscribe_period= +account.3.bla.notify_with_expire.enable= +account.3.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.3.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.3.acd.enable= 0 +account.3.acd.available= 0 +account.3.acd.unavailable_reason_enable= 0 +account.3.acd.initial_state= 1 +account.3.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.3.reason_code.1= +account.3.reason_code_name.1= 0 +account.3.bw_disp_code.1= +account.3.bw_disp_code_name.1= +account.3.supervisor_info_code.1= +account.3.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.3.call_center.call_info_enable= 0 +account.3.call_center.show_call_info_time= 30 +account.3.call_center.disp_code_enable= 0 +account.3.call_center.trace_enable= 0 +account.3.call_center.emergency_enable= 0 +account.3.call_center.queue_status_enable= 0 +account.3.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.3.hoteling.enable= 0 +account.3.hoteling.user_id= 0 +account.3.hoteling.password= 0 +account.3.hoteling.expires= 0 +account.3.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.3.xsi.user = +account.3.xsi.password = +account.3.xsi.host = +account.3.xsi.server_type = +account.3.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.3.direct_pickup_code = +account.3.group_pickup_code = +account.3.dialoginfo_callpickup = 0 +account.3.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.3.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.3.conf_uri = {if $nway_conference == 'true'}nway{$account.3.user_id}@{$account.3.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.3.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.3.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.3.flexible_seating.enable= +account.3.hoteling.pin= +account.3.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.3.features.forward.feature_key_sync.local_processing.enable= +account.3.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.3.dnd.feature_key_sync.enable= +account.3.feature_key_sync.enable= +account.3.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.3.acd.available_url= +account.3.acd.away_url = +account.3.acd.refresh_url = +account.3.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +#bw.virtual_user.1.enable= +#bw.virtual_user.1.label= +#bw.virtual_user.1.xsi.dnd.enable= +#bw.virtual_user.1.xsi.host= +#bw.virtual_user.1.xsi.password= +#bw.virtual_user.1.xsi.port= +#bw.virtual_user.1.xsi.server_type= +#bw.virtual_user.1.xsi.user= + +####################################################################################### +## Transfer ## +####################################################################################### +account.4.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.4.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.4.anonymous_call.server_base_only = +account.4.send_anonymous_rejection_code = +account.4.anonymous_reject_offcode = +account.4.anonymous_reject_oncode = +account.4.reject_anonymous_call= +account.4.anonymous_call_offcode = +account.4.anonymous_call_oncode = +account.4.anonymous_call = 0 +account.4.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.4.music_server_uri= +account.4.music_on_hold_type= +account.4.auto_label.rule= +account.4.auto_label.enable= +account.4.number_of_linekey= +account.4.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.4.codec.ilbc_15_2kbps.priority= +account.4.codec.ilbc_15_2kbps.enable= + +account.4.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.4.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.4.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.4.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.4.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.4.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.4.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.4.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.4.codec.opus.para= 106 + +account.4.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.4.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.4.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.4.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.4.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.4.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.4.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.4.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.4.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.4.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.4.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.4.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.4.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.4.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.4.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.4.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.4.codec.G722_1_24kpbs.priority= +account.4.codec.G722_1_24kpbs.enable= +account.4.codec.G722_1c_24kpbs.priority= +account.4.codec.G722_1c_24kpbs.enable= +account.4.codec.G722_1c_32kpbs.priority= +account.4.codec.G722_1c_32kpbs.enable= +account.4.codec.G722_1c_48kpbs.priority= +account.4.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account4 Register ## +################################################################ +{if isset($account.4.password) } +account.4.enable = 1 +{else} +account.4.enable = 0 +{/if} +account.4.label = {$account.4.label} +account.4.display_name = {$account.4.display_name} +account.4.auth_name = {$account.4.auth_id} + +{if isset($account.4.server.1.address)} +account.4.user_name = {$account.4.user_id}@{$account.4.server_address} +{else} +account.4.user_name = {$account.4.user_id} +{/if} + +account.4.password = {$account.4.password} +account.4.sip_server.1.address= {$account.4.server_address} +account.4.sip_server_port = {$account.4.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if} +{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if} +{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if} +{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if} + +account.4.sip_server.1.expires= {$account.4.register_expires} +account.4.sip_server.1.retry_counts= 3 + +account.4.sip_server.2.address= {$account.4.server.2.address} +account.4.sip_server.2.port= {$account.4.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if} +{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if} +{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if} +{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if} + +account.4.sip_server.2.expires= {$account.4.register_expires} +account.4.sip_server.2.retry_counts= 3 + +account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if} + +account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary} +account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.4.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.4.outbound_proxy.1.port = {$account.4.sip_port} +{/if} + +account.4.outbound_proxy.2.address= {$account.4.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.4.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.4.outbound_proxy.2.port = {$account.4.sip_port} +{/if} + +account.4.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.4.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.4.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.4.nat.udp_update_enable= +account.4.nat.udp_update_time= +account.4.nat.rport= {$yealink_rport} + +account.4.dtmf.type= {$yealink_dtmf_type} +account.4.dtmf.info_type= +account.4.dtmf.dtmf_payload= +account.4.100rel_enable= + +account.4.subscribe_register= +account.4.cid_source= {$yealink_cid_source} +account.4.enable_user_equal_phone= +account.4.srtp_encryption= {$yealink_srtp_encryption} +account.4.ptime= +account.4.register_line= +account.4.register_mac= +account.4.reg_fail_retry_interval= +account.4.unregister_on_reboot= + +account.4.session_timer.refresher= +account.4.session_timer.expires= +account.4.session_timer.enable= {$yealink_session_timer} + +account.4.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.4.sip_server_type= + +##V83 Add +account.4.srtp.unencrypted_rtcp.enable = +account.4.srtp.unencrypted_rtp.enable = +account.4.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.4.outbound_proxy.1.register_on_enable= +account.4.outbound_proxy.1.failback_timeout= +account.4.outbound_proxy.1.failback_mode= +account.4.outbound_proxy.1.retry_counts= +account.4.outbound_proxy.1.only_signal_with_registered= +account.4.outbound_proxy.1.failback_subscribe.enable= +account.4.outbound_proxy.1.invite_retry_counts= + +account.4.sip_server.1.register_on_enable= +account.4.sip_server.1.failback_timeout= +account.4.sip_server.1.failback_mode= +account.4.sip_server.1.failback_subscribe.enable= +account.4.sip_server.1.only_signal_with_registered= +account.4.sip_server.1.invite_retry_counts= + +account.4.outbound_proxy.2.register_on_enable= +account.4.outbound_proxy.2.failback_timeout= +account.4.outbound_proxy.2.failback_mode= +account.4.outbound_proxy.2.retry_counts= +account.4.outbound_proxy.2.only_signal_with_registered= +account.4.outbound_proxy.2.failback_subscribe.enable= +account.4.outbound_proxy.2.invite_retry_counts= + +account.4.sip_server.2.register_on_enable= +account.4.sip_server.2.failback_timeout= +account.4.sip_server.2.failback_mode= +account.4.sip_server.2.failback_subscribe.enable= +account.4.sip_server.2.only_signal_with_registered= +account.4.sip_server.2.invite_retry_counts= + +account.4.static_cache_pri= +account.4.dns_cache_type= +account.4.naptr_build= +account.4.fallback.timeout= +account.4.fallback.redundancy_type= +account.4.reg_failed_retry_max_time= +account.4.reg_failed_retry_min_time= +account.4.redundancy_with_reg_fail.enable = + +##V83 Add +account.4.sip_server.1.outbound_proxy_enable = +account.4.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.4.contact_take_line_param= +account.4.update_ack_while_dialing= +account.4.srtp_lifetime= +account.4.third_part_request_with_route.enable= +account.4.insert_outbound_in_route.enable= +account.4.path.enable= +account.4.sub_fail_retry_interval= +account.4.transfer_refer_to_contact_header.enable= +account.4.hold_use_inactive= +account.4.gruu.enable= +account.4.dial_tone= +account.4.call_id_mode= +account.4.subscribe_expires_overlap= +account.4.register_expires_overlap= +account.4.call_info= +account.4.custom_ua= +account.4.mwi_parse_terminated= +account.4.check_cseq.enable= +account.4.check_to_tag.enable= +account.4.vq_rtcpxr.collector_server_port= +account.4.vq_rtcpxr.collector_server_host= +account.4.vq_rtcpxr.collector_name= +account.4.compact_header_enable= +account.4.cp_source= 2 +account.4.cid_source_ppi= 1 +account.4.cid_source_privacy= 1 +account.4.reg_with_pani_header.enable = +account.4.alert_info= +account.4.picture_info_enable= 1 + +##V83 Add +account.4.invite_with_pani_header.enable = + +##V84 Add +account.4.invite_with_rpid_header.enable= + +account.4.auto_answer_mute_enable + +##V84 SP4 Add +account.4.share_line.enable_private_code = +account.4.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.4.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.4.timeout_fwd.off_code= +account.4.timeout_fwd.on_code= +account.4.timeout_fwd.timeout= +account.4.timeout_fwd.target= +account.4.timeout_fwd.enable= +account.4.busy_fwd.off_code= +account.4.busy_fwd.on_code= +account.4.busy_fwd.target= +account.4.busy_fwd.enable= +account.4.always_fwd.off_code= +account.4.always_fwd.on_code= +account.4.always_fwd.target= +account.4.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.4.dnd.enable= +account.4.dnd.off_code= +account.4.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.4.subscribe_mwi= 1 +account.4.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.4.subscribe_mwi_expires= 3600 +account.4.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.4.auto_dial_enable= +account.4.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.4.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.4.dialplan.digitmap.enable= +account.4.dialplan.digitmap.string= +account.4.dialplan.digitmap.no_match_action= +account.4.dialplan.digitmap.interdigit_short_timer= +account.4.dialplan.digitmap.interdigit_long_timer= +account.4.dialplan.digitmap.apply_to.press_send= +account.4.dialplan.digitmap.apply_to.forward= +account.4.dialplan.digitmap.apply_to.history_dial= +account.4.dialplan.digitmap.apply_to.directory_dial= +account.4.dialplan.digitmap.apply_to.on_hook_dial= +account.4.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.4.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.4.blf.blf_list_uri= +account.4.blf_list_barge_in_code= +account.4.blf_list_code= +account.4.blf_list_retrieve_call_parked_code= +account.4.blf.subscribe_period= +account.4.blf.match_host.enable= +account.4.out_dialog_blf_enable= +account.4.blf.subscribe_event= + +##V84 Add +account.4.blf_list_call_parked_code= +account.4.blf_list_call_parked_list= + +##V84 SP4 ADD +account.4.blf_list_whisper_code= +account.4.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.4.shared_line= +account.4.line_seize.expires= +account.4.shared_line_one_touch_bargein.enable= +account.4.shared_line_one_touch_retrieve.enable= +account.4.sca_manage_interface_display_time= +account.4.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.4.bla_number= +account.4.bla_subscribe_period= +account.4.bla.notify_with_expire.enable= +account.4.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.4.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.4.acd.enable= 0 +account.4.acd.available= 0 +account.4.acd.unavailable_reason_enable= 0 +account.4.acd.initial_state= 1 +account.4.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.4.reason_code.1= +account.4.reason_code_name.1= 0 +account.4.bw_disp_code.1= +account.4.bw_disp_code_name.1= +account.4.supervisor_info_code.1= +account.4.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.4.call_center.call_info_enable= 0 +account.4.call_center.show_call_info_time= 30 +account.4.call_center.disp_code_enable= 0 +account.4.call_center.trace_enable= 0 +account.4.call_center.emergency_enable= 0 +account.4.call_center.queue_status_enable= 0 +account.4.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.4.hoteling.enable= 0 +account.4.hoteling.user_id= 0 +account.4.hoteling.password= 0 +account.4.hoteling.expires= 0 +account.4.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.4.xsi.user = +account.4.xsi.password = +account.4.xsi.host = +account.4.xsi.server_type = +account.4.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.4.direct_pickup_code = +account.4.group_pickup_code = +account.4.dialoginfo_callpickup = 0 +account.4.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.4.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.4.conf_uri = {if $nway_conference == 'true'}nway{$account.4.user_id}@{$account.4.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.4.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.4.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.4.flexible_seating.enable= +account.4.hoteling.pin= +account.4.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.4.features.forward.feature_key_sync.local_processing.enable= +account.4.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.4.dnd.feature_key_sync.enable= +account.4.feature_key_sync.enable= +account.4.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.4.acd.available_url= +account.4.acd.away_url = +account.4.acd.refresh_url = +account.4.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +#bw.virtual_user.1.enable= +#bw.virtual_user.1.label= +#bw.virtual_user.1.xsi.dnd.enable= +#bw.virtual_user.1.xsi.host= +#bw.virtual_user.1.xsi.password= +#bw.virtual_user.1.xsi.port= +#bw.virtual_user.1.xsi.server_type= +#bw.virtual_user.1.xsi.user= + +####################################################################################### +## Transfer ## +####################################################################################### +account.5.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.5.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.5.anonymous_call.server_base_only = +account.5.send_anonymous_rejection_code = +account.5.anonymous_reject_offcode = +account.5.anonymous_reject_oncode = +account.5.reject_anonymous_call= +account.5.anonymous_call_offcode = +account.5.anonymous_call_oncode = +account.5.anonymous_call = 0 +account.5.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.5.music_server_uri= +account.5.music_on_hold_type= +account.5.auto_label.rule= +account.5.auto_label.enable= +account.5.number_of_linekey= +account.5.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.5.codec.ilbc_15_2kbps.priority= +account.5.codec.ilbc_15_2kbps.enable= + +account.5.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.5.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.5.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.5.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.5.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.5.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.5.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.5.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.5.codec.opus.para= 106 + +account.5.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.5.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.5.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.5.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.5.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.5.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.5.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.5.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.5.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.5.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.5.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.5.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.5.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.5.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.5.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.5.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.5.codec.G722_1_24kpbs.priority= +account.5.codec.G722_1_24kpbs.enable= +account.5.codec.G722_1c_24kpbs.priority= +account.5.codec.G722_1c_24kpbs.enable= +account.5.codec.G722_1c_32kpbs.priority= +account.5.codec.G722_1c_32kpbs.enable= +account.5.codec.G722_1c_48kpbs.priority= +account.5.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account5 Register ## +################################################################ +{if isset($account.5.password) } +account.5.enable = 1 +{else} +account.5.enable = 0 +{/if} +account.5.label = {$account.5.label} +account.5.display_name = {$account.5.display_name} +account.5.auth_name = {$account.5.auth_id} + +{if isset($account.5.server.1.address)} +account.5.user_name = {$account.5.user_id}@{$account.5.server_address} +{else} +account.5.user_name = {$account.5.user_id} +{/if} + +account.5.password = {$account.5.password} +account.5.sip_server.1.address= {$account.5.server_address} +account.5.sip_server_port = {$account.5.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if} +{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if} +{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if} +{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if} + +account.5.sip_server.1.expires= {$account.5.register_expires} +account.5.sip_server.1.retry_counts= 3 + +account.5.sip_server.2.address= {$account.5.server.2.address} +account.5.sip_server.2.port= {$account.5.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if} +{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if} +{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if} +{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if} + +account.5.sip_server.2.expires= {$account.5.register_expires} +account.5.sip_server.2.retry_counts= 3 + +account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if} + +account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary} +account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.5.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.5.outbound_proxy.1.port = {$account.5.sip_port} +{/if} + +account.5.outbound_proxy.2.address= {$account.5.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.5.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.5.outbound_proxy.2.port = {$account.5.sip_port} +{/if} + +account.5.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.5.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.5.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.5.nat.udp_update_enable= +account.5.nat.udp_update_time= +account.5.nat.rport= {$yealink_rport} + +account.5.dtmf.type= {$yealink_dtmf_type} +account.5.dtmf.info_type= +account.5.dtmf.dtmf_payload= +account.5.100rel_enable= + +account.5.subscribe_register= +account.5.cid_source= {$yealink_cid_source} +account.5.enable_user_equal_phone= +account.5.srtp_encryption= {$yealink_srtp_encryption} +account.5.ptime= +account.5.register_line= +account.5.register_mac= +account.5.reg_fail_retry_interval= +account.5.unregister_on_reboot= + +account.5.session_timer.refresher= +account.5.session_timer.expires= +account.5.session_timer.enable= {$yealink_session_timer} + +account.5.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.5.sip_server_type= + +##V83 Add +account.5.srtp.unencrypted_rtcp.enable = +account.5.srtp.unencrypted_rtp.enable = +account.5.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.5.outbound_proxy.1.register_on_enable= +account.5.outbound_proxy.1.failback_timeout= +account.5.outbound_proxy.1.failback_mode= +account.5.outbound_proxy.1.retry_counts= +account.5.outbound_proxy.1.only_signal_with_registered= +account.5.outbound_proxy.1.failback_subscribe.enable= +account.5.outbound_proxy.1.invite_retry_counts= + +account.5.sip_server.1.register_on_enable= +account.5.sip_server.1.failback_timeout= +account.5.sip_server.1.failback_mode= +account.5.sip_server.1.failback_subscribe.enable= +account.5.sip_server.1.only_signal_with_registered= +account.5.sip_server.1.invite_retry_counts= + +account.5.outbound_proxy.2.register_on_enable= +account.5.outbound_proxy.2.failback_timeout= +account.5.outbound_proxy.2.failback_mode= +account.5.outbound_proxy.2.retry_counts= +account.5.outbound_proxy.2.only_signal_with_registered= +account.5.outbound_proxy.2.failback_subscribe.enable= +account.5.outbound_proxy.2.invite_retry_counts= + +account.5.sip_server.2.register_on_enable= +account.5.sip_server.2.failback_timeout= +account.5.sip_server.2.failback_mode= +account.5.sip_server.2.failback_subscribe.enable= +account.5.sip_server.2.only_signal_with_registered= +account.5.sip_server.2.invite_retry_counts= + +account.5.static_cache_pri= +account.5.dns_cache_type= +account.5.naptr_build= +account.5.fallback.timeout= +account.5.fallback.redundancy_type= +account.5.reg_failed_retry_max_time= +account.5.reg_failed_retry_min_time= +account.5.redundancy_with_reg_fail.enable = + +##V83 Add +account.5.sip_server.1.outbound_proxy_enable = +account.5.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.5.contact_take_line_param= +account.5.update_ack_while_dialing= +account.5.srtp_lifetime= +account.5.third_part_request_with_route.enable= +account.5.insert_outbound_in_route.enable= +account.5.path.enable= +account.5.sub_fail_retry_interval= +account.5.transfer_refer_to_contact_header.enable= +account.5.hold_use_inactive= +account.5.gruu.enable= +account.5.dial_tone= +account.5.call_id_mode= +account.5.subscribe_expires_overlap= +account.5.register_expires_overlap= +account.5.call_info= +account.5.custom_ua= +account.5.mwi_parse_terminated= +account.5.check_cseq.enable= +account.5.check_to_tag.enable= +account.5.vq_rtcpxr.collector_server_port= +account.5.vq_rtcpxr.collector_server_host= +account.5.vq_rtcpxr.collector_name= +account.5.compact_header_enable= +account.5.cp_source= 2 +account.5.cid_source_ppi= 1 +account.5.cid_source_privacy= 1 +account.5.reg_with_pani_header.enable = +account.5.alert_info= +account.5.picture_info_enable= 1 + +##V83 Add +account.5.invite_with_pani_header.enable = + +##V84 Add +account.5.invite_with_rpid_header.enable= + +account.5.auto_answer_mute_enable + +##V84 SP4 Add +account.5.share_line.enable_private_code = +account.5.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.5.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.5.timeout_fwd.off_code= +account.5.timeout_fwd.on_code= +account.5.timeout_fwd.timeout= +account.5.timeout_fwd.target= +account.5.timeout_fwd.enable= +account.5.busy_fwd.off_code= +account.5.busy_fwd.on_code= +account.5.busy_fwd.target= +account.5.busy_fwd.enable= +account.5.always_fwd.off_code= +account.5.always_fwd.on_code= +account.5.always_fwd.target= +account.5.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.5.dnd.enable= +account.5.dnd.off_code= +account.5.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.5.subscribe_mwi= 1 +account.5.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.5.subscribe_mwi_expires= 3600 +account.5.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.5.auto_dial_enable= +account.5.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.5.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.5.dialplan.digitmap.enable= +account.5.dialplan.digitmap.string= +account.5.dialplan.digitmap.no_match_action= +account.5.dialplan.digitmap.interdigit_short_timer= +account.5.dialplan.digitmap.interdigit_long_timer= +account.5.dialplan.digitmap.apply_to.press_send= +account.5.dialplan.digitmap.apply_to.forward= +account.5.dialplan.digitmap.apply_to.history_dial= +account.5.dialplan.digitmap.apply_to.directory_dial= +account.5.dialplan.digitmap.apply_to.on_hook_dial= +account.5.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.5.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.5.blf.blf_list_uri= +account.5.blf_list_barge_in_code= +account.5.blf_list_code= +account.5.blf_list_retrieve_call_parked_code= +account.5.blf.subscribe_period= +account.5.blf.match_host.enable= +account.5.out_dialog_blf_enable= +account.5.blf.subscribe_event= + +##V84 Add +account.5.blf_list_call_parked_code= +account.5.blf_list_call_parked_list= + +##V84 SP4 ADD +account.5.blf_list_whisper_code= +account.5.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.5.shared_line= +account.5.line_seize.expires= +account.5.shared_line_one_touch_bargein.enable= +account.5.shared_line_one_touch_retrieve.enable= +account.5.sca_manage_interface_display_time= +account.5.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.5.bla_number= +account.5.bla_subscribe_period= +account.5.bla.notify_with_expire.enable= +account.5.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.5.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.5.acd.enable= 0 +account.5.acd.available= 0 +account.5.acd.unavailable_reason_enable= 0 +account.5.acd.initial_state= 1 +account.5.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.5.reason_code.1= +account.5.reason_code_name.1= 0 +account.5.bw_disp_code.1= +account.5.bw_disp_code_name.1= +account.5.supervisor_info_code.1= +account.5.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.5.call_center.call_info_enable= 0 +account.5.call_center.show_call_info_time= 30 +account.5.call_center.disp_code_enable= 0 +account.5.call_center.trace_enable= 0 +account.5.call_center.emergency_enable= 0 +account.5.call_center.queue_status_enable= 0 +account.5.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.5.hoteling.enable= 0 +account.5.hoteling.user_id= 0 +account.5.hoteling.password= 0 +account.5.hoteling.expires= 0 +account.5.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.5.xsi.user = +account.5.xsi.password = +account.5.xsi.host = +account.5.xsi.server_type = +account.5.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.5.direct_pickup_code = +account.5.group_pickup_code = +account.5.dialoginfo_callpickup = 0 +account.5.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.5.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.5.conf_uri = {if $nway_conference == 'true'}nway{$account.5.user_id}@{$account.5.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.5.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.5.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.5.flexible_seating.enable= +account.5.hoteling.pin= +account.5.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.5.features.forward.feature_key_sync.local_processing.enable= +account.5.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.5.dnd.feature_key_sync.enable= +account.5.feature_key_sync.enable= +account.5.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.5.acd.available_url= +account.5.acd.away_url = +account.5.acd.refresh_url = +account.5.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +#bw.virtual_user.1.enable= +#bw.virtual_user.1.label= +#bw.virtual_user.1.xsi.dnd.enable= +#bw.virtual_user.1.xsi.host= +#bw.virtual_user.1.xsi.password= +#bw.virtual_user.1.xsi.port= +#bw.virtual_user.1.xsi.server_type= +#bw.virtual_user.1.xsi.user= + +####################################################################################### +## Transfer ## +####################################################################################### +account.6.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} + + +####################################################################################### +## Conference ## +####################################################################################### +account.6.phone_setting.call_appearance.conference_via_new_linekey= + + +####################################################################################### +## Anonymous ## +####################################################################################### +account.6.anonymous_call.server_base_only = +account.6.send_anonymous_rejection_code = +account.6.anonymous_reject_offcode = +account.6.anonymous_reject_oncode = +account.6.reject_anonymous_call= +account.6.anonymous_call_offcode = +account.6.anonymous_call_oncode = +account.6.anonymous_call = 0 +account.6.send_anonymous_code = + + + +####################################################################################### +## Call Configuration ## +####################################################################################### +account.6.music_server_uri= +account.6.music_on_hold_type= +account.6.auto_label.rule= +account.6.auto_label.enable= +account.6.number_of_linekey= +account.6.phone_setting.call_appearance.calls_per_linekey= + + +####################################################################################### +## Codec ## +####################################################################################### +account.6.codec.ilbc_15_2kbps.priority= +account.6.codec.ilbc_15_2kbps.enable= + +account.6.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.6.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.6.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.6.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.6.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.6.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.6.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.6.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.6.codec.opus.para= 106 + +account.6.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.6.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.6.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.6.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.6.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.6.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.6.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.6.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.6.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.6.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.6.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.6.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.6.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.6.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.6.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.6.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.6.codec.G722_1_24kpbs.priority= +account.6.codec.G722_1_24kpbs.enable= +account.6.codec.G722_1c_24kpbs.priority= +account.6.codec.G722_1c_24kpbs.enable= +account.6.codec.G722_1c_32kpbs.priority= +account.6.codec.G722_1c_32kpbs.enable= +account.6.codec.G722_1c_48kpbs.priority= +account.6.codec.G722_1c_48kpbs.enable= + +################################################################ +# Account6 Register ## +################################################################ +{if isset($account.6.password) } +account.6.enable = 1 +{else} +account.6.enable = 0 +{/if} +account.6.label = {$account.6.label} +account.6.display_name = {$account.6.display_name} +account.6.auth_name = {$account.6.auth_id} + +{if isset($account.6.server.1.address)} +account.6.user_name = {$account.6.user_id}@{$account.6.server_address} +{else} +account.6.user_name = {$account.6.user_id} +{/if} + +account.6.password = {$account.6.password} +account.6.sip_server.1.address= {$account.6.server_address} +account.6.sip_server_port = {$account.6.sip_port} + + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; +{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if} +{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if} +{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if} +{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if} + +account.6.sip_server.1.expires= {$account.6.register_expires} +account.6.sip_server.1.retry_counts= 3 + +account.6.sip_server.2.address= {$account.6.server.2.address} +account.6.sip_server.2.port= {$account.6.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if} +{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if} +{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if} +{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if} + +account.6.sip_server.2.expires= {$account.6.register_expires} +account.6.sip_server.2.retry_counts= 3 + +account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if} + +account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary} +account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.6.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.6.outbound_proxy.1.port = {$account.6.sip_port} +{/if} + +account.6.outbound_proxy.2.address= {$account.6.outbound_proxy_secondary} + +{if isset($outbound_proxy_1_port)} +account.6.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.6.outbound_proxy.2.port = {$account.6.sip_port} +{/if} + +account.6.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval} + +account.6.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if} + + + +################################################################ +# Account Basic ## +################################################################ +account.6.auto_answer= + +################################################################ +# Account Advanced ## +################################################################ +account.6.nat.udp_update_enable= +account.6.nat.udp_update_time= +account.6.nat.rport= {$yealink_rport} + +account.6.dtmf.type= {$yealink_dtmf_type} +account.6.dtmf.info_type= +account.6.dtmf.dtmf_payload= +account.6.100rel_enable= + +account.6.subscribe_register= +account.6.cid_source= {$yealink_cid_source} +account.6.enable_user_equal_phone= +account.6.srtp_encryption= {$yealink_srtp_encryption} +account.6.ptime= +account.6.register_line= +account.6.register_mac= +account.6.reg_fail_retry_interval= +account.6.unregister_on_reboot= + +account.6.session_timer.refresher= +account.6.session_timer.expires= +account.6.session_timer.enable= {$yealink_session_timer} + +account.6.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if} +account.6.sip_server_type= + +##V83 Add +account.6.srtp.unencrypted_rtcp.enable = +account.6.srtp.unencrypted_rtp.enable = +account.6.sip_server_mode = + + + +################################################################ +# SIP Backup Server ## +################################################################ +account.6.outbound_proxy.1.register_on_enable= +account.6.outbound_proxy.1.failback_timeout= +account.6.outbound_proxy.1.failback_mode= +account.6.outbound_proxy.1.retry_counts= +account.6.outbound_proxy.1.only_signal_with_registered= +account.6.outbound_proxy.1.failback_subscribe.enable= +account.6.outbound_proxy.1.invite_retry_counts= + +account.6.sip_server.1.register_on_enable= +account.6.sip_server.1.failback_timeout= +account.6.sip_server.1.failback_mode= +account.6.sip_server.1.failback_subscribe.enable= +account.6.sip_server.1.only_signal_with_registered= +account.6.sip_server.1.invite_retry_counts= + +account.6.outbound_proxy.2.register_on_enable= +account.6.outbound_proxy.2.failback_timeout= +account.6.outbound_proxy.2.failback_mode= +account.6.outbound_proxy.2.retry_counts= +account.6.outbound_proxy.2.only_signal_with_registered= +account.6.outbound_proxy.2.failback_subscribe.enable= +account.6.outbound_proxy.2.invite_retry_counts= + +account.6.sip_server.2.register_on_enable= +account.6.sip_server.2.failback_timeout= +account.6.sip_server.2.failback_mode= +account.6.sip_server.2.failback_subscribe.enable= +account.6.sip_server.2.only_signal_with_registered= +account.6.sip_server.2.invite_retry_counts= + +account.6.static_cache_pri= +account.6.dns_cache_type= +account.6.naptr_build= +account.6.fallback.timeout= +account.6.fallback.redundancy_type= +account.6.reg_failed_retry_max_time= +account.6.reg_failed_retry_min_time= +account.6.redundancy_with_reg_fail.enable = + +##V83 Add +account.6.sip_server.1.outbound_proxy_enable = +account.6.sip_server.2.outbound_proxy_enable = + +################################################################ +# SIP Basic config ## +################################################################ +account.6.contact_take_line_param= +account.6.update_ack_while_dialing= +account.6.srtp_lifetime= +account.6.third_part_request_with_route.enable= +account.6.insert_outbound_in_route.enable= +account.6.path.enable= +account.6.sub_fail_retry_interval= +account.6.transfer_refer_to_contact_header.enable= +account.6.hold_use_inactive= +account.6.gruu.enable= +account.6.dial_tone= +account.6.call_id_mode= +account.6.subscribe_expires_overlap= +account.6.register_expires_overlap= +account.6.call_info= +account.6.custom_ua= +account.6.mwi_parse_terminated= +account.6.check_cseq.enable= +account.6.check_to_tag.enable= +account.6.vq_rtcpxr.collector_server_port= +account.6.vq_rtcpxr.collector_server_host= +account.6.vq_rtcpxr.collector_name= +account.6.compact_header_enable= +account.6.cp_source= 2 +account.6.cid_source_ppi= 1 +account.6.cid_source_privacy= 1 +account.6.reg_with_pani_header.enable = +account.6.alert_info= +account.6.picture_info_enable= 1 + +##V83 Add +account.6.invite_with_pani_header.enable = + +##V84 Add +account.6.invite_with_rpid_header.enable= + +account.6.auto_answer_mute_enable + +##V84 SP4 Add +account.6.share_line.enable_private_code = +account.6.share_line.cancel_private_code = + +####################################################################################### +## History ## +####################################################################################### +account.6.missed_calllog= + + +####################################################################################### +## Forward ## +####################################################################################### +account.6.timeout_fwd.off_code= +account.6.timeout_fwd.on_code= +account.6.timeout_fwd.timeout= +account.6.timeout_fwd.target= +account.6.timeout_fwd.enable= +account.6.busy_fwd.off_code= +account.6.busy_fwd.on_code= +account.6.busy_fwd.target= +account.6.busy_fwd.enable= +account.6.always_fwd.off_code= +account.6.always_fwd.on_code= +account.6.always_fwd.target= +account.6.always_fwd.enable= + + +####################################################################################### +## DND ## +####################################################################################### +account.6.dnd.enable= +account.6.dnd.off_code= +account.6.dnd.on_code= + + + +####################################################################################### +## Voice Mail ## +####################################################################################### +voice_mail.number.1= {$voicemail_number} +account.6.subscribe_mwi= 1 +account.6.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm} +account.6.subscribe_mwi_expires= 3600 +account.6.display_mwi.enable= + +####################################################################################### +## Auto Dial ## +####################################################################################### +account.6.auto_dial_enable= +account.6.auto_dial_num= + + +####################################################################################### +## Preference&Status ## +####################################################################################### +account.6.ringtone.ring_type= + +####################################################################################### +## Digitmap ## +####################################################################################### +account.6.dialplan.digitmap.enable= +account.6.dialplan.digitmap.string= +account.6.dialplan.digitmap.no_match_action= +account.6.dialplan.digitmap.interdigit_short_timer= +account.6.dialplan.digitmap.interdigit_long_timer= +account.6.dialplan.digitmap.apply_to.press_send= +account.6.dialplan.digitmap.apply_to.forward= +account.6.dialplan.digitmap.apply_to.history_dial= +account.6.dialplan.digitmap.apply_to.directory_dial= +account.6.dialplan.digitmap.apply_to.on_hook_dial= +account.6.dialplan.digitmap.active.on_hook_dialing= + + +####################################################################################### +## Rings Settings ## +####################################################################################### +account.6.alert_info_url_enable= + + +####################################################################################### +## BLF/BLF List ## +####################################################################################### +account.6.blf.blf_list_uri= +account.6.blf_list_barge_in_code= +account.6.blf_list_code= +account.6.blf_list_retrieve_call_parked_code= +account.6.blf.subscribe_period= +account.6.blf.match_host.enable= +account.6.out_dialog_blf_enable= +account.6.blf.subscribe_event= + +##V84 Add +account.6.blf_list_call_parked_code= +account.6.blf_list_call_parked_list= + +##V84 SP4 ADD +account.6.blf_list_whisper_code= +account.6.blf_list_listen_in_code= + + +####################################################################################### +## SCA ## +####################################################################################### +account.6.shared_line= +account.6.line_seize.expires= +account.6.shared_line_one_touch_bargein.enable= +account.6.shared_line_one_touch_retrieve.enable= +account.6.sca_manage_interface_display_time= +account.6.shared_line_callpull_code= + +##V83 Add +account.x.share_line.barge_in.enable + +####################################################################################### +## BLA ## +####################################################################################### +account.6.bla_number= +account.6.bla_subscribe_period= +account.6.bla.notify_with_expire.enable= +account.6.bla.subscribe_uri_build_type= + +####################################################################################### +## Call Park ## +####################################################################################### +account.6.callpark_enable= + + +####################################################################################### +## Broadsoft ACD ## +####################################################################################### +account.6.acd.enable= 0 +account.6.acd.available= 0 +account.6.acd.unavailable_reason_enable= 0 +account.6.acd.initial_state= 1 +account.6.subscribe_acd_expires= + + +####################################################################################### +## Broadsoft ACD Call Center ## +####################################################################################### +##account.X.reason_code.Y= +##account.X.reason_code_name.Y= +##account.X.bw_disp_code.Y= +##account.X.bw_disp_code_name.Y= +##account.X.supervisor_info_code.Y= +##account.X.supervisor_info_code_name.Y= +##The value Y must be continuous. + +account.6.reason_code.1= +account.6.reason_code_name.1= 0 +account.6.bw_disp_code.1= +account.6.bw_disp_code_name.1= +account.6.supervisor_info_code.1= +account.6.supervisor_info_code_name.1= + +####################################################################################### +## Broadsoft Call Center ## +####################################################################################### +account.6.call_center.call_info_enable= 0 +account.6.call_center.show_call_info_time= 30 +account.6.call_center.disp_code_enable= 0 +account.6.call_center.trace_enable= 0 +account.6.call_center.emergency_enable= 0 +account.6.call_center.queue_status_enable= 0 +account.6.call_center.queue_status_light_enable = 0 + + + +####################################################################################### +## Broadsoft Hoteling ## +####################################################################################### +account.6.hoteling.enable= 0 +account.6.hoteling.user_id= 0 +account.6.hoteling.password= 0 +account.6.hoteling.expires= 0 +account.6.hoteling.auto_login_enable= 0 + + +####################################################################################### +## Broadsoft XSI ## +####################################################################################### +account.6.xsi.user = +account.6.xsi.password = +account.6.xsi.host = +account.6.xsi.server_type = +account.6.xsi.port = + + +####################################################################################### +## Call Pickup ## +####################################################################################### +account.6.direct_pickup_code = +account.6.group_pickup_code = +account.6.dialoginfo_callpickup = 0 +account.6.refresh_remote_id.enable = + + +####################################################################################### +## Broadsoft Call Recording ## +####################################################################################### +account.6.call_recording.enable= + +####################################################################################### +## Network Conference ## +####################################################################################### +account.6.conf_uri = {if $nway_conference == 'true'}nway{$account.6.user_id}@{$account.6.server_address}{/if} + + +####################################################################################### +## Broadsoft Call Decline ## +####################################################################################### +account.6.features.call_decline.enable = + + +####################################################################################### +## Broadsoft Security Classification ## +####################################################################################### +account.6.security_classification.enable = + + + +####################################################################################### +## Broadsoft Flexible Seating ## +####################################################################################### +account.6.flexible_seating.enable= +account.6.hoteling.pin= +account.6.hoteling.mode= + +####################################################################################### +## Features Sync ## +####################################################################################### +account.6.features.forward.feature_key_sync.local_processing.enable= +account.6.features.dnd.feature_key_sync.local_processing.enable = + +##V84 Add +account.6.dnd.feature_key_sync.enable= +account.6.feature_key_sync.enable= +account.6.forward.feature_key_sync.enable= + +####################################################################################### +## ACD ## +####################################################################################### +account.6.acd.available_url= +account.6.acd.away_url = +account.6.acd.refresh_url = +account.6.acd.call_information= + + + +####################################################################################### +## virtual_user ## +####################################################################################### +##V84 Add +#bw.virtual_user.1.enable= +#bw.virtual_user.1.label= +#bw.virtual_user.1.xsi.dnd.enable= +#bw.virtual_user.1.xsi.host= +#bw.virtual_user.1.xsi.password= +#bw.virtual_user.1.xsi.port= +#bw.virtual_user.1.xsi.server_type= +#bw.virtual_user.1.xsi.user= From 55d73302fbe0e04c74f900a0dbf5d5127572898d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 30 Dec 2021 15:45:41 -0700 Subject: [PATCH 121/496] Add yealink_ring text and file 1 to 10 --- .../provision/yealink/t43u/y000000000107.cfg | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg index 83863cc605..cbe89f2e48 100644 --- a/resources/templates/provision/yealink/t43u/y000000000107.cfg +++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg @@ -1509,8 +1509,27 @@ dialplan.area_code.code= ####################################################################################### ## Rings Settings ## ####################################################################################### -distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1} -distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2} +distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3} +distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4} +distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5} +distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6} +distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7} +distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8} +distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9} +distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10} + +distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1} +distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2} +distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3} +distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4} +distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5} +distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6} +distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7} +distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8} +distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9} +distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10} ####################################################################################### ## IME Settings ## From 222ff82c85afb0ff740100cac4a1fa3c4163575e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 30 Dec 2021 15:46:48 -0700 Subject: [PATCH 122/496] Add yealink_ring text and file 1 to 10 --- .../provision/yealink/t46u/y000000000108.cfg | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg index f21d0215a1..19ec84e5c6 100644 --- a/resources/templates/provision/yealink/t46u/y000000000108.cfg +++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg @@ -1505,8 +1505,27 @@ dialplan.area_code.code= ####################################################################################### ## Rings Settings ## ####################################################################################### -distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1} -distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2} +distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3} +distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4} +distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5} +distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6} +distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7} +distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8} +distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9} +distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10} + +distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1} +distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2} +distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3} +distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4} +distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5} +distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6} +distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7} +distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8} +distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9} +distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10} ####################################################################################### ## IME Settings ## From b6908307c15cefeaabf23c909e36d6ef2daa1ff3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 30 Dec 2021 15:47:37 -0700 Subject: [PATCH 123/496] Add yealink_ring text and file 1 to 10 --- .../provision/yealink/t48u/y000000000109.cfg | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg index f21d0215a1..19ec84e5c6 100644 --- a/resources/templates/provision/yealink/t48u/y000000000109.cfg +++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg @@ -1505,8 +1505,27 @@ dialplan.area_code.code= ####################################################################################### ## Rings Settings ## ####################################################################################### -distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1} -distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1} +distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2} +distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3} +distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4} +distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5} +distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6} +distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7} +distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8} +distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9} +distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10} + +distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1} +distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2} +distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3} +distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4} +distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5} +distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6} +distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7} +distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8} +distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9} +distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10} ####################################################################################### ## IME Settings ## From 64d1f3862d19a67f1464297a39731e37b5821b08 Mon Sep 17 00:00:00 2001 From: Mendel <44873735+rabbidiesel@users.noreply.github.com> Date: Fri, 31 Dec 2021 15:03:40 -0500 Subject: [PATCH 124/496] Yealink dialnow patchs (#6206) * Update provision.php * Update y000000000124.cfg Added {$yealink_dnd_allow} so that you can remove DND from the phone * Update app_config.php * Update y000000000053.cfg * Update y000000000007.cfg * Update y000000000052.cfg * Update y000000000005.cfg * Update y000000000066.cfg * Update y000000000108.cfg * Update y000000000124.cfg * Update y000000000065.cfg * Update y000000000004.cfg * Update y000000000044.cfg * Update y000000000097.cfg * Match the yealink default Co-authored-by: FusionPBX --- app/yealink/app_config.php | 8 ++++++++ .../templates/provision/yealink/t19p/y000000000053.cfg | 5 ++--- .../templates/provision/yealink/t20p/y000000000007.cfg | 5 ++--- .../templates/provision/yealink/t21p/y000000000052.cfg | 6 +++--- .../templates/provision/yealink/t22p/y000000000005.cfg | 2 +- .../templates/provision/yealink/t23g/y000000000044.cfg | 6 +++--- .../templates/provision/yealink/t26p/y000000000004.cfg | 2 +- .../templates/provision/yealink/t33g/y000000000124.cfg | 2 +- .../templates/provision/yealink/t46s/y000000000066.cfg | 6 +++--- .../templates/provision/yealink/t46u/y000000000108.cfg | 2 +- .../templates/provision/yealink/t48s/y000000000065.cfg | 2 +- .../templates/provision/yealink/t57w/y000000000097.cfg | 3 +-- 12 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index cb0e0269ab..63a3bf1fd2 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -830,6 +830,14 @@ $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "The language used in phone interface."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3f7a5ed6-364c-4d5c-ba7e-4c6e9bdf9131"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dialplan_dialnow_delay"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Time in second till dialnow activates."; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b2d1e9c4-7097-4fc8-bb14-5aba6df4ef32"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; diff --git a/resources/templates/provision/yealink/t19p/y000000000053.cfg b/resources/templates/provision/yealink/t19p/y000000000053.cfg index 31971ad2f2..7bc807ac54 100644 --- a/resources/templates/provision/yealink/t19p/y000000000053.cfg +++ b/resources/templates/provision/yealink/t19p/y000000000053.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 + #!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted.## @@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1 phone_setting.is_deal180 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled; phone_setting.custom_softkey_enable = @@ -1328,4 +1328,3 @@ web_item_level.url = ####################################################################################### sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable} - diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg index a7ac7b7da8..0454e18f26 100644 --- a/resources/templates/provision/yealink/t20p/y000000000007.cfg +++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg @@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1 phone_setting.is_deal180 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled; phone_setting.custom_softkey_enable = @@ -1327,5 +1327,4 @@ web_item_level.url = ## SIP Advanced ## ####################################################################################### -sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable} - +sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg index 7974aac10a..c061276af4 100644 --- a/resources/templates/provision/yealink/t21p/y000000000052.cfg +++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg @@ -875,7 +875,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Configure the emergency number, each separated by a comma. The default value is 112,911,110. phone_setting.emergency.number = {$yealink_emergency_number} @@ -1321,8 +1321,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook = #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled; forward.always.enable = forward.always.target = -forward.always.on_code = {$yealink_forward_always_on_code} -forward.always.off_code = {$yealink_forward_always_off_code} +forward.always.on_code = {$yealink_forward_always_on_code} +forward.always.off_code = {$yealink_forward_always_off_code} ####################################################################################### ## Forward Busy ## diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg index ec3744478d..80752affe6 100644 --- a/resources/templates/provision/yealink/t22p/y000000000005.cfg +++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg @@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1 phone_setting.is_deal180 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled; phone_setting.custom_softkey_enable = diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg index 2b14360fd9..2c301c539e 100644 --- a/resources/templates/provision/yealink/t23g/y000000000044.cfg +++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg @@ -915,7 +915,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Configure the emergency number, each separated by a comma. The default value is 112,911,110. phone_setting.emergency.number = {$yealink_emergency_number} @@ -1361,8 +1361,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook = #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled; forward.always.enable = forward.always.target = -forward.always.on_code = {$yealink_forward_always_on_code} -forward.always.off_code = {$yealink_forward_always_off_code} +forward.always.on_code = {$yealink_forward_always_on_code} +forward.always.off_code = {$yealink_forward_always_off_code} ####################################################################################### ## Forward Busy ## diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg index 7d962a307f..88c41446fa 100644 --- a/resources/templates/provision/yealink/t26p/y000000000004.cfg +++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg @@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1 phone_setting.is_deal180 = #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1. -phone_setting.dialnow_delay = +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled; phone_setting.custom_softkey_enable = diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg index d5b65ccf12..65215902a1 100644 --- a/resources/templates/provision/yealink/t33g/y000000000124.cfg +++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg @@ -1490,7 +1490,7 @@ dialplan_replace_rule.url= dialplan.replace.line_id.1= dialplan.replace.replace.1= dialplan.replace.prefix.1= -phone_setting.dialnow_delay= +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} dialplan_dialnow.url= dialplan.dialnow.line_id.1= dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1} diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg index 4509b48b54..37308242b5 100644 --- a/resources/templates/provision/yealink/t46s/y000000000066.cfg +++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg @@ -991,8 +991,8 @@ forward.no_answer.on_code= forward.no_answer.off_code= forward.busy.off_code= forward.busy.on_code= -forward.always.off_code = {$yealink_forward_always_off_code} -forward.always.on_code = {$yealink_forward_always_on_code} +forward.always.off_code = {$yealink_forward_always_off_code} +forward.always.on_code = {$yealink_forward_always_on_code} forward.no_answer.target= forward.busy.target= forward.always.target= @@ -1330,7 +1330,7 @@ dialplan_replace_rule.url= dialplan.replace.line_id.1= dialplan.replace.replace.1= dialplan.replace.prefix.1= -phone_setting.dialnow_delay= +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} dialplan_dialnow.url= dialnow.item.1= dialplan.dialnow.line_id.1= diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg index 19ec84e5c6..e454c60062 100644 --- a/resources/templates/provision/yealink/t46u/y000000000108.cfg +++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg @@ -1491,7 +1491,7 @@ dialplan_replace_rule.url= dialplan.replace.line_id.1= dialplan.replace.replace.1= dialplan.replace.prefix.1= -phone_setting.dialnow_delay= +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} dialplan_dialnow.url= dialplan.dialnow.line_id.1= dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1} diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg index 7d0fbccd68..d0fd8f3bcd 100644 --- a/resources/templates/provision/yealink/t48s/y000000000065.cfg +++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg @@ -1379,7 +1379,7 @@ dialplan_replace_rule.url= dialplan.replace.line_id.1= dialplan.replace.replace.1= dialplan.replace.prefix.1= -phone_setting.dialnow_delay= +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} dialplan_dialnow.url= dialnow.item.1= dialplan.dialnow.line_id.1= diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg index 37c79ffc8e..868b24eb2a 100644 --- a/resources/templates/provision/yealink/t57w/y000000000097.cfg +++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg @@ -1479,7 +1479,7 @@ dialplan_replace_rule.url= dialplan.replace.line_id.1= dialplan.replace.replace.1= dialplan.replace.prefix.1= -phone_setting.dialnow_delay= +phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay} dialplan_dialnow.url= dialplan.dialnow.line_id.1= @@ -1973,4 +1973,3 @@ phone_setting.end_call_on_hook.enable= directory_setting.shared_contact.enable= shared_contact_list.url= - From 3f144a35a4d299fe34f4cea8487dbb72e65d63ca Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 3 Jan 2022 15:31:30 -0700 Subject: [PATCH 125/496] Add from in a few more places. --- .../scripts/resources/functions/send_mail.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua index 703ddd1cd4..0a52466ef7 100644 --- a/app/scripts/resources/scripts/resources/functions/send_mail.lua +++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua @@ -159,7 +159,7 @@ else local sendmail = require "sendmail" local uuid = require "uuid" - function send_mail(headers, address, message, file) + function send_mail(headers, from, address, message, file) local domain_uuid = headers["X-FusionPBX-Domain-UUID"] local domain_name = headers["X-FusionPBX-Domain-Name"] local email_type = headers["X-FusionPBX-Email-Type"] or 'info' @@ -229,7 +229,7 @@ else end if freeswitch then - function send_mail(headers, address, message, file) + function send_mail(headers, from, address, message, file) local domain_uuid = headers["X-FusionPBX-Domain-UUID"] local domain_name = headers["X-FusionPBX-Domain-Name"] local email_type = headers["X-FusionPBX-Email-Type"] or 'info' @@ -242,15 +242,22 @@ else end xheaders = xheaders:sub(1,-2) .. '}' - local from = settings:get('email', 'smtp_from', 'text') - local from_name = settings:get('email', 'smtp_from_name', 'text') + if (from == nil or from == "") then + from = settings:get('email', 'smtp_from', 'text') + from_name = settings:get('email', 'smtp_from_name', 'text') + end if from == nil or from == "" then from = address elseif from_name ~= nil and from_name ~= "" then from = from_name .. "<" .. from .. ">" end + local subject = message[1] local body = message[2] or '' + + --debug info + --freeswitch.consoleLog("notice", "[voicemail] from: " .. from .. "\n"); + --freeswitch.consoleLog("notice", "[voicemail] subject: " .. subject .. "\n"); local mail_headers = "To: ".. address .. "\n" .. From 82d1c9abbf783070bcde50616d1a4a74d041f611 Mon Sep 17 00:00:00 2001 From: smeyernyc Date: Tue, 4 Jan 2022 12:53:59 -0500 Subject: [PATCH 126/496] =?UTF-8?q?create=20provision=20file=20for=20w73/7?= =?UTF-8?q?6/79p=20technically=20it=20can=20support=2010=20ac=E2=80=A6=20(?= =?UTF-8?q?#6219)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * create provision file for w73/76/79p technically it can support 10 accounts but screw it, 8 is fine. * Create directory.xml * Create favorite_setting.xml * Create y000000000146.cfg * Create y000000000000.boot * Update app_config.php * Update y000000000000.boot * Update app_config.php --- app/yealink/app_config.php | 8 + .../provision/yealink/t48u/y000000000000.boot | 2 +- .../provision/yealink/w7xp/directory.xml | 83 + .../yealink/w7xp/favorite_setting.xml | 8 + .../provision/yealink/w7xp/y000000000000.boot | 7 + .../provision/yealink/w7xp/y000000000146.cfg | 605 +++++ .../provision/yealink/w7xp/{$mac}.cfg | 2105 +++++++++++++++++ 7 files changed, 2817 insertions(+), 1 deletion(-) create mode 100644 resources/templates/provision/yealink/w7xp/directory.xml create mode 100644 resources/templates/provision/yealink/w7xp/favorite_setting.xml create mode 100644 resources/templates/provision/yealink/w7xp/y000000000000.boot create mode 100644 resources/templates/provision/yealink/w7xp/y000000000146.cfg create mode 100644 resources/templates/provision/yealink/w7xp/{$mac}.cfg diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index 63a3bf1fd2..58c60a5e9c 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -399,6 +399,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T46U firmware ROM"; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fe57b4db-e6a2-49be-b103-74345e8dd8b5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t48u"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "T46U(T43U,T46U,T41U,T48U,T42U)-108.86.0.20.rom"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T46U firmware ROM"; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6b70cfeb-2124-42dc-ba8b-6cd77da3fa5f"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t53w"; diff --git a/resources/templates/provision/yealink/t48u/y000000000000.boot b/resources/templates/provision/yealink/t48u/y000000000000.boot index f937e7d73d..a041c7bba8 100644 --- a/resources/templates/provision/yealink/t48u/y000000000000.boot +++ b/resources/templates/provision/yealink/t48u/y000000000000.boot @@ -1,7 +1,7 @@ #!version:1.0.0.1 ## The header above must appear as-is in the first line -include:config "y000000000108.cfg" +include:config "y000000000109.cfg" include:config "{$mac}.cfg" overwrite_mode = {$yealink_overwrite_mode} diff --git a/resources/templates/provision/yealink/w7xp/directory.xml b/resources/templates/provision/yealink/w7xp/directory.xml new file mode 100644 index 0000000000..297b9e4108 --- /dev/null +++ b/resources/templates/provision/yealink/w7xp/directory.xml @@ -0,0 +1,83 @@ + +{foreach $contacts as $row} +{if $smarty.get.contacts == "users" && $row.category == "users"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} +{$row.effective_caller_id_name} +{/if} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} + +{elseif $smarty.get.contacts == "groups" && $row.category == "groups"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} + {$row.effective_caller_id_name} +{/if} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} + +{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"} + +{if $row.contact_name_given != ""} + {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.effective_caller_id_name} +{/if} +{if $row.phone_number != ""} + {$row.phone_number} +{else} + {$row.phone_extension} +{/if} + +{elseif $smarty.get.contacts == "all"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} + {$row.effective_caller_id_name} +{/if} +{if $row.category == "extensions"} +{if $row.phone_number != ""} + {$row.phone_number} +{else} + {$row.phone_extension} +{/if} +{else} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} +{/if} + +{/if} +{/foreach} + diff --git a/resources/templates/provision/yealink/w7xp/favorite_setting.xml b/resources/templates/provision/yealink/w7xp/favorite_setting.xml new file mode 100644 index 0000000000..ba7275358e --- /dev/null +++ b/resources/templates/provision/yealink/w7xp/favorite_setting.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/templates/provision/yealink/w7xp/y000000000000.boot b/resources/templates/provision/yealink/w7xp/y000000000000.boot new file mode 100644 index 0000000000..a0d8ff513e --- /dev/null +++ b/resources/templates/provision/yealink/w7xp/y000000000000.boot @@ -0,0 +1,7 @@ +#!version:1.0.0.1 +## The header above must appear as-is in the first line + +include:config "y000000000146.cfg" +include:config "{$mac}.cfg" + +overwrite_mode = {$yealink_overwrite_mode} diff --git a/resources/templates/provision/yealink/w7xp/y000000000146.cfg b/resources/templates/provision/yealink/w7xp/y000000000146.cfg new file mode 100644 index 0000000000..ecf7f3ab8b --- /dev/null +++ b/resources/templates/provision/yealink/w7xp/y000000000146.cfg @@ -0,0 +1,605 @@ +#!version:1.0.0.1 + +##File header "#!version:1.0.0.1" can not be edited or deleted.## + +####################################################################################### +## Network ## +####################################################################################### +#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address; +#Require reboot; +network.internet_port.type = + +#Configure the static IP address, submask, gateway and DNS server. +#Require reboot; +network.internet_port.ip = +network.internet_port.mask = +network.internet_port.gateway = +network.primary_dns = {$dns_server_primary} +network.secondary_dns = {$dns_server_secondary} + +#Configure the username and password for PPPOE connection. +#Require reboot; +network.pppoe.user = +network.pppoe.password = + +#Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled; +#Require reboot; +network.vlan.internet_port_enable = {$yealink_vlan_enable} + +#Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. +#Require reboot; +network.vlan.internet_port_vid = {$yealink_vlan_id} + +#Configure the VLAN priority, it ranges from 0 (default) to 7. +#Require reboot; +network.vlan.internet_port_priority = + +#Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); +#Require reboot; +network.vlan.dhcp_enable = + +#Configure the DHCP option to obtain the information of the VLAN. It ranges from 0 to 255. +#Multiple options separated by a comma. It supports up to 5 options in all. +#Require reboot; +network.vlan.dhcp_option = + +#Configure the HTTP port (80 by default) and the HTTPS port (443 by default) of the web server. Both range from 1 to 65535. +#Require reboot; +network.port.http = +network.port.https = + +#Configure the maximum local RTP port. It ranges from 0 to 65535, the default value is 12780. +#Require reboot; +network.port.max_rtpport = + +#Configure the minimum local RTP port. It ranges from 0 to 65535, the default value is 11780. +#Require reboot; +network.port.min_rtpport = + +#Configure the voice QOS. It ranges from 0 to 63, the default value is 40. +#Require reboot; +network.qos.rtptos = + +#Configure the SIP QOS. It ranges from 0 to 63, the default value is 26. +#Require reboot; +network.qos.signaltos = + +#Configure the 802.1x mode; 0-Disabled (default), 1-Enabled (EAP-MD5); +#Require reboot; +network.802_1x.mode = + +#Configure the username and password for 802.1x authentication. +#Require reboot; +network.802_1x.identity = +network.802_1x.md5_password = + +#Enable or disable the VPN feature; 0-Disabled (default), 1-Enabled; +#Require reboot; +network.vpn_enable = {$yealink_network_vpn_enable} + +#Enable or disable the LLDP feature; 0-Disabled, 1-Enabled (default); +#Require reboot; +network.lldp.enable = + +#Configure the interval (in seconds) the phone broadcasts the LLDP request. It ranges from 1 to 3600, the default value is 60. +#Require reboot; +network.lldp.packet_interval = + +####################################################################################### +## Syslog Server ## +####################################################################################### + +#Configure the syslog mode; 0-Local, 1-Server,the default value is 0; +#Require reboot; +syslog.mode = + +#Configure the IP address of the syslog server; +#Require reboot; +syslog.server = + +#Configure the syslog level. It ranges from 0 to 6, the default value is 3. +#Require reboot; +syslog.log_level = + +####################################################################################### +## Auto Provisioning ## +####################################################################################### + +#Enable or disable the Plug and Play feature; 0-Disabled, 1-Enabled(default); +auto_provision.pnp_enable = 1 + +#Enable or disable the phone to check new configuration when powered on; 0-Disabled, 1-Enabled (default); +auto_provision.mode = 1 + +#Enable or disable the phone to check the new configuration repeatedly; 0-Disabled (default), 1-Enabled; +auto_provision.repeat.enable = 1 + +#Configure the interval (in minutes) the phone repeatedly checks the new configuration. The default is 1440. +auto_provision.repeat.minutes = + +#Enable or disable the phone to check the new configuration weekly; 0-Disabled (default), 1-Enabled; +auto_provision.weekly.enalbe = + +#Configure the week time the phone checks the new configuration. Applicable when the auto provisioning mode is configured as weekly or power on + weekly. +auto_provision.weekly.mask = +auto_provision.weekly.begin_time = +auto_provision.weekly.end_time = + +#Configure the URL of the auto provisioning server. +auto_provision.server.url = {$yealink_provision_url} + +#Configure the username and password for downloading. +auto_provision.server.username = {$http_auth_username} +auto_provision.server.password = {$http_auth_password} + +#Configure the domain name of the PNP server. +auto_provision.pnp_domain_name = + +#Configure the PNP vendor information. +auto_provision.pnp_event_vendor = + +#Configure the name of the Common configuration file. +auto_provision.common_file_name = + +#Enable or disable the DHCP option mode; 0-Disabled, 1-Enabled (default); +auto_provision.dhcp_enable = + +#Configure the value (manufacturer of the device) of DHCP option 60. +auto_provision.dhcp_option.option60_value = + +#Configure the custom DHCP option number. It ranges from 128 to 254. +auto_provision.dhcp_option.list_user_options = + +#Configure AES key (16 characters) for decrypting the common CFG file. +auto_provision.aes_key_16.com = + +#Configure AES key (16 characters) for decrypting the MAC-Oriented CFG file. +auto_provision.aes_key_16.mac = + +####################################################################################### +## Phone Features ## +####################################################################################### + +#Enable or disable the phone to keep sending the SIP messages to the outbound server; 0-Disabled, 1-Enabled (default); +sip.use_out_bound_in_dialog = + +#Configure the registration random time (in seconds). It ranges from 0 (default) to 60. +sip.reg_surge_prevention = + +#Enable or disable the transferee to display the missed call prompt when receiving a semi_attended transfer call; +#0-Disabled, 1-Enabled (default); +transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended} + +#Enable or disable the phone to complete the blind or attended transfer through on-hook; +#0-Disabled (default), 1-Enabled; +transfer.blind_tran_on_hook_enable = +transfer.on_hook_trans_enable = + +#Enable or disable to access the web user interface of phone using the http/https protocol; +#0-Disabled,1-Enabled (default); +#Require Reboot; +wui.https_enable = +wui.http_enable = + +#Enable or disable the feature key synchronization, 0-Disabled (default), 1-Enabled; +bw.feature_key_sync = {$yealink_feature_key_sync} + +####################################################################################### +## Security Settings ## +####################################################################################### + +#Enable or disable the phone to only accept the certificates in the Trusted Certificates list; +#0-Disabled, 1-Enabled (default); +security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if} + +#Set the password of the user or the administrator, the value format is: user:password or admin:password; +{if isset($user_name) } +security.user_name.user = {$user_name} +security.user_password = {$user_name}:{$user_password} +{/if} +{if isset($admin_name) } +security.user_name.admin = {$admin_name} +security.user_password = {$admin_name}:{$admin_password} +{/if} +{if isset($var_name) } +security.user_name.var = {$var_name} +security.user_password = {$var_name}:{$var_password} +{/if} + +base.pin_code = + +####################################################################################### +## Language Settings ## +####################################################################################### + +#Specify the web language, the valid values are: English, Chinese_S, German, Italian and Turkish; +lang.wui = + +####################################################################################### +## Time Settings ## +####################################################################################### + +#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8. +#The default time zone name is China(Beijing). +#local_time.time_zone = +8 +#local_time.time_zone_name = China(Beijing) +local_time.time_zone = {$yealink_time_zone} +local_time.time_zone_name = {$yealink_time_zone_name} + +#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org. +local_time.ntp_server1 = {$ntp_server_primary} +local_time.ntp_server2 = {$ntp_server_secondary} + +#Configure the update interval (in seconds) when using the NTP server. The default value is 1000. +local_time.interval = + +#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default); +local_time.summer_time = {$yealink_summer_time} + +#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week; +local_time.dst_time_type = {$yealink_dst_type} + +#Configure the start time of DST. The default value is 1/1/0. +#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20. +#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day. +#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January. +local_time.start_time = {$yealink_time_zone_start_time} + +#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time. +local_time.end_time = {$yealink_time_zone_end_time} + +#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank. +local_time.offset_time = {$yealink_offset_time} + +#Configure the time format; 0-12 Hour, 1-24 Hour (default); +local_time.time_format = {$yealink_time_format} + +#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM; +local_time.date_format = {$yealink_date_format} + +#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled; +local_time.dhcp_time = {$yealink_dhcp_time} + +#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0. +local_time.manual_time_enable = + +####################################################################################### +## Dial Plan ## +####################################################################################### + +#Configure the area code. +dialplan.area_code.code = +dialplan.area_code.min_len = 1 +dialplan.area_code.max_len = 15 + +#When applying the rule to multiple lines, each line ID separated by comma. +#e.g. dialplan.area_code.line_id = 1, 2, 3 +dialplan.area_code.line_id = + +#Configure the block out number. X ranges from 1 to 10. +#dialplan.block_out.number.x = +dialplan.block_out.number.1 = + +#When applying the rule to multiple lines, each line ID separated by comma, e.g. 1,2,3. +#dialplan.block_out.line_id.x = +dialplan.block_out.line_id.1 = + +#Configure the replace rule. X ranges from 1 to 10; +#dialplan.replace.prefix.x = +#dialplan.replace.replace.x = +#dialplan.replace.line_id.x = + +dialplan.replace.prefix.1 = +dialplan.replace.replace.1 = +dialplan.replace.line_id.1 = + +####################################################################################### +## Phone Settings ## +####################################################################################### + +#Configure the return code when activating DND; 404-No Found, 480-Temporarily not available (default), 486-Busy here; +#features.dnd_refuse_code = 480 + +#Configure the return code when refusing a call. The valid values are 404, 480, 486 (default). +features.normal_refuse_code = 486 + +account.X.dnd.on_code = +account.X.dnd.off_code = + +#Enable or disable the call waiting feature; 0-Disabled, 1-Enabled (default); +call_waiting.enable = {$yealink_call_waiting} + +#Enable or disable the playing of call waiting tone; 0-Disabled, 1-Enabled (default); +call_waiting.tone = {$yealink_call_waiting_tone} + +#Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default); +features.direct_ip_call_enable = 0 +sip.trust_ctrl=1 + +#Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default); +features.save_call_history = + +#Configure the overtime (in minutes) of logging web user interface. It ranges from 1 to 1000, the default value is 5. +features.relog_offtime = 5 + +#Enable or disable the phone to deal the 180 SIP message after the 183 SIP message; 0-Disabled, 1-Enabled (default); +phone_setting.is_deal180 = 1 + +#Enable or disable the phone to automatically dial out the dialed digits in the pre-dial interface; 0-Disabled (default), 1-Enabled; +phone_setting.predial_autodial = 1 + +####################################################################################### +## Base_Upgrade ## +####################################################################################### +firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w60b} + +####################################################################################### +## Handset_upgrade ## +####################################################################################### + +over_the_air.url = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url} +over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url} +over_the_air.base_trigger = 1 +over_the_air.handset_tip = 1 + +####################################################################################### +## Certificates ## +####################################################################################### +trusted_certificates.url = + +#trusted_certificates.delete = http://localhost/all,delete all the trusted certificates; +trusted_certificates.delete = + +server_certificates.url = + +#server_certificates.delete = http://localhost/all, delete the server certificate; +server_certificates.delete = + +####################################################################################### +## Local Contact/DST Time/Replace Rule ## +####################################################################################### +auto_dst.url = {$yealink_auto_dst_url} +dialplan_replace_rule.url = +blacklist.url = +handset.X.contact_list.url = + +####################################################################################### +## Customized Factory Configurations ## +####################################################################################### +#Configure the access URL for downloading the customized factory configurations; +custom_factory_configuration.url = + +####################################################################################### +## OpenVPN ## +####################################################################################### +#Configure the access URL for downloading the open VPN tar; +openvpn.url = {$yealink_openvpn_url} + + +####################################################################################### +## Remote Phonebook ## +####################################################################################### + +#Configure the access URL and dispaly name of the remote phonebook. X ranges from 1 to 5. +remote_phonebook.display_name = + +{if isset($yealink_remote_phonebook_1_name) } +remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name} +{else} +remote_phonebook.data.1.name = Users +{/if} +{if isset($yealink_remote_phonebook_1_url) } +remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url} +{else} +remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users +{/if} + +{if isset($yealink_remote_phonebook_2_name) } +remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name} +{else} +remote_phonebook.data.2.name = Groups +{/if} +{if isset($yealink_remote_phonebook_2_url) } +remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url} +{else} +remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups +{/if} + +{if isset($yealink_remote_phonebook_3_name) } +remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name} +{else} +remote_phonebook.data.3.name = Extensions +{/if} +{if isset($yealink_remote_phonebook_3_url) } +remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url} +{else} +remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions +{/if} + +remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name} +remote_phonebook.data.4.url = {$yealink_remote_phonebook_4_url} + +remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name} +remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url} + +####################################################################################### +## Network Directory ## +####################################################################################### + +#Configure the interval(in minutes) for the phone to update phonebook,(1440 by default); +directory.update_time_interval = + +#Enable or disable the phone to match the incoming call with the contact in the remote phonebook; 0-Disabled, 1-Enabled(default); +directory.incoming_call_match_enable = + +#Enable or disable the broadsoft directory; 0-Disabled (default), 1-Enabled; +bw.directory_enable = + +#Network Phonebook +xsi.host = +xsi.user = +xsi.password = +bw_phonebook.group_enable = 1 +bw_phonebook.group_common_enable = 0 +bw_phonebook.enterprise_enable = 0 +bw_phonebook.enterprise_common_enable = 0 +bw_phonebook.personal_enable = 0 +bw_phonebook.update_interval = 1440 + +#Network Call Log +bw_phonebook.call_log_enable = 0 + +####################################################################################### +## Echo Cancellation ## +####################################################################################### +voice.cng = {$yealink_cng} +voice.vad = {$yealink_vad} + +####################################################################################### +## Jitter Buffer ## +####################################################################################### +voice.jib.adaptive = {$yealink_jib_adaptive} +voice.jib.min = {$yealink_jib_min} +voice.jib.max = {$yealink_jib_max} +voice.jib.normal= {$yealink_jib_normal} + +####################################################################################### +## Tone ## +####################################################################################### +voice.tone.country = Custom +voice.tone.dial = +voice.tone.ring = +voice.tone.busy = +voice.tone.callwaiting = + + +####################################################################################### +## Number Assignment ## +####################################################################################### +#The line accept to incoming(1,2,3,4,5);X ranges from 1 to 5 +#handset.X.incoming_lines = 1,2,3,4 + +handset.1.incoming_lines = {$yealink_handset_1_incoming_lines} +handset.2.incoming_lines = {$yealink_handset_2_incoming_lines} +handset.3.incoming_lines = {$yealink_handset_3_incoming_lines} +handset.4.incoming_lines = {$yealink_handset_4_incoming_lines} +handset.5.incoming_lines = {$yealink_handset_5_incoming_lines} +handset.6.incoming_lines = {$yealink_handset_6_incoming_lines} +handset.7.incoming_lines = {$yealink_handset_7_incoming_lines} +handset.8.incoming_lines = {$yealink_handset_8_incoming_lines} + +#The line accept to call out(1,2,3,4,5) +#handset.X.dial_out_lines = 1,2,5 +#handset.X.dial_out_default_line = 1 + +handset.1.dial_out_lines = {$yealink_handset_1_dial_out_lines} +handset.1.dial_out_default_line = {$yealink_handset_1_out_default_line} + +handset.2.dial_out_lines = {$yealink_handset_2_dial_out_lines} +handset.2.dial_out_default_line = {$yealink_handset_2_out_default_line} + +handset.3.dial_out_lines = {$yealink_handset_3_dial_out_lines} +handset.3.dial_out_default_line = {$yealink_handset_3_out_default_line} + +handset.4.dial_out_lines = {$yealink_handset_4_dial_out_lines} +handset.4.dial_out_default_line = {$yealink_handset_4_out_default_line} + +handset.5.dial_out_lines = {$yealink_handset_5_dial_out_lines} +handset.5.dial_out_default_line = {$yealink_handset_5_out_default_line} + +handset.6.dial_out_lines = {$yealink_handset_6_dial_out_lines} +handset.6.dial_out_default_line = {$yealink_handset_6_out_default_line} + +handset.7.dial_out_lines = {$yealink_handset_7_dial_out_lines} +handset.7.dial_out_default_line = {$yealink_handset_7_out_default_line} + +handset.8.dial_out_lines = {$yealink_handset_8_dial_out_lines} +handset.8.dial_out_default_line = {$yealink_handset_8_out_default_line} + +handset.1.name = {$display_name_1} +handset.2.name = {$display_name_2} +handset.3.name = {$display_name_3} +handset.4.name = {$display_name_4} +handset.5.name = {$display_name_5} +handset.6.name = {$display_name_6} +handset.7.name = {$display_name_7} +handset.8.name = {$display_name_8} + +####################################################################################### +## Language Settings ## +####################################################################################### +{if isset({$yealink_language_gui})}static.lang.gui = {$yealink_language_gui}{else}static.lang.gui = English{/if} + + +####################################################################################### +## Auto Provisioning Code ## +####################################################################################### + +#This feature allows user to trigger the auto provisioning by pressing a predefined string on the phone. +#Require reboot; +#"X" ranges from 1 to 50 + +#Configure the auto provisioning name. +#The valid value is a string, the maximum length is 100. +#autoprovision.X.name = + +#Configure the auto provisioning code; +#The valid value is a string, the maximum length is 100. +#autoprovision.X.code = + +#Configure the URL of the auto provisioning server. +#The valid value is a string, the maximum length is 256. +#autoprovision.X.url = + +#Configure the username and password for downloading. +#The valid value is a string, the maximum length is 100. +#autoprovision.X.user = +#autoprovision.X.password = + +#Configure AES key (16 characters) for decrypting the common CFG file and MAC-Oriented CFG file. +#autoprovision.X.com_aes = +#autoprovision.X.mac_aes = + +autoprovision.1.name = +autoprovision.1.code = +autoprovision.1.url = +autoprovision.1.user = +autoprovision.1.password = +autoprovision.1.com_aes = +autoprovision.1.mac_aes = + + +####################################################################################### +## TR069 ## +####################################################################################### +#The TR069 feature is only applicable to some designated firmware version. +#All settings of TR069 require reboot. +#Enable or disable the TR069 feature; 0-Disabled (default), 1-Enabled; + +managementserver.enable = +managementserver.username = +managementserver.password = +managementserver.url = +managementserver.periodic_inform_enable = +managementserver.periodic_inform_interval = +managementserver.connection_request_username = +managementserver.connection_request_password = + + +####################################################################################### +## SNMP ## +####################################################################################### +#Enable or disable the SNMP feature; 0-Disabled (default), 1-Enabled; +#Require reboot; +network.snmp.enable = +network.snmp.port = + +#Configure the IP address(es) of the trusted SNMP server,multiple IP addresses must be separated by a space. +#Require reboot; +network.snmp.trust_ip = + +####################################################################################### +## SIP Advanced ## +####################################################################################### + +sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable} diff --git a/resources/templates/provision/yealink/w7xp/{$mac}.cfg b/resources/templates/provision/yealink/w7xp/{$mac}.cfg new file mode 100644 index 0000000000..8890e0bac4 --- /dev/null +++ b/resources/templates/provision/yealink/w7xp/{$mac}.cfg @@ -0,0 +1,2105 @@ +#!version:1.0.0.1 +#{$microtime} + +##File header "#!version:1.0.0.1" can not be edited or deleted.## + +####################################################################################### +## Account 1 Settings ## +####################################################################################### + +#Basic Settings +account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""} + +account.1.label = {$account.1.label} +account.1.display_name = {$account.1.display_name} + +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} +account.1.user_name = {$account.1.user_id} +{/if} +{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if} + +account.1.auth_name = {$account.1.user_id} +account.1.password = {$account.1.password} + +account.1.sip_server_port = {$account.1.sip_port} +account.1.transport = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $account.1.sip_transport == 'tls'}2{/if}{if $account.1.sip_transport == 'dns srv'}3{/if}{""} + +account.1.expires = {$account.1.register_expires} +account.1.outbound_host = {$account.1.outbound_proxy} +account.1.outbound_port = {$account.1.sip_port} + +#Server Redundancy +account.1.sip_server.2.address= {$account.1.server.2.address} +account.1.sip_server.2.port= {$account.1.sip_port} +account.1.sip_server.2.transport_type = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $account.1.sip_transport == 'tls'}2{/if}{if $account.1.sip_transport == 'dns srv'}3{/if}{""} + +account.1.sip_server.2.expires= {$account.1.register_expires} +account.1.retry_counts = 3 + +#Basic Proxy Settings +account.1.outbound_proxy_enable= {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}{""} + +account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary} +account.1.outbound_proxy.1.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""} + +account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary} + +account.1.outbound_proxy.2.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""} +account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.1.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.1.anonymous_call_oncode = +account.1.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.1.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.1.anonymous_reject_oncode = +account.1.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.1.sip_listen_port = + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.1.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.1.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.1.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.1.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.1.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.1.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.1.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.1.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.1.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.1.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.1.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.1.srtp_encryption = {$yealink_srtp_encryption} + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.1.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.1.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.1.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.1.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.1.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.1.enable_signal_encode = + +#Configure the key for encoding. +account.1.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.1.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.1.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.1.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.1.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.1.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.1.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; +account.1.nat.udp_update_enable = 3 + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.1.nat.udp_update_time = 30 + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.1.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.1.advanced.timer_t1 = +account.1.advanced.timer_t2 = +account.1.advanced.timer_t4 = + +account.1.codec.1.enable = {if isset($yealink_codec_pcmu_enable)}1{else}0{/if} + +account.1.codec.1.payload_type = PCMU +account.1.codec.1.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if} + +account.1.codec.1.rtpmap = 0 + +account.1.codec.2.enable = {if isset($yealink_codec_pcma_enable)}1{else}0{/if} + +account.1.codec.2.payload_type = PCMA +account.1.codec.2.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if} + +account.1.codec.2.rtpmap = 8 + +account.1.codec.3.enable = {if isset($yealink_codec_g723_53_enable)}1{else}0{/if} + +account.1.codec.3.payload_type = G723_53 +account.1.codec.3.priority ={if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if} + +account.1.codec.3.rtpmap = 4 + +account.1.codec.4.enable = {if isset($yealink_codec_g723_63_enable)}1{else}0{/if} + +account.1.codec.4.payload_type = G723_63 +account.1.codec.4.priority = {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if} + +account.1.codec.4.rtpmap = 4 + +account.1.codec.5.enable = {if isset($yealink_codec_g729_enable)}1{else}0{/if} + +account.1.codec.5.payload_type = G729 +account.1.codec.5.priority = {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if} + +account.1.codec.5.rtpmap = 18 + +account.1.codec.6.enable = {if isset($yealink_codec_g722_enable)}1{else}0{/if} + +account.1.codec.6.payload_type = G722 +account.1.codec.6.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if} + +account.1.codec.6.rtpmap = 9 + +account.1.codec.7.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if} + +account.1.codec.7.payload_type = iLBC +account.1.codec.7.priority = {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if} + +account.1.codec.7.rtpmap = 106 + +account.1.codec.8.enable = {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} + +account.1.codec.8.payload_type = G726-16 +account.1.codec.8.priority = {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if} + +account.1.codec.8.rtpmap = 103 + +account.1.codec.9.enable = {if isset($yealink_codec_g726_24_enable)}1{else}0{/if} + +account.1.codec.9.payload_type = G726-24 +account.1.codec.9.priority = {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if} + +account.1.codec.9.rtpmap = 104 + +account.1.codec.10.enable = {if isset($yealink_codec_g726_32_enable)}1{else}0{/if} + +account.1.codec.10.payload_type = G726-32 +account.1.codec.10.priority = {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if} + +account.1.codec.10.rtpmap = 102 + +account.1.codec.11.enable = {if isset($yealink_codec_g726_40_enable)}1{else}0{/if} + +account.1.codec.11.payload_type = G726-40 +account.1.codec.11.priority = {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if} + +account.1.codec.11.rtpmap = 105 + +account.1.codec.12.enable = {if isset($yealink_codec_gsm_enable)}1{else}0{/if} + +account.1.codec.12.payload_type = GSM +account.1.codec.12.priority = {if isset($yealink_codec_gsm_priority)}{$yealink_codec_gsm_priority}{else}0{/if} + +account.1.codec.12.rtpmap = 3 + +account.1.codec.13.enable = {if isset($yealink_codec_opus_enable)}1{else}0{/if} + +account.1.codec.13.payload_type = opus +account.1.codec.13.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if} + +account.1.codec.13.rtpmap = 106 + + + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.1.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.1.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.1.busy_fwd.enable = +account.1.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.1.timeout_fwd.enable = +account.1.timeout_fwd.target = +account.1.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account1; 0-Disabled (default), 1-Enabled; +account.1.dnd.enable = + +#Configure the DND on code and off code for account1. + +account.1.sip_trust_ctrl = 1 + +voice_mail.number.1 = {$voicemail_number} + +####################################################################################### +## Account 2 Settings ## +####################################################################################### + +#Basic Settings +account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""} + +account.2.label = {$account.2.label} +account.2.display_name = {$account.2.display_name} + +{if isset($account.2.server.1.address)} +account.2.user_name = {$account.2.user_id}@{$account.2.server_address} +{else} +account.2.user_name = {$account.2.user_id} +{/if} + +account.2.auth_name = {$account.2.user_id} +account.2.password = {$account.2.password} + +{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if} + +account.2.sip_server_port = {$account.2.sip_port} +account.2.transport = {if $account.2.sip_transport == 'udp'}0{/if}{if $account.2.sip_transport == 'tcp'}1{/if}{if $account.2.sip_transport == 'tls'}2{/if}{if $account.2.sip_transport == 'dns srv'}3{/if}{""} + +account.2.expires = {$account.2.register_expires} +account.2.outbound_host = {$account.2.outbound_proxy} +account.2.outbound_port = {$account.2.sip_port} + +#Server Redundancy +account.2.sip_server.2.address= {$account.2.server.2.address} +account.2.sip_server.2.port= {$account.2.sip_port} +account.2.sip_server.2.transport_type = {if $account.2.sip_transport == 'udp'}0{/if}{if $account.2.sip_transport == 'tcp'}1{/if}{if $account.2.sip_transport == 'tls'}2{/if}{if $account.2.sip_transport == 'dns srv'}3{/if}{""} + +account.2.sip_server.2.expires= {$account.2.register_expires} +account.2.retry_counts = 3 + +#Basic Proxy Settings +account.2.outbound_proxy_enable= {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}{""} + +account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary} +account.2.outbound_proxy.1.port = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""} + +account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary} +account.2.outbound_proxy.2.port = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""} + +account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.2.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.2.anonymous_call_oncode = +account.2.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.2.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.2.anonymous_reject_oncode = +account.2.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.2.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.2.expires = {$account.2.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.2.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.2.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.2.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.2.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.2.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.2.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.2.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.2.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.2.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.2.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.2.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.2.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.2.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.2.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.2.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.2.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.2.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.2.enable_signal_encode = + +#Configure the key for encoding. +account.2.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.2.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.2.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.2.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.2.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.2.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.2.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.2.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.2.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.2.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.2.advanced.timer_t1 = +account.2.advanced.timer_t2 = +account.2.advanced.timer_t4 = + +account.2.codec.1.enable = 1 +account.2.codec.1.payload_type = PCMU +account.2.codec.1.priority = 1 +account.2.codec.1.rtpmap = 0 + +account.2.codec.2.enable = 1 +account.2.codec.2.payload_type = PCMA +account.2.codec.2.priority = 2 +account.2.codec.2.rtpmap = 8 + +account.2.codec.3.enable = 0 +account.2.codec.3.payload_type = G723_53 +account.2.codec.3.priority =0 +account.2.codec.3.rtpmap = 4 + +account.2.codec.4.enable = 0 +account.2.codec.4.payload_type = G723_63 +account.2.codec.4.priority = 0 +account.2.codec.4.rtpmap = 4 + +account.2.codec.5.enable = 1 +account.2.codec.5.payload_type = G729 +account.2.codec.5.priority = 3 +account.2.codec.5.rtpmap = 18 + +account.2.codec.6.enable = 1 +account.2.codec.6.payload_type = G722 +account.2.codec.6.priority = 4 +account.2.codec.6.rtpmap = 9 + +account.2.codec.7.enable = 0 +account.2.codec.7.payload_type = G726-32 +account.2.codec.7.priority = 0 +account.2.codec.7.rtpmap = 2 + +account.2.codec.8.enable = 0 +account.2.codec.8.payload_type = iLBC_13_3 +account.2.codec.8.priority = 0 +account.2.codec.8.rtpmap = 97 + +account.2.codec.9.enable = 0 +account.2.codec.9.payload_type = iLBC_15_2 +account.2.codec.9.priority = 0 +account.2.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.2.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.2.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.2.busy_fwd.enable = +account.2.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.2.timeout_fwd.enable = +account.2.timeout_fwd.target = +account.2.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account2; 0-Disabled (default), 1-Enabled; +account.2.dnd.enable = + +#Configure the DND on code and off code for account1. + +account.2.sip_trust_ctrl = 1 + +voice_mail.number.2 = {$voicemail_number} + +####################################################################################### +## Account 3 Settings ## +####################################################################################### + +#Basic Settings +account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""} + +account.3.label = {$account.3.label} +account.3.display_name = {$account.3.display_name} + +{if isset($account.3.server.1.address)} +account.3.user_name = {$account.3.user_id}@{$account.3.server_address} +{else} +account.3.user_name = {$account.3.user_id} +{/if} + +account.3.auth_name = {$account.3.user_id} +account.3.password = {$account.3.password} + +{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if} + +account.3.sip_server_port = {$account.3.sip_port} +account.3.transport = {if $account.3.sip_transport == 'udp'}0{/if}{if $account.3.sip_transport == 'tcp'}1{/if}{if $account.3.sip_transport == 'tls'}2{/if}{if $account.3.sip_transport == 'dns srv'}3{/if}{""} + +account.3.expires = {$register_expires} +account.3.outbound_host = {$outbound_proxy} +account.3.outbound_port = {$sip_port} + +#Server Redundancy +account.3.sip_server.2.address= {$account.3.server.2.address} +account.3.sip_server.2.port= {$account.3.sip_port} +account.3.sip_server.2.transport_type = {if $account.3.sip_transport == 'udp'}0{/if}{if $account.3.sip_transport == 'tcp'}1{/if}{if $account.3.sip_transport == 'tls'}2{/if}{if $account.3.sip_transport == 'dns srv'}3{/if}{""} + +account.3.sip_server.2.expires= {$account.3.register_expires} +account.3.retry_counts = 3 + +#Basic Proxy Settings +account.3.outbound_proxy_enable= {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}{""} + +account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary} +account.3.outbound_proxy.1.port = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""} + +account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary} +account.3.outbound_proxy.2.port = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""} +a +ccount.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.3.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.3.anonymous_call_oncode = +account.3.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.3.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.3.anonymous_reject_oncode = +account.3.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.3.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.3.expires = {$account.3.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.3.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.3.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.3.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.3.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.3.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.3.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.3.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.3.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.3.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.3.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.3.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.3.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.3.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.3.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.3.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.3.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.3.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.3.enable_signal_encode = + +#Configure the key for encoding. +account.3.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.3.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.3.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.3.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.3.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.3.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.3.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.3.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.3.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.3.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.3.advanced.timer_t1 = +account.3.advanced.timer_t2 = +account.3.advanced.timer_t4 = + +account.3.codec.1.enable = 1 +account.3.codec.1.payload_type = PCMU +account.3.codec.1.priority = 1 +account.3.codec.1.rtpmap = 0 + +account.3.codec.2.enable = 1 +account.3.codec.2.payload_type = PCMA +account.3.codec.2.priority = 2 +account.3.codec.2.rtpmap = 8 + +account.3.codec.3.enable = 0 +account.3.codec.3.payload_type = G723_53 +account.3.codec.3.priority =0 +account.3.codec.3.rtpmap = 4 + +account.3.codec.4.enable = 0 +account.3.codec.4.payload_type = G723_63 +account.3.codec.4.priority = 0 +account.3.codec.4.rtpmap = 4 + +account.3.codec.5.enable = 1 +account.3.codec.5.payload_type = G729 +account.3.codec.5.priority = 3 +account.3.codec.5.rtpmap = 18 + +account.3.codec.6.enable = 1 +account.3.codec.6.payload_type = G722 +account.3.codec.6.priority = 4 +account.3.codec.6.rtpmap = 9 + +account.3.codec.7.enable = 0 +account.3.codec.7.payload_type = G726-32 +account.3.codec.7.priority = 0 +account.3.codec.7.rtpmap = 2 + +account.3.codec.8.enable = 0 +account.3.codec.8.payload_type = iLBC_13_3 +account.3.codec.8.priority = 0 +account.3.codec.8.rtpmap = 97 + +account.3.codec.9.enable = 0 +account.3.codec.9.payload_type = iLBC_15_2 +account.3.codec.9.priority = 0 +account.3.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.3.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.3.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.3.busy_fwd.enable = +account.3.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.3.timeout_fwd.enable = +account.3.timeout_fwd.target = +account.3.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account3; 0-Disabled (default), 1-Enabled; +account.3.dnd.enable = + +#Configure the DND on code and off code for account3. + +account.3.sip_trust_ctrl = 1 + +voice_mail.number.3 = {$voicemail_number} + +####################################################################################### +## Account 4 Settings ## +####################################################################################### + +#Basic Settings +account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""} + +account.4.label = {$account.4.label} +account.4.display_name = {$account.4.display_name} + +{if isset($account.4.server.1.address)} +account.4.user_name = {$account.4.user_id}@{$account.4.server_address} +{else} +account.4.user_name = {$account.4.user_id} +{/if} + +account.4.auth_name = {$account.4.user_id} +account.4.password = {$account.4.password} + +{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if} + +account.4.sip_server_port = {$account.4.sip_port} +account.4.transport = {if $account.4.sip_transport == 'udp'}0{/if}{if $account.4.sip_transport == 'tcp'}1{/if}{if $account.4.sip_transport == 'tls'}2{/if}{if $account.4.sip_transport == 'dns srv'}3{/if}{""} + +account.4.expires = {$account.4.register_expires} +account.4.outbound_host = {$account.4.outbound_proxy} +account.4.outbound_port = {$account.4.sip_port} + +#Server Redundancy +account.4.sip_server.2.address= {$account.4.server.2.address} +account.4.sip_server.2.port= {$account.4.sip_port} +account.4.sip_server.2.transport_type = {if $account.4.sip_transport == 'udp'}0{/if}{if $account.4.sip_transport == 'tcp'}1{/if}{if $account.4.sip_transport == 'tls'}2{/if}{if $account.4.sip_transport == 'dns srv'}3{/if}{""} + +account.4.sip_server.2.expires= {$account.4.register_expires} +account.4.retry_counts = 3 + +#Basic Proxy Settings +account.4.outbound_proxy_enable= {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}{""} + +account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary} +account.4.outbound_proxy.1.port = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""} + +account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary} +account.4.outbound_proxy.2.port = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""} + +account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.4.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.4.anonymous_call_oncode = +account.4.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.4.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.4.anonymous_reject_oncode = +account.4.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.4.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.4.expires = {$account.4.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.4.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.4.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.4.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.4.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.4.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.4.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.4.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.4.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.4.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.4.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.4.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.4.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.4.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.4.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.4.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.4.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.4.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.4.enable_signal_encode = + +#Configure the key for encoding. +account.4.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.4.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.4.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.4.dtmf.info_type = + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.4.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.4.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.4.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.4.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.4.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.4.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.4.advanced.timer_t1 = +account.4.advanced.timer_t2 = +account.4.advanced.timer_t4 = + + +account.4.codec.1.enable = 1 +account.4.codec.1.payload_type = PCMU +account.4.codec.1.priority = 1 +account.4.codec.1.rtpmap = 0 + +account.4.codec.2.enable = 1 +account.4.codec.2.payload_type = PCMA +account.4.codec.2.priority = 2 +account.4.codec.2.rtpmap = 8 + +account.4.codec.3.enable = 0 +account.4.codec.3.payload_type = G723_53 +account.4.codec.3.priority =0 +account.4.codec.3.rtpmap = 4 + +account.4.codec.4.enable = 0 +account.4.codec.4.payload_type = G723_63 +account.4.codec.4.priority = 0 +account.4.codec.4.rtpmap = 4 + +account.4.codec.5.enable = 1 +account.4.codec.5.payload_type = G729 +account.4.codec.5.priority = 3 +account.4.codec.5.rtpmap = 18 + +account.4.codec.6.enable = 1 +account.4.codec.6.payload_type = G722 +account.4.codec.6.priority = 4 +account.4.codec.6.rtpmap = 9 + +account.4.codec.7.enable = 0 +account.4.codec.7.payload_type = G726-32 +account.4.codec.7.priority = 0 +account.4.codec.7.rtpmap = 2 + +account.4.codec.8.enable = 0 +account.4.codec.8.payload_type = iLBC_13_3 +account.4.codec.8.priority = 0 +account.4.codec.8.rtpmap = 97 + +account.4.codec.9.enable = 0 +account.4.codec.9.payload_type = iLBC_15_2 +account.4.codec.9.priority = 0 +account.4.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.4.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.4.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.4.busy_fwd.enable = +account.4.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.4.timeout_fwd.enable = +account.4.timeout_fwd.target = +account.4.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account4; 0-Disabled (default), 1-Enabled; +account.4.dnd.enable = + +#Configure the DND on code and off code for account4. + +account.4.sip_trust_ctrl = 1 + +voice_mail.number.4 = {$voicemail_number} + +####################################################################################### +## Account 5 Settings ## +####################################################################################### + +#Basic Settings +account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""} + +account.5.label = {$account.5.label} +account.5.display_name = {$account.5.display_name} + +{if isset($account.5.server.1.address)} +account.5.user_name = {$account.5.user_id}@{$account.5.server_address} +{else} +account.5.user_name = {$account.5.user_id} +{/if} + +account.5.auth_name = {$account.5.user_id} +account.5.password = {$account.5.password} + +{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if} + +account.5.sip_server_port = {$account.5.sip_port} +account.5.transport = {if $account.5.sip_transport == 'udp'}0{/if}{if $account.5.sip_transport == 'tcp'}1{/if}{if $account.5.sip_transport == 'tls'}2{/if}{if $account.5.sip_transport == 'dns srv'}3{/if}{""} + +account.5.expires = {$account.5.register_expires} +account.5.outbound_host = {$account.5.outbound_proxy} +account.5.outbound_port = {$account.5.sip_port} + +#Server Redundancy +account.5.sip_server.2.address= {$account.5.server.2.address} +account.5.sip_server.2.port= {$account.5.sip_port} +account.5.sip_server.2.transport_type = {if $account.5.sip_transport == 'udp'}0{/if}{if $account.5.sip_transport == 'tcp'}1{/if}{if $account.5.sip_transport == 'tls'}2{/if}{if $account.5.sip_transport == 'dns srv'}3{/if}{""} + +account.5.sip_server.2.expires= {$account.5.register_expires} +account.5.retry_counts = 3 + +#Basic Proxy Settings +account.5.outbound_proxy_enable= {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}{""} + +account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary} +account.5.outbound_proxy.1.port = {if isset($account.5.sip_port)}{$account.5.sip_port}{else}5060{/if}{""} + +account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary} +account.5.outbound_proxy.2.port = {if isset($account.5.sip_port)}{$account.4.sip_port}{else}5060{/if}{""} + +account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.5.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.5.anonymous_call_oncode = +account.5.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.5.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.5.anonymous_reject_oncode = +account.5.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.5.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.5.expires = {$account.5.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.5.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.5.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.5.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.5.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.5.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.5.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.5.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.5.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.5.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.5.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.5.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.5.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.5.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.5.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.5.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.5.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.5.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.5.enable_signal_encode = + +#Configure the key for encoding. +account.5.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.5.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.5.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.5.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.5.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.5.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.5.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.5.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.5.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.5.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.5.advanced.timer_t1 = +account.5.advanced.timer_t2 = +account.5.advanced.timer_t4 = + +account.5.codec.1.enable = 1 +account.5.codec.1.payload_type = PCMU +account.5.codec.1.priority = 1 +account.5.codec.1.rtpmap = 0 + +account.5.codec.2.enable = 1 +account.5.codec.2.payload_type = PCMA +account.5.codec.2.priority = 2 +account.5.codec.2.rtpmap = 8 + +account.5.codec.3.enable = 0 +account.5.codec.3.payload_type = G723_53 +account.5.codec.3.priority =0 +account.5.codec.3.rtpmap = 4 + +account.5.codec.4.enable = 0 +account.5.codec.4.payload_type = G723_63 +account.5.codec.4.priority = 0 +account.5.codec.4.rtpmap = 4 + +account.5.codec.5.enable = 1 +account.5.codec.5.payload_type = G729 +account.5.codec.5.priority = 3 +account.5.codec.5.rtpmap = 18 + +account.5.codec.6.enable = 1 +account.5.codec.6.payload_type = G722 +account.5.codec.6.priority = 4 +account.5.codec.6.rtpmap = 9 + +account.5.codec.7.enable = 0 +account.5.codec.7.payload_type = G726-32 +account.5.codec.7.priority = 0 +account.5.codec.7.rtpmap = 2 + +account.5.codec.8.enable = 0 +account.5.codec.8.payload_type = iLBC_13_3 +account.5.codec.8.priority = 0 +account.5.codec.8.rtpmap = 97 + +account.5.codec.9.enable = 0 +account.5.codec.9.payload_type = iLBC_15_2 +account.5.codec.9.priority = 0 +account.5.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.5.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.5.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.5.busy_fwd.enable = +account.5.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.5.timeout_fwd.enable = +account.5.timeout_fwd.target = +account.5.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled; +account.5.dnd.enable = + +#Configure the DND on code and off code for account5. + +account.5.sip_trust_ctrl = 1 + +voice_mail.number.5 = {$voicemail_number} + +####################################################################################### +## Network ## +####################################################################################### + +#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address; +#Require reboot; +network.internet_port.type = + +#Configure the static IP address, submask, gateway and DNS server. +#Require reboot; +network.internet_port.ip = +network.internet_port.mask = +network.internet_port.gateway = +{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""} + +{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""} + +{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""} + +####################################################################################### +## Account 6 Settings ## +####################################################################################### + +#Basic Settings +account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""} + +account.6.label = {$account.6.label} +account.6.display_name = {$account.6.display_name} + +{if isset($account.6.server.1.address)} +account.6.user_name = {$account.6.user_id}@{$account.6.server_address} +{else} +account.6.user_name = {$account.6.user_id} +{/if} + +account.6.auth_name = {$account.6.user_id} +account.6.password = {$account.6.password} + +{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if} + +account.6.sip_server_port = {$account.6.sip_port} +account.6.transport = {if $account.6.sip_transport == 'udp'}0{/if}{if $account.6.sip_transport == 'tcp'}1{/if}{if $account.6.sip_transport == 'tls'}2{/if}{if $account.6.sip_transport == 'dns srv'}3{/if}{""} +a +ccount.6.expires = {$account.6.register_expires} +account.6.outbound_host = {$account.6.outbound_proxy} +account.6.outbound_port = {$account.6.sip_port} + +#Server Redundancy +account.6.sip_server.2.address= {$account.6.server.2.address} +account.6.sip_server.2.port= {$account.6.sip_port} +account.6.sip_server.2.transport_type = {if $account.6.sip_transport == 'udp'}0{/if}{if $account.6.sip_transport == 'tcp'}1{/if}{if $account.6.sip_transport == 'tls'}2{/if}{if $account.6.sip_transport == 'dns srv'}3{/if}{""} + +account.6.sip_server.2.expires= {$account.6.register_expires} +account.6.retry_counts = 3 + +#Basic Proxy Settings +account.6.outbound_proxy_enable= {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}{""} + +account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary} +account.6.outbound_proxy.1.port = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""} + +account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary} +account.6.outbound_proxy.2.port = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""} + +account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.6.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.6.anonymous_call_oncode = +account.6.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.6.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.6.anonymous_reject_oncode = +account.6.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.6.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.6.expires = {$account.6.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.6.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.6.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.6.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.6.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.6.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.6.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.6.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.6.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.6.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.6.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.6.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.6.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.6.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.6.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.6.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.6.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.6.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.6.enable_signal_encode = + +#Configure the key for encoding. +account.6.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.6.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.6.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.6.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.6.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.6.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.6.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.6.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.6.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.6.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.6.advanced.timer_t1 = +account.6.advanced.timer_t2 = +account.6.advanced.timer_t4 = + +account.6.codec.1.enable = 1 +account.6.codec.1.payload_type = PCMU +account.6.codec.1.priority = 1 +account.6.codec.1.rtpmap = 0 + +account.6.codec.2.enable = 1 +account.6.codec.2.payload_type = PCMA +account.6.codec.2.priority = 2 +account.6.codec.2.rtpmap = 8 + +account.6.codec.3.enable = 0 +account.6.codec.3.payload_type = G723_63 +account.6.codec.3.priority =0 +account.6.codec.3.rtpmap = 4 + +account.6.codec.4.enable = 0 +account.6.codec.4.payload_type = G723_63 +account.6.codec.4.priority = 0 +account.6.codec.4.rtpmap = 4 + +account.6.codec.5.enable = 1 +account.6.codec.5.payload_type = G729 +account.6.codec.5.priority = 3 +account.6.codec.5.rtpmap = 18 + +account.6.codec.6.enable = 1 +account.6.codec.6.payload_type = G722 +account.6.codec.6.priority = 4 +account.6.codec.6.rtpmap = 9 + +account.6.codec.7.enable = 0 +account.6.codec.7.payload_type = G726-32 +account.6.codec.7.priority = 0 +account.6.codec.7.rtpmap = 2 + +account.6.codec.8.enable = 0 +account.6.codec.8.payload_type = iLBC_13_3 +account.6.codec.8.priority = 0 +account.6.codec.8.rtpmap = 97 + +account.6.codec.9.enable = 0 +account.6.codec.9.payload_type = iLBC_15_2 +account.6.codec.9.priority = 0 +account.6.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.6.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.6.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.6.busy_fwd.enable = +account.6.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.6.timeout_fwd.enable = +account.6.timeout_fwd.target = +account.6.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled; +account.6.dnd.enable = + +#Configure the DND on code and off code for account5. + +account.6.sip_trust_ctrl = 1 + +voice_mail.number.6 = {$voicemail_number} + +####################################################################################### +## Network ## +####################################################################################### + +#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address; +#Require reboot; +network.internet_port.type = + +#Configure the static IP address, submask, gateway and DNS server. +#Require reboot; +network.internet_port.ip = +network.internet_port.mask = +network.internet_port.gateway = +{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""} + +{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""} + +{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""} + +####################################################################################### +## Account 7 Settings ## +####################################################################################### + +#Basic Settings +account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""} + +account.7.label = {$account.7.label} +account.7.display_name = {$account.7.display_name} + +{if isset($account.7.server.1.address)} +account.7.user_name = {$account.7.user_id}@{$account.7.server_address} +{else} +account.7.user_name = {$account.7.user_id} +{/if} + +account.7.auth_name = {$account.7.user_id} +account.7.password = {$account.7.user_password} + +{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if} + +account.7.sip_server_port = {$account.7.sip_port} +account.7.transport = {if $account.7.sip_transport == 'udp'}0{/if}{if $account.7.sip_transport == 'tcp'}1{/if}{if $account.7.sip_transport == 'tls'}2{/if}{if $account.7.sip_transport == 'dns srv'}3{/if}{""} + +account.7.expires = {$account.7.register_expires} +account.7.outbound_host = {$account.7.outbound_proxy} +account.7.outbound_port = {$account.7.sip_port} + +#Server Redundancy +account.7.sip_server.2.address= {$account.7.server_address} +account.7.sip_server.2.port= {$account.7.sip_port} +account.7.sip_server.2.transport_type = {if $account.7.sip_transport == 'udp'}0{/if}{if $account.7.sip_transport == 'tcp'}1{/if}{if $account.7.sip_transport == 'tls'}2{/if}{if $account.7.sip_transport == 'dns srv'}3{/if}{""} + +account.7.sip_server.2.expires= {$account.7.register_expires} +account.7.retry_counts = 3 + +#Basic Proxy Settings +account.7.outbound_proxy_enable= {if isset($account.7.outbound_proxy_primary)}1{else}0{/if}{""} + +account.7.outbound_proxy.1.address = {$account.7.outbound_proxy_primary} +account.7.outbound_proxy.1.port = {if isset($account.7.sip_port)}{$account.7.outbound_sip_port}{else}5060{/if}{""} + +account.7.outbound_proxy.2.address = {$account.7.outbound_proxy_secondary} +account.7.outbound_proxy.2.port = {if isset($account.7.sip_port)}{$account.7.sip_port}{else}5060{/if}{""} + +account.7.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.7.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.7.anonymous_call_oncode = +account.7.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.7.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.7.anonymous_reject_oncode = +account.7.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.7.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.7.expires = {$register_expires_7} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.7.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.7.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.7.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.7.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.7.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.7.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.7.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.7.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.7.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.7.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.7.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.7.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.7.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.7.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.7.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.7.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.7.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.7.enable_signal_encode = + +#Configure the key for encoding. +account.7.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.7.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.7.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.7.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.7.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.7.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.7.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.7.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.7.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.7.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.7.advanced.timer_t1 = +account.7.advanced.timer_t2 = +account.7.advanced.timer_t4 = + +account.7.codec.1.enable = 1 +account.7.codec.1.payload_type = PCMU +account.7.codec.1.priority = 1 +account.7.codec.1.rtpmap = 0 + +account.7.codec.2.enable = 1 +account.7.codec.2.payload_type = PCMA +account.7.codec.2.priority = 2 +account.7.codec.2.rtpmap = 8 + +account.7.codec.3.enable = 0 +account.7.codec.3.payload_type = G723_73 +account.7.codec.3.priority =0 +account.7.codec.3.rtpmap = 4 + +account.7.codec.4.enable = 0 +account.7.codec.4.payload_type = G723_73 +account.7.codec.4.priority = 0 +account.7.codec.4.rtpmap = 4 + +account.7.codec.5.enable = 1 +account.7.codec.5.payload_type = G729 +account.7.codec.5.priority = 3 +account.7.codec.5.rtpmap = 18 + +account.7.codec.6.enable = 1 +account.7.codec.6.payload_type = G722 +account.7.codec.6.priority = 4 +account.7.codec.6.rtpmap = 9 + +account.7.codec.7.enable = 0 +account.7.codec.7.payload_type = G726-32 +account.7.codec.7.priority = 0 +account.7.codec.7.rtpmap = 2 + +account.7.codec.8.enable = 0 +account.7.codec.8.payload_type = iLBC_13_3 +account.7.codec.8.priority = 0 +account.7.codec.8.rtpmap = 97 + +account.7.codec.9.enable = 0 +account.7.codec.9.payload_type = iLBC_15_2 +account.7.codec.9.priority = 0 +account.7.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.7.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.7.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.7.busy_fwd.enable = +account.7.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.7.timeout_fwd.enable = +account.7.timeout_fwd.target = +account.7.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled; +account.7.dnd.enable = + +#Configure the DND on code and off code for account5. + +account.7.sip_trust_ctrl = 1 + +voice_mail.number.7= {$voicemail_number} + +####################################################################################### +## Network ## +####################################################################################### + +#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address; +#Require reboot; +network.internet_port.type = + +#Configure the static IP address, submask, gateway and DNS server. +#Require reboot; +network.internet_port.ip = +network.internet_port.mask = +network.internet_port.gateway = +{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""} + +{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""} + +{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""} + +####################################################################################### +## Account 8 Settings ## +####################################################################################### + +#Basic Settings +account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""} + +account.8.label = {$account.8.label} +account.8.display_name = {$account.8.display_name} + +{if isset($account.8.server.1.address)} +account.8.user_name = {$account.8.user_id}@{$account.8.server_address} +{else} +account.8.user_name = {$account.8.user_id} +{/if} + +account.8.auth_name = {$account.8.user_id} +account.8.password = {$account.8.user_password} + +{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if} + +account.8.sip_server_port = {$account.8.sip_port} +account.8.transport = {if $account.8.sip_transport == 'udp'}0{/if}{if $account.8.sip_transport == 'tcp'}1{/if}{if $account.8.sip_transport == 'tls'}2{/if}{if $account.8.sip_transport == 'dns srv'}3{/if}{""} + +account.8.expires = {$account.8.register_expires} +account.8.outbound_host = {$account.8.outbound_proxy} +account.8.outbound_port = {$account.8.sip_port} + +#Server Redundancy +account.8.sip_server.2.address= {$account.8.server_address} +account.8.sip_server.2.port= {$account.8.sip_port} +account.8.sip_server.2.transport_type = {if $account.8.sip_transport == 'udp'}0{/if}{if $account.8.sip_transport == 'tcp'}1{/if}{if $account.8.sip_transport == 'tls'}2{/if}{if $account.8.sip_transport == 'dns srv'}3{/if}{""} + +account.8.sip_server.2.expires= {$account.8.register_expires} +account.8.retry_counts = 3 + +#Basic Proxy Settings +account.8.outbound_proxy_enable= {if isset($account.8.outbound_proxy_primary)}1{else}0{/if}{""} + +account.8.outbound_proxy.1.address = {$account.8.outbound_proxy_primary} +account.8.outbound_proxy.1.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""} + +account.8.outbound_proxy.2.address = {$account.8.outbound_proxy_secondary} +account.8.outbound_proxy.2.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""} + +account.8.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} + +#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; +account.8.anonymous_call = + +#Configure the on code and off code of the anonymous call feature. +account.8.anonymous_call_oncode = +account.8.anonymous_call_offcode = + +#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled; +account.8.reject_anonymous_call = + +#Configure the on code and off code of the reject anonymous call feature. +account.8.anonymous_reject_oncode = +account.8.anonymous_reject_offcode = + +#Configure the SIP port for account 1, the default value is 5060. +account.8.sip_listen_port = + +#Configure the register expiry time (in seconds), the default value is 3600. +account.8.expires = {$account.8.register_expires} + +#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); +account.8.100rel_enable = {$yealink_retransmission} + +#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled; +account.8.precondition = + +#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled; +account.8.subscribe_register = + +#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.8.subscribe_mwi = {$yealink_subscribe_mwi} + +#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. +account.8.subscribe_mwi_expires = 3600 + +#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; +account.8.cid_source = {$yealink_cid_source} + +#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916; +account.8.cp_source = 2 + +#Enable or disable the session timer; 0-Disabled (default), 1-Enabled; +account.8.session_timer.enable = {$yealink_session_timer} + +#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999. +account.8.session_timer.expires = + +#Configure the session timer refresher; 0-Uac (default), 1-Uas; +account.8.session_timer.refresher = + +#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; +account.8.enable_user_equal_phone = + +#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated; +account.8.srtp_encryption = + +#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60. +account.8.ptime = + +#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; +account.8.subscribe_mwi_to_vm = 0 + +#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; +account.8.register_mac = + +#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default); +account.8.register_line = + +#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30. +account.8.reg_fail_retry_interval = + +#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4); +account.8.enable_signal_encode = + +#Configure the key for encoding. +account.8.signal_encode_key = + +#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO; +account.8.dtmf.type = {$yealink_dtmf_type} + +#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101. +account.8.dtmf.dtmf_payload = + +#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event; +account.8.dtmf.info_type = + + +####################################################################################### +## NAT Settings ## +####################################################################################### + +#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; +account.8.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""} + +#Configure the STUN server address. +account.8.nat.stun_server = {$stun_server} + +#Configure the STUN server port, the default value is 3478. +account.8.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}{""} + +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default); +account.8.nat.udp_update_enable = + +#Specify the keep-alive interval (in seconds), the default value is 30. +account.8.nat.udp_update_time = + +#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled; +account.8.nat.rport = {$yealink_rport} + +#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5. +account.8.advanced.timer_t1 = +account.8.advanced.timer_t2 = +account.8.advanced.timer_t4 = + +account.8.codec.1.enable = 1 +account.8.codec.1.payload_type = PCMU +account.8.codec.1.priority = 1 +account.8.codec.1.rtpmap = 0 + +account.8.codec.2.enable = 1 +account.8.codec.2.payload_type = PCMA +account.8.codec.2.priority = 2 +account.8.codec.2.rtpmap = 8 + +account.8.codec.3.enable = 0 +account.8.codec.3.payload_type = G723_83 +account.8.codec.3.priority =0 +account.8.codec.3.rtpmap = 4 + +account.8.codec.4.enable = 0 +account.8.codec.4.payload_type = G723_83 +account.8.codec.4.priority = 0 +account.8.codec.4.rtpmap = 4 + +account.8.codec.5.enable = 1 +account.8.codec.5.payload_type = G729 +account.8.codec.5.priority = 3 +account.8.codec.5.rtpmap = 18 + +account.8.codec.6.enable = 1 +account.8.codec.6.payload_type = G722 +account.8.codec.6.priority = 4 +account.8.codec.6.rtpmap = 9 + +account.8.codec.7.enable = 0 +account.8.codec.7.payload_type = G726-32 +account.8.codec.7.priority = 0 +account.8.codec.7.rtpmap = 2 + +account.8.codec.8.enable = 0 +account.8.codec.8.payload_type = iLBC_13_3 +account.8.codec.8.priority = 0 +account.8.codec.8.rtpmap = 97 + +account.8.codec.9.enable = 0 +account.8.codec.9.payload_type = iLBC_15_2 +account.8.codec.9.priority = 0 +account.8.codec.9.rtpmap = 97 + +####################################################################################### +## Call Forward ## +####################################################################################### +#Enable or disable the always forward, 0-Disabled(default), 1-Enabled; +account.8.always_fwd.enable = + +#Configure the target phonenumber that the phone will forward the call to; +account.8.always_fwd.target = + +#Configure the on/off code for always forward; + + +#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled; +account.8.busy_fwd.enable = +account.8.busy_fwd.target = + + +#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled; +#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default); +account.8.timeout_fwd.enable = +account.8.timeout_fwd.target = +account.8.timeout_fwd.timeout = + + +####################################################################################### +## DND ## +####################################################################################### + +#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode. +features.dnd_mode = + +#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled; +account.8.dnd.enable = + +#Configure the DND on code and off code for account5. + +account.8.sip_trust_ctrl = 1 + +voice_mail.number.8 = {$voicemail_number} + +####################################################################################### +## Network ## +####################################################################################### + +#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address; +#Require reboot; +network.internet_port.type = + +#Configure the static IP address, submask, gateway and DNS server. +#Require reboot; +network.internet_port.ip = +network.internet_port.mask = +network.internet_port.gateway = +{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""} + +{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""} + +{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""} + + +####################################################################################### +## SCA ## +####################################################################################### +account.1.shared_line= {$shared_line_1} +account.2.shared_line= {$shared_line_2} +account.3.shared_line= {$shared_line_3} +account.4.shared_line= {$shared_line_4} +account.5.shared_line= {$shared_line_5} +account.6.shared_line= {$shared_line_6} +account.7.shared_line= {$shared_line_7} +account.8.shared_line= {$shared_line_8} From 7579393f2ff79595144ac513feb28412ddffa284 Mon Sep 17 00:00:00 2001 From: smeyernyc Date: Tue, 4 Jan 2022 14:38:49 -0500 Subject: [PATCH 127/496] Updates to yealink provisioning (#6224) * Create directory.xml * Update app_config.php --- app/yealink/app_config.php | 2 +- .../provision/yealink/t48u/directory.xml | 83 +++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 resources/templates/provision/yealink/t48u/directory.xml diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index 58c60a5e9c..1097cc53ea 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -405,7 +405,7 @@ $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "T46U(T43U,T46U,T41U,T48U,T42U)-108.86.0.20.rom"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T46U firmware ROM"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T48U firmware ROM"; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6b70cfeb-2124-42dc-ba8b-6cd77da3fa5f"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; diff --git a/resources/templates/provision/yealink/t48u/directory.xml b/resources/templates/provision/yealink/t48u/directory.xml new file mode 100644 index 0000000000..297b9e4108 --- /dev/null +++ b/resources/templates/provision/yealink/t48u/directory.xml @@ -0,0 +1,83 @@ + +{foreach $contacts as $row} +{if $smarty.get.contacts == "users" && $row.category == "users"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} +{$row.effective_caller_id_name} +{/if} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} + +{elseif $smarty.get.contacts == "groups" && $row.category == "groups"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} + {$row.effective_caller_id_name} +{/if} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} + +{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"} + +{if $row.contact_name_given != ""} + {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.effective_caller_id_name} +{/if} +{if $row.phone_number != ""} + {$row.phone_number} +{else} + {$row.phone_extension} +{/if} + +{elseif $smarty.get.contacts == "all"} + +{if $row.contact_name_given != ""} +{if $row.contact_organization != ""} + {$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family} +{else} + {$row.contact_name_given} {$row.contact_name_family} +{/if} +{else} + {$row.effective_caller_id_name} +{/if} +{if $row.category == "extensions"} +{if $row.phone_number != ""} + {$row.phone_number} +{else} + {$row.phone_extension} +{/if} +{else} +{foreach $row.numbers as $number} +{if $number.phone_number != ""} + {$number.phone_number} +{else} + {$number.phone_extension} +{/if} +{/foreach} +{/if} + +{/if} +{/foreach} + From 1f0af43d835216358e4be25dec8906cc79a4df99 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 4 Jan 2022 16:54:47 -0700 Subject: [PATCH 128/496] Use the date c function only if the the epoch is_numeric --- app/xml_cdr/resources/classes/xml_cdr.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php index f2872e0ecc..63be2f36eb 100644 --- a/app/xml_cdr/resources/classes/xml_cdr.php +++ b/app/xml_cdr/resources/classes/xml_cdr.php @@ -371,13 +371,13 @@ if (!class_exists('xml_cdr')) { //time $start_epoch = urldecode($xml->variables->start_epoch); $this->array[$key]['start_epoch'] = $start_epoch; - $this->array[$key]['start_stamp'] = date('c', $start_epoch); + $this->array[$key]['start_stamp'] = is_numeric($start_epoch) ? date('c', $start_epoch) : ''; $answer_epoch = urldecode($xml->variables->answer_epoch); $this->array[$key]['answer_epoch'] = $answer_epoch; - $this->array[$key]['answer_stamp'] = date('c', $answer_epoch); + $this->array[$key]['answer_stamp'] = is_numeric($answer_epoch) ? date('c', $answer_epoch) : ''; $end_epoch = urldecode($xml->variables->end_epoch); $this->array[$key]['end_epoch'] = $end_epoch; - $this->array[$key]['end_stamp'] = date('c', $end_epoch); + $this->array[$key]['end_stamp'] = is_numeric($end_epoch) ? date('c', $end_epoch) : ''; $this->array[$key]['duration'] = urldecode($xml->variables->duration); $this->array[$key]['mduration'] = urldecode($xml->variables->mduration); $this->array[$key]['billsec'] = urldecode($xml->variables->billsec); From 9d01324da7882dd297b0233f85cb01a116ec8825 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 4 Jan 2022 17:50:51 -0700 Subject: [PATCH 129/496] Use sip_from_display and sip_from_user when the call originated from the VoIP Provider. When an inbound call is forwarded the call_direction is set to inbound and then updated to outbound. In this situation we use the sip_from_display and sip_from_user to get the original caller ID instead of the updated caller ID after the call was forwarded. --- app/xml_cdr/resources/classes/xml_cdr.php | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php index 63be2f36eb..86a4291e96 100644 --- a/app/xml_cdr/resources/classes/xml_cdr.php +++ b/app/xml_cdr/resources/classes/xml_cdr.php @@ -298,16 +298,28 @@ if (!class_exists('xml_cdr')) { //process data if the call detail record is not a duplicate if ($duplicate_uuid == false && is_uuid($uuid)) { - //get the caller details + //get the caller ID $caller_id_name = urldecode($xml->variables->caller_id_name); $caller_id_number = urldecode($xml->variables->caller_id_number); - if (isset($xml->variables->effective_caller_id_name)) { + + //if the call is outbound use the external caller ID + if (urldecode($xml->variables->call_direction) == 'outbound' && isset($xml->variables->effective_caller_id_name)) { $caller_id_name = urldecode($xml->variables->effective_caller_id_name); } - if (isset($xml->variables->effective_caller_id_number)) { + if (urldecode($xml->variables->call_direction) == 'outbound' && isset($xml->variables->effective_caller_id_number)) { $caller_id_number = urldecode($xml->variables->effective_caller_id_number); } + //if the sip_from_domain and domain_name are not the same then original call direction was inbound + //when an inbound call is forward the call_direction is set to inbound and then updated to outbound + //use sip_from_display and sip_from_user to get the original caller ID instead of the updated caller ID info from the forward + if (urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name) && isset($xml->variables->sip_from_display)) { + $caller_id_name = urldecode($xml->variables->sip_from_display); + } + if (urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name) && isset($xml->variables->sip_from_user)) { + $caller_id_number = urldecode($xml->variables->sip_from_user); + } + //get the values from the callflow. $i = 0; foreach ($xml->callflow as $row) { @@ -316,12 +328,6 @@ if (!class_exists('xml_cdr')) { $destination_number = urldecode($row->caller_profile->destination_number); $network_addr = urldecode($row->caller_profile->network_addr); } - if (strlen($caller_id_name) == 0) { - $caller_id_name = urldecode($row->caller_profile->caller_id_name); - } - if (strlen($caller_id_number) == 0) { - $caller_id_number = urldecode($row->caller_profile->caller_id_number); - } $i++; } unset($i); @@ -371,13 +377,13 @@ if (!class_exists('xml_cdr')) { //time $start_epoch = urldecode($xml->variables->start_epoch); $this->array[$key]['start_epoch'] = $start_epoch; - $this->array[$key]['start_stamp'] = is_numeric($start_epoch) ? date('c', $start_epoch) : ''; + $this->array[$key]['start_stamp'] = is_numeric($start_epoch) ? date('c', $start_epoch) : null; $answer_epoch = urldecode($xml->variables->answer_epoch); $this->array[$key]['answer_epoch'] = $answer_epoch; - $this->array[$key]['answer_stamp'] = is_numeric($answer_epoch) ? date('c', $answer_epoch) : ''; + $this->array[$key]['answer_stamp'] = is_numeric($answer_epoch) ? date('c', $answer_epoch) : null; $end_epoch = urldecode($xml->variables->end_epoch); $this->array[$key]['end_epoch'] = $end_epoch; - $this->array[$key]['end_stamp'] = is_numeric($end_epoch) ? date('c', $end_epoch) : ''; + $this->array[$key]['end_stamp'] = is_numeric($end_epoch) ? date('c', $end_epoch) : null; $this->array[$key]['duration'] = urldecode($xml->variables->duration); $this->array[$key]['mduration'] = urldecode($xml->variables->mduration); $this->array[$key]['billsec'] = urldecode($xml->variables->billsec); From 61844e682385720e26f4b0c20f42fc1dc2404ad2 Mon Sep 17 00:00:00 2001 From: smeyernyc Date: Tue, 4 Jan 2022 22:47:24 -0500 Subject: [PATCH 130/496] Update y000000000109.cfg (#6226) --- resources/templates/provision/yealink/t48u/y000000000109.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg index 19ec84e5c6..bf6e25ef3e 100644 --- a/resources/templates/provision/yealink/t48u/y000000000109.cfg +++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg @@ -310,7 +310,7 @@ static.managementserver.connection_request_username = ####################################################################################### ## Firmware Update ## ####################################################################################### -static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t46u} +static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t48u} ####################################################################################### From ab0e4faa94d6d8c78a233c38306e27fe7672cabe Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 4 Jan 2022 20:48:35 -0700 Subject: [PATCH 131/496] Add labels to dashboard system counts (#6225) * Update app_languages.php * Update system_counts.php --- .../resources/dashboard/system_counts.php | 2 +- core/user_settings/app_languages.php | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/system/resources/dashboard/system_counts.php b/app/system/resources/dashboard/system_counts.php index 30a23fe4c7..b56530b97c 100644 --- a/app/system/resources/dashboard/system_counts.php +++ b/app/system/resources/dashboard/system_counts.php @@ -299,7 +299,7 @@ var system_counts_chart_context = document.getElementById('system_counts_chart').getContext('2d'); const system_counts_chart_data = { - labels: ['InActive: ', 'Active: '], + labels: [': ', ': '], datasets: [{ data: ['', ''], backgroundColor: [ diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php index 714a717fff..71076e0d81 100644 --- a/core/user_settings/app_languages.php +++ b/core/user_settings/app_languages.php @@ -2499,4 +2499,46 @@ $text['description-user_setting-add']['ru-ru'] = "Добавьте параме $text['description-user_setting-add']['sv-se'] = "Lägg till en inställning för denna användare."; $text['description-user_setting-add']['uk-ua'] = ""; +$text['label-active']['en-us'] = "Active"; +$text['label-active']['en-gb'] = "Active"; +$text['label-active']['ar-eg'] = ""; +$text['label-active']['de-at'] = "Aktiv"; //copied from de-de +$text['label-active']['de-ch'] = "Aktiv"; //copied from de-de +$text['label-active']['de-de'] = "Aktiv"; +$text['label-active']['es-cl'] = ""; +$text['label-active']['es-mx'] = ""; +$text['label-active']['fr-ca'] = "Actif"; +$text['label-active']['fr-fr'] = "Actif"; +$text['label-active']['he-il'] = ""; +$text['label-active']['it-it'] = "Attivo"; +$text['label-active']['nl-nl'] = ""; +$text['label-active']['pl-pl'] = ""; +$text['label-active']['pt-br'] = ""; +$text['label-active']['pt-pt'] = ""; +$text['label-active']['ro-ro'] = ""; +$text['label-active']['ru-ru'] = "Активные"; +$text['label-active']['sv-se'] = "Aktiv"; +$text['label-active']['uk-ua'] = ""; + +$text['label-inactive']['en-us'] = "InActive"; +$text['label-inactive']['en-gb'] = "InActive"; +$text['label-inactive']['ar-eg'] = ""; +$text['label-inactive']['de-at'] = "InAktiv"; //copied from de-de +$text['label-inactive']['de-ch'] = "InAktiv"; //copied from de-de +$text['label-inactive']['de-de'] = "InAktiv"; +$text['label-inactive']['es-cl'] = ""; +$text['label-inactive']['es-mx'] = ""; +$text['label-inactive']['fr-ca'] = "InActif"; +$text['label-inactive']['fr-fr'] = "InActif"; +$text['label-inactive']['he-il'] = ""; +$text['label-inactive']['it-it'] = "Non Attivo"; +$text['label-inactive']['nl-nl'] = ""; +$text['label-inactive']['pl-pl'] = ""; +$text['label-inactive']['pt-br'] = ""; +$text['label-inactive']['pt-pt'] = ""; +$text['label-inactive']['ro-ro'] = ""; +$text['label-inactive']['ru-ru'] = "Неактивный"; +$text['label-inactive']['sv-se'] = "InAktiv"; +$text['label-inactive']['uk-ua'] = ""; + ?> From 9f0b304a4ff531ddbe4cd77aa5afe723474a4cc7 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 5 Jan 2022 12:13:37 -0700 Subject: [PATCH 132/496] Deprecate v_device_keys.device_profile_uuid, and v_device_settings.device_profile_uuid. These fields were moved to their own table device profile keys and device profile settings tables so these fields are no longer used. --- app/devices/app_config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/devices/app_config.php b/app/devices/app_config.php index 475cbeaaf3..05b54c673b 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -637,7 +637,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_device_profiles"; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "device_profile_uuid"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; - + $apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true"; $y++; $apps[$x]['db'][$y]['table']['name'] = "v_device_keys"; $apps[$x]['db'][$y]['table']['parent'] = "v_devices"; @@ -672,6 +672,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_device_profiles"; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "device_profile_uuid"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true"; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_key_id"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; From f52b33caf2fd2a90e73e5ee5690bae80203add2e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 5 Jan 2022 19:53:31 -0700 Subject: [PATCH 133/496] Remove sub table data if it doesn't have more details than domain_uuid an device_uuid. --- app/devices/device_imports.php | 61 +++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php index f290b5688b..def7e7cdcb 100644 --- a/app/devices/device_imports.php +++ b/app/devices/device_imports.php @@ -278,7 +278,7 @@ foreach ($fields as $key => $value) { //get the line $result = str_getcsv($line, $delimiter, $enclosure); - + //get the table and field name $field_array = explode(".",$value); $table_name = $field_array[0]; @@ -361,6 +361,35 @@ //process a chunk of the array if ($row_id === 1000) { + //remove sub table data if it doesn't have more details than domain_uuid an device_uuid + $x = 0; + foreach ($array['devices'] as $row) { + //remove empty device keys + if (isset($row['device_keys'])) { + $y = 0; + foreach ($row['device_keys'] as &$sub_row) { + if (count($sub_row) == 2) { + unset($array['devices'][$x]['device_keys']); + } + $y++; + } + } + + //remove empty device lines + if (isset($row['device_lines'])) { + $y = 0; + foreach ($row['device_lines'] as &$sub_row) { + if (count($sub_row) == 2) { + unset($array['devices'][$x]['device_lines']); + } + $y++; + } + } + + //increment device id + $x++; + } + //save to the data $database->save($array); //$message = $database->message; @@ -379,6 +408,35 @@ } //end while fclose($handle); + //remove sub table data if it doesn't have more details than domain_uuid an device_uuid + $x = 0; + foreach ($array['devices'] as $row) { + //remove empty device keys + if (isset($row['device_keys'])) { + $y = 0; + foreach ($row['device_keys'] as &$sub_row) { + if (count($sub_row) == 2) { + unset($array['devices'][$x]['device_keys']); + } + $y++; + } + } + + //remove empty device lines + if (isset($row['device_lines'])) { + $y = 0; + foreach ($row['device_lines'] as &$sub_row) { + if (count($sub_row) == 2) { + unset($array['devices'][$x]['device_lines']); + } + $y++; + } + } + + //increment device id + $x++; + } + //debug info //view_array($array); @@ -386,6 +444,7 @@ if (is_array($array)) { $database->save($array); //$message = $database->message; + //view_array($message); } if (strlen($_SESSION['provision']['path']['text']) > 0) { From d97308e0ad70957a1299d400d200e47e13e1923b Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Thu, 6 Jan 2022 13:47:17 -0500 Subject: [PATCH 134/496] [provision] don't show file path on not found (#6229) --- app/provision/resources/classes/provision.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 02cbfe1ad2..ad108a66cd 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -1194,7 +1194,7 @@ include "root.php"; else { //make sure the file exists if (!file_exists($template_dir."/".$device_template ."/".$file)) { - echo "file not found ".$template_dir."/".$device_template ."/".$file; + $this->http_error('404'); if ($_SESSION['provision']['debug']['boolean'] == 'true') { echo ":$template_dir/$device_template/$file
    "; echo "template_dir: $template_dir
    "; From b90547ca2a18757d16f84722c9ad2123673a67f0 Mon Sep 17 00:00:00 2001 From: smeyernyc Date: Thu, 6 Jan 2022 19:10:44 -0500 Subject: [PATCH 135/496] Many yealink changes and fixes (#6228) * Create directory.xml * More Yealink fixes -Spelling -Wrong var -Updated power_saving schema to be uniform across all devices to best written variable logic. - Good job whoever built it. IF YOU HAVE SET THIS UP IN THE PAST IN THE OLD FORMAT IT MAY BREAK. $yealink_powersave_* vars have been depreciated in favor of $yealink_ps_* since logic has been built to allow more with less total vars. -Added some documentation --- .../provision/yealink/t33g/y000000000124.cfg | 53 +++++++++++----- .../provision/yealink/t33g/{$mac}.cfg | 2 +- .../provision/yealink/t41s/y000000000068.cfg | 51 +++++++++++----- .../provision/yealink/t42s/y000000000067.cfg | 51 +++++++++++----- .../provision/yealink/t43u/y000000000107.cfg | 53 +++++++++++----- .../provision/yealink/t46s/y000000000066.cfg | 51 +++++++++++----- .../provision/yealink/t46u/y000000000108.cfg | 53 +++++++++++----- .../provision/yealink/t48s/y000000000065.cfg | 51 +++++++++++----- .../provision/yealink/t48u/y000000000109.cfg | 61 +++++++++++++------ .../provision/yealink/t4x/y000000000065.cfg | 4 +- .../provision/yealink/t4x/y000000000066.cfg | 4 +- .../provision/yealink/t4x/y000000000067.cfg | 4 +- .../provision/yealink/t4x/y000000000068.cfg | 4 +- .../provision/yealink/t4x/y000000000107.cfg | 4 +- .../provision/yealink/t4x/y000000000108.cfg | 4 +- .../provision/yealink/t4x/y000000000109.cfg | 4 +- .../provision/yealink/t4x/y000000000116.cfg | 4 +- .../provision/yealink/t52s/y000000000074.cfg | 51 +++++++++++----- .../provision/yealink/t53/y000000000095.cfg | 53 +++++++++++----- .../provision/yealink/t53/{$mac}.cfg | 20 +++--- .../provision/yealink/t53w/y000000000095.cfg | 53 +++++++++++----- .../provision/yealink/t53w/{$mac}.cfg | 20 +++--- .../provision/yealink/t54s/y000000000070.cfg | 51 +++++++++++----- .../provision/yealink/t54w/y000000000096.cfg | 53 +++++++++++----- .../provision/yealink/t54w/{$mac}.cfg | 2 +- .../provision/yealink/t57w/y000000000097.cfg | 53 +++++++++++----- .../provision/yealink/t57w/{$mac}.cfg | 20 +++--- .../provision/yealink/t5x/y000000000070.cfg | 4 +- .../provision/yealink/t5x/y000000000095.cfg | 6 +- .../provision/yealink/t5x/y000000000096.cfg | 6 +- .../provision/yealink/t5x/y000000000097.cfg | 6 +- 31 files changed, 601 insertions(+), 255 deletions(-) diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg index 65215902a1..d8142bb0f3 100644 --- a/resources/templates/provision/yealink/t33g/y000000000124.cfg +++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg @@ -423,7 +423,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### dialplan.transfer.mode = {$yealink_transfer_mode} transfer.on_hook_trans_enable = {$yealink_transfer_onhook} @@ -1549,20 +1549,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg index 8e47d2daa4..b7315bc857 100644 --- a/resources/templates/provision/yealink/t33g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg @@ -5,7 +5,7 @@ ##T33P/T33G :X ranges from 1 to 4 ##T30/T30P Not Support ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey} diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg index e9a9596a3a..11359c3d1d 100644 --- a/resources/templates/provision/yealink/t41s/y000000000068.cfg +++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg @@ -1413,20 +1413,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg index 5e5c83d32c..deee590f1d 100644 --- a/resources/templates/provision/yealink/t42s/y000000000067.cfg +++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg @@ -1410,20 +1410,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg index cbe89f2e48..c7acb2010f 100644 --- a/resources/templates/provision/yealink/t43u/y000000000107.cfg +++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg @@ -424,7 +424,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### dialplan.transfer.mode = {$yealink_transfer_mode} transfer.on_hook_trans_enable = {$yealink_transfer_onhook} @@ -1573,20 +1573,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg index 37308242b5..d7067f8e5d 100644 --- a/resources/templates/provision/yealink/t46s/y000000000066.cfg +++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg @@ -1411,20 +1411,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg index e454c60062..08fd50a93f 100644 --- a/resources/templates/provision/yealink/t46u/y000000000108.cfg +++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg @@ -424,7 +424,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### dialplan.transfer.mode = {$yealink_transfer_mode} transfer.on_hook_trans_enable = {$yealink_transfer_onhook} @@ -1569,20 +1569,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg index d0fd8f3bcd..d9f47578b3 100644 --- a/resources/templates/provision/yealink/t48s/y000000000065.cfg +++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg @@ -1460,20 +1460,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg index bf6e25ef3e..88feaf851a 100644 --- a/resources/templates/provision/yealink/t48u/y000000000109.cfg +++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg @@ -424,7 +424,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### dialplan.transfer.mode = {$yealink_transfer_mode} transfer.on_hook_trans_enable = {$yealink_transfer_onhook} @@ -1569,20 +1569,43 @@ screensaver.xml_browser.url= ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= -features.power_saving.power_led_flash.on_time= -features.power_saving.power_led_flash.off_time= -features.power_saving.office_hour.monday= -features.power_saving.office_hour.tuesday= -features.power_saving.office_hour.wednesday= -features.power_saving.office_hour.thursday= -features.power_saving.office_hour.friday= -features.power_saving.office_hour.saturday= -features.power_saving.office_hour.sunday = -features.power_saving.user_input_ext.idle_timeout= -features.power_saving.off_hour.idle_timeout= -features.power_saving.office_hour.idle_timeout= -features.power_saving.intelligent_mode= +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### @@ -1596,11 +1619,11 @@ features.power_saving.intelligent_mode= ##Single File Size: <=5MB ##2MB of space should bereserved for the phone -wallpaper_upload.url = {$yealink_t46u_wallpaper} -{if isset($yealink_t46u_wallpaper_filename)} -phone_setting.backgrounds = Config:{$yealink_t46u_wallpaper_filename} +wallpaper_upload.url = {$yealink_t48u_wallpaper} +{if isset($yealink_t48u_wallpaper_filename)} +phone_setting.backgrounds = Config:{$yealink_t48u_wallpaper_filename} {else} -phone_setting.backgrounds = Config:yealink_t46u_wallpaper.png +phone_setting.backgrounds = Config:yealink_t48u_wallpaper.png {/if} ## phone_setting.backgrounds_with_dsskey_unfold(Only support T48U/T48G/S) diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg index 94bdea4238..06adcb68ab 100644 --- a/resources/templates/provision/yealink/t4x/y000000000065.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg @@ -1460,10 +1460,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg index 90b0f91020..7fa2faf4ae 100644 --- a/resources/templates/provision/yealink/t4x/y000000000066.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg @@ -1410,10 +1410,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1440,6 +1441,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg index 86a9325c8d..b173cbb99b 100644 --- a/resources/templates/provision/yealink/t4x/y000000000067.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg @@ -1409,10 +1409,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1439,6 +1440,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg index 170425bd20..56e3ef67a4 100644 --- a/resources/templates/provision/yealink/t4x/y000000000068.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg @@ -1413,10 +1413,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1443,6 +1444,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg index 94bdea4238..06adcb68ab 100644 --- a/resources/templates/provision/yealink/t4x/y000000000107.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg @@ -1460,10 +1460,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg index 669f55694c..6b4af107b4 100644 --- a/resources/templates/provision/yealink/t4x/y000000000108.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg @@ -1410,10 +1410,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1440,6 +1441,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg index 94bdea4238..06adcb68ab 100644 --- a/resources/templates/provision/yealink/t4x/y000000000109.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg @@ -1460,10 +1460,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg index 86a9325c8d..b173cbb99b 100644 --- a/resources/templates/provision/yealink/t4x/y000000000116.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg @@ -1409,10 +1409,11 @@ screensaver.xml_browser.url= ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1439,6 +1440,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg index 0facbfe63c..153a3c1c79 100644 --- a/resources/templates/provision/yealink/t52s/y000000000074.cfg +++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg @@ -1410,20 +1410,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg index a7cf6600f5..b6daabf5a5 100644 --- a/resources/templates/provision/yealink/t53/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53/y000000000095.cfg @@ -416,7 +416,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1559,20 +1559,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg index c00cf68c6b..bb92a2eb12 100644 --- a/resources/templates/provision/yealink/t53/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53/{$mac}.cfg @@ -4,7 +4,7 @@ ##account.X.*:(T54S/T48G/T48S/T46G/T46S/T29G: X ranges from 1 to 16. T52S/T42G/T42S: X ranges from 1 to 12. T41P/T41S/T27P/T27G: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)## ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -564,7 +564,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.2.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1090,7 +1090,7 @@ pstn.account.2.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1617,7 +1617,7 @@ pstn.account.3.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.4.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2143,7 +2143,7 @@ pstn.account.4.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.5.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2683,7 +2683,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.6.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3210,7 +3210,7 @@ pstn.account.6.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.7.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3737,7 +3737,7 @@ pstn.account.7.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.8.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4264,7 +4264,7 @@ pstn.account.8.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.9.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4791,7 +4791,7 @@ pstn.account.9.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.10.phone_setting.call_appearance.transfer_via_new_linekey= diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg index 94ef22dfab..06e830a699 100644 --- a/resources/templates/provision/yealink/t53w/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg @@ -416,7 +416,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1563,20 +1563,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg index 5f601f2246..9acf1a0745 100644 --- a/resources/templates/provision/yealink/t53w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg @@ -4,7 +4,7 @@ ##account.X.*:(T54S/T48G/T48S/T46G/T46S/T29G: X ranges from 1 to 16. T52S/T42G/T42S: X ranges from 1 to 12. T41P/T41S/T27P/T27G: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)## ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -565,7 +565,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.2.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1092,7 +1092,7 @@ pstn.account.2.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1620,7 +1620,7 @@ pstn.account.3.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.4.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2147,7 +2147,7 @@ pstn.account.4.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.5.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2688,7 +2688,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.6.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3216,7 +3216,7 @@ pstn.account.6.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.7.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3744,7 +3744,7 @@ pstn.account.7.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.8.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4272,7 +4272,7 @@ pstn.account.8.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.9.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4800,7 +4800,7 @@ pstn.account.9.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.10.phone_setting.call_appearance.transfer_via_new_linekey= diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg index 6c53ebb483..1d5ab6da7c 100644 --- a/resources/templates/provision/yealink/t54s/y000000000070.cfg +++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg @@ -1408,20 +1408,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg index c01340dacd..650aafe7fa 100644 --- a/resources/templates/provision/yealink/t54w/y000000000096.cfg +++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg @@ -416,7 +416,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1565,20 +1565,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg index a1500aaef1..16e924e173 100644 --- a/resources/templates/provision/yealink/t54w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg @@ -15,7 +15,7 @@ ## account.X.enable = ????????????????????????????????????????????????????????????????????????????????????????????????????????????? ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.{$row.line_number}.phone_setting.call_appearance.transfer_via_new_linekey= diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg index 868b24eb2a..28c949e491 100644 --- a/resources/templates/provision/yealink/t57w/y000000000097.cfg +++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg @@ -417,7 +417,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1564,20 +1564,43 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ####################################################################################### ## Power Saving ## ####################################################################################### -features.power_saving.enable= {$yealink_powersave_enable} -features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time} -features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time} -features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon} -features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue} -features.power_saving.office_hour.wednesday= {$yealink_powersave_wed} -features.power_saving.office_hour.thursday= {$yealink_powersave_thu} -features.power_saving.office_hour.friday= {$yealink_powersave_fri} -features.power_saving.office_hour.saturday= {$yealink_powersave_sat} -features.power_saving.office_hour.sunday = {$yealink_powersave_sun} -features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout} -features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout} -features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout} -features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode} +features.power_saving.enable = {$yealink_ps_enabled} +##Written in 24hr +features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} +features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} + +##Written in 24hr, values should be comma delimited, e.g. 9,17 +{if isset($yealink_ps_days_all)} +features.power_saving.office_hour.monday = {$yealink_ps_days_all} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_all} +features.power_saving.office_hour.thursday = {$yealink_ps_days_all} +features.power_saving.office_hour.friday = {$yealink_ps_days_all} +features.power_saving.office_hour.saturday = {$yealink_ps_days_all} +features.power_saving.office_hour.sunday = {$yealink_ps_days_all} +{elseif isset($yealink_ps_days_workweek)} +features.power_saving.office_hour.monday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.friday = {$yealink_ps_days_workweek} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{else} +features.power_saving.office_hour.monday = {$yealink_ps_day_monday} +features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday} +features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday} +features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday} +features.power_saving.office_hour.friday = {$yealink_ps_day_friday} +features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} +features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} +{/if} + +##Written in minutes +features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} +features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} +features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} +features.power_saving.intelligent_mode = {$yealink_ps_intel_mode} ####################################################################################### diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg index 39af546c1f..e2f64aa818 100644 --- a/resources/templates/provision/yealink/t57w/{$mac}.cfg +++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg @@ -4,7 +4,7 @@ ##account.X.*:(T54S/T48G/T48S/T46G/T46S/T29G: X ranges from 1 to 16. T52S/T42G/T42S: X ranges from 1 to 12. T41P/T41S/T27P/T27G: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)## ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -565,7 +565,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.2.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1091,7 +1091,7 @@ pstn.account.2.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.1.phone_setting.call_appearance.transfer_via_new_linekey= @@ -1618,7 +1618,7 @@ pstn.account.3.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.4.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2144,7 +2144,7 @@ pstn.account.4.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.5.phone_setting.call_appearance.transfer_via_new_linekey= @@ -2684,7 +2684,7 @@ bw.virtual_user.1.xsi.user= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.6.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3211,7 +3211,7 @@ pstn.account.6.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.7.phone_setting.call_appearance.transfer_via_new_linekey= @@ -3738,7 +3738,7 @@ pstn.account.7.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.8.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4265,7 +4265,7 @@ pstn.account.8.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.9.phone_setting.call_appearance.transfer_via_new_linekey= @@ -4792,7 +4792,7 @@ pstn.account.9.label= ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### account.10.phone_setting.call_appearance.transfer_via_new_linekey= diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg index 04decbd007..add2c31430 100644 --- a/resources/templates/provision/yealink/t5x/y000000000070.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg @@ -1408,10 +1408,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1438,6 +1439,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg index 44f961512b..2ba40aa6ff 100644 --- a/resources/templates/provision/yealink/t5x/y000000000095.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg @@ -410,7 +410,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1558,10 +1558,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1588,6 +1589,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg index 9906e06fc3..09ab4bd38d 100644 --- a/resources/templates/provision/yealink/t5x/y000000000096.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg @@ -411,7 +411,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1559,10 +1559,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1589,6 +1590,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg index c6764c0294..d543c0d6ab 100644 --- a/resources/templates/provision/yealink/t5x/y000000000097.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg @@ -411,7 +411,7 @@ static.auto_provision.encryption.config = ####################################################################################### -## Trnasfer ## +## Transfer ## ####################################################################################### features.transfer_type= {$yealink_transfer_type} dialplan.transfer.mode = {$yealink_transfer_mode} @@ -1559,10 +1559,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url} ## Power Saving ## ####################################################################################### features.power_saving.enable = {$yealink_ps_enabled} - +##Written in 24hr features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on} features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off} +##Written in 24hr, values should be comma delimited, e.g. 9,17 {if isset($yealink_ps_days_all)} features.power_saving.office_hour.monday = {$yealink_ps_days_all} features.power_saving.office_hour.tuesday = {$yealink_ps_days_all} @@ -1589,6 +1590,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday} features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday} {/if} +##Written in minutes features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout} features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout} features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout} From 37d3baa77319f1d9e6e46f93d805f90d07576d3e Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:11:34 -0500 Subject: [PATCH 136/496] [Yealink] add ringing_timeout variable (#6227) --- resources/templates/provision/yealink/t33g/y000000000124.cfg | 2 +- resources/templates/provision/yealink/t41s/y000000000068.cfg | 2 +- resources/templates/provision/yealink/t42s/y000000000067.cfg | 2 +- resources/templates/provision/yealink/t43u/y000000000107.cfg | 2 +- resources/templates/provision/yealink/t46s/y000000000066.cfg | 2 +- resources/templates/provision/yealink/t46u/y000000000108.cfg | 2 +- resources/templates/provision/yealink/t48s/y000000000065.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000065.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000066.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000067.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000068.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000107.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000108.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000109.cfg | 2 +- resources/templates/provision/yealink/t4x/y000000000116.cfg | 2 +- resources/templates/provision/yealink/t52s/y000000000074.cfg | 2 +- resources/templates/provision/yealink/t53/y000000000095.cfg | 2 +- resources/templates/provision/yealink/t53w/y000000000095.cfg | 2 +- resources/templates/provision/yealink/t54s/y000000000070.cfg | 2 +- resources/templates/provision/yealink/t54w/y000000000096.cfg | 2 +- resources/templates/provision/yealink/t56a/y000000000056.cfg | 4 ++-- resources/templates/provision/yealink/t57w/y000000000097.cfg | 2 +- resources/templates/provision/yealink/t58a/y000000000058.cfg | 4 ++-- resources/templates/provision/yealink/t58v/y000000000058.cfg | 4 ++-- resources/templates/provision/yealink/t5x/y000000000070.cfg | 2 +- resources/templates/provision/yealink/t5x/y000000000095.cfg | 2 +- resources/templates/provision/yealink/t5x/y000000000096.cfg | 2 +- resources/templates/provision/yealink/t5x/y000000000097.cfg | 2 +- resources/templates/provision/yealink/vp59/y000000000091.cfg | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg index d8142bb0f3..6873005583 100644 --- a/resources/templates/provision/yealink/t33g/y000000000124.cfg +++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg @@ -483,7 +483,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg index 11359c3d1d..a2101634ab 100644 --- a/resources/templates/provision/yealink/t41s/y000000000068.cfg +++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg @@ -445,7 +445,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg index deee590f1d..7d6c5281fb 100644 --- a/resources/templates/provision/yealink/t42s/y000000000067.cfg +++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg @@ -446,7 +446,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg index c7acb2010f..f5a1256477 100644 --- a/resources/templates/provision/yealink/t43u/y000000000107.cfg +++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg @@ -484,7 +484,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg index d7067f8e5d..d5aeeb72de 100644 --- a/resources/templates/provision/yealink/t46s/y000000000066.cfg +++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg @@ -446,7 +446,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg index 08fd50a93f..f91a9ac3a1 100644 --- a/resources/templates/provision/yealink/t46u/y000000000108.cfg +++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg @@ -484,7 +484,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg index d9f47578b3..f0458f6654 100644 --- a/resources/templates/provision/yealink/t48s/y000000000065.cfg +++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg @@ -486,7 +486,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg index 06adcb68ab..43f798140f 100644 --- a/resources/templates/provision/yealink/t4x/y000000000065.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg @@ -485,7 +485,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg index 7fa2faf4ae..713d0467e1 100644 --- a/resources/templates/provision/yealink/t4x/y000000000066.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg @@ -444,7 +444,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg index b173cbb99b..b48cc6fec8 100644 --- a/resources/templates/provision/yealink/t4x/y000000000067.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg @@ -444,7 +444,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg index 56e3ef67a4..b7ff8036b9 100644 --- a/resources/templates/provision/yealink/t4x/y000000000068.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg @@ -444,7 +444,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg index 06adcb68ab..43f798140f 100644 --- a/resources/templates/provision/yealink/t4x/y000000000107.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg @@ -485,7 +485,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg index 6b4af107b4..8b897e637f 100644 --- a/resources/templates/provision/yealink/t4x/y000000000108.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg @@ -444,7 +444,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg index 06adcb68ab..43f798140f 100644 --- a/resources/templates/provision/yealink/t4x/y000000000109.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg @@ -485,7 +485,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg index b173cbb99b..b48cc6fec8 100644 --- a/resources/templates/provision/yealink/t4x/y000000000116.cfg +++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg @@ -444,7 +444,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg index 153a3c1c79..8804bcccda 100644 --- a/resources/templates/provision/yealink/t52s/y000000000074.cfg +++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg @@ -451,7 +451,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg index b6daabf5a5..35d4d75716 100644 --- a/resources/templates/provision/yealink/t53/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53/y000000000095.cfg @@ -477,7 +477,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg index 06e830a699..e2f107acdd 100644 --- a/resources/templates/provision/yealink/t53w/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg @@ -477,7 +477,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg index 1d5ab6da7c..39253da67c 100644 --- a/resources/templates/provision/yealink/t54s/y000000000070.cfg +++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg @@ -450,7 +450,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg index 650aafe7fa..a899384046 100644 --- a/resources/templates/provision/yealink/t54w/y000000000096.cfg +++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg @@ -477,7 +477,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg index 3fda5d507a..53460cc436 100644 --- a/resources/templates/provision/yealink/t56a/y000000000056.cfg +++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg @@ -874,7 +874,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.page_tip = phone_setting.predial_autodial = @@ -1494,7 +1494,7 @@ voice.side_tone = static.security.default_access_level = static.auto_provision.attempt_expired_time = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} ####################################################################################### diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg index 28c949e491..9749565942 100644 --- a/resources/templates/provision/yealink/t57w/y000000000097.cfg +++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg @@ -478,7 +478,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg index 4b096c2129..ee712ccf81 100644 --- a/resources/templates/provision/yealink/t58a/y000000000058.cfg +++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg @@ -873,7 +873,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.page_tip = phone_setting.predial_autodial = @@ -1493,7 +1493,7 @@ voice.side_tone = static.security.default_access_level = static.auto_provision.attempt_expired_time = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} ####################################################################################### diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg index 4e9a1af7d5..863bcb9289 100644 --- a/resources/templates/provision/yealink/t58v/y000000000058.cfg +++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg @@ -874,7 +874,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.page_tip = phone_setting.predial_autodial = @@ -1494,7 +1494,7 @@ voice.side_tone = static.security.default_access_level = static.auto_provision.attempt_expired_time = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} ####################################################################################### diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg index add2c31430..74a58ba543 100644 --- a/resources/templates/provision/yealink/t5x/y000000000070.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg @@ -449,7 +449,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.hold_trans_delay= transfer.multi_call_trans_enable = diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg index 2ba40aa6ff..0a26fd92ff 100644 --- a/resources/templates/provision/yealink/t5x/y000000000095.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg @@ -471,7 +471,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg index 09ab4bd38d..2f98b74348 100644 --- a/resources/templates/provision/yealink/t5x/y000000000096.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg @@ -472,7 +472,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg index d543c0d6ab..6aab7ea851 100644 --- a/resources/templates/provision/yealink/t5x/y000000000097.cfg +++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg @@ -472,7 +472,7 @@ features.headset_training= features.headset_prior= features.dtmf.replace_tran = features.dtmf.transfer = -phone_setting.ringing_timeout= +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.ringback_timeout= features.keep_mute.enable= diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg index 6526e36734..443ac257fb 100644 --- a/resources/templates/provision/yealink/vp59/y000000000091.cfg +++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg @@ -789,7 +789,7 @@ phone_setting.is_deal180 = phone_setting.show_code403 = phone_setting.ringback_timeout = -phone_setting.ringing_timeout = +phone_setting.ringing_timeout = {$yealink_ringing_timeout} phone_setting.page_tip = phone_setting.predial_autodial = From 63ab72df13bfffee64faae2d5b382a47df4aca77 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 6 Jan 2022 18:46:40 -0700 Subject: [PATCH 137/496] Change value to be consistent with other cert value both are enabled false. --- app/polycom/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php index e3a293d0fe..3eb6b3b0e0 100644 --- a/app/polycom/app_config.php +++ b/app/polycom/app_config.php @@ -347,7 +347,7 @@ $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_provision_cert_validate"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Require Provisioning Cert Validation 0=Disabled - 1=Enabled "; $y++; From ccf59f4a0c859c403c18d31a91e8dd93a1e6df65 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 8 Jan 2022 10:53:44 -0700 Subject: [PATCH 138/496] Fix the delete for sofia global settings. --- .../resources/classes/sofia_global_settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sofia_global_settings/resources/classes/sofia_global_settings.php b/app/sofia_global_settings/resources/classes/sofia_global_settings.php index aac3f7485b..65d8b10b69 100644 --- a/app/sofia_global_settings/resources/classes/sofia_global_settings.php +++ b/app/sofia_global_settings/resources/classes/sofia_global_settings.php @@ -95,7 +95,7 @@ if (!class_exists('sofia_global_settings')) { $x = 0; foreach ($records as $record) { //add to the array - if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + if ($record['checked'] == 'true' && is_uuid($record['sofia_global_setting_uuid'])) { $array[$this->table][$x]['sofia_global_setting_uuid'] = $record['sofia_global_setting_uuid']; } From c0946a03cedb7b464d2c5f35c796845ce15602aa Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 8 Jan 2022 11:46:18 -0700 Subject: [PATCH 139/496] Only add sofia global settings that are not in the database --- app/sofia_global_settings/app_defaults.php | 44 ++++++++++++++++------ 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/app/sofia_global_settings/app_defaults.php b/app/sofia_global_settings/app_defaults.php index 2b69295326..5fe2cfdfec 100644 --- a/app/sofia_global_settings/app_defaults.php +++ b/app/sofia_global_settings/app_defaults.php @@ -1,6 +1,12 @@ select($sql, null, 'all'); //build array $x = 0; @@ -28,19 +34,35 @@ if ($domains_processed == 1) { $array['sofia_global_settings'][$x]['global_setting_enabled'] = 'false'; $array['sofia_global_settings'][$x]['global_setting_description'] = ''; - //grant temporary permissions - $p = new permissions; - $p->add('sofia_global_setting_add', 'temp'); + //removes settings from the array that are already in the database + $x = 0; + foreach($sofia_global_settings as $row) { + $x = 0; + foreach ($array['sofia_global_settings'] as $sub_row) { + if ($row['sofia_global_setting_uuid'] == $sub_row['sofia_global_setting_uuid']) { + unset($array['sofia_global_settings'][$x]); + } + $x++; + } + } - //execute insert - $database = new database; - $database->app_name = 'sofia_global_settings'; - $database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945'; - $database->save($array, false); - unset($array); + //add settings that are not in the database + if (count($array['sofia_global_settings']) > 0) { + //grant temporary permissions + $p = new permissions; + $p->add('sofia_global_setting_add', 'temp'); + + //execute insert + $database = new database; + $database->app_name = 'sofia_global_settings'; + $database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945'; + $database->save($array, false); + unset($array); + + //revoke temporary permissions + $p->delete('sofia_global_setting_add', 'temp'); + } - //revoke temporary permissions - $p->delete('sofia_global_setting_add', 'temp'); } ?> From fa2d81725463b8b0f61ff3d528f5c1eedac28841 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 8 Jan 2022 16:14:36 -0700 Subject: [PATCH 140/496] Correct the UUID format for these yealink provision settings. --- app/yealink/app_config.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php index 1097cc53ea..8a837b8321 100644 --- a/app/yealink/app_config.php +++ b/app/yealink/app_config.php @@ -63,7 +63,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "0-12 Hour, 1-24 Hour"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "166b27d118604154-88d3-5e15781e7bbb"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "166b27d1-1860-4154-88d3-5e15781e7bbb"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_date_format"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; @@ -79,7 +79,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable or disable the NAT Rport. 0-Disabled (default), 1-Enabled."; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "70894b7b-2edd-41ad8526060589df4e11"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "70894b7b-2edd-41ad-8526-060589df4e11"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_session_timer"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; @@ -87,7 +87,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "SIP Session Timers"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "aa200d6f-c04842039838-8dd05fa31bd5"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "aa200d6f-c048-4203-9838-8dd05fa31bd5"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_retransmission"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; @@ -167,7 +167,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default 0"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be02b916-3419-4bc7-881e46711134577c"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be02b916-3419-4bc7-881e-46711134577c"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_blf_led_mode"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; @@ -319,7 +319,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T33G firmware ROM"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "758509689226450f-a3e1-414ec1d610ee"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "75850968-9226-450f-a3e1-414ec1d610ee"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t38g"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; @@ -335,7 +335,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T40G firmware ROM"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c5d9b7ea-8e3b44289845438be7be0baa"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c5d9b7ea-8e3b-4428-9845-438be7be0baa"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t40p"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; @@ -351,7 +351,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T41P firmware ROM"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9480f346-c038-462b-b440329383290b84"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9480f346-c038-462b-b440-329383290b84"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t41s"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; @@ -479,7 +479,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T52Sfirmware ROM"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7378c0b632424989-8af6-903dfb437285"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7378c0b6-3242-4989-8af6-903dfb437285"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t54s"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; @@ -487,7 +487,7 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Firmware tested 2017-11-26"; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ffd1ad7-1b00-41f7-8e9319412127245a"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ffd1ad7-1b00-41f7-8e93-19412127245a"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t56a"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; From 2c096c9e018d316c565f74b6987f30a5111a3528 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 8 Jan 2022 16:22:03 -0700 Subject: [PATCH 141/496] Only load default settings that are not in the database. --- resources/classes/domains.php | 123 ++++++++-------------------------- 1 file changed, 28 insertions(+), 95 deletions(-) diff --git a/resources/classes/domains.php b/resources/classes/domains.php index 681ea92d9d..6a434e6572 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -759,7 +759,16 @@ if (!class_exists('domains')) { */ public function settings() { - //get the list of installed apps from the core and mod directories + //get an array of the default settings UUIDs + $sql = "select * from v_default_settings "; + $database = new database; + $result = $database->select($sql, null, 'all'); + foreach($result as $row) { + $setting[$row['default_setting_uuid']] = 1; + } + unset($sql); + + //get the list of default settings $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $x=0; foreach ($config_list as $config_path) { @@ -769,109 +778,33 @@ if (!class_exists('domains')) { $x = 0; foreach ($apps as $app) { if (is_array($app['default_settings'])) { - foreach ($app['default_settings'] as $setting) { - $array[$x] = ($setting); + foreach ($app['default_settings'] as $row) { + if (!isset($setting[$row['default_setting_uuid']])) { + $array[$x] = $row; $array[$x]['app_uuid'] = $app['uuid']; $x++; + } } } } - //get an array of the default settings - $sql = "select * from v_default_settings "; - $sql .= "order by default_setting_category asc, default_setting_subcategory asc"; - $database = new database; - $default_settings = $database->select($sql, null, 'all'); - unset($sql); - - //named array - foreach ($default_settings as $row) { - $default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['uuid'] = $row['default_setting_uuid']; - $default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['value'] = $row['default_setting_value']; - $default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['app_uuid'] = $row['app_uuid']; - //echo "[".$row['default_setting_category']."][".$row['default_setting_subcategory']."][".$row['default_setting_name']."] = ".$row['default_setting_value']."\n"; - } - - //update matching settings with the correct default_setting_uuid and app_uuid and if they exist remove them from the array - $x = 0; - foreach ($array as $row) { - $category = $row['default_setting_category']; - $subcategory = $row['default_setting_subcategory']; - $name = $row['default_setting_name']; - - if (isset($default_settings[$category][$subcategory][$name]['value'])) { - //set the variables - $default_setting_uuid = $default_settings[$category][$subcategory][$name]['uuid']; - $app_uuid = $default_settings[$category][$subcategory][$name]['app_uuid']; - //update matching settings - if ($app_uuid == null) { - $sql = "update v_default_settings set "; - if ($default_setting_uuid != $row['default_setting_uuid']) { - $sql .= "default_setting_uuid = :default_setting_uuid, "; - } - $sql .= "app_uuid = :app_uuid "; - $sql .= "where default_setting_uuid = :default_setting_uuid';"; - $parameters['default_setting_uuid'] = $row['default_setting_uuid']; - $parameters['app_uuid'] = $row['app_uuid']; - $database = new database; - $default_settings = $database->select($sql, $parameters, 'all'); - unset($sql, $parameters); - //echo "\n"; - } - - //remove settings from the array that were found - unset($array[$x]); - } - $x++; - } - unset($default_settings); - - //get the missing count - $array_count = count($array); - //add the missing default settings if (is_array($array) && count($array) > 0) { - foreach ($array as $row) { - $sql = "insert into v_default_settings ("; - $sql .= "default_setting_uuid, "; - $sql .= "default_setting_category, "; - $sql .= "default_setting_subcategory, "; - $sql .= "default_setting_name, "; - $sql .= "default_setting_value, "; - if ($row['default_setting_order']) { - $sql .= "default_setting_order, "; - } - $sql .= "default_setting_enabled, "; - $sql .= "default_setting_description "; - $sql .= ") values \n"; - $sql .= "("; - $sql .= ":default_setting_uuid, "; - $sql .= ":default_setting_category, "; - $sql .= ":default_setting_subcategory, "; - $sql .= ":default_setting_name, "; - $sql .= ":default_setting_value, "; - if ($row['default_setting_order']) { - $sql .= ":default_setting_order, "; - } - $sql .= ":default_setting_enabled, "; - $sql .= ":default_setting_description "; - $sql .= ");"; - $parameters['default_setting_uuid'] = $row['default_setting_uuid']; - $parameters['default_setting_category'] = $row['default_setting_category']; - $parameters['default_setting_subcategory'] = $row['default_setting_subcategory']; - $parameters['default_setting_name'] = $row['default_setting_name']; - $parameters['default_setting_value'] = $row['default_setting_value']; - if ($row['default_setting_order']) { - $parameters['default_setting_order'] = $row['default_setting_order']; - } - $parameters['default_setting_enabled'] = $row['default_setting_enabled']; - $parameters['default_setting_description'] = $row['default_setting_description']; + //grant temporary permissions + $p = new permissions; + $p->add('default_setting_add', 'temp'); + + //execute insert $database = new database; - $default_settings = $database->select($sql, $parameters, 'all'); - unset($sql, $parameters); - } - unset($array); - } + $database->app_name = 'default_settings'; + $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09'; + $database->save($array, false); + unset($array); + + //revoke temporary permissions + $p->delete('default_setting_add', 'temp'); + } + } //end settings method } } From a43299605503000f5e7c51d2cf52a800e8ba1eea Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sun, 9 Jan 2022 06:41:25 -0700 Subject: [PATCH 142/496] Add missing part of the array. --- resources/classes/domains.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/classes/domains.php b/resources/classes/domains.php index 6a434e6572..5bc749ca42 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -780,8 +780,8 @@ if (!class_exists('domains')) { if (is_array($app['default_settings'])) { foreach ($app['default_settings'] as $row) { if (!isset($setting[$row['default_setting_uuid']])) { - $array[$x] = $row; - $array[$x]['app_uuid'] = $app['uuid']; + $array['default_settings'][$x] = $row; + $array['default_settings'][$x]['app_uuid'] = $app['uuid']; $x++; } } From e3e41624e2602a316b5027792eeb9725978dff6e Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Sun, 9 Jan 2022 10:53:40 -0500 Subject: [PATCH 143/496] [send_mail] return freeswitch.email Boolean value (#6231) --- .../resources/scripts/resources/functions/send_mail.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua index 0a52466ef7..b4f9676dbd 100644 --- a/app/scripts/resources/scripts/resources/functions/send_mail.lua +++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua @@ -266,10 +266,11 @@ else "X-Headers: " .. xheaders if file then - freeswitch.email(address, from, mail_headers, body, file) + ok = freeswitch.email(address, from, mail_headers, body, file) else - freeswitch.email(address, from, mail_headers, body) + ok = freeswitch.email(address, from, mail_headers, body) end + return ok end end From 6815388b73ca9a6d0a94847b1b35d5278c1a10ca Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 10 Jan 2022 11:02:37 -0700 Subject: [PATCH 144/496] Get the email from_address using default settings. --- app/scripts/resources/scripts/fax_retry.lua | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/scripts/resources/scripts/fax_retry.lua b/app/scripts/resources/scripts/fax_retry.lua index 2ea25f673a..79510b2965 100644 --- a/app/scripts/resources/scripts/fax_retry.lua +++ b/app/scripts/resources/scripts/fax_retry.lua @@ -16,7 +16,7 @@ -- -- The Initial Developer of the Original Code is -- Mark J Crane --- Copyright (C) 2010 - 2021 +-- Copyright (C) 2010 - 2022 -- the Initial Developer. All Rights Reserved. -- -- Contributor(s): @@ -49,11 +49,11 @@ --array count require "resources.functions.count"; --- show all channel variables +--show all channel variables --dat = env:serialize() --freeswitch.consoleLog("INFO","[FAX] info:\n" .. dat .. "\n") --- example channel variables relating to fax +--example channel variables relating to fax --variable_fax_success: 0 --variable_fax_result_code: 49 --variable_fax_result_text: The%20call%20dropped%20prematurely @@ -66,7 +66,7 @@ --variable_fax_bad_rows: 0 --variable_fax_transfer_rate: 14400 --- set channel variables to lua variables +--set channel variables to lua variables uuid = env:getHeader("uuid"); domain_uuid = env:getHeader("domain_uuid"); domain_name = env:getHeader("domain_name"); @@ -91,6 +91,10 @@ fax_busy_attempts = tonumber(env:getHeader("fax_busy_attempts")); hangup_cause_q850 = tonumber(env:getHeader("hangup_cause_q850")); +--prepare to get the settings + local Settings = require "resources.functions.lazy_settings" + local settings = Settings.new(dbh, domain_name, domain_uuid); + --set default values default_language = 'en'; default_dialect = 'us'; @@ -322,6 +326,14 @@ end --do not use apostrophies in message, they are not escaped and the mail will fail. +--get the from address + if (from_address == nil) then + from_address = settings:get('fax', 'smtp_from', 'text'); + if (from_address == nil) then + from_address = settings:get('email', 'smtp_from', 'text'); + end + end + --get the templates local sql = "SELECT * FROM v_email_templates "; sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) "; @@ -467,7 +479,7 @@ end end --- send the selected variables to the console +--send the selected variables to the console if (fax_success ~= nil) then freeswitch.consoleLog("INFO","[FAX] Success: '" .. fax_success .. "'\n"); end @@ -487,7 +499,7 @@ freeswitch.consoleLog("INFO","[FAX] mailto_address: ".. email_address .."\n"); freeswitch.consoleLog("INFO","[FAX] hangup_cause_q850: '" .. hangup_cause_q850 .. "'\n"); --- set the type +--set the type email_type = "email2fax"; --prepare the headers @@ -497,7 +509,7 @@ headers["X-FusionPBX-Email-Type"] = email_type; headers["X-FusionPBX-Email-From"] = from_address; --- if the fax failed then try again +--if the fax failed then try again if (fax_success == "0") then --DEBUG --email_cmd = "/bin/echo '"..email_subject_fail.."' | /usr/bin/mail -s 'Fax to: "..number_dialed.." FAILED' -r "..from_address.." -a '"..fax_file.."' "..email_address; From 9e18d5a13dfc2670d91488f21b7f2c052484aca3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 10 Jan 2022 12:06:24 -0700 Subject: [PATCH 145/496] Add the fax call uuid and add include for send_mail function. --- app/scripts/resources/scripts/fax_retry.lua | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/scripts/resources/scripts/fax_retry.lua b/app/scripts/resources/scripts/fax_retry.lua index 79510b2965..999683b368 100644 --- a/app/scripts/resources/scripts/fax_retry.lua +++ b/app/scripts/resources/scripts/fax_retry.lua @@ -43,11 +43,10 @@ json = require "resources.functions.lunajson" end ---define the explode function +--additional includes require "resources.functions.explode"; - ---array count require "resources.functions.count"; + require "resources.functions.send_mail"; --show all channel variables --dat = env:serialize() @@ -91,10 +90,6 @@ fax_busy_attempts = tonumber(env:getHeader("fax_busy_attempts")); hangup_cause_q850 = tonumber(env:getHeader("hangup_cause_q850")); ---prepare to get the settings - local Settings = require "resources.functions.lazy_settings" - local settings = Settings.new(dbh, domain_name, domain_uuid); - --set default values default_language = 'en'; default_dialect = 'us'; @@ -328,9 +323,21 @@ --get the from address if (from_address == nil) then - from_address = settings:get('fax', 'smtp_from', 'text'); + if (settings['fax'] ~= nil) then + if (settings['fax']['smtp_from'] ~= nil) then + if (settings['fax']['smtp_from']['text'] ~= nil) then + smtp_from = settings['fax']['smtp_from']['text']; + end + end + end if (from_address == nil) then - from_address = settings:get('email', 'smtp_from', 'text'); + if (settings['email'] ~= nil) then + if (settings['email']['smtp_from'] ~= nil) then + if (settings['email']['smtp_from']['text'] ~= nil) then + smtp_from = settings['email']['smtp_from']['text']; + end + end + end end end @@ -508,6 +515,7 @@ headers["X-FusionPBX-Domain-Name"] = domain_name; headers["X-FusionPBX-Email-Type"] = email_type; headers["X-FusionPBX-Email-From"] = from_address; + headers["X-FusionPBX-Call-UUID"] = uuid; --if the fax failed then try again if (fax_success == "0") then From 9d69d916301b4b8a5f8850c3a36465fcc79edea6 Mon Sep 17 00:00:00 2001 From: agree <37550360+greenbea@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:25:42 -0500 Subject: [PATCH 146/496] [destinations] fix missing dialplan extension name (#6237) --- app/destinations/destination_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php index 96d0b6a22b..ac3c78e4fd 100644 --- a/app/destinations/destination_edit.php +++ b/app/destinations/destination_edit.php @@ -375,7 +375,7 @@ } //build the xml dialplan - $dialplan["dialplan_xml"] = "\n"; + $dialplan["dialplan_xml"] = "\n"; $dialplan["dialplan_xml"] .= " \n"; $dialplan["dialplan_xml"] .= " \n"; $dialplan["dialplan_xml"] .= " \n"; From affba4b61d6a3d13cb6b068c3de04477ea274797 Mon Sep 17 00:00:00 2001 From: Antonio Fernandez Date: Tue, 11 Jan 2022 00:27:33 -0500 Subject: [PATCH 147/496] Update xml_cdr_statistics.php (#6236) --- app/xml_cdr/xml_cdr_statistics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index 8336ad5608..e14a2974d6 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -280,7 +280,7 @@ echo " ".$text['table-calls-per-minute']."\n"; echo " ".$text['table-missed']."\n"; echo " ASR\n"; - echo " ALOC\n"; + echo " ".$text['label-aloc']."\n"\n"; echo "\n"; $i = 0; From 13a1590c8f64d82a2cc5d4e144e5de5044799fc0 Mon Sep 17 00:00:00 2001 From: Antonio Fernandez Date: Tue, 11 Jan 2022 00:28:55 -0500 Subject: [PATCH 148/496] Update xml_cdr_extension_summary.php (#6235) --- app/xml_cdr/xml_cdr_extension_summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php index 97dcd6cfaf..feb8c126af 100644 --- a/app/xml_cdr/xml_cdr_extension_summary.php +++ b/app/xml_cdr/xml_cdr_extension_summary.php @@ -197,7 +197,7 @@ echo " ".$text['label-missed']."\n"; echo " ".$text['label-no_answer']."\n"; echo " ".$text['label-busy']."\n"; - echo " ".$text['label-aloc']."\n"; + echo " ".$text['label-aloc']."\n"; echo " ".$text['label-inbound_calls']."\n"; echo " ".$text['label-inbound_duration']."\n"; echo " ".$text['label-outbound_calls']."\n"; From 7e321c43fb3a3fde23a275bee67815a6d7c24e2f Mon Sep 17 00:00:00 2001 From: Antonio Fernandez Date: Tue, 11 Jan 2022 00:33:47 -0500 Subject: [PATCH 149/496] added support for ALOC description #1 (#6234) * added support for ALOC description * Changed description to 'Average Length of Call' Conversation isn't bad but I've always heard it as Average Length of Call. Co-authored-by: FusionPBX --- app/xml_cdr/app_languages.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index cfe264dc02..18a31503e8 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -2772,6 +2772,27 @@ $text['description-mos']['ru-ru'] = "Средний оценочный пока $text['description-mos']['sv-se'] = "Genomsnittlig bedömning poäng"; $text['description-mos']['uk-ua'] = "Середнє число думок"; +$text['description-aloc']['en-us'] = "Average Length of Call"; +$text['description-aloc']['en-gb'] = "Average Length of Call"; +$text['description-aloc']['ar-eg'] = "متوسط طول المحادثة"; +$text['description-aloc']['de-at'] = "Durchschnittliche Gesprächsdauer"; +$text['description-aloc']['de-ch'] = "Durchschnittliche Gesprächsdauer"; +$text['description-aloc']['de-de'] = "Durchschnittliche Gesprächsdauer"; +$text['description-aloc']['es-cl'] = "Duración promedio de la conversación"; +$text['description-aloc']['es-mx'] = "Duración promedio de la conversación"; +$text['description-aloc']['fr-ca'] = "Durée moyenne de la conversation"; +$text['description-aloc']['fr-fr'] = "Durée moyenne de la conversation"; +$text['description-aloc']['he-il'] = "משך השיחה הממוצע"; +$text['description-aloc']['it-it'] = "Durata media della conversazione"; +$text['description-aloc']['nl-nl'] = ""; +$text['description-aloc']['pl-pl'] = ""; +$text['description-aloc']['pt-br'] = "Duração média da conversa"; +$text['description-aloc']['pt-pt'] = "Duração média da conversa"; +$text['description-aloc']['ro-ro'] = "Durata medie a conversației"; +$text['description-aloc']['ru-ru'] = "Средняя продолжительность разговора"; +$text['description-aloc']['sv-se'] = "Genomsnittlig konversationslängd"; +$text['description-aloc']['uk-ua'] = "Середня тривалість розмови";= + $text['button-archive']['en-us'] = "Archive"; $text['button-archive']['en-gb'] = "Archive"; $text['button-archive']['ar-eg'] = ""; From d3c0f3ac3420c1172476e9a8c13e0239a7532e68 Mon Sep 17 00:00:00 2001 From: Antonio Fernandez Date: Tue, 11 Jan 2022 00:36:57 -0500 Subject: [PATCH 150/496] Removing {$row.display_name} from the line button (#6233) The reason I think this should be removed is because setting the label on this model of phone removes the ability to see status of the line button. For example (without the label), if I have a call on hold on my first line button, it will show the caller's number and the state of that call. For example: "4165551234 holding" When you put the label, it removes that great feature. --- resources/templates/provision/snom/D785/{$mac}.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml index d6705e3491..33fe69b458 100644 --- a/resources/templates/provision/snom/D785/{$mac}.xml +++ b/resources/templates/provision/snom/D785/{$mac}.xml @@ -79,7 +79,7 @@ {assign var="maxKeys" value=77 - count($lines)} {foreach $lines as $row} - line + line {if $row@index eq 11}{break}{/if} {/foreach} {foreach $keys["line"] as $row} From c3d342963574cb6b7e6ef36a358397009893c832 Mon Sep 17 00:00:00 2001 From: vivoras <60329535+vivoras@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:23:08 +0100 Subject: [PATCH 151/496] Update app_languages.php (#6238) --- app/xml_cdr/app_languages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 18a31503e8..ea438317d6 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -2791,7 +2791,7 @@ $text['description-aloc']['pt-pt'] = "Duração média da conversa"; $text['description-aloc']['ro-ro'] = "Durata medie a conversației"; $text['description-aloc']['ru-ru'] = "Средняя продолжительность разговора"; $text['description-aloc']['sv-se'] = "Genomsnittlig konversationslängd"; -$text['description-aloc']['uk-ua'] = "Середня тривалість розмови";= +$text['description-aloc']['uk-ua'] = "Середня тривалість розмови"; $text['button-archive']['en-us'] = "Archive"; $text['button-archive']['en-gb'] = "Archive"; From 650f50a6ce20b1b9c89eb689542e8e4ebf2ba805 Mon Sep 17 00:00:00 2001 From: vivoras <60329535+vivoras@users.noreply.github.com> Date: Wed, 12 Jan 2022 00:27:34 +0100 Subject: [PATCH 152/496] Update xml_cdr_statistics.php (#6239) --- app/xml_cdr/xml_cdr_statistics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index e14a2974d6..e50e8c03fa 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -280,7 +280,7 @@ echo " ".$text['table-calls-per-minute']."\n"; echo " ".$text['table-missed']."\n"; echo " ASR\n"; - echo " ".$text['label-aloc']."\n"\n"; + echo " ".$text['label-aloc']."\n"; echo "\n"; $i = 0; From daf9694c7c5501e06e552a1b4ec24a3175632e6b Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 12 Jan 2022 12:04:56 -0700 Subject: [PATCH 153/496] Add from_address to the send_mail function for missed call emails. --- app/scripts/resources/scripts/app/hangup/index.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/scripts/resources/scripts/app/hangup/index.lua b/app/scripts/resources/scripts/app/hangup/index.lua index 20338c01f7..f4c1772d0e 100644 --- a/app/scripts/resources/scripts/app/hangup/index.lua +++ b/app/scripts/resources/scripts/app/hangup/index.lua @@ -53,6 +53,11 @@ local Database = require "resources.functions.database"; local dbh = Database.new('system'); + --prepare to get the settings + local Settings = require "resources.functions.lazy_settings" + local settings = Settings.new(dbh, domain_name, domain_uuid) + local from_address = settings:get('email', 'smtp_from', 'text'); + --get the templates local sql = "SELECT * FROM v_email_templates "; sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) "; @@ -75,7 +80,7 @@ headers["X-FusionPBX-Domain-Name"] = domain_name; headers["X-FusionPBX-Call-UUID"] = uuid; headers["X-FusionPBX-Email-Type"] = 'missed'; - + --remove quotes from caller id name and number caller_id_name = caller_id_name:gsub("'", "'"); caller_id_name = caller_id_name:gsub([["]], """); @@ -104,7 +109,7 @@ --send the emails send_mail(headers, - missed_call_data, + from_address, missed_call_data, {subject, body} ); From 1db3e5ba14087143cd1881250c4d35056f74b252 Mon Sep 17 00:00:00 2001 From: Anthony <96078404+AntoniusDC@users.noreply.github.com> Date: Wed, 12 Jan 2022 16:00:01 -0700 Subject: [PATCH 154/496] Removed Search Reset (#6241) * Update default_settings.php * Update devices.php * Update extensions.php * Update gateways.php * Update users.php * Update destinations.php * Update dialplans.php * Update bridges.php * Update call_block.php * Update call_broadcast.php * Update call_flows.php * Update call_forward.php * Update call_recordings.php * Update conference_centers.php * Update conference_controls.php * Update conference_profiles.php * Update conferences.php * Update contacts.php * Update fax.php * Update ivr_menus.php * Update phrases.php * Update recordings.php * Update ring_groups.php * Update time_conditions.php * Update voicemails.php * Update call_center_queues.php * Update email_logs.php * Update registrations.php * Update user_logs.php * Update access_controls.php * Update domains.php * Update email_templates.php * Update groups.php * Update menu.php * Update number_translations.php * Update sip_profiles.php * Update database_transactions.php * Update vars.php * Update dashboard.php --- app/access_controls/access_controls.php | 6 +++--- app/bridges/bridges.php | 6 +++--- app/call_block/call_block.php | 6 +++--- app/call_broadcast/call_broadcast.php | 8 ++++---- app/call_centers/call_center_queues.php | 6 +++--- app/call_flows/call_flows.php | 6 +++--- app/call_forward/call_forward.php | 6 +++--- app/call_recordings/call_recordings.php | 6 +++--- app/conference_centers/conference_centers.php | 8 ++++---- app/conference_controls/conference_controls.php | 8 ++++---- app/conference_profiles/conference_profiles.php | 8 ++++---- app/conferences/conferences.php | 8 ++++---- app/contacts/contacts.php | 6 +++--- app/database_transactions/database_transactions.php | 6 +++--- app/destinations/destinations.php | 6 +++--- app/devices/devices.php | 6 +++--- app/dialplans/dialplans.php | 6 +++--- app/email_logs/email_logs.php | 8 ++++---- app/email_templates/email_templates.php | 8 ++++---- app/extensions/extensions.php | 6 +++--- app/fax/fax.php | 6 +++--- app/gateways/gateways.php | 6 +++--- app/ivr_menus/ivr_menus.php | 8 ++++---- app/number_translations/number_translations.php | 6 +++--- app/phrases/phrases.php | 6 +++--- app/recordings/recordings.php | 6 +++--- app/registrations/registrations.php | 6 +++--- app/ring_groups/ring_groups.php | 6 +++--- app/sip_profiles/sip_profiles.php | 6 +++--- app/time_conditions/time_conditions.php | 8 ++++---- app/vars/vars.php | 8 ++++---- app/voicemails/voicemails.php | 6 +++--- core/dashboard/dashboard.php | 6 +++--- core/default_settings/default_settings.php | 6 +++--- core/domains/domains.php | 6 +++--- core/groups/groups.php | 6 +++--- core/menu/menu.php | 6 +++--- core/user_logs/user_logs.php | 8 ++++---- core/users/users.php | 6 +++--- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index 0df2caa638..78423c0ec9 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -161,9 +161,9 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; echo "
    \n"; diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index cbe6d8a0bb..e3d6a31308 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -174,9 +174,9 @@ echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']); } } - echo ""; - echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); - echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'ring_groups.php','style'=>($search == '' ? 'display: none;' : null)]); + echo ""; + echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); + //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'ring_groups.php','style'=>($search == '' ? 'display: none;' : null)]); if ($paging_controls_mini != '') { echo "".$paging_controls_mini.""; } diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index 8571f4701d..094e1d66ab 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -137,9 +137,9 @@ echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>'code','collapse'=>'hide-xs','link'=>'/app/sofia_global_settings/sofia_global_settings.php']); } echo "
    \n"; echo "
    \n"; @@ -169,7 +169,7 @@ echo "\n"; if (permission_exists('module_edit') || permission_exists('module_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } echo "".$text['label-label']."\n"; @@ -206,7 +206,7 @@ $modifier = str_replace(' ', ' ', $modifier); $modifier = str_replace(' ', '_', $modifier); echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } @@ -275,4 +275,4 @@ //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index d2969f22e2..9e013f525c 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -424,7 +424,7 @@ echo ""; } if (permission_exists('music_on_hold_delete') && $streams) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "
    \n"; echo "
    \n"; @@ -510,7 +510,7 @@ echo " \n"; if (permission_exists('music_on_hold_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } @@ -541,7 +541,7 @@ echo "\n"; if (permission_exists('music_on_hold_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index 079b534b2f..53300161b0 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -132,13 +132,13 @@ echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'phrase_edit.php']); } if (permission_exists('phrase_add') && $phrases) { - echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]); + echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); } if (permission_exists('phrase_edit') && $phrases) { - echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); + echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); } if (permission_exists('phrase_delete') && $phrases) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo ""; } if (permission_exists('recording_delete') && $recordings) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "
    \n"; @@ -138,7 +138,7 @@ echo "\n"; if (permission_exists('database_add') || permission_exists('database_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } echo th_order_by('database_driver', $text['label-driver'], $order_by, $order); @@ -158,7 +158,7 @@ echo "\n"; if (permission_exists('database_add') || permission_exists('database_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } @@ -194,4 +194,4 @@ //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index f53b18214d..fa12ef012c 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -260,7 +260,7 @@ } if (permission_exists('default_setting_add') && $default_settings) { if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { - echo button::create(['type'=>'button','label'=>$text['button-copy'],'id'=>'btn_copy','icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','onclick'=>'show_domains();']); + echo button::create(['type'=>'button','label'=>$text['button-copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','onclick'=>'show_domains();']); echo button::create(['type'=>'button','label'=>$text['button-cancel'],'id'=>'btn_copy_cancel','icon'=>$_SESSION['theme']['button_icon_cancel'],'style'=>'display: none;','onclick'=>'hide_domains();']); echo "\n"; + echo " \n"; echo " \n"; } if ($_GET['show'] == 'all' && permission_exists('default_setting_all')) { @@ -395,7 +395,7 @@ echo "\n"; if (permission_exists('default_setting_add') || permission_exists('default_setting_edit') || permission_exists('default_setting_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } diff --git a/core/domains/domains.php b/core/domains/domains.php index 7ccf78caf4..e2c8a52acd 100644 --- a/core/domains/domains.php +++ b/core/domains/domains.php @@ -191,10 +191,10 @@ echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'domain_edit.php']); } if (permission_exists('domain_edit') && $domains) { - echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); + echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); } if (permission_exists('domain_delete') && $domains) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete_domain','onclick'=>"modal_open('modal-delete','btn_delete_domain');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete_domain','name'=>'btn_delete_domain','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete_domain');"]); } echo "\n"; echo ""; @@ -226,7 +226,7 @@ echo "\n"; if (permission_exists('domain_edit') || permission_exists('domain_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } if ($_GET['show'] == 'all' && permission_exists('domain_all')) { @@ -250,7 +250,7 @@ echo "\n"; if (permission_exists('domain_edit') || permission_exists('domain_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } diff --git a/core/groups/groups.php b/core/groups/groups.php index c4776486dc..d84530a5e9 100644 --- a/core/groups/groups.php +++ b/core/groups/groups.php @@ -143,13 +143,13 @@ echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'group_edit.php']); } if (permission_exists('group_add') && $groups) { - echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]); + echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); } if (permission_exists('group_edit') && $groups) { - echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); + echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); } if (permission_exists('group_delete') && $groups) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; if (permission_exists('group_all')) { @@ -192,7 +192,7 @@ echo "\n"; if (permission_exists('group_add') || permission_exists('group_edit') || permission_exists('group_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } if ($_GET['show'] == 'all' && permission_exists('group_all')) { @@ -217,7 +217,7 @@ echo "\n"; if (permission_exists('group_add') || permission_exists('group_edit') || permission_exists('group_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } diff --git a/core/menu/menu.php b/core/menu/menu.php index 287fc05c11..6db98a91be 100644 --- a/core/menu/menu.php +++ b/core/menu/menu.php @@ -111,7 +111,7 @@ echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'menu_edit.php']); } if (permission_exists('menu_delete') && $menus) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; echo ""; @@ -140,7 +140,7 @@ echo "\n"; if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } echo th_order_by('menu_name', $text['label-menu_name'], $order_by, $order); @@ -160,7 +160,7 @@ echo "\n"; if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } diff --git a/core/users/users.php b/core/users/users.php index 3ed9942d26..ed774457ec 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -195,13 +195,13 @@ echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'user_edit.php']); } if (permission_exists('user_add') && $users) { - echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]); + echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); } if (permission_exists('user_edit') && $users) { - echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); + echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]); } if (permission_exists('user_delete') && $users) { - echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]); + echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; if (permission_exists('user_all')) { @@ -244,7 +244,7 @@ echo "\n"; if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; } if ($_GET['show'] == 'all' && permission_exists('user_all')) { @@ -274,7 +274,7 @@ echo "\n"; if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) { echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; } From 0a8c6f01fb8c6eb7733fd4fc7093567d073d2f15 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 14 Jan 2022 10:35:06 -0700 Subject: [PATCH 156/496] Increase the number used in the ring group destination delay and timeout. --- app/ring_groups/ring_group_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 3e0bd9b8cc..e7a244223c 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -772,7 +772,7 @@ echo " \n"; echo " \n"; $i = 5; - while($i <= 300) { + while($i <= 999) { if ($i == $row['destination_timeout']) { echo " \n"; } From 3779b4a93e334c27b729386f6ccfcc466f3aacf1 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 15 Jan 2022 13:01:12 -0700 Subject: [PATCH 157/496] No need to require contact type when adding a new contact. --- app/contacts/contact_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index f0487a1d82..70f09a381d 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -234,7 +234,7 @@ //check for all required data $msg = ''; - if (strlen($contact_type) == 0) { $msg .= $text['message-required']." ".$text['label-contact_type']."
    \n"; } + //if (strlen($contact_type) == 0) { $msg .= $text['message-required']." ".$text['label-contact_type']."
    \n"; } //if (strlen($contact_title) == 0) { $msg .= $text['message-required']." ".$text['label-contact_title']."
    \n"; } //if (strlen($contact_role) == 0) { $msg .= $text['message-required']." ".$text['label-contact_role']."
    \n"; } //if (strlen($contact_category) == 0) { $msg .= $text['message-required']." ".$text['label-contact_category']."
    \n"; } From c084373d0a7db4d60c2e4839be493930097e6944 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 17 Jan 2022 10:09:12 -0700 Subject: [PATCH 158/496] Add a new permissions variable. --- .../scripts/app/speed_dial/index.lua | 78 +++++++++++-------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/app/scripts/resources/scripts/app/speed_dial/index.lua b/app/scripts/resources/scripts/app/speed_dial/index.lua index 22e6b678f8..995f94ace4 100644 --- a/app/scripts/resources/scripts/app/speed_dial/index.lua +++ b/app/scripts/resources/scripts/app/speed_dial/index.lua @@ -15,7 +15,7 @@ -- The Initial Developer of the Original Code is -- Mark J Crane --- Portions created by the Initial Developer are Copyright (C) 2019 +-- Portions created by the Initial Developer are Copyright (C) 2019 - 2021 -- the Initial Developer. All Rights Reserved. -- load config @@ -34,9 +34,13 @@ domain_name = session:getVariable("domain_name"); domain_uuid = session:getVariable("domain_uuid"); context = session:getVariable("context"); + permissions = session:getVariable("permissions") user = session:getVariable("sip_auth_username") or session:getVariable("username"); +--set the default + if (not permissions) then permissions = 'false'; end + --get the argv values destination = argv[2]; @@ -64,38 +68,50 @@ local dbh = Database.new('system'); -- search for the phone number in database using the speed dial - local sql = [[ - -- find all contacts with correct user or withot users and groups at all - select t0.phone_number --, t6.extension, 'GROUP:' || t3.group_name as user_name - from v_contact_phones t0 - inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid - left outer join v_contact_groups t2 on t1.contact_uuid = t2.contact_uuid - left outer join v_user_groups t3 on t2.group_uuid = t3.group_uuid - left outer join v_users t4 on t3.user_uuid = t4.user_uuid - left outer join v_extension_users t5 on t4.user_uuid = t5.user_uuid - left outer join v_extensions t6 on t5.extension_uuid = t6.extension_uuid - where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial - and ( (1 = 0) - or (t6.domain_uuid = :domain_uuid and (t6.extension = :user or t6.number_alias = :user)) - or (t2.contact_uuid is null and not exists(select 1 from v_contact_users t where t.contact_uuid = t0.contact_uuid) ) - ) + if (permissions == 'true') then + --advanced, check on user and group permissions + sql = [[ + -- find all contacts with correct user or withot users and groups at all + select t0.phone_number --, t6.extension, 'GROUP:' || t3.group_name as user_name + from v_contact_phones t0 + inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid + left outer join v_contact_groups t2 on t1.contact_uuid = t2.contact_uuid + left outer join v_user_groups t3 on t2.group_uuid = t3.group_uuid + left outer join v_users t4 on t3.user_uuid = t4.user_uuid + left outer join v_extension_users t5 on t4.user_uuid = t5.user_uuid + left outer join v_extensions t6 on t5.extension_uuid = t6.extension_uuid + where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial + and ( (1 = 0) + or (t6.domain_uuid = :domain_uuid and (t6.extension = :user or t6.number_alias = :user)) + or (t2.contact_uuid is null and not exists(select 1 from v_contact_users t where t.contact_uuid = t0.contact_uuid)) + ) - union + union - -- find all contacts with correct group or withot users and groups at all - select t0.phone_number -- , t5.extension, 'USER:' || t3.username as user_name - from v_contact_phones t0 - inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid - left outer join v_contact_users t2 on t1.contact_uuid = t2.contact_uuid - left outer join v_users t3 on t2.user_uuid = t3.user_uuid - left outer join v_extension_users t4 on t3.user_uuid = t4.user_uuid - left outer join v_extensions t5 on t4.extension_uuid = t5.extension_uuid - where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial - and ( (1 = 0) - or (t5.domain_uuid = :domain_uuid and (t5.extension = :user or t5.number_alias = :user)) - or (t2.contact_user_uuid is null and not exists(select 1 from v_contact_groups t where t.contact_uuid = t0.contact_uuid)) - ) - ]]; + -- find all contacts with correct group or withot users and groups at all + select t0.phone_number -- , t5.extension, 'USER:' || t3.username as user_name + from v_contact_phones t0 + inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid + left outer join v_contact_users t2 on t1.contact_uuid = t2.contact_uuid + left outer join v_users t3 on t2.user_uuid = t3.user_uuid + left outer join v_extension_users t4 on t3.user_uuid = t4.user_uuid + left outer join v_extensions t5 on t4.extension_uuid = t5.extension_uuid + where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial + and ( (1 = 0) + or (t5.domain_uuid = :domain_uuid and (t5.extension = :user or t5.number_alias = :user)) + or (t2.contact_user_uuid is null and not exists(select 1 from v_contact_groups t where t.contact_uuid = t0.contact_uuid)) + ) + ]]; + log.noticef("[speed dial] advanced"); + else + -- simple, skip looking up user or group permissions + sql = [[select phone_number + from v_contact_phones + where domain_uuid = :domain_uuid + and phone_speed_dial = :phone_speed_dial + ]]; + log.noticef("[speed dial] simple"); + end local params = {phone_speed_dial = destination, domain_uuid = domain_uuid, user = user}; if (debug["sql"]) then From d7d99fc9cf01157d8fa1989c112fb9cc6ef76ef8 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 17 Jan 2022 10:10:54 -0700 Subject: [PATCH 159/496] Add permissions=false to the speed_dial dialplan. --- app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml index 58d2d034c0..1275cdc46d 100644 --- a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml +++ b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml @@ -1,6 +1,7 @@ + From a9fff8b9377052daf01a58007f652e884bc31095 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 17 Jan 2022 14:44:09 -0700 Subject: [PATCH 160/496] Add Call Flow - Feature Code to the list of destinations. (#6243) * Add Call Flows - Destination and Feature Code * Add call flow feature code --- app/call_flows/app_config.php | 16 +++++++++++- app/call_flows/app_languages.php | 42 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php index f260fd46da..4ff68b40eb 100644 --- a/app/call_flows/app_config.php +++ b/app/call_flows/app_config.php @@ -32,7 +32,7 @@ //destination details $y=0; $apps[$x]['destinations'][$y]['type'] = "sql"; - $apps[$x]['destinations'][$y]['label'] = "call_flows"; + $apps[$x]['destinations'][$y]['label'] = "call_flow_destination"; $apps[$x]['destinations'][$y]['name'] = "call_flows"; $apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' "; $apps[$x]['destinations'][$y]['order_by'] = "call_flow_name asc"; @@ -44,6 +44,20 @@ $apps[$x]['destinations'][$y]['select_value']['dialplan'] = "transfer:\${destination} XML \${context}"; $apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination} XML \${context}"; $apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}"; + $y++; + $apps[$x]['destinations'][$y]['type'] = "sql"; + $apps[$x]['destinations'][$y]['label'] = "call_flow_feature_code"; + $apps[$x]['destinations'][$y]['name'] = "call_flows"; + $apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' "; + $apps[$x]['destinations'][$y]['order_by'] = "call_flow_name asc"; + $apps[$x]['destinations'][$y]['field']['call_flow_uuid'] = "call_flow_uuid"; + $apps[$x]['destinations'][$y]['field']['name'] = "call_flow_name"; + $apps[$x]['destinations'][$y]['field']['destination'] = "call_flow_feature_code"; + $apps[$x]['destinations'][$y]['field']['extension'] = "call_flow_feature_code"; + $apps[$x]['destinations'][$y]['field']['context'] = "call_flow_context"; + $apps[$x]['destinations'][$y]['select_value']['dialplan'] = "transfer:\${destination} XML \${context}"; + $apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination} XML \${context}"; + $apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}"; //permission details $y=0; diff --git a/app/call_flows/app_languages.php b/app/call_flows/app_languages.php index 6e30aafa30..6e81095cef 100644 --- a/app/call_flows/app_languages.php +++ b/app/call_flows/app_languages.php @@ -43,6 +43,48 @@ $text['title-call_flow']['ru-ru'] = "Переключатель вызовов"; $text['title-call_flow']['sv-se'] = "Samtalsflöde"; $text['title-call_flow']['uk-ua'] = "Потік дзвінків"; +$text['title-call_flow_destination']['en-us'] = "Call Flows - Destination"; +$text['title-call_flow_destination']['en-gb'] = "Call Flows - Destination"; +$text['title-call_flow_destination']['ar-eg'] = ""; +$text['title-call_flow_destination']['de-at'] = "Anruf Steuerung - Ziel"; //copied from de-de +$text['title-call_flow_destination']['de-ch'] = "Anruf Steuerung - Ziel"; //copied from de-de +$text['title-call_flow_destination']['de-de'] = "Anruf Steuerung - Ziel"; +$text['title-call_flow_destination']['es-cl'] = "Flujo de Llamada - Destino"; +$text['title-call_flow_destination']['es-mx'] = "Flujo de Llamada - Destino"; //copied from es-cl +$text['title-call_flow_destination']['fr-ca'] = "Flux d'appel - Destination"; //copied from fr-fr +$text['title-call_flow_destination']['fr-fr'] = "Flux d'appel - Destination"; +$text['title-call_flow_destination']['he-il'] = ""; +$text['title-call_flow_destination']['it-it'] = "Deviatori di Chiamata - Destinazione"; +$text['title-call_flow_destination']['nl-nl'] = "Oproep besturing - Bestemming"; +$text['title-call_flow_destination']['pl-pl'] = "Przepływ rozmów - Destynacja"; +$text['title-call_flow_destination']['pt-br'] = "Fluxo de chamadas - Destino"; +$text['title-call_flow_destination']['pt-pt'] = "Fluxo de Chamadas - Desvio"; +$text['title-call_flow_destination']['ro-ro'] = ""; +$text['title-call_flow_destination']['ru-ru'] = "Переключатели вызовов - Направление"; +$text['title-call_flow_destination']['sv-se'] = "Samtalsflöden - Destination"; +$text['title-call_flow_destination']['uk-ua'] = "Потоки дзвінків - Номер"; + +$text['title-call_flow_feature_code']['en-us'] = "Call Flows - Feature Code"; +$text['title-call_flow_feature_code']['en-gb'] = "Call Flows - Feature Code"; +$text['title-call_flow_feature_code']['ar-eg'] = ""; +$text['title-call_flow_feature_code']['de-at'] = "Anruf Steuerung - Funktions-Code"; //copied from de-de +$text['title-call_flow_feature_code']['de-ch'] = "Anruf Steuerung - Funktions-Code"; //copied from de-de +$text['title-call_flow_feature_code']['de-de'] = "Anruf Steuerung - Funktions-Code"; +$text['title-call_flow_feature_code']['es-cl'] = "Flujo de Llamada - Código distintivo"; +$text['title-call_flow_feature_code']['es-mx'] = "Flujo de Llamada - Código distintivo"; //copied from es-cl +$text['title-call_flow_feature_code']['fr-ca'] = "Flux d'appel - Code Fonction"; //copied from fr-fr +$text['title-call_flow_feature_code']['fr-fr'] = "Flux d'appel - Code Fonction"; +$text['title-call_flow_feature_code']['he-il'] = ""; +$text['title-call_flow_feature_code']['it-it'] = "Deviatori di Chiamata "; +$text['title-call_flow_feature_code']['nl-nl'] = "Oproep besturing - Functie-code"; +$text['title-call_flow_feature_code']['pl-pl'] = "Przepływ rozmów "; +$text['title-call_flow_feature_code']['pt-br'] = "Fluxo de chamadas - Código de função"; +$text['title-call_flow_feature_code']['pt-pt'] = "Fluxo de Chamadas - Código de função"; +$text['title-call_flow_feature_code']['ro-ro'] = ""; +$text['title-call_flow_feature_code']['ru-ru'] = "Переключатели вызовов - Код функции"; +$text['title-call_flow_feature_code']['sv-se'] = "Samtalsflöden - Funktionskod"; +$text['title-call_flow_feature_code']['uk-ua'] = "Потоки дзвінків"; + $text['label-call_flow_name']['en-us'] = "Name"; $text['label-call_flow_name']['en-gb'] = "Name"; $text['label-call_flow_name']['ar-eg'] = ""; From 74cebb72e50bd03e8a1ab116089fa7c8a5c93367 Mon Sep 17 00:00:00 2001 From: KRooney <42127223+LEMTEL-krooney@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:05:18 -0500 Subject: [PATCH 161/496] Update {$mac}.cfg (#6200) --- resources/templates/provision/fanvil/x4u/{$mac}.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg index d856baee3e..41dfba4d08 100644 --- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg @@ -2771,7 +2771,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 6 && $row.device_key_id <= 12} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -2783,7 +2783,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 12 && $row.device_key_id <= 18} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -2795,7 +2795,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 18 && $row.device_key_id <= 24} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -2807,7 +2807,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 24 && $row.device_key_id <= 30} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} From 1ed392c9c4cedc71ed38504c2b5436017c5521f2 Mon Sep 17 00:00:00 2001 From: KRooney <42127223+LEMTEL-krooney@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:06:17 -0500 Subject: [PATCH 162/496] Update app_languages.php (#6205) --- core/user_settings/app_languages.php | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php index 71076e0d81..cdf83cfee1 100644 --- a/core/user_settings/app_languages.php +++ b/core/user_settings/app_languages.php @@ -10,7 +10,7 @@ $text['title-user_setting-edit']['de-de'] = "Benutzereinstellung"; $text['title-user_setting-edit']['el-gr'] = "Ρυθμίσεις χρήστη"; $text['title-user_setting-edit']['es-cl'] = "Configuración de Usuario"; $text['title-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl -$text['title-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr +$text['title-user_setting-edit']['fr-ca'] = "Paramètre d'utilisateur"; $text['title-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur"; $text['title-user_setting-edit']['he-il'] = ""; $text['title-user_setting-edit']['it-it'] = "Parametri Utente"; @@ -32,7 +32,7 @@ $text['title-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen"; $text['title-user_setting-add']['el-gr'] = "Προσθήκη ρύθμισης χρήστη"; $text['title-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar"; $text['title-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl -$text['title-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr +$text['title-user_setting-add']['fr-ca'] = "Ajouter Paramètre d'utilisateur"; //copied from fr-fr $text['title-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter"; $text['title-user_setting-add']['he-il'] = ""; $text['title-user_setting-add']['it-it'] = "Inserimento Parametri Utente"; @@ -76,7 +76,7 @@ $text['title']['de-de'] = "Kontoeinstellungen"; $text['title']['el-gr'] = "Ρυθμίσεις λογαριασμού"; $text['title']['es-cl'] = "Configuración de Cuenta"; $text['title']['es-mx'] = "Configuración de Cuenta"; //copied from es-cl -$text['title']['fr-ca'] = "Personalisation du compte"; //copied from fr-fr +$text['title']['fr-ca'] = "Paramètres du compte"; $text['title']['fr-fr'] = "Personalisation du compte"; $text['title']['he-il'] = "הגדרת חשבון"; $text['title']['it-it'] = "Parametri Account"; @@ -142,7 +142,7 @@ $text['table-title']['de-de'] = "Benutzerinformationen"; $text['table-title']['el-gr'] = "Στοιχεία χρήστη"; $text['table-title']['es-cl'] = "Información de Usuario"; $text['table-title']['es-mx'] = "Información de Usuario"; //copied from es-cl -$text['table-title']['fr-ca'] = "Informations de l'usager"; //copied from fr-fr +$text['table-title']['fr-ca'] = "informations Utilisateur"; $text['table-title']['fr-fr'] = "Informations de l'usager"; $text['table-title']['he-il'] = "פרטי משתמש"; $text['table-title']['it-it'] = "Informazioni Utente"; @@ -164,7 +164,7 @@ $text['table-extension']['de-de'] = "Nebenstelle"; $text['table-extension']['el-gr'] = "Extension"; $text['table-extension']['es-cl'] = "Extensión"; $text['table-extension']['es-mx'] = "Extensión"; //copied from es-cl -$text['table-extension']['fr-ca'] = "Extension"; //copied from fr-fr +$text['table-extension']['fr-ca'] = "Extension"; $text['table-extension']['fr-fr'] = "Extension"; $text['table-extension']['he-il'] = "שלוחה"; $text['table-extension']['it-it'] = "Interno"; @@ -208,7 +208,7 @@ $text['message-reset_link_sent']['de-de'] = "Link zum Zurücksetzen des Passwort $text['message-reset_link_sent']['el-gr'] = "Έχει σταλεί email επαναφοράς κωδικού"; $text['message-reset_link_sent']['es-cl'] = "Restablecer Contraseña de Conexión Enviados"; $text['message-reset_link_sent']['es-mx'] = "Restablecer Contraseña de Conexión Enviados"; //copied from es-cl -$text['message-reset_link_sent']['fr-ca'] = "Lien de réinitialisation de mot de passe envoyé"; //copied from fr-fr +$text['message-reset_link_sent']['fr-ca'] = "Lien de réinitialisation de mot de passe envoyé"; $text['message-reset_link_sent']['fr-fr'] = "Lien de réinitialisation de mot de passe envoyé"; $text['message-reset_link_sent']['he-il'] = "קישור לאיפוס סיסמה נשלח"; $text['message-reset_link_sent']['it-it'] = "Link Ripristino Password Inviato"; @@ -340,7 +340,7 @@ $text['message-invalid_email']['de-de'] = "Ungültige E-Mail-Adresse"; $text['message-invalid_email']['el-gr'] = "Λάθος διεύθυνση email"; $text['message-invalid_email']['es-cl'] = "Dirección no válida de correo electrónico"; $text['message-invalid_email']['es-mx'] = "Dirección no válida de correo electrónico"; //copied from es-cl -$text['message-invalid_email']['fr-ca'] = "Adresse email invalide"; //copied from fr-fr +$text['message-invalid_email']['fr-ca'] = "Adresse courriel invalide"; $text['message-invalid_email']['fr-fr'] = "Adresse email invalide"; $text['message-invalid_email']['he-il'] = "כתובת דואר מייל לא תקינה"; $text['message-invalid_email']['it-it'] = "Indirizzo Email non valido"; @@ -362,7 +362,7 @@ $text['message-email_assigned_mutliple_users']['de-de'] = "Bereits vorhanden"; $text['message-email_assigned_mutliple_users']['el-gr'] = "Εντοπίστηκε διπλοεγγραφή"; $text['message-email_assigned_mutliple_users']['es-cl'] = "duplicar detectado"; $text['message-email_assigned_mutliple_users']['es-mx'] = "duplicar detectado"; //copied from es-cl -$text['message-email_assigned_mutliple_users']['fr-ca'] = "Donblons détectés"; //copied from fr-fr +$text['message-email_assigned_mutliple_users']['fr-ca'] = "Adresse courriel attribuée à plusieurs utilisateurs"; $text['message-email_assigned_mutliple_users']['fr-fr'] = "Donblons détectés"; $text['message-email_assigned_mutliple_users']['he-il'] = "זוהותה כפילות"; $text['message-email_assigned_mutliple_users']['it-it'] = "Duplicato Rilevato"; @@ -606,7 +606,7 @@ $text['label-uppercase_letters']['de-de'] = "Großbuchstaben"; $text['label-uppercase_letters']['el-gr'] = "Κεφαλαία γράμματα"; $text['label-uppercase_letters']['es-cl'] = "Letras mayúsculas"; $text['label-uppercase_letters']['es-mx'] = "Letras mayúsculas"; //copied from es-cl -$text['label-uppercase_letters']['fr-ca'] = "Lettres capitales"; //copied from fr-fr +$text['label-uppercase_letters']['fr-ca'] = "Lettres Majuscules"; $text['label-uppercase_letters']['fr-fr'] = "Lettres capitales"; $text['label-uppercase_letters']['he-il'] = "אותיות רישיות"; $text['label-uppercase_letters']['it-it'] = "Lettere Maiuscole"; @@ -650,8 +650,8 @@ $text['label-total_destinations']['de-de'] = "Ziele insgesamt"; $text['label-total_destinations']['el-gr'] = "Σύνολο προορισμών"; $text['label-total_destinations']['es-cl'] = "destinos totales"; $text['label-total_destinations']['es-mx'] = "destinos totales"; //copied from es-cl -$text['label-total_destinations']['fr-ca'] = "total des destinations"; //copied from fr-fr -$text['label-total_destinations']['fr-fr'] = "total des destinations"; +$text['label-total_destinations']['fr-ca'] = "Total des Destinations"; //copied from fr-fr +$text['label-total_destinations']['fr-fr'] = "Total des Destinations"; $text['label-total_destinations']['he-il'] = "רוזן יעד"; $text['label-total_destinations']['it-it'] = "Destinazioni Totali"; $text['label-total_destinations']['nl-nl'] = ""; @@ -760,7 +760,7 @@ $text['label-system_counts']['de-de'] = "Systemzähler"; $text['label-system_counts']['el-gr'] = "Στατιστικά συστήματος"; $text['label-system_counts']['es-cl'] = "Cuenta del sistema"; $text['label-system_counts']['es-mx'] = "Cuenta del sistema"; //copied from es-cl -$text['label-system_counts']['fr-ca'] = "Chiffres de système"; //copied from fr-fr +$text['label-system_counts']['fr-ca'] = "Compte de système"; //copied from fr-fr $text['label-system_counts']['fr-fr'] = "Chiffres de système"; $text['label-system_counts']['he-il'] = "ספירת מערכת"; $text['label-system_counts']['it-it'] = "Statistiche Sistema"; @@ -980,8 +980,8 @@ $text['label-processor_usage']['de-de'] = "Prozessorauslastung "; $text['label-processor_usage']['el-gr'] = "Χρήση CPU"; $text['label-processor_usage']['es-cl'] = "uso del procesador"; $text['label-processor_usage']['es-mx'] = "uso del procesador"; //copied from es-cl -$text['label-processor_usage']['fr-ca'] = "processeur Utilisation"; //copied from fr-fr -$text['label-processor_usage']['fr-fr'] = "processeur Utilisation"; +$text['label-processor_usage']['fr-ca'] = "Processeur Utilisation"; //copied from fr-fr +$text['label-processor_usage']['fr-fr'] = "Processeur Utilisation"; $text['label-processor_usage']['he-il'] = "שימוש מעבד"; $text['label-processor_usage']['it-it'] = "Uso CPU"; $text['label-processor_usage']['nl-nl'] = ""; @@ -1068,7 +1068,7 @@ $text['label-no_voicemail_assigned']['de-de'] = "Keine Mailbox zugewiesen"; $text['label-no_voicemail_assigned']['el-gr'] = "Δεν έχει οριστεί φωνοκιβώτιο"; $text['label-no_voicemail_assigned']['es-cl'] = "No Asignado correo de voz"; $text['label-no_voicemail_assigned']['es-mx'] = "No Asignado correo de voz"; //copied from es-cl -$text['label-no_voicemail_assigned']['fr-ca'] = "Non Voicemail Assigné"; //copied from fr-fr +$text['label-no_voicemail_assigned']['fr-ca'] = "Aucune Messagerie Vocale Assigné"; //copied from fr-fr $text['label-no_voicemail_assigned']['fr-fr'] = "Non Voicemail Assigné"; $text['label-no_voicemail_assigned']['he-il'] = "אין שירות תא קולי Assigned"; $text['label-no_voicemail_assigned']['it-it'] = "Nessuna Casella Vocale Assegnata"; @@ -1244,7 +1244,7 @@ $text['label-memory_available']['de-de'] = "Available Memory"; $text['label-memory_available']['el-gr'] = "Διαθέσιμη μνήμη"; $text['label-memory_available']['es-cl'] = "Available Memory"; $text['label-memory_available']['es-mx'] = "Available Memory"; -$text['label-memory_available']['fr-ca'] = "Available Memory"; +$text['label-memory_available']['fr-ca'] = "Mémoire Libre"; $text['label-memory_available']['fr-fr'] = "Available Memory"; $text['label-memory_available']['he-il'] = "Available Memory"; $text['label-memory_available']['it-it'] = "Available Memory"; @@ -1376,7 +1376,7 @@ $text['label-item']['de-de'] = "Objekt"; $text['label-item']['el-gr'] = "Είδος"; $text['label-item']['es-cl'] = "Ítem"; $text['label-item']['es-mx'] = "Ítem"; //copied from es-cl -$text['label-item']['fr-ca'] = "Article"; //copied from fr-fr +$text['label-item']['fr-ca'] = "Objet"; //copied from fr-fr $text['label-item']['fr-fr'] = "Article"; $text['label-item']['he-il'] = "פריט"; $text['label-item']['it-it'] = "Oggetto"; @@ -1420,7 +1420,7 @@ $text['label-followme']['de-de'] = "Anrufweiterschaltung"; $text['label-followme']['el-gr'] = "Follow Me"; $text['label-followme']['es-cl'] = "Sígueme"; $text['label-followme']['es-mx'] = "Sígueme"; //copied from es-cl -$text['label-followme']['fr-ca'] = "Follow Me"; //copied from fr-fr +$text['label-followme']['fr-ca'] = "Me Suivre"; $text['label-followme']['fr-fr'] = "Follow Me"; $text['label-followme']['he-il'] = "עקוב אחרי"; $text['label-followme']['it-it'] = "Seguimi"; @@ -1442,7 +1442,7 @@ $text['label-feature']['de-de'] = "Funktion"; $text['label-feature']['el-gr'] = "Χαρακτηριστικά"; $text['label-feature']['es-cl'] = "Característica"; $text['label-feature']['es-mx'] = "Característica"; //copied from es-cl -$text['label-feature']['fr-ca'] = "Fonctionnalité"; //copied from fr-fr +$text['label-feature']['fr-ca'] = "Fonction"; //copied from fr-fr $text['label-feature']['fr-fr'] = "Fonctionnalité"; $text['label-feature']['he-il'] = "מאפיין"; $text['label-feature']['it-it'] = "Funzionalità"; @@ -1464,7 +1464,7 @@ $text['label-failed']['de-de'] = "Fehlgeschlagen"; $text['label-failed']['el-gr'] = "Απέτυχαν"; $text['label-failed']['es-cl'] = "Fracasado"; $text['label-failed']['es-mx'] = "Fracasado"; //copied from es-cl -$text['label-failed']['fr-ca'] = "Manqué"; //copied from fr-fr +$text['label-failed']['fr-ca'] = "échoué"; $text['label-failed']['fr-fr'] = "Manqué"; $text['label-failed']['he-il'] = "נכשל"; $text['label-failed']['it-it'] = "Fallito"; @@ -1530,8 +1530,8 @@ $text['label-email_address']['de-de'] = "Email Adresse"; $text['label-email_address']['el-gr'] = "Email Address"; $text['label-email_address']['es-cl'] = "Dirección de Correo Electrónico"; $text['label-email_address']['es-mx'] = "Dirección de Correo Electrónico"; //copied from es-cl -$text['label-email_address']['fr-ca'] = "Adresse E-mail"; //copied from fr-fr -$text['label-email_address']['fr-fr'] = "Adresse E-mail"; +$text['label-email_address']['fr-ca'] = "Adresse Courriel"; +$text['label-email_address']['fr-fr'] = "Adresse Courriel"; $text['label-email_address']['he-il'] = "כתובת מייל"; $text['label-email_address']['it-it'] = "Indirizzo Email"; $text['label-email_address']['nl-nl'] = ""; @@ -1662,7 +1662,7 @@ $text['label-disabled']['de-de'] = "Ausgeschaltet"; $text['label-disabled']['el-gr'] = "Απενεργοποιημένα"; $text['label-disabled']['es-cl'] = "Discapacitado"; $text['label-disabled']['es-mx'] = "Discapacitado"; //copied from es-cl -$text['label-disabled']['fr-ca'] = "Non Permis"; //copied from fr-fr +$text['label-disabled']['fr-ca'] = "Désactivé"; $text['label-disabled']['fr-fr'] = "Non Permis"; $text['label-disabled']['he-il'] = ""; $text['label-disabled']['it-it'] = "Disabilitato"; @@ -1684,7 +1684,7 @@ $text['label-devices']['de-de'] = "Geräte"; $text['label-devices']['el-gr'] = "Συσκευές"; $text['label-devices']['es-cl'] = "Dispositivos"; $text['label-devices']['es-mx'] = "Dispositivos"; //copied from es-cl -$text['label-devices']['fr-ca'] = "Equipements"; //copied from fr-fr +$text['label-devices']['fr-ca'] = "Appareils"; //copied from fr-fr $text['label-devices']['fr-fr'] = "Equipements"; $text['label-devices']['he-il'] = "התקנים"; $text['label-devices']['it-it'] = "Apparati"; @@ -1838,7 +1838,7 @@ $text['label-characters']['de-de'] = "Zeichen"; $text['label-characters']['el-gr'] = "Χαρακτήρες"; $text['label-characters']['es-cl'] = "Caracteres"; $text['label-characters']['es-mx'] = "Caracteres"; //copied from es-cl -$text['label-characters']['fr-ca'] = "Personnages"; //copied from fr-fr +$text['label-characters']['fr-ca'] = "Caractères"; $text['label-characters']['fr-fr'] = "Personnages"; $text['label-characters']['he-il'] = "דמויות"; $text['label-characters']['it-it'] = "Caratteri"; @@ -1992,8 +1992,8 @@ $text['label-active_users']['de-de'] = "Aktive Benutzer"; $text['label-active_users']['el-gr'] = "Ενεργοί χρήστες"; $text['label-active_users']['es-cl'] = "Los usuarios activos"; $text['label-active_users']['es-mx'] = "Los usuarios activos"; //copied from es-cl -$text['label-active_users']['fr-ca'] = "Usuários ativos..."; //copied from fr-fr -$text['label-active_users']['fr-fr'] = "Usuários ativos..."; +$text['label-active_users']['fr-ca'] = "Utilisateurs Actifs"; +$text['label-active_users']['fr-fr'] = "Utilisateurs Actifs"; $text['label-active_users']['he-il'] = "משתמשים פעילים"; $text['label-active_users']['it-it'] = "Utenti Attivi"; $text['label-active_users']['nl-nl'] = ""; @@ -2075,7 +2075,7 @@ $text['label-single']['de-ch'] = "Single"; $text['label-single']['de-de'] = "Single"; $text['label-single']['es-cl'] = "Single"; $text['label-single']['es-mx'] = "Single"; -$text['label-single']['fr-ca'] = "Single"; +$text['label-single']['fr-ca'] = "Simple"; $text['label-single']['fr-fr'] = "Single"; $text['label-single']['he-il'] = "Single"; $text['label-single']['it-it'] = "Single"; @@ -2310,7 +2310,7 @@ $text['confirm-password']['de-de'] = "Die Passwörter stimmen nicht überein"; $text['confirm-password']['el-gr'] = "Δεν ταιριάζουν οι κωδικοί"; $text['confirm-password']['es-cl'] = "Las contraseñas no coinciden."; $text['confirm-password']['es-mx'] = "Las contraseñas no coinciden."; //copied from es-cl -$text['confirm-password']['fr-ca'] = "Les mots de passe ne sont pas les mêmes."; //copied from fr-fr +$text['confirm-password']['fr-ca'] = "Les mots de passe ne sont pas identiques."; //copied from fr-fr $text['confirm-password']['fr-fr'] = "Les mots de passe ne sont pas les mêmes."; $text['confirm-password']['he-il'] = "סיסמאות לא תואמות"; $text['confirm-password']['it-it'] = "Le password non coincidono."; @@ -2486,7 +2486,7 @@ $text['description-user_setting-add']['de-de'] = "Eine Einstellung für diesen B $text['description-user_setting-add']['el-gr'] = "Προσθήκη μιας ρύθμισης για αυτό το χρήστη"; $text['description-user_setting-add']['es-cl'] = "Añadir un entorno para este usuario."; $text['description-user_setting-add']['es-mx'] = "Añadir un entorno para este usuario."; //copied from es-cl -$text['description-user_setting-add']['fr-ca'] = "Ajouter un cadre pour cet utilisateur."; //copied from fr-fr +$text['description-user_setting-add']['fr-ca'] = "Ajouter un paramètre pour cet utilisateur."; $text['description-user_setting-add']['fr-fr'] = "Ajouter un cadre pour cet utilisateur."; $text['description-user_setting-add']['he-il'] = ""; $text['description-user_setting-add']['it-it'] = "Aggiungi un parametro per questo utente."; From 70b08527a57daa2e27ed53e8202d2655c3eea496 Mon Sep 17 00:00:00 2001 From: KRooney <42127223+LEMTEL-krooney@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:07:39 -0500 Subject: [PATCH 163/496] Update {$mac}.cfg (#6202) fix dss key not provisionning --- resources/templates/provision/fanvil/x5u/{$mac}.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg index 16add4cab4..c37bf2fbfd 100644 --- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg @@ -3417,7 +3417,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 6 && $row.device_key_id <= 12} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -3429,7 +3429,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 12 && $row.device_key_id <= 18} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -3441,7 +3441,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 18 && $row.device_key_id <= 24} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} @@ -3453,7 +3453,7 @@ {foreach $keys["memory"] as $row} {if $row.device_key_id > 24 && $row.device_key_id <= 30} - + {if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if} {if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if} {$row.device_key_label} From 73f13ef005dd4a4f52553ab1993fc4e06735ea2a Mon Sep 17 00:00:00 2001 From: KRooney <42127223+LEMTEL-krooney@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:08:32 -0500 Subject: [PATCH 164/496] Update app_languages.php (#6203) --- core/users/app_languages.php | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/core/users/app_languages.php b/core/users/app_languages.php index 2698b2c3cf..e529657935 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -473,8 +473,8 @@ $text['message-invalid_user']['de-ch'] = "Invalid User"; $text['message-invalid_user']['de-de'] = "Invalid User"; $text['message-invalid_user']['es-cl'] = "Invalid User"; $text['message-invalid_user']['es-mx'] = "Invalid User"; -$text['message-invalid_user']['fr-ca'] = "Invalid User"; -$text['message-invalid_user']['fr-fr'] = "Invalid User"; +$text['message-invalid_user']['fr-ca'] = "Utilisateur Invalide"; +$text['message-invalid_user']['fr-fr'] = "Utilisateur Invalide"; $text['message-invalid_user']['he-il'] = "Invalid User"; $text['message-invalid_user']['it-it'] = "Invalid User"; $text['message-invalid_user']['nl-nl'] = "Invalid User"; @@ -494,8 +494,8 @@ $text['message-unsaved_changes']['de-ch'] = "Unsaved Changes"; $text['message-unsaved_changes']['de-de'] = "Unsaved Changes"; $text['message-unsaved_changes']['es-cl'] = "Unsaved Changes"; $text['message-unsaved_changes']['es-mx'] = "Unsaved Changes"; -$text['message-unsaved_changes']['fr-ca'] = "Unsaved Changes"; -$text['message-unsaved_changes']['fr-fr'] = "Unsaved Changes"; +$text['message-unsaved_changes']['fr-ca'] = "Modifications non enregistrées"; +$text['message-unsaved_changes']['fr-fr'] = "Modifications non enregistrées"; $text['message-unsaved_changes']['he-il'] = "Unsaved Changes"; $text['message-unsaved_changes']['it-it'] = "Unsaved Changes"; $text['message-unsaved_changes']['nl-nl'] = "Unsaved Changes"; @@ -515,8 +515,8 @@ $text['message-green_border_passwords_match']['de-ch'] = "Green field borders in $text['message-green_border_passwords_match']['de-de'] = "Green field borders indicate typed passwords match."; $text['message-green_border_passwords_match']['es-cl'] = "Green field borders indicate typed passwords match."; $text['message-green_border_passwords_match']['es-mx'] = "Green field borders indicate typed passwords match."; -$text['message-green_border_passwords_match']['fr-ca'] = "Green field borders indicate typed passwords match."; -$text['message-green_border_passwords_match']['fr-fr'] = "Green field borders indicate typed passwords match."; +$text['message-green_border_passwords_match']['fr-ca'] = "Les bordures vertes indiquent que les mots de passe saisis correspondent."; +$text['message-green_border_passwords_match']['fr-fr'] = "Les bordures vertes indiquent que les mots de passe saisis correspondent."; $text['message-green_border_passwords_match']['he-il'] = "Green field borders indicate typed passwords match."; $text['message-green_border_passwords_match']['it-it'] = "Green field borders indicate typed passwords match."; $text['message-green_border_passwords_match']['nl-nl'] = "Green field borders indicate typed passwords match."; @@ -1292,8 +1292,8 @@ $text['label-required']['de-ch'] = "Required"; $text['label-required']['de-de'] = "Required"; $text['label-required']['es-cl'] = "Required"; $text['label-required']['es-mx'] = "Required"; -$text['label-required']['fr-ca'] = "Required"; -$text['label-required']['fr-fr'] = "Required"; +$text['label-required']['fr-ca'] = "Requis"; +$text['label-required']['fr-fr'] = "Requis"; $text['label-required']['he-il'] = "Required"; $text['label-required']['it-it'] = "Required"; $text['label-required']['nl-nl'] = "Required"; @@ -1313,8 +1313,8 @@ $text['label-number']['de-ch'] = "Number"; $text['label-number']['de-de'] = "Number"; $text['label-number']['es-cl'] = "Number"; $text['label-number']['es-mx'] = "Number"; -$text['label-number']['fr-ca'] = "Number"; -$text['label-number']['fr-fr'] = "Number"; +$text['label-number']['fr-ca'] = "Numéro"; +$text['label-number']['fr-fr'] = "Numéro"; $text['label-number']['he-il'] = "Number"; $text['label-number']['it-it'] = "Number"; $text['label-number']['nl-nl'] = "Number"; @@ -1334,8 +1334,8 @@ $text['label-lowercase']['de-ch'] = "Lowercase"; $text['label-lowercase']['de-de'] = "Lowercase"; $text['label-lowercase']['es-cl'] = "Lowercase"; $text['label-lowercase']['es-mx'] = "Lowercase"; -$text['label-lowercase']['fr-ca'] = "Lowercase"; -$text['label-lowercase']['fr-fr'] = "Lowercase"; +$text['label-lowercase']['fr-ca'] = "Minuscule"; +$text['label-lowercase']['fr-fr'] = "Minuscule"; $text['label-lowercase']['he-il'] = "Lowercase"; $text['label-lowercase']['it-it'] = "Lowercase"; $text['label-lowercase']['nl-nl'] = "Lowercase"; @@ -1355,8 +1355,8 @@ $text['label-uppercase']['de-ch'] = "Uppercase"; $text['label-uppercase']['de-de'] = "Uppercase"; $text['label-uppercase']['es-cl'] = "Uppercase"; $text['label-uppercase']['es-mx'] = "Uppercase"; -$text['label-uppercase']['fr-ca'] = "Uppercase"; -$text['label-uppercase']['fr-fr'] = "Uppercase"; +$text['label-uppercase']['fr-ca'] = "Majuscule"; +$text['label-uppercase']['fr-fr'] = "Majuscule"; $text['label-uppercase']['he-il'] = "Uppercase"; $text['label-uppercase']['it-it'] = "Uppercase"; $text['label-uppercase']['nl-nl'] = "Uppercase"; @@ -1397,8 +1397,8 @@ $text['label-center']['de-ch'] = "Mitte"; //copied from de-de $text['label-center']['de-de'] = "Mitte"; $text['label-center']['es-cl'] = "Centrar"; $text['label-center']['es-mx'] = "Centrar"; //copied from es-cl -$text['label-center']['fr-ca'] = "centre"; //copied from fr-fr -$text['label-center']['fr-fr'] = "centre"; +$text['label-center']['fr-ca'] = "Centre"; //copied from fr-fr +$text['label-center']['fr-fr'] = "Centre"; $text['label-center']['he-il'] = "מֶרְכָּז"; $text['label-center']['it-it'] = "Centro"; $text['label-center']['nl-nl'] = ""; @@ -1460,8 +1460,8 @@ $text['label-message_key']['de-ch'] = "Message Schlüssel"; //copied from de-de $text['label-message_key']['de-de'] = "Message Schlüssel"; $text['label-message_key']['es-cl'] = "Message Key"; $text['label-message_key']['es-mx'] = "Message Key"; //copied from es-cl -$text['label-message_key']['fr-ca'] = "Clé d'Message"; //copied from fr-fr -$text['label-message_key']['fr-fr'] = "Clé d'Message"; +$text['label-message_key']['fr-ca'] = "Clé de Message"; //copied from fr-fr +$text['label-message_key']['fr-fr'] = "Clé de Message"; $text['label-message_key']['he-il'] = ""; $text['label-message_key']['it-it'] = "Message Key"; $text['label-message_key']['nl-nl'] = ""; @@ -1481,7 +1481,7 @@ $text['label-user_enabled']['de-ch'] = "Aktiviert"; //copied from de-de $text['label-user_enabled']['de-de'] = "Aktiviert"; $text['label-user_enabled']['es-cl'] = "Activado"; $text['label-user_enabled']['es-mx'] = "Activado"; //copied from es-cl -$text['label-user_enabled']['fr-ca'] = "Actif"; //copied from fr-fr +$text['label-user_enabled']['fr-ca'] = "Activé"; //copied from fr-fr $text['label-user_enabled']['fr-fr'] = "Actif"; $text['label-user_enabled']['he-il'] = ""; $text['label-user_enabled']['it-it'] = "Abilitato"; @@ -1566,8 +1566,8 @@ $text['label-dynamic']['de-ch'] = "Dynamic"; $text['label-dynamic']['de-de'] = "Dynamic"; $text['label-dynamic']['es-cl'] = "Dynamic"; $text['label-dynamic']['es-mx'] = "Dynamic"; -$text['label-dynamic']['fr-ca'] = "Dynamic"; -$text['label-dynamic']['fr-fr'] = "Dynamic"; +$text['label-dynamic']['fr-ca'] = "Dynamique"; +$text['label-dynamic']['fr-fr'] = "Dynamique"; $text['label-dynamic']['he-il'] = "Dynamic"; $text['label-dynamic']['it-it'] = "Dynamic"; $text['label-dynamic']['nl-nl'] = "Dynamic"; @@ -1584,8 +1584,8 @@ $text['label-single']['de-ch'] = "Single"; $text['label-single']['de-de'] = "Single"; $text['label-single']['es-cl'] = "Single"; $text['label-single']['es-mx'] = "Single"; -$text['label-single']['fr-ca'] = "Single"; -$text['label-single']['fr-fr'] = "Single"; +$text['label-single']['fr-ca'] = "Simple"; +$text['label-single']['fr-fr'] = "Simple"; $text['label-single']['he-il'] = "Single"; $text['label-single']['it-it'] = "Single"; $text['label-single']['nl-nl'] = "Single"; @@ -1707,8 +1707,8 @@ $text['header-user_settings']['de-de'] = "User Settings"; $text['header-user_settings']['el-gr'] = "User Settings"; $text['header-user_settings']['es-cl'] = "User Settings"; $text['header-user_settings']['es-mx'] = "User Settings"; -$text['header-user_settings']['fr-ca'] = "User Settings"; -$text['header-user_settings']['fr-fr'] = "User Settings"; +$text['header-user_settings']['fr-ca'] = "Paramètres Utilisateur"; +$text['header-user_settings']['fr-fr'] = "Paramètres Utilisateur"; $text['header-user_settings']['he-il'] = "User Settings"; $text['header-user_settings']['it-it'] = "User Settings"; $text['header-user_settings']['nl-nl'] = "User Settings"; @@ -1729,8 +1729,8 @@ $text['header_description-user_settings']['de-ch'] = "Settings for this user tha $text['header_description-user_settings']['de-de'] = "Settings for this user that should override those defined in Domain or Default Settings."; $text['header_description-user_settings']['es-cl'] = "Settings for this user that should override those defined in Domain or Default Settings."; $text['header_description-user_settings']['es-mx'] = "Settings for this user that should override those defined in Domain or Default Settings."; -$text['header_description-user_settings']['fr-ca'] = "Settings for this user that should override those defined in Domain or Default Settings."; -$text['header_description-user_settings']['fr-fr'] = "Settings for this user that should override those defined in Domain or Default Settings."; +$text['header_description-user_settings']['fr-ca'] = "Paramètres pour cet utilisateur qui doivent remplacer ceux définis dans le domaine ou les paramètres par défaut."; +$text['header_description-user_settings']['fr-fr'] = "Paramètres pour cet utilisateur qui doivent remplacer ceux définis dans le domaine ou les paramètres par défaut."; $text['header_description-user_settings']['he-il'] = "Settings for this user that should override those defined in Domain or Default Settings."; $text['header_description-user_settings']['it-it'] = "Settings for this user that should override those defined in Domain or Default Settings."; $text['header_description-user_settings']['nl-nl'] = "Settings for this user that should override those defined in Domain or Default Settings."; From 78a43b3c54dbbc12e334029430a681b9981938df Mon Sep 17 00:00:00 2001 From: KRooney <42127223+LEMTEL-krooney@users.noreply.github.com> Date: Mon, 17 Jan 2022 23:09:22 -0500 Subject: [PATCH 165/496] Update app_languages.php (#6204) * Update app_languages.php --- core/dashboard/app_languages.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/core/dashboard/app_languages.php b/core/dashboard/app_languages.php index b63fa12db5..0cc0183cdf 100644 --- a/core/dashboard/app_languages.php +++ b/core/dashboard/app_languages.php @@ -10,8 +10,8 @@ $text['title-dashboard']['el-gr'] = "Πίνακας ελέγχου"; $text['title-dashboard']['es-cl'] = "Dashboard Usuario"; $text['title-dashboard']['es-mx'] = "Dashboard Usuario"; //copied from es-cl - $text['title-dashboard']['fr-ca'] = "Tableau de bord de l'utilisateur"; //copied from fr-fr - $text['title-dashboard']['fr-fr'] = "Tableau de bord de l'utilisateur"; + $text['title-dashboard']['fr-ca'] = "Tableau de bord"; //copied from fr-fr + $text['title-dashboard']['fr-fr'] = "Tableau de bord"; $text['title-dashboard']['he-il'] = "ממשק משתמש"; $text['title-dashboard']['it-it'] = "Pannello di Controllo"; $text['title-dashboard']['nl-nl'] = ""; @@ -52,7 +52,7 @@ $text['label-group_uuid']['de-de'] = ''; $text['label-group_uuid']['es-cl'] = ''; $text['label-group_uuid']['es-mx'] = ''; - $text['label-group_uuid']['fr-ca'] = ''; + $text['label-group_uuid']['fr-ca'] = 'UUID De Groupe'; $text['label-group_uuid']['fr-fr'] = ''; $text['label-group_uuid']['he-il'] = ''; $text['label-group_uuid']['it-it'] = ''; @@ -72,7 +72,7 @@ $text['description-group_uuid']['de-de'] = ''; $text['description-group_uuid']['es-cl'] = ''; $text['description-group_uuid']['es-mx'] = ''; - $text['description-group_uuid']['fr-ca'] = ''; + $text['description-group_uuid']['fr-ca'] = "Saisissez l'UUID De Groupe"; $text['description-group_uuid']['fr-fr'] = ''; $text['description-group_uuid']['he-il'] = ''; $text['description-group_uuid']['it-it'] = ''; @@ -92,7 +92,7 @@ $text['label-dashboard_name']['de-de'] = ''; $text['label-dashboard_name']['es-cl'] = ''; $text['label-dashboard_name']['es-mx'] = ''; - $text['label-dashboard_name']['fr-ca'] = ''; + $text['label-dashboard_name']['fr-ca'] = 'Nom'; $text['label-dashboard_name']['fr-fr'] = ''; $text['label-dashboard_name']['he-il'] = ''; $text['label-dashboard_name']['it-it'] = ''; @@ -112,7 +112,7 @@ $text['description-dashboard_name']['de-de'] = ''; $text['description-dashboard_name']['es-cl'] = ''; $text['description-dashboard_name']['es-mx'] = ''; - $text['description-dashboard_name']['fr-ca'] = ''; + $text['description-dashboard_name']['fr-ca'] = 'Saisissez le nom du widget du tableau de bord.'; $text['description-dashboard_name']['fr-fr'] = ''; $text['description-dashboard_name']['he-il'] = ''; $text['description-dashboard_name']['it-it'] = ''; @@ -132,7 +132,7 @@ $text['label-dashboard_path']['de-de'] = ''; $text['label-dashboard_path']['es-cl'] = ''; $text['label-dashboard_path']['es-mx'] = ''; - $text['label-dashboard_path']['fr-ca'] = ''; + $text['label-dashboard_path']['fr-ca'] = 'Chemin'; $text['label-dashboard_path']['fr-fr'] = ''; $text['label-dashboard_path']['he-il'] = ''; $text['label-dashboard_path']['it-it'] = ''; @@ -152,7 +152,7 @@ $text['description-dashboard_path']['de-de'] = ''; $text['description-dashboard_path']['es-cl'] = ''; $text['description-dashboard_path']['es-mx'] = ''; - $text['description-dashboard_path']['fr-ca'] = ''; + $text['description-dashboard_path']['fr-ca'] = 'Entrez le chemin du widget du tableau de bord.'; $text['description-dashboard_path']['fr-fr'] = ''; $text['description-dashboard_path']['he-il'] = ''; $text['description-dashboard_path']['it-it'] = ''; @@ -172,7 +172,7 @@ $text['label-dashboard_groups']['de-de'] = ''; $text['label-dashboard_groups']['es-cl'] = ''; $text['label-dashboard_groups']['es-mx'] = ''; - $text['label-dashboard_groups']['fr-ca'] = ''; + $text['label-dashboard_groups']['fr-ca'] = 'Groupes'; $text['label-dashboard_groups']['fr-fr'] = ''; $text['label-dashboard_groups']['he-il'] = ''; $text['label-dashboard_groups']['it-it'] = ''; @@ -192,7 +192,7 @@ $text['description-dashboard_groups']['de-de'] = ''; $text['description-dashboard_groups']['es-cl'] = ''; $text['description-dashboard_groups']['es-mx'] = ''; - $text['description-dashboard_groups']['fr-ca'] = ''; + $text['description-dashboard_groups']['fr-ca'] = 'Ajoutez les groupes autorisés à accéder à ce widget.'; $text['description-dashboard_groups']['fr-fr'] = ''; $text['description-dashboard_groups']['he-il'] = ''; $text['description-dashboard_groups']['it-it'] = ''; @@ -252,7 +252,7 @@ $text['label-dashboard_order']['de-de'] = ''; $text['label-dashboard_order']['es-cl'] = ''; $text['label-dashboard_order']['es-mx'] = ''; - $text['label-dashboard_order']['fr-ca'] = ''; + $text['label-dashboard_order']['fr-ca'] = 'Ordre'; $text['label-dashboard_order']['fr-fr'] = ''; $text['label-dashboard_order']['he-il'] = ''; $text['label-dashboard_order']['it-it'] = ''; @@ -272,7 +272,7 @@ $text['description-dashboard_order']['de-de'] = ''; $text['description-dashboard_order']['es-cl'] = ''; $text['description-dashboard_order']['es-mx'] = ''; - $text['description-dashboard_order']['fr-ca'] = ''; + $text['description-dashboard_order']['fr-ca'] = 'Saisissez l ordre du widget du tableau de bord.'; $text['description-dashboard_order']['fr-fr'] = ''; $text['description-dashboard_order']['he-il'] = ''; $text['description-dashboard_order']['it-it'] = ''; @@ -292,7 +292,7 @@ $text['label-dashboard_enabled']['de-de'] = ''; $text['label-dashboard_enabled']['es-cl'] = ''; $text['label-dashboard_enabled']['es-mx'] = ''; - $text['label-dashboard_enabled']['fr-ca'] = ''; + $text['label-dashboard_enabled']['fr-ca'] = 'Activé'; $text['label-dashboard_enabled']['fr-fr'] = ''; $text['label-dashboard_enabled']['he-il'] = ''; $text['label-dashboard_enabled']['it-it'] = ''; @@ -312,7 +312,7 @@ $text['description-dashboard_enabled']['de-de'] = ''; $text['description-dashboard_enabled']['es-cl'] = ''; $text['description-dashboard_enabled']['es-mx'] = ''; - $text['description-dashboard_enabled']['fr-ca'] = ''; + $text['description-dashboard_enabled']['fr-ca'] = 'Entrez le widget de tableau de bord activé.'; $text['description-dashboard_enabled']['fr-fr'] = ''; $text['description-dashboard_enabled']['he-il'] = ''; $text['description-dashboard_enabled']['it-it'] = ''; @@ -332,7 +332,7 @@ $text['label-dashboard_description']['de-de'] = ''; $text['label-dashboard_description']['es-cl'] = ''; $text['label-dashboard_description']['es-mx'] = ''; - $text['label-dashboard_description']['fr-ca'] = ''; + $text['label-dashboard_description']['fr-ca'] = 'Description'; $text['label-dashboard_description']['fr-fr'] = ''; $text['label-dashboard_description']['he-il'] = ''; $text['label-dashboard_description']['it-it'] = ''; @@ -352,7 +352,7 @@ $text['description-dashboard_description']['de-de'] = ''; $text['description-dashboard_description']['es-cl'] = ''; $text['description-dashboard_description']['es-mx'] = ''; - $text['description-dashboard_description']['fr-ca'] = ''; + $text['description-dashboard_description']['fr-ca'] = 'Saisissez la description du widget du tableau de bord.'; $text['description-dashboard_description']['fr-fr'] = ''; $text['description-dashboard_description']['he-il'] = ''; $text['description-dashboard_description']['it-it'] = ''; From 844cdb480b430349924c6aa942b342d0ee4feea7 Mon Sep 17 00:00:00 2001 From: Timothy Willey Date: Mon, 17 Jan 2022 20:42:58 -0800 Subject: [PATCH 166/496] enable customization of emergency numbers on polycom phones (#6148) --- app/polycom/app_config.php | 40 +++++++++++++++++++ .../provision/polycom/5.x/{$mac}.cfg | 8 ++++ .../provision/polycom/6.x/{$mac}.cfg | 8 ++++ 3 files changed, 56 insertions(+) diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php index 3eb6b3b0e0..08e8a1afb6 100644 --- a/app/polycom/app_config.php +++ b/app/polycom/app_config.php @@ -550,5 +550,45 @@ $apps[$x]['default_settings'][$y]['default_setting_value'] = "04:00"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the time to stop polling when using random mode"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2ffdfa5b-2545-4d5b-a819-8cd36c866c28"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_customized"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "allow custom emergency numbers, for example 933"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0fb63bf9-66d0-4d71-b368-3f314a974e82"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_server"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "example.domain.tld"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "server handling emergency calls"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fae39a6e-df46-48db-8e4f-0b0bbe46f759"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_port"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "5060"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "port on which server handling emergency calls is reachable"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "18df4b4b-cb69-46fa-bee2-c984269a7af7"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "911"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "911"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ab84a4f1-b30c-464e-a838-665104903290"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "933"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "933 service"; ?> diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg index b688611f50..dacc712cf1 100644 --- a/resources/templates/provision/polycom/5.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg @@ -144,6 +144,14 @@ tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0" /> diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg index 27a0746ee2..2fa3d32e37 100644 --- a/resources/templates/provision/polycom/6.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg @@ -140,6 +140,14 @@ tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0" /> From a911086dd6cd089927cf7bfad8b65a9738c95654 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 17 Jan 2022 23:53:55 -0700 Subject: [PATCH 167/496] Add field device location (#6244) * Add device location * Add label-device_location * Add permission and field device_location. * Update app_languages.php --- app/devices/app_config.php | 9 ++++++++ app/devices/app_languages.php | 42 +++++++++++++++++++++++++++++++++++ app/devices/device_edit.php | 20 ++++++++++++++++- 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/app/devices/app_config.php b/app/devices/app_config.php index 05b54c673b..0c6e43ae2d 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -206,6 +206,10 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "device_location"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "device_model"; //$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; @@ -398,6 +402,11 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_location"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_model"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "phone_model"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index 57ecfe91cf..28f07cfe4d 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -2523,6 +2523,27 @@ $text['label-device_vendor']['ru-ru'] = "Производитель"; $text['label-device_vendor']['sv-se'] = "Tillverkare"; $text['label-device_vendor']['uk-ua'] = ""; +$text['label-device_location']['en-us'] = "Location"; +$text['label-device_location']['en-gb'] = "Location"; +$text['label-device_location']['ar-eg'] = "Location"; +$text['label-device_location']['de-at'] = "Ort"; //copied from de-de +$text['label-device_location']['de-ch'] = "Ort"; //copied from de-de +$text['label-device_location']['de-de'] = "Ort"; +$text['label-device_location']['es-cl'] = "Ubicación"; +$text['label-device_location']['es-mx'] = "Ubicación"; //copied from es-cl +$text['label-device_location']['fr-ca'] = "Situation géographique"; +$text['label-device_location']['fr-fr'] = "Emplacement"; +$text['label-device_location']['he-il'] = "מקום"; +$text['label-device_location']['it-it'] = "Ubicazione"; +$text['label-device_location']['nl-nl'] = "Plaats"; +$text['label-device_location']['pl-pl'] = "Wprowadź lokalizację urządzenia."; +$text['label-device_location']['pt-br'] = "Localização"; //copied from pt-pt +$text['label-device_location']['pt-pt'] = "Localização"; +$text['label-device_location']['ro-ro'] = "Introduceți locația dispozitivului."; +$text['label-device_location']['ru-ru'] = "Местоположение"; +$text['label-device_location']['sv-se'] = "Ange enhetens plats."; +$text['label-device_location']['uk-ua'] = "Введіть розташування пристрою."; + $text['label-device_key_vendor']['en-us'] = "Vendor"; $text['label-device_key_vendor']['en-gb'] = "Vendor"; $text['label-device_key_vendor']['ar-eg'] = ""; @@ -5197,6 +5218,27 @@ $text['description-device_vendor']['ru-ru'] = "Введите название $text['description-device_vendor']['sv-se'] = "Fyll i tillverkar-namn."; $text['description-device_vendor']['uk-ua'] = ""; +$text['description-device_location']['en-us'] = "Enter the device location."; +$text['description-device_location']['en-gb'] = "Enter the device location."; +$text['description-device_location']['ar-eg'] = "Enter the device location."; +$text['description-device_location']['de-at'] = "Geben Sie den Gerätestandort ein."; //copied from de-de +$text['description-device_location']['de-ch'] = "Geben Sie den Gerätestandort ein."; //copied from de-de +$text['description-device_location']['de-de'] = "Geben Sie den Gerätestandort ein."; +$text['description-device_location']['es-cl'] = "Introduzca la ubicación del dispositivo."; +$text['description-device_location']['es-mx'] = "Introduzca la ubicación del dispositivo."; //copied from es-cl +$text['description-device_location']['fr-ca'] = "Entrez dans l'emplacement de l'appareil."; //copied from fr-fr +$text['description-device_location']['fr-fr'] = "Entrez l'emplacement de l'appareil."; +$text['description-device_location']['he-il'] = "הזן את מיקום ההתקן."; +$text['description-device_location']['it-it'] = "Inserisci la posizione del dispositivo."; +$text['description-device_location']['nl-nl'] = "Voer de locatie van het apparaat in."; +$text['description-device_location']['pl-pl'] = "Wprowadź lokalizację urządzenia."; +$text['description-device_location']['pt-br'] = "Digite a localização do dispositivo."; +$text['description-device_location']['pt-pt'] = "Introduza a localização do dispositivo."; +$text['description-device_location']['ro-ro'] = "Introduceți locația dispozitivului."; +$text['description-device_location']['ru-ru'] = "Введите расположение устройства."; +$text['description-device_location']['sv-se'] = "Ange enhetens plats."; +$text['description-device_location']['uk-ua'] = "Введіть розташування пристрою."; + $text['description-device_time_zone']['en-us'] = "Enter the time zone."; $text['description-device_time_zone']['en-gb'] = "Enter the time zone."; $text['description-device_time_zone']['ar-eg'] = ""; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 9a3a99ca67..ad627395a9 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2021 + Portions created by the Initial Developer are Copyright (C) 2008-2022 the Initial Developer. All Rights Reserved. */ @@ -115,6 +115,7 @@ $device_username = $_POST["device_username"]; $device_password = $_POST["device_password"]; $device_vendor = $_POST["device_vendor"]; + $device_location = $_POST["device_location"]; $device_uuid_alternate = $_POST["device_uuid_alternate"]; $device_model = $_POST["device_model"]; $device_firmware_version = $_POST["device_firmware_version"]; @@ -257,6 +258,9 @@ if (permission_exists('device_vendor')) { $array['devices'][0]['device_vendor'] = $device_vendor; } + if (permission_exists('device_location')) { + $array['devices'][0]['device_location'] = $device_location; + } if (permission_exists('device_alternate') && is_uuid($device_uuid_alternate)) { $array['devices'][0]['device_uuid_alternate'] = $device_uuid_alternate; } @@ -502,6 +506,7 @@ $device_username = $row["device_username"]; $device_password = $row["device_password"]; $device_vendor = $row["device_vendor"]; + $device_location = $row["device_location"]; $device_uuid_alternate = $row["device_uuid_alternate"]; $device_model = $row["device_model"]; $device_firmware_version = $row["device_firmware_version"]; @@ -1754,6 +1759,19 @@ echo "\n"; } + if (permission_exists('device_location')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-device_location']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
    \n"; + echo $text['description-device_location']."\n"; + echo "\n"; + echo "\n"; + } + if (permission_exists('device_model')) { echo "\n"; echo "\n"; From e16cc5e725523211f494281a5b44874b40cf4b15 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 18 Jan 2022 11:52:26 -0700 Subject: [PATCH 168/496] Need to keep the caller ID prefix on the caller ID name. This was needed to keep caller id prefix for the caller ID name so it shows up in the Call Detail Records. --- app/xml_cdr/resources/classes/xml_cdr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php index 86a4291e96..d8df0219ae 100644 --- a/app/xml_cdr/resources/classes/xml_cdr.php +++ b/app/xml_cdr/resources/classes/xml_cdr.php @@ -303,7 +303,7 @@ if (!class_exists('xml_cdr')) { $caller_id_number = urldecode($xml->variables->caller_id_number); //if the call is outbound use the external caller ID - if (urldecode($xml->variables->call_direction) == 'outbound' && isset($xml->variables->effective_caller_id_name)) { + if (isset($xml->variables->effective_caller_id_name)) { $caller_id_name = urldecode($xml->variables->effective_caller_id_name); } if (urldecode($xml->variables->call_direction) == 'outbound' && isset($xml->variables->effective_caller_id_number)) { From ba2f5c379f431f45254f29a6e333575728ef1d2c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 18 Jan 2022 12:05:32 -0700 Subject: [PATCH 169/496] Only compare sip_from_domain with domain_name if the sip_from_domain exists. --- app/xml_cdr/resources/classes/xml_cdr.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php index d8df0219ae..4bd39a91dc 100644 --- a/app/xml_cdr/resources/classes/xml_cdr.php +++ b/app/xml_cdr/resources/classes/xml_cdr.php @@ -313,11 +313,13 @@ if (!class_exists('xml_cdr')) { //if the sip_from_domain and domain_name are not the same then original call direction was inbound //when an inbound call is forward the call_direction is set to inbound and then updated to outbound //use sip_from_display and sip_from_user to get the original caller ID instead of the updated caller ID info from the forward - if (urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name) && isset($xml->variables->sip_from_display)) { - $caller_id_name = urldecode($xml->variables->sip_from_display); - } - if (urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name) && isset($xml->variables->sip_from_user)) { - $caller_id_number = urldecode($xml->variables->sip_from_user); + if (isset($xml->variables->sip_from_domain) && urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name)) { + if (isset($xml->variables->sip_from_display)) { + $caller_id_name = urldecode($xml->variables->sip_from_display); + } + if (isset($xml->variables->sip_from_user)) { + $caller_id_number = urldecode($xml->variables->sip_from_user); + } } //get the values from the callflow. From 7f91e009b1c1a495aa73d73c5ca4999b60301e39 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 18 Jan 2022 16:45:48 -0700 Subject: [PATCH 170/496] Add registration count to the the SIP Status -> Profile Registrations button. --- app/sip_status/sip_status.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index f2aa7326e1..d5de7bad66 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -103,6 +103,9 @@ message::add($message, 'negative', 5000); } +//define registration object + $registration = new registrations; + //include the header $document['title'] = $text['title-sip_status']; require_once "resources/header.php"; @@ -248,7 +251,7 @@ echo "
    ".$text['title-sofia-status-profile']." ".urlencode($sip_profile_name)."
    \n"; echo "
    \n"; echo button::create(['type'=>'button','label'=>$text['button-flush_registrations'],'icon'=>'eraser','collapse'=>'hide-xs','link'=>'cmd.php?profile='.urlencode($sip_profile_name).'&action=flush_inbound_reg']); - echo button::create(['type'=>'button','label'=>$text['button-registrations'],'icon'=>'phone-alt','collapse'=>'hide-xs','link'=>PROJECT_PATH.'/app/registrations/registrations.php?profile='.urlencode($sip_profile_name)]); + echo button::create(['type'=>'button','label'=>$text['button-registrations'].' ('.$registration->count($sip_profile_name).')','icon'=>'phone-alt','collapse'=>'hide-xs','link'=>PROJECT_PATH.'/app/registrations/registrations.php?profile='.urlencode($sip_profile_name)]); if ($profile_state == 'stopped') { echo button::create(['type'=>'button','label'=>$text['button-start'],'icon'=>$_SESSION['theme']['button_icon_start'],'collapse'=>'hide-xs','link'=>'cmd.php?profile='.urlencode($sip_profile_name).'&action=start']); } From 55ba4cb2a525f74b81c0f48d6db00dd1d4e8dc2d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 18 Jan 2022 21:49:59 -0700 Subject: [PATCH 171/496] Make contact edit more interactive. CDR Search for phone numbers Click to Call for phone numbers Added mailto link for email address Link for the URL --- app/contacts/contact_edit.php | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 70f09a381d..5554338dda 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -1502,6 +1502,21 @@ if (permission_exists('contact_user_view') || permission_exists('contact_group_v } if (permission_exists('contact_phone_view')) { + + echo "\n"; + $x = 0; foreach($contact_phones as $row) { echo "
    \n"; @@ -1516,6 +1531,28 @@ if (permission_exists('contact_phone_view')) { echo " \n"; echo "
    \n"; } + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + + $call = "send_cmd('"; + $call .= PROJECT_PATH."/app/click_to_call/click_to_call.php"; + $call .= "?src_cid_name=".urlencode($row['phone_number']); + $call .= "&src_cid_number=".urlencode($row['phone_number']); + $call .= "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name']); + $call .= "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number']); + $call .= "&src=".urlencode($_SESSION['user']['extension'][0]['user']); + $call .= "&dest=".urlencode($row['phone_number']); + $call .= "&rec=false"; + $call .= "&ringback=us-ring"; + $call .= "&auto_answer=true"; + $call .= "');"; + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
    \n"; echo "
    \n"; echo "
    \n"; echo "
    \n"; @@ -1938,6 +1975,11 @@ if (permission_exists('contact_email_view')) { echo " \n"; echo "
    \n"; } + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; echo "
    \n"; echo "
    \n"; @@ -2025,6 +2067,11 @@ if (permission_exists('contact_url_view')) { echo " \n"; echo "
    \n"; } + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; echo "
    \n"; echo "
    \n"; echo " \n"; From 825f5f2269aac77879392b974bc36f2587125a99 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 19 Jan 2022 00:08:26 -0700 Subject: [PATCH 172/496] Assign the device_location to the template. --- app/provision/resources/classes/provision.php | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index ad108a66cd..72ffe4910b 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -356,15 +356,16 @@ include "root.php"; //set the variables from values in the database $device_uuid = $row["device_uuid"]; $device_label = $row["device_label"]; - if (strlen($row["device_vendor"]) > 0) { - $device_vendor = strtolower($row["device_vendor"]); - } + $device_template = $row["device_template"]; + $device_profile_uuid = $row["device_profile_uuid"]; $device_user_uuid = $row["device_user_uuid"]; $device_model = $row["device_model"]; $device_firmware_version = $row["device_firmware_version"]; + if (strlen($row["device_vendor"]) > 0) { + $device_vendor = strtolower($row["device_vendor"]); + } + $device_location = $row["device_location"]; $device_enabled = $row["device_enabled"]; - $device_template = $row["device_template"]; - $device_profile_uuid = $row["device_profile_uuid"]; $device_description = $row["device_description"]; } unset($row); @@ -380,12 +381,13 @@ include "root.php"; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && sizeof($row) != 0) { $device_label = $row["device_label"]; - $device_vendor = strtolower($row["device_vendor"]); - $device_model = $row["device_model"]; - $device_firmware_version = $row["device_firmware_version"]; - $device_enabled = $row["device_enabled"]; $device_template = $row["device_template"]; $device_profile_uuid = $row["device_profile_uuid"]; + $device_model = $row["device_model"]; + $device_firmware_version = $row["device_firmware_version"]; + $device_vendor = strtolower($row["device_vendor"]); + $device_location = strtolower($row["device_location"]); + $device_enabled = $row["device_enabled"]; $device_description = $row["device_description"]; } unset($row, $parameters); @@ -590,11 +592,13 @@ include "root.php"; if (is_array($row) && sizeof($row) != 0) { if ($row["device_enabled"] == "true") { $device_label = $row["device_label"]; + $device_profile_uuid = $row["device_profile_uuid"]; $device_firmware_version = $row["device_firmware_version"]; $device_user_uuid = $row["device_user_uuid"]; + $device_location = strtolower($row["device_location"]); + $device_vendor = strtolower($row["device_vendor"]); $device_enabled = $row["device_enabled"]; //keep the original template - $device_profile_uuid = $row["device_profile_uuid"]; $device_description = $row["device_description"]; } } @@ -1125,6 +1129,8 @@ include "root.php"; $view->assign("user_id",$user_id); $view->assign("password",$password); $view->assign("template",$device_template); + $view->assign("location",$device_location); + $view->assign("device_location",$device_location); $view->assign("microtime",microtime(true)); //personal ldap password From a6ae75bf10ea3396c71dea97e7bb205ae111baa8 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 19 Jan 2022 10:25:05 -0700 Subject: [PATCH 173/496] Fix a syntax error in the Polycom 5.x and 6.x templates. (#6247) * Fix a syntax error * Update {$mac}.cfg --- resources/templates/provision/polycom/5.x/{$mac}.cfg | 2 +- resources/templates/provision/polycom/6.x/{$mac}.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg index dacc712cf1..38bfc698a2 100644 --- a/resources/templates/provision/polycom/5.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg @@ -144,7 +144,7 @@ tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0" /> Date: Wed, 19 Jan 2022 10:33:42 -0700 Subject: [PATCH 174/496] Fix the Caller ID name. --- app/scripts/resources/scripts/disa.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/resources/scripts/disa.lua b/app/scripts/resources/scripts/disa.lua index 02ff5a6bb9..fb14622d24 100644 --- a/app/scripts/resources/scripts/disa.lua +++ b/app/scripts/resources/scripts/disa.lua @@ -158,7 +158,7 @@ if (caller_id_name) then --caller id name provided do nothing else - caller_id_number = session:getVariable("effective_caller_id_number"); + caller_id_name = session:getVariable("effective_caller_id_name"); end if (caller_id_number) then --caller id number provided do nothing @@ -169,7 +169,7 @@ if (caller_id_name) then --caller id name provided do nothing else - caller_id_number = session:getVariable("outbound_caller_id_number"); + caller_id_name = session:getVariable("outbound_caller_id_name"); end if (caller_id_number) then --caller id number provided do nothing From 28c28fab846084570ffd8543d4270a2d5c68f143 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 19 Jan 2022 15:27:17 -0700 Subject: [PATCH 175/496] Enable *72 in addition to the *72(2-20) digits Some people were used to *72 original behavior then at some point someone added *72 followed by 2 - 20 digits. However to make everyone happy both of these can co-exist. --- .../resources/switch/conf/dialplan/500_call-forward.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml index 3ceee6e3e2..f9a4ca469b 100644 --- a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml +++ b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml @@ -5,6 +5,11 @@ + + + + + From 8bf4bec5899061914333f92a831a6408766db258 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 19 Jan 2022 15:32:19 -0700 Subject: [PATCH 176/496] Add $ as this makes it look for an exact match. --- .../resources/switch/conf/dialplan/500_call-forward.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml index f9a4ca469b..12cbe2f995 100644 --- a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml +++ b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml @@ -5,7 +5,7 @@ - + From 00c23e5390b12c8c66d547741fff1723b8e9b291 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 20 Jan 2022 02:54:30 -0700 Subject: [PATCH 177/496] Use larger icons on the contact edit page. --- app/contacts/contact_edit.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 5554338dda..8cdf99dbdb 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -1533,7 +1533,7 @@ if (permission_exists('contact_phone_view')) { } echo "
    \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; $call = "send_cmd('"; @@ -1549,7 +1549,7 @@ if (permission_exists('contact_phone_view')) { $call .= "&auto_answer=true"; $call .= "');"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
    \n"; @@ -1977,7 +1977,7 @@ if (permission_exists('contact_email_view')) { } echo "
    \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
    \n"; echo "
    \n"; @@ -2069,7 +2069,7 @@ if (permission_exists('contact_url_view')) { } echo "
    \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
    \n"; echo "
    \n"; From e31655977109a908958cc880c791357c3bb708eb Mon Sep 17 00:00:00 2001 From: AlexC <40072887+alexdcrane@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:54:42 -0700 Subject: [PATCH 178/496] Added show all button (#6249) * Update call_center_queues.php * Update call_center_agents.php * Update app_config.php * Update app_config.php * Update contacts.php * Update app_config.php * Update ivr_menus.php * Update app_config.php * Update call_flows.php * Update app_config.php * Update conference_centers.php * Update app_config.php * Update voicemails.php * Update app_config.php * Update phrases.php * Update app_config.php * Update recordings.php * Update app_config.php * Update call_recordings.php * Update app_config.php * Update call_broadcast.php * Update app_config.php * Update time_conditions.php * Update app_config.php * Update music_on_hold.php * Update app_config.php * Update conferences.php --- app/call_broadcast/app_config.php | 3 ++ app/call_broadcast/call_broadcast.php | 32 ++++++++++++-- app/call_centers/app_config.php | 3 ++ app/call_centers/call_center_agents.php | 32 ++++++++++++-- app/call_centers/call_center_queues.php | 32 ++++++++++++-- app/call_flows/app_config.php | 3 ++ app/call_flows/call_flows.php | 32 ++++++++++++-- app/call_recordings/app_config.php | 3 ++ app/call_recordings/call_recordings.php | 24 ++++++++-- app/conference_centers/app_config.php | 3 ++ app/conference_centers/conference_centers.php | 32 ++++++++++++-- app/conferences/app_config.php | 3 ++ app/conferences/conferences.php | 32 ++++++++++++-- app/contacts/app_config.php | 3 ++ app/contacts/contacts.php | 32 ++++++++++++-- app/ivr_menus/app_config.php | 3 ++ app/ivr_menus/ivr_menus.php | 32 ++++++++++++-- app/music_on_hold/app_config.php | 3 ++ app/music_on_hold/music_on_hold.php | 29 ++++++++++-- app/phrases/app_config.php | 3 ++ app/phrases/phrases.php | 32 ++++++++++++-- app/recordings/app_config.php | 3 ++ app/recordings/recordings.php | 40 ++++++++++++++--- app/time_conditions/app_config.php | 3 ++ app/time_conditions/time_conditions.php | 44 +++++++++++++++---- app/voicemails/app_config.php | 3 ++ app/voicemails/voicemails.php | 32 ++++++++++++-- 27 files changed, 443 insertions(+), 53 deletions(-) diff --git a/app/call_broadcast/app_config.php b/app/call_broadcast/app_config.php index 2be87c9ca5..a65d8ce9b8 100644 --- a/app/call_broadcast/app_config.php +++ b/app/call_broadcast/app_config.php @@ -80,6 +80,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "call_broadcast_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "call_broadcast_send"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index f7f8d8d961..15bba09512 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -90,17 +90,23 @@ //get the count $sql = "select count(*) from v_call_broadcasts "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('call_broadcast_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (isset($sql_search)) { $sql .= "and ".$sql_search; } $database = new database; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $num_rows = $database->select($sql, $parameters, 'column'); //prepare the paging $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -137,6 +143,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('call_broadcast_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type='.urlencode($destination_type).'&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -169,6 +183,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('broadcast_name', $text['label-name'], $order_by, $order); echo th_order_by('broadcast_concurrent_limit', $text['label-concurrent-limit'], $order_by, $order); echo th_order_by('broadcast_description', $text['label-description'], $order_by, $order); @@ -190,6 +207,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " "; if (permission_exists('call_broadcast_edit')) { echo "".escape($row['broadcast_name']).""; diff --git a/app/call_centers/app_config.php b/app/call_centers/app_config.php index c80812e088..f5f9c2969d 100644 --- a/app/call_centers/app_config.php +++ b/app/call_centers/app_config.php @@ -66,6 +66,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "call_center_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "call_center_agent_view"; $apps[$x]['permissions'][$y]['menu']['uuid'] = "597c483a-51a9-f95a-8d54-ea7d87ada2b8"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php index 84170e2363..bae686ba4f 100644 --- a/app/call_centers/call_center_agents.php +++ b/app/call_centers/call_center_agents.php @@ -81,17 +81,23 @@ //get total call center agent count from the database $sql = "select count(*) from v_call_center_agents "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('call_center_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (isset($sql_search)) { $sql .= "and ".$sql_search; } - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -132,6 +138,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo ""; + if (permission_exists('call_center_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_center_agents.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -161,6 +175,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } //echo th_order_by('domain_uuid', 'domain_uuid', $order_by, $order); echo th_order_by('agent_name', $text['label-agent_name'], $order_by, $order); echo th_order_by('agent_id', $text['label-agent_id'], $order_by, $order); @@ -190,6 +207,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " "; if (permission_exists('call_center_agent_edit')) { echo "".escape($row['agent_name']).""; diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 4d75dcd805..84252b359b 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -87,17 +87,23 @@ //get total call center queues count from the database $sql = "select count(*) from v_call_center_queues "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('call_center_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (isset($sql_search)) { $sql .= "and ".$sql_search; } - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -147,6 +153,14 @@ unset($margin_left); } echo "\n"; + if (permission_exists('call_center_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_center_queues.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -179,6 +193,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('queue_name', $text['label-queue_name'], $order_by, $order); echo th_order_by('queue_extension', $text['label-extension'], $order_by, $order); echo th_order_by('queue_strategy', $text['label-strategy'], $order_by, $order); @@ -213,6 +230,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_center_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " "; if (permission_exists('call_center_queue_edit')) { echo " ".escape($row['queue_name']).""; diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php index 4ff68b40eb..9a04902b73 100644 --- a/app/call_flows/app_config.php +++ b/app/call_flows/app_config.php @@ -78,6 +78,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "call_flow_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "call_flow_context"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index 3c71ca6ca4..0a899828c9 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -101,15 +101,21 @@ //prepare to page the results $sql = "select count(*) from v_call_flows "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('call_flow_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } $sql .= $sql_search; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('call_flow_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -164,6 +170,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('call_flow_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_flows.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -200,6 +214,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_flow_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('call_flow_name', $text['label-call_flow_name'], $order_by, $order); echo th_order_by('call_flow_extension', $text['label-call_flow_extension'], $order_by, $order); echo th_order_by('call_flow_feature_code', $text['label-call_flow_feature_code'], $order_by, $order); @@ -227,6 +244,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_flow_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".escape($row['call_flow_name'])." \n"; echo " ".escape($row['call_flow_extension'])." \n"; echo " ".escape($row['call_flow_feature_code'])." \n"; diff --git a/app/call_recordings/app_config.php b/app/call_recordings/app_config.php index a5ecfcf706..553c273ae6 100644 --- a/app/call_recordings/app_config.php +++ b/app/call_recordings/app_config.php @@ -26,6 +26,9 @@ $apps[$x]['permissions'][$y]['name'] = 'call_recording_delete'; $apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; $y++; + $apps[$x]['permissions'][$y]['name'] = 'call_recording_all'; + $apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; + $y++; $apps[$x]['permissions'][$y]['name'] = 'call_recording_play'; $apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; $y++; diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php index 3857100125..27d68499de 100644 --- a/app/call_recordings/call_recordings.php +++ b/app/call_recordings/call_recordings.php @@ -82,17 +82,23 @@ //get the count $sql = "select count(call_recording_uuid) from v_call_recordings "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('call_recording_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (isset($sql_search)) { $sql .= $sql_search; } - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('call_recording_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -157,6 +163,9 @@ echo " \n"; $col_count++; } + if ($_GET['show'] == "all" && permission_exists('call_recording_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('call_recording_name', $text['label-call_recording_name'], $order_by, $order, null, "class='pct-40'"); if (permission_exists('call_recording_play') || permission_exists('call_recording_download')) { echo "".$text['label-recording']."\n"; @@ -188,6 +197,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('call_recording_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".escape($row['call_recording_name'])."\n"; if (permission_exists('call_recording_play') || permission_exists('call_recording_download')) { echo " "; diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 426a31fa79..6642c89545 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -64,6 +64,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_center_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_room_view"; $apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 21d2c578e7..6747fbc31d 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -97,15 +97,21 @@ //prepare to page the results $sql = "select count(*) from v_conference_centers "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('conference_center_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } $sql .= $sql_search; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('conference_center_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -146,6 +152,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('conference_center_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conference_centers.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -178,6 +192,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('conference_center_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('conference_center_name', $text['label-conference_center_name'], $order_by, $order); echo th_order_by('conference_center_extension', $text['label-conference_center_extension'], $order_by, $order); echo th_order_by('conference_center_greeting', $text['label-conference_center_greeting'], $order_by, $order); @@ -202,6 +219,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('conference_center_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".escape($row['conference_center_name'])." \n"; echo " ".escape($row['conference_center_extension'])." \n"; echo " ".escape($row['conference_center_greeting'])." \n"; diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php index d2a543b88d..27127c36dc 100644 --- a/app/conferences/app_config.php +++ b/app/conferences/app_config.php @@ -66,6 +66,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "conference_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "conference_user_view"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin";; diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index 33194b84c8..38a6add73c 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -97,7 +97,11 @@ if (if_group("superadmin") || if_group("admin")) { //show all extensions $sql = "select count(*) from v_conferences "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('conference_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } } else { //show only assigned extensions @@ -108,13 +112,15 @@ $parameters['user_uuid'] = $_SESSION['user_uuid']; } $sql .= $sql_search; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('conference_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); @@ -157,6 +163,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('conference_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conferences.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -192,6 +206,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('conference_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('conference_name', $text['table-name'], $order_by, $order); echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order); echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order); @@ -216,6 +233,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('conference_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".str_replace('-', ' ', $row['conference_name'])." \n"; echo " ".escape($row['conference_extension'])." \n"; echo " ".escape($row['conference_profile'])." \n"; diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php index 54e2cea01a..efa0ac87e5 100644 --- a/app/contacts/app_config.php +++ b/app/contacts/app_config.php @@ -48,6 +48,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "contact_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "contact_upload"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index b2573ed5f8..ddb8e9d6a5 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -186,7 +186,11 @@ //build query for paging and list $sql = "select count(*) "; $sql .= "from v_contacts as c "; - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('contact_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (!permission_exists('contact_domain_view')) { $sql .= "and ( "; //only contacts assigned to current user's group(s) and those not assigned to any group $sql .= " contact_uuid in ( "; @@ -216,13 +220,15 @@ $parameters['user_uuid'] = $_SESSION['user_uuid']; } $sql .= $sql_search; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('contact_all')) { + $param .= "&show=all"; + } $page = $_GET['page']; if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); //bottom @@ -286,6 +292,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('contact_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'contacts.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -315,6 +329,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('contact_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('contact_type', $text['label-contact_type'], $order_by, $order); echo th_order_by('contact_organization', $text['label-contact_organization'], $order_by, $order); echo " \n"; @@ -340,6 +357,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('contact_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".ucwords(escape($row['contact_type']))." \n"; echo " ".escape($row['contact_organization'])." \n"; echo " "; diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php index 7821d40b3a..75a705e896 100644 --- a/app/ivr_menus/app_config.php +++ b/app/ivr_menus/app_config.php @@ -95,6 +95,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "ivr_menu_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "ivr_menu_option_view"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php index 494c75e3d1..6900beed81 100644 --- a/app/ivr_menus/ivr_menus.php +++ b/app/ivr_menus/ivr_menus.php @@ -96,8 +96,11 @@ //prepare to page the results $sql = "select count(*) from v_ivr_menus "; - $sql .= "where domain_uuid = :domain_uuid "; - $parameters['domain_uuid'] = $_SESSION["domain_uuid"]; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('ivr_menu_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } $database = new database; $total_ivr_menus = $database->select($sql, $parameters, 'column'); $num_rows = $total_ivr_menus; @@ -111,7 +114,10 @@ //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) { + $param .= "&show=all"; + } $page = is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true); @@ -150,6 +156,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "\n"; + if (permission_exists('ivr_menu_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']); //echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'ivr_menus.php','style'=>($search == '' ? 'display: none;' : null)]); @@ -185,6 +199,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo th_order_by('ivr_menu_name', $text['label-name'], $order_by, $order); echo th_order_by('ivr_menu_extension', $text['label-extension'], $order_by, $order); echo th_order_by('ivr_menu_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'"); @@ -207,6 +224,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " "; if (permission_exists('ivr_menu_edit')) { echo "".escape($row['ivr_menu_name']).""; diff --git a/app/music_on_hold/app_config.php b/app/music_on_hold/app_config.php index de7f4489c9..7b2f9a05e6 100644 --- a/app/music_on_hold/app_config.php +++ b/app/music_on_hold/app_config.php @@ -44,6 +44,9 @@ $apps[$x]['permissions'][$y]['name'] = "music_on_hold_delete"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "music_on_hold_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "music_on_hold_name"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 9e013f525c..e6e22c4874 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -45,14 +45,15 @@ //get the music_on_hold array $sql = "select * from v_music_on_hold "; - $sql .= "where ( "; - $sql .= "domain_uuid = :domain_uuid "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('music_on_hold_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } if (permission_exists('music_on_hold_domain')) { $sql .= "or domain_uuid is null "; } - $sql .= ") "; $sql .= "order by domain_uuid desc, music_on_hold_name asc, music_on_hold_rate asc"; - $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $database = new database; $streams = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -423,6 +424,14 @@ echo "\n"; echo ""; } + if (permission_exists('music_on_hold_all')) { + if ($_GET['show'] == 'all') { + echo " "; + } + else { + echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]); + } + } if (permission_exists('music_on_hold_delete') && $streams) { echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } @@ -514,6 +523,9 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('music_on_hold_all')) { + echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'"); + } echo " ".$stream_details."\n"; echo " ".$text['label-tools']."\n"; echo " ".$text['label-file-size']."\n"; @@ -545,6 +557,15 @@ echo " \n"; echo " \n"; } + if ($_GET['show'] == "all" && permission_exists('music_on_hold_all')) { + if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) { + $domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name']; + } + else { + $domain = $text['label-global']; + } + echo " ".escape($domain)."\n"; + } echo " ".escape($stream_file)."\n"; echo " "; echo ""; diff --git a/app/phrases/app_config.php b/app/phrases/app_config.php index 8fe3fa4c6c..38a079efe5 100644 --- a/app/phrases/app_config.php +++ b/app/phrases/app_config.php @@ -62,6 +62,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "phrase_all"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "phrase_play"; $apps[$x]['permissions'][$y]['groups'][] = "user"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index 53300161b0..389e628aa9 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -94,15 +94,21 @@ //get phrases record count $sql = "select count(*) from v_phrases "; - $sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) "; + $sql .= "where true "; + if ($_GET['show'] != "all" || !permission_exists('phrase_all')) { + $sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) "; + $parameters['domain_uuid'] = $_SESSION['domain_uuid']; + } $sql .= $sql_search; - $parameters['domain_uuid'] = $domain_uuid; $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; - $param = "&search=".$search; + $param = "&search=".urlencode($search); + if ($_GET['show'] == "all" && permission_exists('phrase_all')) { + $param .= "&show=all"; + } $page = is_numeric($_GET['page']) ? $_GET['page'] : 0; list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true); @@ -141,6 +147,14 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "