Rewrite some stuff
This commit is contained in:
parent
2949e59045
commit
1f4fa8eb72
@ -109,7 +109,7 @@ function listFiles($onlyMine = true): array
|
|||||||
if (!$onlyMine && !isModerator()) {
|
if (!$onlyMine && !isModerator()) {
|
||||||
$onlyMine = true;
|
$onlyMine = true;
|
||||||
}
|
}
|
||||||
$query = "SELECT ID, Path, Type, UploadedAt, UploadedBy FROM Files ORDER BY UploadedAt DESC";
|
$query = "SELECT Files.ID, Files.Path, Files.Type, Files.UploadedAt, Files.UploadedBy, Users.Nickname FROM Files INNER JOIN Users ON Files.UploadedBy = Users.ID ORDER BY UploadedAt DESC";
|
||||||
|
|
||||||
if ($onlyMine) {
|
if ($onlyMine) {
|
||||||
$query .= " WHERE UploadedBy = ?";
|
$query .= " WHERE UploadedBy = ?";
|
||||||
@ -124,9 +124,10 @@ function listFiles($onlyMine = true): array
|
|||||||
$path = "";
|
$path = "";
|
||||||
$type = "";
|
$type = "";
|
||||||
$uploadedAt = "";
|
$uploadedAt = "";
|
||||||
$uploadedBy = 0;
|
$uploadedByID = 0;
|
||||||
|
$uploadedBy = "";
|
||||||
|
|
||||||
$stmt->bind_result($id, $path, $type, $uploadedAt, $uploadedBy);
|
$stmt->bind_result($id, $path, $type, $uploadedAt, $uploadedByID, $uploadedBy);
|
||||||
|
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|
||||||
@ -137,6 +138,7 @@ function listFiles($onlyMine = true): array
|
|||||||
'Path' => $path,
|
'Path' => $path,
|
||||||
'Type' => $type,
|
'Type' => $type,
|
||||||
'UploadedAt' => $uploadedAt,
|
'UploadedAt' => $uploadedAt,
|
||||||
|
'UploadedByID' => $uploadedByID,
|
||||||
'UploadedBy' => $uploadedBy,
|
'UploadedBy' => $uploadedBy,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user