dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add subtype to vendor functions and device keys. (#6409)

Browse Source 
* Add subtype to vendor functions and device keys.

Added to support phones that require a subtype for provisioning the phone.

* Add device_key_subtype

* Update device_edit.php

* Update device_profile_edit.php

* Update device_vendor_edit.php

* Update device_vendor_function_edit.php

* Update device_vendor_functions.php

* Update device_vendor_restore.php

* Update index.php

* Update provision.php

* Update app_languages.php

* Update app_config.php
This commit is contained in:
FusionPBX
2023-04-04 08:57:41 -06:00
committed by GitHub
parent de08aa6a1d
commit 408122c60c
12 changed files with 867 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/devices/device_vendor_functions.php
+42 -19
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2019
Portions created by the Initial Developer are Copyright (C) 2016-2022
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -80,26 +80,23 @@
$order_by = $_GET["order_by"];
$order = $_GET["order"];
//add the search term
$search = $_GET["search"];
if (strlen($search) > 0) {
$sql_where = "and (";
$sql_where .= "label like :search ";
$sql_where .= "or name like :search ";
$sql_where .= "or value like :search ";
$sql_where .= "or enabled like :search ";
$sql_where .= "or description like :search ";
$sql_where .= ")";
$parameters['search'] = '%'.$search.'%';
}
//prepare to page the results
$sql = "select count(*) from v_device_vendor_functions ";
$sql .= "where device_vendor_uuid = :device_vendor_uuid ";
$sql .= $sql_where;
if (isset($_GET["search"])) {
$sql .= "and (";
$sql .= "label like :search ";
$sql .= "or name like :search ";
$sql .= "or value like :search ";
$sql .= "or enabled like :search ";
$sql .= "or description like :search ";
$sql .= ")";
$parameters['search'] = '%'.$_GET["search"].'%';
}
$parameters['device_vendor_uuid'] = $device_vendor_uuid;
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
//prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
@@ -113,7 +110,19 @@
}
//get the list
$sql = str_replace('count(*)', '*', $sql);
$sql = "select * from v_device_vendor_functions ";
$sql .= "where device_vendor_uuid = :device_vendor_uuid ";
if (isset($_GET["search"])) {
$sql .= "and (";
$sql .= " label like :search ";
$sql .= " or name like :search ";
$sql .= " or value like :search ";
$sql .= " or enabled like :search ";
$sql .= " or description like :search ";
$sql .= ")";
$parameters['search'] = '%'.$_GET["search"].'%';
}
$parameters['device_vendor_uuid'] = $device_vendor_uuid;
$sql .= order_by($order_by, $order, 'name', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
$database = new database;
@@ -163,7 +172,8 @@
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($vendor_functions ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
}
echo th_order_by('name', $text['label-name'], $order_by, $order);
echo th_order_by('type', $text['label-type'], $order_by, $order);
echo th_order_by('subtype', $text['label-subtype'], $order_by, $order);
echo th_order_by('value', $text['label-value'], $order_by, $order);
echo "<th class='hide-sm-dn'>".$text['label-groups']."</th>\n";
echo th_order_by('enabled', $text['label-enabled'], $order_by, $order, null, "class='center'");
@@ -176,6 +186,7 @@
if (is_array($vendor_functions) && @sizeof($vendor_functions) != 0) {
$x = 0;
foreach ($vendor_functions as $row) {
//get the groups that have been assigned to the vendor functions
$sql = "select ";
$sql .= "fg.*, g.domain_uuid as group_domain_uuid ";
@@ -200,6 +211,7 @@
}
$group_list = isset($group_list) ? implode(', ', $group_list) : '';
unset ($vendor_function_groups);
//show the row of data
if (permission_exists('device_vendor_function_edit')) {
$list_row_url = "device_vendor_function_edit.php?device_vendor_uuid=".urlencode($row['device_vendor_uuid'])."&id=".urlencode($row['device_vendor_function_uuid']);
@@ -211,14 +223,25 @@
echo " <input type='hidden' name='vendor_functions[$x][uuid]' value='".escape($row['device_vendor_function_uuid'])."' />\n";
echo " </td>\n";
}
echo " <td>\n";
if (permission_exists('device_vendor_function_edit')) {
echo " <a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['name'])."</a>\n";
echo " <a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['type'])."</a>\n";
}
else {
echo " ".escape($row['name']);
echo " ".escape($row['type']);
}
echo " </td>\n";
echo " <td>\n";
if (permission_exists('device_vendor_function_edit')) {
echo " <a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['subtype'])."</a>\n";
}
else {
echo " ".escape($row['subtype']);
}
echo " </td>\n";
echo " <td>".escape($row['value'])."&nbsp;</td>\n";
echo " <td class='hide-sm-dn'>".escape($group_list)."&nbsp;</td>\n";
if (permission_exists('device_vendor_function_edit')) {