bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-11-04 05:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1296 formatting numbers on the admin health page

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2023-05-27 16:42:48 +02:00
parent c2b20a01eb
commit 5fbefb28a5
3 changed files with 100 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.php.in
View File

@@ -274,6 +274,8 @@ $config['SIZE_Y'] = 250;
$config['DATE_TEMPLATE'] = 'Y.m.d';
$config['DATE_FORMAT'] = 'YYYY-MM-DD';
$config['JQUERY_DATE_FORMAT'] = 'yy-mm-dd';
$config['DECIMAL_SEPARATOR'] = "."; // See https://www.php.net/manual/en/function.number-format
$config['THOUSANDS_SEPARATOR'] = ","; // for the format options
$config['FROM_LENGTH_TO_SHOW'] = 28;

5
webui/system/misc.php
View File

@@ -291,6 +291,11 @@ function my_qp_encode($s){
}
function format_number($n) {
return number_format($n, 0, DECIMAL_SEPARATOR, THOUSANDS_SEPARATOR);
}
function nice_size($size = 0, $space = '') {
if($size < 1000) return "1k";
if($size < 1000000) return round($size/1000) . $space . "k";

20
webui/view/theme/default/templates/health/worker.tpl
View File

@@ -67,15 +67,14 @@
</tr>
<tr>
<th><?php print $text_smtp_status; ?>:</th>
<td>
<th><?php print $text_smtp_status; ?>:</th>
<td>
<?php foreach($health['health'] as $h) {
if(preg_match("/^220/", $h[1])) {
$status = 'OK'; $class = 'text-success';
} else {
$status = 'ERROR'; $class = 'text-error';
}
?>
} ?>
<div class="<?php print $class; ?>"><span onmouseover="Tip('<?php print preg_replace("/\'/", "\'", $h[1]); ?>, <?php print $h[2]; ?>', BALLOON, true, ABOVE, true)" onmouseout="UnTip()"><?php print $h[3]; ?>: <?php print $status; ?></span></div>
<?php } ?>
</td>
@@ -114,20 +113,19 @@
<tr>
<td><?php print $text_processed_emails; ?></td>
<td>
<?php print $health['processed_emails']['last_60_mins_count']; ?> (<?php print $text_60_minutes; ?>)<br />
<?php print $health['processed_emails']['today_count']; ?> (<?php print $text_24_hours; ?>)<br />
<?php print $health['processed_emails']['last_7_days_count']; ?> (<?php print $text_1_week; ?>)<br />
<?php print $health['processed_emails']['last_30_days_count']; ?> (<?php print $text_30_days; ?>)
<?php print format_number($health['processed_emails']['last_60_mins_count']); ?> (<?php print $text_60_minutes; ?>)<br />
<?php print format_number($health['processed_emails']['today_count']); ?> (<?php print $text_24_hours; ?>)<br />
<?php print format_number($health['processed_emails']['last_7_days_count']); ?> (<?php print $text_1_week; ?>)<br />
<?php print format_number($health['processed_emails']['last_30_days_count']); ?> (<?php print $text_30_days; ?>)
</td>
</tr>
<tr>
<th colspan="2"><?php print $text_message_disposition; ?></th>
</tr>
<?php foreach($health['counters'] as $k => $v) {
if(!is_numeric($k)) { ?>
<?php foreach($health['counters'] as $k => $v) { if(!is_numeric($k)) { ?>
<tr>
<td><?php $a = preg_replace("/^_piler\:/", "", $k); if(isset($$a)) { print $$a; } else { print $k; } ?></td>
<td><?php print $v; ?></td>
<td><?php print format_number($v); ?></td>
</tr>
<?php } } ?>