Skip to content

Commit 392d23b

Browse files
jaapmarcusjaapmarcus
authored
Add Quota info to the user list (hestiacp#3487)
* Include quota in user list * Minor improvements * Fix 1000mb and display it at 1.0gb
1 parent 53d33ee commit 392d23b

File tree

5 files changed

+34
-19
lines changed

5 files changed

+34
-19
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,10 @@
12391239
width: 90px;
12401240
}
12411241

1242+
&.compact-6 {
1243+
width: 100px;
1244+
}
1245+
12421246
&.compact-4 {
12431247
width: 130px;
12441248
}

‎web/css/themes/default.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/inc/main.php‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ function humanize_time($usage) {
346346
}
347347
}
348348

349-
function humanize_usage_size($usage) {
349+
function humanize_usage_size($usage, $round = 2) {
350350
if ($usage == "unlimited") {
351351
return "∞";
352352
}
@@ -356,33 +356,47 @@ function humanize_usage_size($usage) {
356356
$usage = $usage / 1024;
357357
if ($usage > 1024) {
358358
$usage = $usage / 1024;
359-
$usage = number_format($usage, 2);
359+
$usage = number_format($usage, $round);
360360
} else {
361-
$usage = number_format($usage, 2);
361+
if ($usage > 1000) {
362+
$usage = $usage / 1024;
363+
}
364+
$usage = number_format($usage, $round);
362365
}
363366
} else {
364-
$usage = number_format($usage, 2);
367+
if ($usage > 1000) {
368+
$usage = $usage / 1024;
369+
}
370+
$usage = number_format($usage, $round);
371+
}
372+
} else {
373+
if ($usage > 1000) {
374+
$usage = $usage / 1024;
365375
}
376+
$usage = number_format($usage, $round);
377+
}
378+
if (strlen($usage) > 4) {
379+
return number_format($usage, $round - 1);
366380
}
367381
return $usage;
368382
}
369383

370384
function humanize_usage_measure($usage) {
371385
if ($usage == "unlimited") {
372-
return "mb";
386+
return;
373387
}
374388

375389
$measure = "kb";
376390
if ($usage > 1024) {
377391
$usage = $usage / 1024;
378392
if ($usage > 1024) {
379393
$usage = $usage / 1024;
380-
$measure = $usage > 1024 ? "pb" : "tb";
394+
$measure = $usage < 1024 ? "tb" : "pb";
381395
} else {
382-
$measure = "gb";
396+
$measure = $usage < 1024 ? "gb" : "tb";
383397
}
384398
} else {
385-
$measure = "mb";
399+
$measure = $usage < 1024 ? "mb" : "gb";
386400
}
387401
return $measure;
388402
}

‎web/templates/pages/list_mail_acc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class="data-controls js-confirm-action"
190190
</div>
191191

192192
<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
193-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _(humanize_usage_size($data[$key]["QUOTA"])) ?></b> <span class="u-text-small"><?= _(humanize_usage_measure($data[$key]["QUOTA"])) ?></span></div>
193+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=humanize_usage_size($data[$key]["QUOTA"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["QUOTA"]) ?></span></div>
194194
<div class="clearfix l-unit__stat-col--left u-text-center">
195195
<i class="fas <?= $alias_icon ?>"></i>
196196
</div>

‎web/templates/pages/list_user.php‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@
6969
</div>
7070
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Name") ?></b></div>
7171
<div class="clearfix l-unit__stat-col--left compact-3"><b>&nbsp;</b></div>
72-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Package") ?></b></div>
72+
<div class="clearfix l-unit__stat-col--left u-text-center width"><b><?= _("Package") ?></b></div>
7373
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><?= _("IPs") ?></b></div>
74-
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-hard-drive" title="<?= _("Disk") ?>"></i></b></div>
75-
<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
74+
<div class="clearfix l-unit__stat-col--left u-text-center compact-6"><b><i class="fas fa-hard-drive" title="<?= _("Disk") ?>"></i></b></div>
75+
<div class="clearfix l-unit__stat-col--left u-text-center compact-6"><b><i class="fas fa-right-left" title="<?= _("Bandwidth") ?>"></i></b></div>
7676
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-earth-americas" title="<?= _("Web Domains") ?>"></i></b></div>
7777
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-book-atlas" title="<?= _("DNS Domains") ?>"></i></b></div>
7878
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-envelopes-bulk" title="<?= _("Mail Domains") ?>"></i></b></div>
7979
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-database" title="<?= _("Databases") ?>"></i></b></div>
80-
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-clock" title="<?= _("Cron Jobs") ?>"></i></b></div>
8180
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><i class="fas fa-file-zipper" title="<?= _("Backups") ?>"></i></b></div>
8281
</div>
8382
</div>
@@ -161,7 +160,7 @@ class="data-controls js-confirm-action"
161160
</div>
162161
</div>
163162
<!-- END QUICK ACTION TOOLBAR AREA -->
164-
<div class="clearfix l-unit__stat-col--left u-text-center">
163+
<div class="clearfix l-unit__stat-col--left u-text-center width">
165164
<b>
166165
<?php if ($data[$key]["PACKAGE"] === "system") { ?>
167166
<?= $data[$key]["PACKAGE"] ?>
@@ -171,19 +170,17 @@ class="data-controls js-confirm-action"
171170
</b>
172171
</div>
173172
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><?= $data[$key]["IP_OWNED"] ?></div>
174-
<div class="clearfix l-unit__stat-col--left u-text-center super-compact"><b><?= humanize_usage_size($data[$key]["U_DISK"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span></div>
175-
<div class="clearfix l-unit__stat-col--left u-text-center compact"><b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?></span></div>
173+
<div class="clearfix l-unit__stat-col--left u-text-center compact-6"><b><?= humanize_usage_size($data[$key]["U_DISK"],1) ?></b><span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_DISK"]) ?></span> / <b><?= humanize_usage_size($data[$key]["DISK_QUOTA"],1) ?></b><span class="u-text-small"><?= humanize_usage_measure($data[$key]["DISK_QUOTA"]) ?></span></div>
174+
<div class="clearfix l-unit__stat-col--left u-text-center compact-6"><b><?= humanize_usage_size($data[$key]["U_BANDWIDTH"],1) ?></b><span class="u-text-small"><?= humanize_usage_measure($data[$key]["U_BANDWIDTH"]) ?></span> / <b><?= humanize_usage_size($data[$key]["BANDWIDTH"],1) ?></b><span class="u-text-small"><?= humanize_usage_measure($data[$key]["BANDWIDTH"]) ?></span></div>
176175
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_WEB_DOMAINS"] ?> <?= _("Web Domains") ?>"><span class="badge"><b><?= $data[$key]["U_WEB_DOMAINS"] ?></b></span></div>
177176
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_DNS_DOMAINS"] ?> <?= _("DNS Domains") ?>"><span class="badge"><b><?= $data[$key]["U_DNS_DOMAINS"] ?></b></span></div>
178177
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_MAIL_DOMAINS"] ?> <?= _("Mail Domains") ?>"><span class="badge"><b><?= $data[$key]["U_MAIL_DOMAINS"] ?></b></span></div>
179178
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_DATABASES"] ?> <?= _("Databases") ?>"><span class="badge"><b><?= $data[$key]["U_DATABASES"] ?></b></span></div>
180-
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_CRON_JOBS"] ?> <?= _("Cron Jobs") ?>"><span class="badge"><b><?= $data[$key]["U_CRON_JOBS"] ?></b></span></div>
181179
<div class="clearfix l-unit__stat-col--left u-text-center super-compact" title="<?= $data[$key]["U_BACKUPS"] ?> <?= _("Backups") ?>"><span class="badge"><b><?= $data[$key]["U_BACKUPS"] ?></b></span></div>
182180
</div>
183181
</div>
184182
<?php } ?>
185183
</div>
186-
187184
<footer class="app-footer">
188185
<div class="container app-footer-inner">
189186
<p>

0 commit comments

Comments
 (0)