maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

rework monthly traffic stats mail

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-04 16:08:07 +01:00
parent 0608713b6a
commit 338eca4eb6
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Froxlor/Cron/Traffic/ReportsCron.php
View File

@@ -263,34 +263,35 @@ class ReportsCron extends FroxlorCron
Database::pexecute($customers_stmt, $customers_data); Database::pexecute($customers_stmt, $customers_data);
while ($customer = $customers_stmt->fetch(PDO::FETCH_ASSOC)) { while ($customer = $customers_stmt->fetch(PDO::FETCH_ASSOC)) {
$t = $customer['traffic_used_total'] / 1048576; $customer['traffic'] *= 1024;
$t = $customer['traffic_used_total'];
if ($customer['traffic'] > 0) { if ($customer['traffic'] > 0) {
$p = (($customer['traffic_used_total'] * 100) / $customer['traffic']); $p = (($customer['traffic_used_total'] * 100) / $customer['traffic']);
$tg = $customer['traffic'] / 1048576; $tg = $customer['traffic'];
$str = sprintf('%00.1f GB ( %00.1f %% )', $t, $p); $str = sprintf('%s ( %00.1f %% )', PhpHelper::sizeReadable($t, null, 'bi'), $p);
$mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . sprintf('%00.1f GB', $tg) . "\n"; $mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . sprintf('%s', PhpHelper::sizeReadable($tg, null, 'bi')) . "\n";
} elseif ($customer['traffic'] == 0) { } elseif ($customer['traffic'] == 0) {
$str = sprintf('%00.1f GB ( - )', $t); $str = sprintf('%s ( - )', PhpHelper::sizeReadable($t, null, 'bi'));
$mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . '0' . "\n"; $mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . '0' . "\n";
} else { } else {
$str = sprintf('%00.1f GB ( - )', $t); $str = sprintf('%s ( - )', PhpHelper::sizeReadable($t, null, 'bi'));
$mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . 'unlimited' . "\n"; $mail_body .= sprintf('%-15s', $customer['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . 'unlimited' . "\n";
} }
} }
$mail_body .= '---------------------------------------------------------------' . "\n"; $mail_body .= '---------------------------------------------------------------' . "\n";
$t = $row['traffic_used_total'] / 1048576; $t = $row['traffic_used_total'];
if ($row['traffic'] > 0) { if ($row['traffic'] > 0) {
$p = (($row['traffic_used_total'] * 100) / $row['traffic']); $p = (($row['traffic_used_total'] * 100) / $row['traffic']);
$tg = $row['traffic'] / 1048576; $tg = $row['traffic'];
$str = sprintf('%00.1f GB ( %00.1f %% )', $t, $p); $str = sprintf('%s ( %00.1f %% )', PhpHelper::sizeReadable($t, null, 'bi'), $p);
$mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . sprintf('%00.1f GB', $tg) . "\n"; $mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . sprintf('%s', PhpHelper::sizeReadable($tg, null, 'bi')) . "\n";
} elseif ($row['traffic'] == 0) { } elseif ($row['traffic'] == 0) {
$str = sprintf('%00.1f GB ( - )', $t); $str = sprintf('%s ( - )', PhpHelper::sizeReadable($t, null, 'bi'));
$mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . '0' . "\n"; $mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . '0' . "\n";
} else { } else {
$str = sprintf('%00.1f GB ( - )', $t); $str = sprintf('%s ( - )', PhpHelper::sizeReadable($t, null, 'bi'));
$mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . 'unlimited' . "\n"; $mail_body .= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-25s', $str) . ' ' . 'unlimited' . "\n";
} }
@@ -300,6 +301,7 @@ class ReportsCron extends FroxlorCron
$mail->SetFrom($row['email'], $row['name']); $mail->SetFrom($row['email'], $row['name']);
$mail->Subject = $mail_subject; $mail->Subject = $mail_subject;
$mail->Body = $mail_body; $mail->Body = $mail_body;
$mail->MsgHTML(nl2br($mail_body));
$mail->AddAddress($row['email'], $row['name']); $mail->AddAddress($row['email'], $row['name']);
$mail->Send(); $mail->Send();
} catch (\PHPMailer\PHPMailer\Exception $e) { } catch (\PHPMailer\PHPMailer\Exception $e) {