kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Some quotas displaying bugs fixed

This commit is contained in:
Axel ROGER 2012-12-26 10:21:14 +00:00
parent 192d169ae7
commit 331b8828f7
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bureau/admin/quotas_oneuser.php
View File

@ -55,11 +55,9 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
foreach ($domaines_user as $domaine) { foreach ($domaines_user as $domaine) {
$alias_sizes = $quota->get_size_mail_details_domain($domaine); $alias_sizes = $quota->get_size_mail_details_domain($domaine);
$domsize = 0; $domsize = 0;
$d = $quota->get_size_unit($domsize);
foreach ($alias_sizes as $e) { foreach ($alias_sizes as $e) {
if($e['size'] > 0) { if($e['size'] > 0) {
$domsize += $e['size']; $domsize += $e['size'];
$d = $quota->get_size_unit($domsize);
echo "<tr><td>{$domaine}</td>"; echo "<tr><td>{$domaine}</td>";
echo "<td>".str_replace("_","@",$e["alias"])."</td>"; echo "<td>".str_replace("_","@",$e["alias"])."</td>";
echo "<td"; if ($mode!=2) echo " style=\"text-align: right\""; echo ">"; echo "<td"; if ($mode!=2) echo " style=\"text-align: right\""; echo ">";
@ -79,6 +77,9 @@ if (!isset($mode)) { # when included from adm_login, mode is not set
echo "</td></tr>"; echo "</td></tr>";
} }
} }
$d = $quota->get_size_unit($domsize);
if ($totalmail) { if ($totalmail) {
$tpc = intval(100 * $domsize / $totalmail); $tpc = intval(100 * $domsize / $totalmail);
} else { } else {

70
bureau/admin/quotas_users.php
View File

@ -89,20 +89,29 @@ if (isset($error) && $error) {
$mlc = $quota->get_size_mailman_count_user($mUID); $mlc = $quota->get_size_mailman_count_user($mUID);
$tmpdb = $quota->get_size_db_sum_user($mData["login"]); $tmpdb = $quota->get_size_db_sum_user($mData["login"]);
$totaldb += $tmpdb; $totaldb += $tmpdb;
$dbc = $quota->get_size_db_count_user($mData["login"]); $dbc = $quota->get_size_db_count_user($mData["login"]);
} }
$totaltotal=$totalweb+$totallist+$totalmail+($totaldb/1024); // en Ko $tmptotal=$totalweb+$totallist+$totalmail+($totaldb/1024);
$totaltotal=$quota->get_size_unit($tmptotal);
} }
else else
{ {
$totalweb = $quota->get_size_web_sum_all(); $tmptotalweb = $quota->get_size_web_sum_all(); // In KB
$totalmail = $quota->get_size_mail_sum_all(); $totalweb=$quota->get_size_unit($tmptotalweb * 1024);
$totallist = $quota->get_size_mailman_sum_all();
$totaldb = $quota->get_size_db_sum_all();
$totaltotal=$totalweb+$totallist+$totalmail+($totaldb/1024); // en Ko $tmptotalmail = $quota->get_size_mail_sum_all(); // In B
$totalmail=$quota->get_size_unit($tmptotalmail);
$tmptotallist = $quota->get_size_mailman_sum_all(); // IN KB
$totallist=$quota->get_size_unit($tmptotallist * 1024);
$tmptotaldb = $quota->get_size_db_sum_all(); // IN B
$totaldb=$quota->get_size_unit($tmptotaldb);
$tmptotaltotal=($tmptotalweb*1024)+($tmptotallist*1024)+$tmptotalmail+($tmptotaldb/1024); // IN B
$totaltotal=$quota->get_size_unit($tmptotaltotal);
$dc = $dom->count_domains_all(); $dc = $dom->count_domains_all();
$mc = $quota->get_size_mail_count_all(); $mc = $quota->get_size_mail_count_all();
@ -121,28 +130,28 @@ if (isset($error) && $error) {
<tr> <tr>
<th><?php __("Domains"); ?></th> <th><?php __("Domains"); ?></th>
<td><?php echo $dc; ?></td> <td><?php echo $dc; ?></td>
<td><?php echo sprintf("%.1f", $totalweb / 1024); ?>&nbsp;Mo</td> <td><?php echo sprintf("%.1f", $totalweb['size'])."&nbsp;".$totalweb['unit']; ?></td>
</tr> </tr>
<tr> <tr>
<th><?php __("Email addresses"); ?></th> <th><?php __("Email addresses"); ?></th>
<td><?php echo $mc; ?></td> <td><?php echo $mc; ?></td>
<td><?php echo sprintf("%.1f", $totalmail / 1024); ?>&nbsp;Mo</td> <td><?php echo sprintf("%.1f", $totalmail['size'])."&nbsp;".$totalmail['unit']; ?></td>
</tr> </tr>
<?php if ($mlc) { ?> <?php if ($mlc) { ?>
<tr> <tr>
<th><?php __("Mailman lists"); ?></th> <th><?php __("Mailman lists"); ?></th>
<td><?php echo $mlc; ?></td> <td><?php echo $mlc; ?></td>
<td><?php echo sprintf("%.1f", $totallist / 1024); ?>&nbsp;Mo</td> <td><?php echo sprintf("%.1f", $totallist['size'])."&nbsp;".$totallist['unit']; ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr> <tr>
<th><?php __("MySQL Databases"); ?></th> <th><?php __("MySQL Databases"); ?></th>
<td><?php echo $dbc; ?></td> <td><?php echo $dbc; ?></td>
<td><?php echo sprintf("%.1f", $totaldb / 1024 / 1024); ?>&nbsp;Mo</td> <td><?php echo sprintf("%.1f", $totaldb['size'])."&nbsp;".$totaldb['unit']; ?></td>
</tr> </tr>
<tr> <tr>
<th colspan="2"><?php __("Total"); ?></th> <th colspan="2"><?php __("Total"); ?></th>
<td><?php echo sprintf("%.1f", $totaltotal / 1024); ?>&nbsp;Mo</td> <td><?php echo sprintf("%.1f", $totaltotal['size'])."&nbsp;".$totaltotal['unit']; ?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -189,7 +198,7 @@ if ($cuid != 2000)
foreach ($mList as $mUID => $mData) foreach ($mList as $mUID => $mData)
{ {
$tmpweb = $quota->get_size_web_sum_user($mUID); $tmpweb = $quota->get_size_web_sum_user($mUID);
$totalweb += $tmpweb; $totalweb += $tmpweb;
if (!empty($mData["domaines"])) if (!empty($mData["domaines"]))
{ {
@ -197,18 +206,18 @@ if ($cuid != 2000)
{ {
$dc++; $dc++;
$tmpmail = $quota->get_size_mail_sum_domain($domaine); $tmpmail = $quota->get_size_mail_sum_domain($domaine);
$totalmail += $tmpmail; $totalmail += $tmpmail;
$mc = $quota->get_size_mail_count_domain($domaine); $mc = $quota->get_size_mail_count_domain($domaine);
$tmplist = $quota->get_size_mailman_sum_domain($domaine); $tmplist = $quota->get_size_mailman_sum_domain($domaine);
$totallist += $tmplist; $totallist += $tmplist;
} }
} }
$mlc = $quota->get_size_mailman_count_user($mUID); $mlc = $quota->get_size_mailman_count_user($mUID);
$tmpdb = $quota->get_size_db_sum_user($mData["login"]); $tmpdb = $quota->get_size_db_sum_user($mData["login"]);
$totaldb += $tmpdb; $totaldb += $tmpdb;
$dbc = $quota->get_size_db_count_user($mData["login"]); $dbc = $quota->get_size_db_count_user($mData["login"]);
} }
@ -221,7 +230,7 @@ else
$totaldb = $quota->get_size_db_sum_all(); $totaldb = $quota->get_size_db_sum_all();
} }
$totaltotal=$totalweb+$totallist+$totalmail+($totaldb/1024); // en Ko $totaltotal=$totalweb+$totallist+($totalmail/1024)+($totaldb/1024); // In KB
if ($totaltotal==0) $totaltotal=1; if ($totaltotal==0) $totaltotal=1;
if ($cuid != 2000) { if ($cuid != 2000) {
@ -249,6 +258,13 @@ foreach ($membres_list as $c) {
$mls+=$mlstmp; $mls+=$mlstmp;
} }
$mailsize=$quota->get_size_unit($ms);
if($mls != 0)
$mailmansize=$quota->get_size_unit($mls);
else
$mailmansize=$quota->get_size_unit($quota->get_size_mailman_sum_user($c["uid"]) * 1024);
// Mail Count // Mail Count
$maildomains_list = $mail->enum_domains($c["uid"]); $maildomains_list = $mail->enum_domains($c["uid"]);
$mc = 0; $mc = 0;
@ -256,17 +272,15 @@ foreach ($membres_list as $c) {
$mc += $md['nb_mail']; $mc += $md['nb_mail'];
} }
if (isset($mailman)) {
// Mailman List Count // Mailman List Count
$mlc = $mailman->count_ml_user($c["uid"]); $mlc = $mailman->count_ml_user($c["uid"]);
echo "</td><td>$dc</td><td>$mc</td><td>$mlc</td><td"; echo "</td><td>$dc</td><td>$mc</td><td>$mlc</td><td";
if ($mode!=2) echo " style=\"text-align: right\""; if ($mode!=2) echo " style=\"text-align: right\"";
echo ">"; echo ">";
} // isset mailman
// Espace WEB // Espace WEB
$ws = $quota->get_size_web_sum_user($c["uid"]); $ws = $quota->get_size_web_sum_user($c["uid"]);
$webspace=$quota->get_size_unit($ws * 1024);
if (isset($totalweb) && $totalweb){ if (isset($totalweb) && $totalweb){
$pc=intval(100*$ws/$totalweb); $pc=intval(100*$ws/$totalweb);
} }
@ -275,7 +289,7 @@ if (isset($mailman)) {
} }
if ($mode==0) { if ($mode==0) {
echo sprintf("%.1f", $ws / 1024)."&nbsp;"._("MB"); echo sprintf("%.1f", $webspace['size'])."&nbsp;".$webspace['unit'];
} elseif ($mode==1) { } elseif ($mode==1) {
echo sprintf("%.1f",$pc)."&nbsp;%"; echo sprintf("%.1f",$pc)."&nbsp;%";
} else { } else {
@ -293,7 +307,7 @@ else
$pc=0; $pc=0;
if ($mode==0) { if ($mode==0) {
echo sprintf("%.1f", $ms / 1024)."&nbsp;Mo"; echo sprintf("%.1f", $mailsize['size'])."&nbsp;".$mailsize['unit'];
} elseif ($mode==1) { } elseif ($mode==1) {
echo sprintf("%.1f",$pc)."&nbsp;%"; echo sprintf("%.1f",$pc)."&nbsp;%";
} else { } else {
@ -311,7 +325,7 @@ else
$pc=0; $pc=0;
if ($mode==0) { if ($mode==0) {
echo sprintf("%.1f", $mls / 1024)."&nbsp;"._("MB"); echo sprintf("%.1f", $mailmansize['size'])."&nbsp;".$mailmansize['unit'];
} elseif ($mode==1) { } elseif ($mode==1) {
echo sprintf("%.1f",$pc)."&nbsp;%"; echo sprintf("%.1f",$pc)."&nbsp;%";
} else { } else {
@ -324,6 +338,7 @@ echo ">";
// Espace DB : // Espace DB :
$ds = $quota->get_size_db_sum_user($c["login"]); $ds = $quota->get_size_db_sum_user($c["login"]);
$dbsize=$quota->get_size_unit($ds);
if ($totaldb) if ($totaldb)
$pc=intval(100*$ds/$totaldb); $pc=intval(100*$ds/$totaldb);
@ -331,7 +346,7 @@ else
$pc=0; $pc=0;
if ($mode==0) { if ($mode==0) {
echo sprintf("%.1f", $ds / 1024/1024)."&nbsp;"._("MB"); echo sprintf("%.1f", $dbsize['size'])."&nbsp;".$dbsize['unit'];
} elseif ($mode==1) { } elseif ($mode==1) {
echo sprintf("%.1f",$pc)."&nbsp;%"; echo sprintf("%.1f",$pc)."&nbsp;%";
} else { } else {
@ -342,9 +357,10 @@ echo "</td><td";
if ($mode!=2) echo " style=\"text-align: right\""; if ($mode!=2) echo " style=\"text-align: right\"";
echo ">"; echo ">";
$ts=$ds/1024+$ws+$ms+$mls; $ts=$ds/1024+$ws+$ms/1024+$mls; // In KB
$totalsize=$quota->get_size_unit($ts * 1024);
if ($mode==0) { if ($mode==0) {
echo sprintf("%.1f", $ts/1024)."&nbsp;"._("MB"); echo sprintf("%.1f", $totalsize['size'])."&nbsp;".$totalsize['unit'];
} elseif ($mode==1) { } elseif ($mode==1) {
echo sprintf("%.1f",(100*$ts/$totaltotal))."&nbsp;%"; echo sprintf("%.1f",(100*$ts/$totaltotal))."&nbsp;%";
} else { } else {