Skip to content

Commit 18f1915

Browse files
shirosaidevshirosaidev
committed
updates
1 parent 33e5fe0 commit 18f1915

2 files changed

Lines changed: 8 additions & 48 deletions

File tree

‎diskover-web/public/results.php‎

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,8 @@
549549
<a class="pathdark" href="search.php?index=<?php echo $esIndex; ?>&amp;submitted=true&amp;p=1&amp;q=parent_path:<?php echo rawurlencode(escape_chars($parentpath)); ?>&amp;path=<?php echo rawurlencode($parentpath); ?>"><?php echo $file['parent_path']; ?></a>
550550
</td>
551551
<?php } ?>
552-
<th><?php echo formatBytes($file['size']); ?>
553-
</td>
554-
<?php if (!in_array('sizedu', $hiddencol)) { ?><th> <?php echo formatBytes($file['size_du']); ?>
555-
</td><?php } ?>
552+
<td><?php echo formatBytes($file['size']); ?></td>
553+
<?php if (!in_array('sizedu', $hiddencol)) { ?><td><?php echo formatBytes($file['size_du']); ?></td><?php } ?>
556554
<?php if (!in_array('sizep', $hiddencol)) { ?><td>
557555
<?php $width = ($total_size > 0) ? $file['size'] / $total_size * 100 : 0; ?>
558556
<?php if ($width > 0) { ?>
@@ -561,54 +559,14 @@
561559
</div>
562560
<?php } ?>
563561
</td><?php } ?>
564-
<?php if (!in_array('modified', $hiddencol)) { ?><th><?php echo utcTimeToLocal($file['mtime']); ?></td><?php } ?>
565-
<?php if (!in_array('accessed', $hiddencol)) { ?><th><?php echo utcTimeToLocal($file['atime']); ?></td><?php } ?>
562+
<?php if (!in_array('modified', $hiddencol)) { ?><td><?php echo utcTimeToLocal($file['mtime']); ?></td><?php } ?>
563+
<?php if (!in_array('accessed', $hiddencol)) { ?><td><?php echo utcTimeToLocal($file['atime']); ?></td><?php } ?>
566564
<?php if ($_GET['doctype'] == 'directory' || $_GET['doctype'] == '') { ?>
567565
<?php if (!in_array('files', $hiddencol)) { ?>
568-
<th>
569-
<?php if ($file['type'] == 'directory') {
570-
echo number_format($file['file_count']); ?>
571-
<!-- show comparison file count -->
572-
<?php if ($esIndex2 != "") { ?>
573-
<?php
574-
$filecount_change = 0;
575-
if ($file['file_count'] > 0 && $fileinfo_index2[3] > 0) {
576-
$filecount_change = number_format(changePercent($file['file_count'], $fileinfo_index2[3]), 1);
577-
} else if ($file['file_count'] > 0 && $fileinfo_index2[3] == 0) {
578-
$filecount_change = 100.0;
579-
}
580-
if ($filecount_change != 0) { ?>
581-
<br><small><?php echo number_format($fileinfo_index2[3]); ?>
582-
<br><span style="color:<?php echo $filecount_change > 0 ? "red" : "#29FE2F"; ?>;">(<?php echo $filecount_change > 0 ? '<i class="fa fa-caret-up"></i> +' : '<i class="fa fa-caret-down"></i>'; ?>
583-
<?php echo $filecount_change; ?>%)</span></small>
584-
<?php }
585-
} ?>
586-
<!-- end show comparison file count -->
587-
<?php } ?>
588-
</td>
566+
<td><?php if ($file['type'] == 'directory') { echo number_format($file['file_count']); ?><?php } ?></td>
589567
<?php } ?>
590568
<?php if (!in_array('folders', $hiddencol)) { ?>
591-
<th>
592-
<?php if ($file['type'] == 'directory') {
593-
echo number_format($file['dir_count']); ?>
594-
<!-- show comparison file count -->
595-
<?php if ($esIndex2 != "") { ?>
596-
<?php
597-
$dircount_change = 0;
598-
if ($file['dir_count'] > 0 && $fileinfo_index2[4] > 0) {
599-
$dircount_change = number_format(changePercent($file['dir_count'], $fileinfo_index2[4]), 1);
600-
} else if ($file['dir_count'] > 0 && $fileinfo_index2[4] == 0) {
601-
$dircount_change = 100.0;
602-
}
603-
if ($dircount_change != 0) { ?>
604-
<br><small><?php echo number_format($fileinfo_index2[4]); ?>
605-
<br><span style="color:<?php echo $dircount_change > 0 ? "red" : "#29FE2F"; ?>;">(<?php echo $dircount_change > 0 ? '<i class="fa fa-caret-up"></i> +' : '<i class="fa fa-caret-down"></i>'; ?>
606-
<?php echo $dircount_change; ?>%)</span></small>
607-
<?php }
608-
} ?>
609-
<!-- end show comparison file count -->
610-
<?php } ?>
611-
</td>
569+
<td><?php if ($file['type'] == 'directory') { echo number_format($file['dir_count']); ?><?php } ?></td>
612570
<?php } ?>
613571
<?php } ?>
614572
<?php if (!in_array('owner', $hiddencol)) { ?><td><?php echo $file['owner']; ?></td><?php } ?>

‎diskover-web/public/search.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ function gtag(){dataLayer.push(arguments);}
267267
$js_fullpaths = json_encode($fullpaths);
268268
echo "var js_fullpaths = " . $js_fullpaths . ";\n";
269269
?>
270+
// log indexinfo time to console
271+
console.log('indexinfotime: <?php echo $indexinfotime; ?> ms');
270272
</script>
271273
</body>
272274

0 commit comments

Comments
 (0)