torsten/fvsjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed from error

Browse Source
This commit is contained in:
Torsten Schulz
2023-12-28 17:32:03 +01:00
parent a54c3f88de
commit 3b20af213e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/members.php
View File

@@ -7,7 +7,7 @@ class Members extends Renderer {
$members = $this->getMemberList(true); $members = $this->getMemberList(true);
$tableBody = '<tbody>'; $tableBody = '<tbody>';
foreach ($members as $row) { foreach ($members as $row) {
$tableBody .= '<tr>' $tableBody .= '<tr' . ($row['status_text'] !== 'Mitgliedschaft bestätigt' ? ' style="color:#a0a0a0"' : '') . '>'
. '<td>' . $row['id'] . '</td>' . '<td>' . $row['id'] . '</td>'
. '<td>' . $row['last_name'] . ', ' . $row['first_name'] . '</td>' . '<td>' . $row['last_name'] . ', ' . $row['first_name'] . '</td>'
. '<td>' . $row['email'] . '</td>' . '<td>' . $row['email'] . '</td>'

10
include/renderer.php
View File

@@ -554,9 +554,9 @@ class Renderer {
ON cp.id = c.position_id ON cp.id = c.position_id
WHERE cs.`status_text` NOT IN ("Mitgliedschaft abgelehnt", "Mitgliedschaft gekündigt") WHERE cs.`status_text` NOT IN ("Mitgliedschaft abgelehnt", "Mitgliedschaft gekündigt")
queryend; queryend;
$result = mysqli_query($this->dbConnection, $query); $result = mysqli_query($this->dbConnection, $query);
$entries = []; $entries = [];
while ($row = mysqli_fetch_assoc($result)) { while ($row = mysqli_fetch_assoc($result)) {
$entry = [ $entry = [
'last_name' => $this->decode($row['last_name'], $row['salt']), 'last_name' => $this->decode($row['last_name'], $row['salt']),
'first_name' => $this->decode($row['first_name'], $row['salt']), 'first_name' => $this->decode($row['first_name'], $row['salt']),
@@ -588,8 +588,8 @@ queryend;
protected function sortUserList($userList): array { protected function sortUserList($userList): array {
usort($userList, function($a, $b) { usort($userList, function($a, $b) {
$nameComparison = strcmp($a['last_name'], $b['last_name']); $nameComparison = stricmp($a['last_name'], $b['last_name']);
return ($nameComparison !== 0) ? $nameComparison : strcmp($a['first_name'], $b['first_name']); return ($nameComparison !== 0) ? $nameComparison : stricmp($a['first_name'], $b['first_name']);
}); });
return $userList; return $userList;
} }