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

Added content card div to devices (#7122)

This commit is contained in:
Alex 2024-09-06 10:20:03 -07:00 committed by GitHub
parent 2182ebd0b4
commit c01403cce8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/devices/device_edit.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2023 Portions created by the Initial Developer are Copyright (C) 2008-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
*/ */
@ -509,7 +509,7 @@
$sql = "select * from v_devices "; $sql = "select * from v_devices ";
$sql .= "where device_uuid = :device_uuid "; $sql .= "where device_uuid = :device_uuid ";
$parameters['device_uuid'] = $device_uuid; $parameters['device_uuid'] = $device_uuid;
$row = $database->select($sql, $parameters, 'row'); $row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) { if (is_array($row) && @sizeof($row) != 0) {
$device_address = $row["device_address"]; $device_address = $row["device_address"];
@ -540,7 +540,7 @@
if (empty($device_vendor)) { if (empty($device_vendor)) {
//get the device vendor using the device address //get the device vendor using the device address
$device_vendor = device::get_vendor($device_address ?? null); $device_vendor = device::get_vendor($device_address ?? null);
//if the vendor was not found using the device address use an alternative method //if the vendor was not found using the device address use an alternative method
if (empty($device_vendor)) { if (empty($device_vendor)) {
$template_array = explode("/", $device_template ?? ''); $template_array = explode("/", $device_template ?? '');
@ -567,7 +567,7 @@
$sql .= "where device_uuid = :device_uuid "; $sql .= "where device_uuid = :device_uuid ";
$sql .= "order by cast(line_number as int) asc "; $sql .= "order by cast(line_number as int) asc ";
$parameters['device_uuid'] = $device_uuid ?? null; $parameters['device_uuid'] = $device_uuid ?? null;
$device_lines = $database->select($sql, $parameters, 'all'); $device_lines = $database->select($sql, $parameters, 'all');
unset($sql, $parameters); unset($sql, $parameters);
@ -638,7 +638,7 @@
$sql .= "from v_device_vendors "; $sql .= "from v_device_vendors ";
$sql .= "where enabled = 'true' "; $sql .= "where enabled = 'true' ";
$sql .= "order by name asc "; $sql .= "order by name asc ";
$device_vendors = $database->select($sql, null, 'all'); $device_vendors = $database->select($sql, null, 'all');
unset($sql); unset($sql);
@ -885,7 +885,7 @@
//get the provision settings //get the provision settings
$provision = new settings(["category" => "provision"]); $provision = new settings(["category" => "provision"]);
$acrobits_code = $provision->get('provision', 'acrobits_code'); $acrobits_code = $provision->get('provision', 'acrobits_code');
if (!empty($template) && isset($acrobits_code)) { if (!empty($template) && isset($acrobits_code)) {
$template = str_replace('{$server_address}', $row['server_address'], $template); $template = str_replace('{$server_address}', $row['server_address'], $template);
$template = str_replace('{$user_id}', urlencode($row['user_id']), $template); $template = str_replace('{$user_id}', urlencode($row['user_id']), $template);
@ -1101,6 +1101,7 @@
echo $text['description-device']."\n"; echo $text['description-device']."\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
@ -2029,6 +2030,7 @@
echo " </td>\n"; echo " </td>\n";
echo " </tr>"; echo " </tr>";
echo "</table>"; echo "</table>";
echo "</div>\n";
echo "<br><br>"; echo "<br><br>";
echo "</form>"; echo "</form>";
@ -2051,4 +2053,5 @@
//show the footer //show the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

14
app/devices/device_imports.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2018-2023 Portions created by the Initial Developer are Copyright (C) 2018-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -105,7 +105,7 @@
} }
//filter for specific tables and build the schema array //filter for specific tables and build the schema array
if ($table_name == "devices" || $table_name == "device_lines" || if ($table_name == "devices" || $table_name == "device_lines" ||
$table_name == "device_keys" || $table_name == "device_settings") { $table_name == "device_keys" || $table_name == "device_settings") {
$schema[$i]['table'] = $table_name; $schema[$i]['table'] = $table_name;
$schema[$i]['parent'] = $parent_name; $schema[$i]['parent'] = $parent_name;
@ -164,6 +164,7 @@
echo $text['description-import']."\n"; echo $text['description-import']."\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
//loop through user columns //loop through user columns
@ -200,6 +201,7 @@
} }
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<input name='action' type='hidden' value='import'>\n"; echo "<input name='action' type='hidden' value='import'>\n";
@ -247,7 +249,7 @@
//user selected fields //user selected fields
$fields = $_POST['fields']; $fields = $_POST['fields'];
//set the domain_uuid //set the domain_uuid
$domain_uuid = $_SESSION['domain_uuid']; $domain_uuid = $_SESSION['domain_uuid'];
@ -285,7 +287,7 @@
//echo "value: $value<br />\n"; //echo "value: $value<br />\n";
//echo "table_name: $table_name<br />\n"; //echo "table_name: $table_name<br />\n";
//echo "field_name: $field_name<br />\n"; //echo "field_name: $field_name<br />\n";
//get the parent table name //get the parent table name
$parent = get_parent($schema, $table_name); $parent = get_parent($schema, $table_name);
@ -445,7 +447,7 @@
//$message = $database->message; //$message = $database->message;
//view_array($message); //view_array($message);
} }
if (!empty($_SESSION['provision']['path']['text'])) { if (!empty($_SESSION['provision']['path']['text'])) {
$prov = new provision; $prov = new provision;
$prov->domain_uuid = $domain_uuid; $prov->domain_uuid = $domain_uuid;
@ -481,6 +483,7 @@
echo $text['description-import']."\n"; echo $text['description-import']."\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<div class='card'>\n";
echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n"; echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
echo "<tr>\n"; echo "<tr>\n";
@ -552,6 +555,7 @@
echo "</tr>\n"; echo "</tr>\n";
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br><br>"; echo "<br><br>";
echo "<input name='type' type='hidden' value='csv'>\n"; echo "<input name='type' type='hidden' value='csv'>\n";

2
app/devices/device_profile_copy.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2023 Portions created by the Initial Developer are Copyright (C) 2008-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):

10
app/devices/device_profile_edit.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Copyright (C) 2020-2023 All Rights Reserved. Copyright (C) 2020-2024 All Rights Reserved.
Contributor(s): Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
@ -427,6 +427,7 @@
echo $text['description-device_profiles']."\n"; echo $text['description-device_profiles']."\n";
echo "<br /><br />\n"; echo "<br /><br />\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
@ -499,7 +500,7 @@
echo " <th class='vtablereq'>".$text['label-device_key_id']."</td>\n"; echo " <th class='vtablereq'>".$text['label-device_key_id']."</td>\n";
echo " <th class='vtablereq'>".$text['label-device_vendor']."</td>\n"; echo " <th class='vtablereq'>".$text['label-device_vendor']."</td>\n";
echo " <th class='vtablereq'>".$text['label-device_key_type']."</td>\n"; echo " <th class='vtablereq'>".$text['label-device_key_type']."</td>\n";
if ($show_key_subtype) { if ($show_key_subtype) {
echo " <th class='vtable'>".$text['label-device_key_subtype']."</th>\n"; echo " <th class='vtable'>".$text['label-device_key_subtype']."</th>\n";
} }
echo " <th class='vtablereq'>".$text['label-device_key_line']."</td>\n"; echo " <th class='vtablereq'>".$text['label-device_key_line']."</td>\n";
@ -531,11 +532,11 @@
echo " <td class='formfld'>\n"; echo " <td class='formfld'>\n";
echo " <select class='formfld' name='device_profile_keys[$x][profile_key_category]'>\n"; echo " <select class='formfld' name='device_profile_keys[$x][profile_key_category]'>\n";
echo " <option value='line' ".($row['profile_key_category'] == "line" ? "selected='selected'" : null).">".$text['label-line']."</option>\n"; echo " <option value='line' ".($row['profile_key_category'] == "line" ? "selected='selected'" : null).">".$text['label-line']."</option>\n";
if ($row['profile_key_vendor'] !== "polycom") { if ($row['profile_key_vendor'] !== "polycom") {
echo " <option value='memory' ".($row['profile_key_category'] == "memory" ? "selected='selected'" : null).">".$text['label-memory']."</option>\n"; echo " <option value='memory' ".($row['profile_key_category'] == "memory" ? "selected='selected'" : null).">".$text['label-memory']."</option>\n";
} }
echo " <option value='programmable' ".($row['profile_key_category'] == "programmable" ? "selected='selected'" : null).">".$text['label-programmable']."</option>\n"; echo " <option value='programmable' ".($row['profile_key_category'] == "programmable" ? "selected='selected'" : null).">".$text['label-programmable']."</option>\n";
if ($row['profile_key_vendor'] !== "polycom") { if ($row['profile_key_vendor'] !== "polycom") {
if (empty($row['profile_key_vendor'])) { if (empty($row['profile_key_vendor'])) {
echo " <option value='expansion' ".($row['profile_key_category'] == "expansion" ? "selected='selected'" : null).">".$text['label-expansion']."</option>\n"; echo " <option value='expansion' ".($row['profile_key_category'] == "expansion" ? "selected='selected'" : null).">".$text['label-expansion']."</option>\n";
echo " <option value='expansion-1' ".($row['profile_key_category'] == "expansion-1" ? "selected='selected'" : null).">".$text['label-expansion']." 1</option>\n"; echo " <option value='expansion-1' ".($row['profile_key_category'] == "expansion-1" ? "selected='selected'" : null).">".$text['label-expansion']." 1</option>\n";
@ -791,6 +792,7 @@
echo "</tr>\n"; echo "</tr>\n";
echo "</table>"; echo "</table>";
echo "</div>\n";
echo "<br /><br />"; echo "<br /><br />";
echo "<input type='hidden' name='device_profile_uuid' value='".escape($device_profile_uuid)."'>\n"; echo "<input type='hidden' name='device_profile_uuid' value='".escape($device_profile_uuid)."'>\n";

4
app/devices/device_profiles.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Copyright (C) 2019-2023 All Rights Reserved. Copyright (C) 2019-2024 All Rights Reserved.
Contributor(s): Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
@ -215,6 +215,7 @@
echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n"; echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n"; echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n";
echo "<div class='card'>\n";
echo "<table class='list'>\n"; echo "<table class='list'>\n";
echo "<tr class='list-header'>\n"; echo "<tr class='list-header'>\n";
if (permission_exists('device_profile_add') || permission_exists('device_profile_edit') || permission_exists('device_profile_delete')) { if (permission_exists('device_profile_add') || permission_exists('device_profile_edit') || permission_exists('device_profile_delete')) {
@ -285,6 +286,7 @@
} }
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br />\n"; echo "<br />\n";
echo "<div align='center'>".$paging_controls."</div>\n"; echo "<div align='center'>".$paging_controls."</div>\n";

7
app/devices/device_vendor_edit.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2023 Portions created by the Initial Developer are Copyright (C) 2016-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -159,6 +159,7 @@
echo " <div style='clear: both;'></div>\n"; echo " <div style='clear: both;'></div>\n";
echo "</div>\n"; echo "</div>\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
@ -206,6 +207,7 @@
echo "</tr>\n"; echo "</tr>\n";
echo "</table>"; echo "</table>";
echo "</div>\n";
echo "<br /><br />"; echo "<br /><br />";
if ($action == "update") { if ($action == "update") {
@ -223,4 +225,5 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

5
app/devices/device_vendor_function_edit.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2023 Portions created by the Initial Developer are Copyright (C) 2016-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -287,6 +287,7 @@
echo " <div style='clear: both;'></div>\n"; echo " <div style='clear: both;'></div>\n";
echo "</div>\n"; echo "</div>\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n"; echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n"; echo "<tr>\n";
@ -394,6 +395,7 @@
echo " </td>\n"; echo " </td>\n";
echo " </tr>"; echo " </tr>";
echo "</table>"; echo "</table>";
echo "</div>\n";
echo "</form>"; echo "</form>";
echo "<br /><br />"; echo "<br /><br />";
@ -401,3 +403,4 @@
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

7
app/devices/device_vendor_functions.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2023 Portions created by the Initial Developer are Copyright (C) 2016-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -162,6 +162,7 @@
echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]); echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
} }
echo "<div class='card'>\n";
echo "<table class='list'>\n"; echo "<table class='list'>\n";
echo "<tr class='list-header'>\n"; echo "<tr class='list-header'>\n";
if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) { if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) {
@ -263,6 +264,7 @@
} }
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br />\n"; echo "<br />\n";
echo "<div align='center'>".($paging_controls ?? '')."</div>\n"; echo "<div align='center'>".($paging_controls ?? '')."</div>\n";
@ -286,4 +288,5 @@
echo "</script>\n"; echo "</script>\n";
?> ?>

5
app/devices/device_vendor_restore.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2023 Portions created by the Initial Developer are Copyright (C) 2016-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -156,4 +156,5 @@
header('Location: device_vendors.php'); header('Location: device_vendors.php');
exit; exit;
?> ?>

8
app/devices/device_vendors.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2016-2023 Portions created by the Initial Developer are Copyright (C) 2016-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -159,7 +159,7 @@
echo "<input type='hidden' id='action' name='action' value=''>\n"; echo "<input type='hidden' id='action' name='action' value=''>\n";
echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n"; echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
echo "<div class='card'>\n";
echo "<table class='list'>\n"; echo "<table class='list'>\n";
echo "<tr class='list-header'>\n"; echo "<tr class='list-header'>\n";
if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) { if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) {
@ -210,6 +210,7 @@
unset($result); unset($result);
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br />\n"; echo "<br />\n";
echo "<div align='center'>".$paging_controls."</div>\n"; echo "<div align='center'>".$paging_controls."</div>\n";
@ -220,4 +221,5 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

5
app/devices/devices.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008 - 2023 Portions created by the Initial Developer are Copyright (C) 2008-2024
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -384,6 +384,7 @@
echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n"; echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n"; echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n";
echo "<div class='card'>\n";
echo "<table class='list'>\n"; echo "<table class='list'>\n";
echo "<tr class='list-header'>\n"; echo "<tr class='list-header'>\n";
if ($has_device_edit || $has_device_delete) { if ($has_device_edit || $has_device_delete) {
@ -485,6 +486,7 @@
unset($devices); unset($devices);
echo "</table>\n"; echo "</table>\n";
echo "</div>\n";
echo "<br />\n"; echo "<br />\n";
echo "<div align='center'>".$paging_controls."</div>\n"; echo "<div align='center'>".$paging_controls."</div>\n";
@ -496,3 +498,4 @@
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>