Skip to content

Commit 1281b77

Browse files
authored
Merge pull request #1124 from Whit3XLightning/patch-1
client_files - check if file shared before assigning variables to prevent errors
2 parents 829ee37 + 608c9ef commit 1281b77

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

client_files.php

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
473473
$file_size_KB = number_format($file_size / 1024);
474474
$file_mime_type = nullable_htmlentities($row['file_mime_type']);
475475
$file_size = intval($row['file_size']);
476+
$file_uploaded_by = nullable_htmlentities($row['user_name']);
476477
$file_has_thumbnail = intval($row['file_has_thumbnail']);
477478
$file_has_preview = intval($row['file_has_preview']);
478479
$file_created_at = nullable_htmlentities($row['file_created_at']);
@@ -490,19 +491,22 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
490491
AND item_related_id = $file_id
491492
LIMIT 1"
492493
);
493-
$row = mysqli_fetch_array($sql_shared);
494-
$item_id = intval($row['item_id']);
495-
$item_active = nullable_htmlentities($row['item_active']);
496-
$item_key = nullable_htmlentities($row['item_key']);
497-
$item_type = nullable_htmlentities($row['item_type']);
498-
$item_related_id = intval($row['item_related_id']);
499-
$item_note = nullable_htmlentities($row['item_note']);
500-
$item_recipient = nullable_htmlentities($row['item_recipient']);
501-
$item_views = nullable_htmlentities($row['item_views']);
502-
$item_view_limit = nullable_htmlentities($row['item_view_limit']);
503-
$item_created_at = nullable_htmlentities($row['item_created_at']);
504-
$item_expire_at = nullable_htmlentities($row['item_expire_at']);
505-
$item_expire_at_human = timeAgo($row['item_expire_at']);
494+
$file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false;
495+
if ($file_shared) {
496+
$row = mysqli_fetch_array($sql_shared);
497+
$item_id = intval($row['item_id']);
498+
$item_active = nullable_htmlentities($row['item_active']);
499+
$item_key = nullable_htmlentities($row['item_key']);
500+
$item_type = nullable_htmlentities($row['item_type']);
501+
$item_related_id = intval($row['item_related_id']);
502+
$item_note = nullable_htmlentities($row['item_note']);
503+
$item_recipient = nullable_htmlentities($row['item_recipient']);
504+
$item_views = nullable_htmlentities($row['item_views']);
505+
$item_view_limit = nullable_htmlentities($row['item_view_limit']);
506+
$item_created_at = nullable_htmlentities($row['item_created_at']);
507+
$item_expire_at = nullable_htmlentities($row['item_expire_at']);
508+
$item_expire_at_human = timeAgo($row['item_expire_at']);
509+
}
506510

507511
?>
508512

@@ -533,7 +537,7 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
533537
<div class="text-secondary mt-1"><?php echo $file_uploaded_by; ?></div>
534538
</td>
535539
<td>
536-
<?php if (mysqli_num_rows($sql_shared) > 0) { ?>
540+
<?php if ($file_shared) { ?>
537541
<div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
538542
<i class="fas fa-link mr-2 mt-1"></i>
539543
<div class="media-body">Shared

0 commit comments

Comments
 (0)