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

Update users.php for PHP 8.1

This commit is contained in:
FusionPBX 2023-05-13 13:55:08 -06:00 committed by GitHub
parent 445b63ec3a
commit 0035a93d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/users/users.php
View File

@ -47,10 +47,10 @@
$text = $language->get();
//get the http post data
if (is_array($_POST['users'])) {
$action = $_POST['action'];
$search = $_POST['search'];
$users = $_POST['users'];
if (!empty($_POST['users'])) {
$action = $_POST['action'] ?? '';
$search = $_POST['search'] ?? '';
$users = $_POST['users'] ?? '';
}
//check to see if contact details are in the view
@ -69,7 +69,7 @@
unset($parameters);
//process the http post data by action
if ($action != '' && is_array($users) && @sizeof($users) != 0) {
if (!empty($action) && is_array($users) && @sizeof($users) != 0) {
switch ($action) {
case 'copy':
if (permission_exists('user_add')) {
@ -96,11 +96,19 @@
}
//get order and order by
$order_by = $_GET["order_by"];
$order = $_GET["order"];
$order_by = $_GET["order_by"] ?? '';
$order = $_GET["order"] ?? '';
//set additional variables
$context = !empty($_GET["context"]) ? $_GET["context"] : '';
$search = !empty($_GET["search"]) ? $_GET["search"] : '';
$show = !empty($_GET["show"]) ? $_GET["show"] : '';
//set from session variables
$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
//add the search string
if (isset($_GET["search"])) {
if (!empty($search)) {
$search = strtolower($_GET["search"]);
$sql_search = " (";
$sql_search .= " lower(username) like :search ";
@ -114,7 +122,7 @@
//get the count
$sql = "select count(*) from view_users ";
if ($_GET['show'] == "all" && permission_exists('user_all')) {
if ($show == "all" && permission_exists('user_all')) {
if (isset($sql_search)) {
$sql .= "where ".$sql_search;
}
@ -124,7 +132,7 @@
}
else {
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
if (isset($sql_search)) {
if (!empty($sql_search)) {
$sql .= "and ".$sql_search;
}
$parameters['domain_uuid'] = $domain_uuid;
@ -140,8 +148,8 @@
//prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
$param = $search ? "&search=".$search : null;
$param .= ($_GET['show'] == 'all' && permission_exists('user_all')) ? "&show=all" : null;
$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
$param .= ($show == 'all' && permission_exists('user_all')) ? "&show=all" : null;
$page = !empty($_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);
$offset = $rows_per_page * $page;
@ -153,7 +161,7 @@
}
$sql .= "cast(user_enabled as text) ";
$sql .= "from view_users ";
if ($_GET['show'] == "all" && permission_exists('user_all')) {
if ($show == "all" && permission_exists('user_all')) {
if (isset($sql_search)) {
$sql .= "where ".$sql_search;
}
@ -208,7 +216,7 @@
}
echo "<form id='form_search' class='inline' method='get'>\n";
if (permission_exists('user_all')) {
if ($_GET['show'] == 'all') {
if ($show == 'all') {
echo " <input type='hidden' name='show' value='all'>\n";
}
else {
@ -247,10 +255,10 @@
echo "<tr class='list-header'>\n";
if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) {
echo " <th class='checkbox'>\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($users ?: "style='visibility: hidden;'").">\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($users) ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
}
if ($_GET['show'] == 'all' && permission_exists('user_all')) {
if ($show == 'all' && permission_exists('user_all')) {
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
}
echo th_order_by('username', $text['label-username'], $order_by, $order, null, null, $param);
@ -263,7 +271,7 @@
//echo th_order_by('user_status', $text['label-user_status'], $order_by, $order);
//echo th_order_by('add_date', $text['label-add_date'], $order_by, $order);
echo th_order_by('user_enabled', $text['label-user_enabled'], $order_by, $order, null, "class='center'", $param);
if (permission_exists('user_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
if (permission_exists('user_edit') && $list_row_edit_button == 'true') {
echo " <td class='action-button'>&nbsp;</td>\n";
}
echo "</tr>\n";
@ -281,7 +289,7 @@
echo " <input type='hidden' name='users[$x][uuid]' value='".escape($row['user_uuid'])."' />\n";
echo " </td>\n";
}
if ($_GET['show'] == 'all' && permission_exists('user_all')) {
if ($show == 'all' && permission_exists('user_all')) {
echo " <td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
}
echo " <td>\n";
@ -310,7 +318,7 @@
echo $text['label-'.$row['user_enabled']];
}
echo " </td>\n";
if (permission_exists('user_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
if (permission_exists('user_edit') && $list_row_edit_button == 'true') {
echo " <td class='action-button'>\n";
echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
echo " </td>\n";