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

Devices, Device Profiles - Search: Scope enhancements.

This commit is contained in:
fusionate 2021-01-20 11:06:34 -07:00
parent 322bbd4c20
commit da79aa0fb1
3 changed files with 118 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/devices/app_languages.php
View File

@ -4583,6 +4583,27 @@ $text['label-custom']['ru-ru'] = "";
$text['label-custom']['sv-se'] = "";
$text['label-custom']['uk-ua'] = "";
$text['label-fields']['en-us'] = "Fields";
$text['label-fields']['en-gb'] = "Fields";
$text['label-fields']['ar-eg'] = "Fields";
$text['label-fields']['de-at'] = "Fields";
$text['label-fields']['de-ch'] = "Fields";
$text['label-fields']['de-de'] = "Fields";
$text['label-fields']['es-cl'] = "Fields";
$text['label-fields']['es-mx'] = "Fields";
$text['label-fields']['fr-ca'] = "Fields";
$text['label-fields']['fr-fr'] = "Fields";
$text['label-fields']['he-il'] = "Fields";
$text['label-fields']['it-it'] = "Fields";
$text['label-fields']['nl-nl'] = "Fields";
$text['label-fields']['pl-pl'] = "Fields";
$text['label-fields']['pt-br'] = "Fields";
$text['label-fields']['pt-pt'] = "Fields";
$text['label-fields']['ro-ro'] = "Fields";
$text['label-fields']['ru-ru'] = "Fields";
$text['label-fields']['sv-se'] = "Fields";
$text['label-fields']['uk-ua'] = "Fields";
$text['header-device_import']['en-us'] = "Device Import";
$text['header-device_import']['en-gb'] = "Device Import";
$text['header-device_import']['ar-eg'] = "";

49
app/devices/device_profiles.php
View File

@ -49,6 +49,10 @@
$profiles = $_POST['profiles'];
}
//get the search
$search = strtolower($_REQUEST["search"]);
$fields = strtolower($_REQUEST["fields"]);
//process the http post data by action
if ($action != '' && is_array($profiles) && @sizeof($profiles) != 0) {
switch ($action) {
@ -72,7 +76,7 @@
break;
}
header('Location: device_profiles.php'.($search != '' ? '?search='.urlencode($search) : null));
header('Location: device_profiles.php'.($search != '' ? '?search='.urlencode($search).'&fields='.urlencode($fields) : null));
exit;
}
@ -81,22 +85,25 @@
$order = $_GET["order"];
//add the search term
$search = strtolower($_GET["search"]);
if (strlen($search) > 0) {
$sql_search = "and (";
$sql_search .= " lower(device_profile_name) like :search ";
$sql_search .= " or lower(device_profile_description) like :search ";
$sql_search .= " or device_profile_uuid in ( ";
$sql_search .= " select dpk.device_profile_uuid from v_device_profile_keys as dpk ";
$sql_search .= " where dpk.profile_key_value like :search ";
$sql_search .= " or dpk.profile_key_label like :search ";
$sql_search .= " ) ";
$sql_search .= " or device_profile_uuid in ( ";
$sql_search .= " select dps.device_profile_uuid from v_device_profile_settings as dps ";
$sql_search .= " where dps.profile_setting_name like :search ";
$sql_search .= " or dps.profile_setting_value like :search ";
$sql_search .= " or dps.profile_setting_description like :search ";
$sql_search .= " ) ";
if ($fields == 'all' || $fields == 'keys') {
$sql_search .= " or device_profile_uuid in ( ";
$sql_search .= " select dpk.device_profile_uuid from v_device_profile_keys as dpk ";
$sql_search .= " where dpk.profile_key_value like :search ";
$sql_search .= " or dpk.profile_key_label like :search ";
$sql_search .= " ) ";
}
if ($fields == 'all' || $fields == 'settings') {
$sql_search .= " or device_profile_uuid in ( ";
$sql_search .= " select dps.device_profile_uuid from v_device_profile_settings as dps ";
$sql_search .= " where dps.profile_setting_name like :search ";
$sql_search .= " or dps.profile_setting_value like :search ";
$sql_search .= " or dps.profile_setting_description like :search ";
$sql_search .= " ) ";
}
$sql_search .= ") ";
$parameters['search'] = '%'.$search.'%';
}
@ -114,7 +121,10 @@
//prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
$param = "&search=".$search;
if ($search) {
$param = "&search=".$search;
$param .= "&fields=".$fields;
}
if ($_GET['show'] == "all" && permission_exists('device_profile_all')) {
$param .= "&show=all";
}
@ -166,7 +176,15 @@
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
}
}
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo "<select class='formfld' name='fields' id='select_fields' style='width: auto; margin-left: 15px;' onchange=\"if (document.getElementById('search').value != '') { this.form.submit(); }\">\n";
echo " <option value=''>".$text['label-fields']."...</option>\n";
echo " <option value=''>".$text['label-default']."</option>\n";
echo " <option value='keys' ".($fields == 'keys' ? " selected='selected'" : null).">".$text['label-keys']."</option>\n";
echo " <option value='settings' ".($fields == 'settings' ? " selected='selected'" : null).">".$text['label-settings']."</option>\n";
echo " <option value='all' ".($fields == 'all' ? " selected='selected'" : null).">".$text['label-all']."</option>\n";
echo " </select>";
echo "<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
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'=>'device_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') {
@ -193,6 +211,7 @@
echo "<form id='form_list' method='post'>\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='fields' value=\"".escape($fields)."\">\n";
echo "<table class='list'>\n";
echo "<tr class='list-header'>\n";

103
app/devices/devices.php
View File

@ -51,6 +51,7 @@
//get the search
$search = strtolower($_REQUEST["search"]);
$fields = strtolower($_REQUEST["fields"]);
//process the http post data by action
if ($action != '' && is_array($devices) && @sizeof($devices) != 0) {
@ -69,7 +70,7 @@
break;
}
header('Location: devices.php'.($search != '' ? '?search='.urlencode($search) : null));
header('Location: devices.php'.($search != '' ? '?search='.urlencode($search).'&fields='.urlencode($fields) : null));
exit;
}
@ -126,23 +127,29 @@
$sql .= " or lower(d.device_description) like :search ";
$sql .= " or lower(d.device_provisioned_method) like :search ";
$sql .= " or lower(d.device_provisioned_ip) like :search ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select dl.device_uuid from v_device_lines as dl ";
$sql .= " where dl.display_name like :search ";
$sql .= " or dl.user_id like :search ";
$sql .= " or dl.auth_id like :search ";
$sql .= " ) ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select dk.device_uuid from v_device_keys as dk ";
$sql .= " where dk.device_key_value like :search ";
$sql .= " or dk.device_key_label like :search ";
$sql .= " ) ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select ds.device_uuid from v_device_settings as ds ";
$sql .= " where ds.device_setting_subcategory like :search ";
$sql .= " or ds.device_setting_value like :search ";
$sql .= " or ds.device_setting_description like :search ";
$sql .= " ) ";
if ($fields == 'all' || $fields == 'lines') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select dl.device_uuid from v_device_lines as dl ";
$sql .= " where dl.display_name like :search ";
$sql .= " or dl.user_id like :search ";
$sql .= " or dl.auth_id like :search ";
$sql .= " ) ";
}
if ($fields == 'all' || $fields == 'keys') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select dk.device_uuid from v_device_keys as dk ";
$sql .= " where dk.device_key_value like :search ";
$sql .= " or dk.device_key_label like :search ";
$sql .= " ) ";
}
if ($fields == 'all' || $fields == 'settings') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select ds.device_uuid from v_device_settings as ds ";
$sql .= " where ds.device_setting_subcategory like :search ";
$sql .= " or ds.device_setting_value like :search ";
$sql .= " or ds.device_setting_description like :search ";
$sql .= " ) ";
}
$sql .= ") ";
$parameters['search'] = '%'.strtolower($search).'%';
}
@ -152,11 +159,12 @@
//prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
$param = "&search=".$search."&show=all";
}
else {
if ($search) {
$param = "&search=".$search;
$param .= "&fields=".$fields;
}
if ($_GET['show'] == "all" && permission_exists('device_all')) {
$param .= "&show=all";
}
$page = $_GET['page'];
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
@ -203,23 +211,29 @@
$sql .= " or lower(d.device_description) like :search ";
$sql .= " or lower(d.device_provisioned_method) like :search ";
$sql .= " or lower(d.device_provisioned_ip) like :search ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select dl.device_uuid from v_device_lines as dl ";
$sql .= " where dl.display_name like :search ";
$sql .= " or dl.user_id like :search ";
$sql .= " or dl.auth_id like :search ";
$sql .= " ) ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select dk.device_uuid from v_device_keys as dk ";
$sql .= " where dk.device_key_value like :search ";
$sql .= " or dk.device_key_label like :search ";
$sql .= " ) ";
$sql .= " or d.device_uuid in ( ";
$sql .= " select ds.device_uuid from v_device_settings as ds ";
$sql .= " where ds.device_setting_subcategory like :search ";
$sql .= " or ds.device_setting_value like :search ";
$sql .= " or ds.device_setting_description like :search ";
$sql .= " ) ";
if ($fields == 'all' || $fields == 'lines') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select dl.device_uuid from v_device_lines as dl ";
$sql .= " where dl.display_name like :search ";
$sql .= " or dl.user_id like :search ";
$sql .= " or dl.auth_id like :search ";
$sql .= " ) ";
}
if ($fields == 'all' || $fields == 'keys') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select dk.device_uuid from v_device_keys as dk ";
$sql .= " where dk.device_key_value like :search ";
$sql .= " or dk.device_key_label like :search ";
$sql .= " ) ";
}
if ($fields == 'all' || $fields == 'settings') {
$sql .= " or d.device_uuid in ( ";
$sql .= " select ds.device_uuid from v_device_settings as ds ";
$sql .= " where ds.device_setting_subcategory like :search ";
$sql .= " or ds.device_setting_value like :search ";
$sql .= " or ds.device_setting_description like :search ";
$sql .= " ) ";
}
$sql .= ") ";
$parameters['search'] = '%'.strtolower($search).'%';
}
@ -292,7 +306,15 @@
}
}
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo "<select class='formfld' name='fields' id='select_fields' style='width: auto; margin-left: 15px;' onchange=\"if (document.getElementById('search').value != '') { this.form.submit(); }\">\n";
echo " <option value=''>".$text['label-fields']."...</option>\n";
echo " <option value=''>".$text['label-default']."</option>\n";
echo " <option value='lines' ".($fields == 'lines' ? " selected='selected'" : null).">".$text['label-lines']."</option>\n";
echo " <option value='keys' ".($fields == 'keys' ? " selected='selected'" : null).">".$text['label-keys']."</option>\n";
echo " <option value='settings' ".($fields == 'settings' ? " selected='selected'" : null).">".$text['label-settings']."</option>\n";
echo " <option value='all' ".($fields == 'all' ? " selected='selected'" : null).">".$text['label-all']."</option>\n";
echo " </select>";
echo "<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
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'=>'devices.php','style'=>($search == '' ? 'display: none;' : null)]);
if ($paging_controls_mini != '') {
@ -316,6 +338,7 @@
echo "<form id='form_list' method='post'>\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='fields' value=\"".escape($fields)."\">\n";
echo "<table class='list'>\n";
echo "<tr class='list-header'>\n";