mirror of
https://github.com/prasathmani/tinyfilemanager
synced 2024-05-17 21:16:38 +02:00
Merge 4ecf842f4a
into ca4b1b1743
This commit is contained in:
commit
72892a9ec8
|
@ -720,6 +720,9 @@ if (isset($_POST['newfilename'], $_POST['newfile'], $_POST['token']) && !FM_READ
|
|||
}
|
||||
$FM_PATH=FM_PATH; fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
|
||||
}
|
||||
if (isset($_POST['foldersize'])) {
|
||||
$_SESSION[FM_SESSION_ID]['foldersize'] = !($_SESSION[FM_SESSION_ID]['foldersize']??false);
|
||||
}
|
||||
|
||||
// Copy folder / file
|
||||
if (isset($_GET['copy'], $_GET['finish']) && !FM_READONLY) {
|
||||
|
@ -2071,7 +2074,7 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
|
|||
$modif = date(FM_DATETIME_FORMAT, $modif_raw);
|
||||
$date_sorting = strtotime(date("F d Y H:i:s.", $modif_raw));
|
||||
$filesize_raw = "";
|
||||
$filesize = lng('Folder');
|
||||
$filesize = $_SESSION[FM_SESSION_ID]['foldersize']??false ? fm_get_filesize(fm_foldersize($path . '/' . $f)) : lng('Folder');
|
||||
$perms = substr(decoct(fileperms($path . '/' . $f)), -4);
|
||||
if (function_exists('posix_getpwuid') && function_exists('posix_getgrgid')) {
|
||||
$owner = posix_getpwuid(fileowner($path . '/' . $f));
|
||||
|
@ -2230,6 +2233,8 @@ $tableTheme = (FM_THEME == "dark") ? "text-white bg-dark table-dark" : "bg-white
|
|||
<a href="javascript:document.getElementById('a-tar').click();" class="btn btn-small btn-outline-primary btn-2"><i class="fa fa-file-archive-o"></i> <?php echo lng('Tar') ?> </a></li>
|
||||
<li class="list-inline-item"><input type="submit" class="hidden" name="copy" id="a-copy" value="Copy">
|
||||
<a href="javascript:document.getElementById('a-copy').click();" class="btn btn-small btn-outline-primary btn-2"><i class="fa fa-files-o"></i> <?php echo lng('Copy') ?> </a></li>
|
||||
<li class="list-inline-item"><input type="submit" class="hidden" name="foldersize" id="a-foldersize" value="Foldersize">
|
||||
<a href="javascript:document.getElementById('a-foldersize').click();" class="btn btn-small btn-outline-primary btn-2 <?php echo $_SESSION[FM_SESSION_ID]['foldersize']??false ? 'btn-active':''; ?>"><i class="fa fa-pie-chart"></i> <?php echo lng('Foldersize') ?> </a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-3 d-none d-sm-block"><a href="https://tinyfilemanager.github.io" target="_blank" class="float-right text-muted">Tiny File Manager <?php echo VERSION; ?></a></div>
|
||||
|
@ -2274,6 +2279,26 @@ function verifyToken($token)
|
|||
}
|
||||
return false;
|
||||
}
|
||||
function fm_foldersize($path) {
|
||||
$total_size = 0;
|
||||
$files = scandir($path);
|
||||
$cleanPath = rtrim($path, '/'). '/';
|
||||
foreach($files as $t) {
|
||||
if ($t<>"." && $t<>"..") {
|
||||
$currentFile = $cleanPath . $t;
|
||||
if (is_dir($currentFile)) {
|
||||
$size = fm_foldersize($currentFile);
|
||||
$total_size += $size;
|
||||
}
|
||||
else {
|
||||
$size = filesize($currentFile);
|
||||
$total_size += $size;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $total_size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete file or folder (recursively)
|
||||
|
@ -3849,6 +3874,7 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal';
|
|||
.table-hover>tbody>tr:hover>td:first-child { border-left: 1px solid #1b77fd; }
|
||||
#main-table tr.even { background-color: #F8F9Fa; }
|
||||
.filename>a>i {margin-right: 3px;}
|
||||
.btn-active { background-color: yellow; }
|
||||
</style>
|
||||
<?php
|
||||
if (FM_THEME == "dark"): ?>
|
||||
|
|
Loading…
Reference in a new issue