nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update group files prevent null errors.

Browse Source
This commit is contained in:
markjcrane
2023-05-15 22:38:46 -06:00
parent b8d03a0384
commit c5f7e61c82
7 changed files with 725 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/groups/group_members.php
View File

@@ -51,15 +51,18 @@
$language = new text;
$text = $language->get();
//get the http post data
if (is_array($_POST['group_members'])) {
$action = $_POST['action'];
$group_uuid = $_POST['group_uuid'];
$group_members = $_POST['group_members'];
}
//get the http data
$action = $_REQUEST['action'] ?? '';
$group_uuid = $_REQUEST['group_uuid'] ?? '';
$group_members = $_REQUEST['group_members'] ?? '';
//set default values
$group_name = '';
$domain_uuid = '';
$list_row_url = '';
//process the http post data by action
if ($action != '' && is_array($group_members) && @sizeof($group_members) != 0) {
if (!empty($action) && !empty($group_members)) {
switch ($action) {
case 'delete':
if (permission_exists('group_member_delete') && is_uuid($group_uuid)) {
@@ -75,7 +78,6 @@
}
//get the group uuid, lookup domain uuid (if any) and name
$group_uuid = $_REQUEST['group_uuid'];
$sql = "select domain_uuid, group_name from v_groups ";
$sql .= "where group_uuid = :group_uuid ";
$parameters['group_uuid'] = $group_uuid;
@@ -120,12 +122,16 @@
unset($sql, $parameters);
//add group_member to the users array
foreach ($users as &$field) {
$field['group_member'] = 'false';
foreach($user_groups as $row) {
if ($row['user_uuid'] == $field['user_uuid']) {
$field['group_member'] = 'true';
break;
if (!empty($users)) {
foreach ($users as &$field) {
$field['group_member'] = 'false';
if (!empty($user_groups)) {
foreach($user_groups as $row) {
if ($row['user_uuid'] == $field['user_uuid']) {
$field['group_member'] = 'true';
break;
}
}
}
}
}
@@ -148,7 +154,7 @@
}
if (permission_exists('group_member_add')) {
echo "<form class='inline' method='post' action='groupmemberadd.php'>\n";
echo "<form class='inline' method='post' action='group_member_add.php'>\n";
echo " <select name='user_uuid' class='formfld'>\n";
echo " <option value=''>".$text['label-select']."...</option>\n";
foreach ($users as $row) {
@@ -183,7 +189,7 @@
echo "<tr class='list-header'>\n";
if (permission_exists('group_member_delete')) {
echo " <th class='checkbox'>\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($user_groups ?: "style='visibility: hidden;'").">\n";
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".(!empty($user_groups) ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
}
if (permission_exists('user_all')) {