Updated to reflect 1024 size calculation systemwide, refs #1277

Fixed decimal places in customer_mysql.php

customer_email.php

@@ -56,8 +56,7 @@ if ($page == 'overview') {
 			if (!isset($emails[$row['domain']]) || !is_array($emails[$row['domain']])) {
 				$emails[$row['domain']] = array();
 			}
-
+			
-			$row['mboxsize'] = size_readable($row['mboxsize']);
 			$emails[$row['domain']][$row['email_full']] = $row;
 		}
 
@@ -106,6 +105,8 @@ if ($page == 'overview') {
 					if (strlen($row['destination']) > 35) {
 						$row['destination'] = substr($row['destination'], 0, 32) . '... (' . $destinations_count . ')';
 					}
+					
+					$row['mboxsize'] = size_readable($row['mboxsize'], 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
 
 					$row = htmlentities_array($row);
 					eval("\$accounts.=\"" . getTemplate("email/emails_email") . "\";");

customer_mysql.php

@@ -66,13 +66,13 @@ if ($page == 'overview') {
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
 			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
-				$mbdata_stmt = Database::prepare("SELECT SUM( data_length + index_length) / 1024 / 1024 'MB' FROM information_schema.TABLES
+				$mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) FROM information_schema.TABLES
 					WHERE table_schema = :table_schema
 					GROUP BY table_schema"
 				);
 				Database::pexecute($mbdata_stmt, array("table_schema" => $row['databasename']));
 				$mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC);
-				$row['size'] = number_format($mbdata['MB'], 3, '.', '');
+				$row['size'] = size_readable($mbdata['MB'], 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
 				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
 				$count++;
 			}

customer_traffic.php

@@ -79,17 +79,17 @@ if (!is_null($month) && !is_null($year)) {
 		$traf['day'] = $row['day'] . '.';
 
 		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MiB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MiB (Mail)";
 			$traf['ftp'] = bcdiv($ftp, 1024, $settings['panel']['decimal_places']);
 			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
 			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
 			$traf['byte'] = bcdiv($traf['byte'], 1024, $settings['panel']['decimal_places']);
 		} else {
-			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MiB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MiB (Mail)";
 			$traf['http'] = round($http, $settings['panel']['decimal_places']);
 			$traf['ftp'] = round($ftp, $settings['panel']['decimal_places']);
 			$traf['mail'] = round($mail, $settings['panel']['decimal_places']);
@@ -99,16 +99,10 @@ if (!is_null($month) && !is_null($year)) {
 		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
 		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
 	}
-
+	
-	if (extension_loaded('bcmath')) {
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024, $settings['panel']['decimal_places']);
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024, $settings['panel']['decimal_places']);
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024, $settings['panel']['decimal_places']);
-	} else {
-		$traffic_complete['http'] = round($traffic_complete['http'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024, $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024, $settings['panel']['decimal_places']);
-	}
 
 	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
 } else {
@@ -138,17 +132,17 @@ if (!is_null($month) && !is_null($year)) {
 		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;
 
 		if (extension_loaded('bcmath')) {
-			$traf['ftptext'] = bcdiv($ftp_up, 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($ftp_down, 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['ftptext'] = bcdiv($ftp_up, 1024, $settings['panel']['decimal_places']) . " MiB up/ " . bcdiv($ftp_down, 1024, $settings['panel']['decimal_places']) . " MiB down (FTP)";
-			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MiB (HTTP)";
-			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MiB (Mail)";
 			$traf['ftp'] = bcdiv(($ftp_up + $ftp_down), 1024, $settings['panel']['decimal_places']);
 			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
 			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
 			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, $settings['panel']['decimal_places']);
 		} else {
-			$traf['ftptext'] = round($ftp_up / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($ftp_down / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
+			$traf['ftptext'] = round($ftp_up / 1024, $settings['panel']['decimal_places']) . " MiB up/ " . round($ftp_down / 1024, $settings['panel']['decimal_places']) . " MiB down (FTP)";
-			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
+			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MiB (HTTP)";
-			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
+			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MiB (Mail)";
 			$traf['ftp'] = round(($ftp_up + $ftp_down) / 1024, $settings['panel']['decimal_places']);
 			$traf['http'] = round($http / 1024, $settings['panel']['decimal_places']);
 			$traf['mail'] = round($mail / 1024, $settings['panel']['decimal_places']);
@@ -158,15 +152,9 @@ if (!is_null($month) && !is_null($year)) {
 		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
 	}
 
-	if (extension_loaded('bcmath')) {
+	$traffic_complete['http'] = size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024 * 1024, $settings['panel']['decimal_places']);
+	$traffic_complete['ftp'] = size_readable($traffic_complete['ftp'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024 * 1024, $settings['panel']['decimal_places']);
+	$traffic_complete['mail'] = size_readable($traffic_complete['mail'] * 1024, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
-		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024 * 1024, $settings['panel']['decimal_places']);
-	} else {
-		$traffic_complete['http'] = round($traffic_complete['http'] / (1024 * 1024), $settings['panel']['decimal_places']);
-		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / (1024 * 1024), $settings['panel']['decimal_places']);
-		$traffic_complete['mail'] = round($traffic_complete['mail'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	}
 
 	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
 }

lng/english.lng.php

@@ -61,8 +61,8 @@ $lng['customer']['phone'] = 'Phone';
 $lng['customer']['fax'] = 'Fax';
 $lng['customer']['email'] = 'Email';
 $lng['customer']['customernumber'] = 'Customer ID';
-$lng['customer']['diskspace'] = 'Webspace (MB)';
+$lng['customer']['diskspace'] = 'Webspace (MiB)';
-$lng['customer']['traffic'] = 'Traffic (GB)';
+$lng['customer']['traffic'] = 'Traffic (GiB)';
 $lng['customer']['mysqls'] = 'MySQL-databases';
 $lng['customer']['emails'] = 'Email-addresses';
 $lng['customer']['accounts'] = 'Email-accounts';
@@ -720,11 +720,11 @@ $lng['traffic']['months'][9] = "September";
 $lng['traffic']['months'][10] = "October";
 $lng['traffic']['months'][11] = "November";
 $lng['traffic']['months'][12] = "December";
-$lng['traffic']['mb'] = "Traffic (MB)";
+$lng['traffic']['mb'] = "Traffic (MiB)";
 $lng['traffic']['distribution'] = '<font color="#019522">FTP</font> | <font color="#0000FF">HTTP</font> | <font color="#800000">Mail</font>';
-$lng['traffic']['sumhttp'] = 'Summation HTTP-Traffic in';
+$lng['traffic']['sumhttp'] = 'Total HTTP-Traffic';
-$lng['traffic']['sumftp'] = 'Summation FTP-Traffic in';
+$lng['traffic']['sumftp'] = 'Total FTP-Traffic';
-$lng['traffic']['summail'] = 'Summation Mail-Traffic in';
+$lng['traffic']['summail'] = 'Total Mail-Traffic';
 
 // ADDED IN 1.2.19-svn4.5
 
@@ -1870,13 +1870,13 @@ $lng['error']['session_timeout_desc'] = 'You should not set the session timeout
 $lng['admin']['assignedmax'] = 'Assigned / Max';
 $lng['admin']['usedmax'] = 'Used / Max';
 $lng['admin']['used'] = 'Used';
-$lng['mysql']['size'] = 'Database size (MB)';
+$lng['mysql']['size'] = 'Size';
 
 $lng['error']['invalidhostname'] = 'Hostname can\'t be empty nor can it consist only of whitespaces';
 
-$lng['traffic']['http'] = 'HTTP (MB)';
+$lng['traffic']['http'] = 'HTTP (MiB)';
-$lng['traffic']['ftp'] = 'FTP (MB)';
+$lng['traffic']['ftp'] = 'FTP (MiB)';
-$lng['traffic']['mail'] = 'Mail (MB)';
+$lng['traffic']['mail'] = 'Mail (MiB)';
 
 // ADDED IN 0.9.27-svn1
 $lng['serversettings']['mod_fcgid']['idle_timeout']['title'] = 'Idle Timeout';

lng/german.lng.php

@@ -61,8 +61,8 @@ $lng['customer']['phone'] = 'Telefon';
 $lng['customer']['fax'] = 'Fax';
 $lng['customer']['email'] = 'E-Mail';
 $lng['customer']['customernumber'] = 'Kundennummer';
-$lng['customer']['diskspace'] = 'Webspace (MB)';
+$lng['customer']['diskspace'] = 'Webspace (MiB)';
-$lng['customer']['traffic'] = 'Traffic (GB)';
+$lng['customer']['traffic'] = 'Traffic (GiB)';
 $lng['customer']['mysqls'] = 'MySQL-Datenbanken';
 $lng['customer']['emails'] = 'E-Mail-Adressen';
 $lng['customer']['accounts'] = 'E-Mail-Konten';
@@ -718,12 +718,12 @@ $lng['traffic']['months'][9] = "September";
 $lng['traffic']['months'][10] = "Oktober";
 $lng['traffic']['months'][11] = "November";
 $lng['traffic']['months'][12] = "Dezember";
-$lng['traffic']['mb'] = "Traffic (MB)";
+$lng['traffic']['mb'] = "Traffic (MiB)";
 $lng['traffic']['day'] = "Tag";
 $lng['traffic']['distribution'] = '<font color="#019522">FTP</font> | <font color="#0000FF">HTTP</font> | <font color="#800000">Mail</font>';
-$lng['traffic']['sumhttp'] = 'Summe HTTP-Traffic in';
+$lng['traffic']['sumhttp'] = 'Gesamt HTTP-Traffic';
-$lng['traffic']['sumftp'] = 'Summe FTP-Traffic in';
+$lng['traffic']['sumftp'] = 'Gesamt FTP-Traffic';
-$lng['traffic']['summail'] = 'Summe Mail-Traffic in';
+$lng['traffic']['summail'] = 'Gesamt Mail-Traffic';
 
 // ADDED IN 1.2.19-svn4.5
 
@@ -1597,13 +1597,13 @@ $lng['error']['session_timeout_desc'] = 'Der Wert der Session-Timeout sollte nic
 $lng['admin']['assignedmax'] = 'Zugewiesen / Max.';
 $lng['admin']['usedmax'] = 'Benutzt / Max.';
 $lng['admin']['used'] = 'Benutzt';
-$lng['mysql']['size'] = 'Datenbankgröße (MB)';
+$lng['mysql']['size'] = 'Datenbankgröße';
 
 $lng['error']['invalidhostname'] = 'Hostname darf nicht leer sein oder nur aus Leerzeichen bestehen';
 
-$lng['traffic']['http'] = 'HTTP (MB)';
+$lng['traffic']['http'] = 'HTTP (MiB)';
-$lng['traffic']['ftp'] = 'FTP (MB)';
+$lng['traffic']['ftp'] = 'FTP (MiB)';
-$lng['traffic']['mail'] = 'Mail (MB)';
+$lng['traffic']['mail'] = 'Mail (MiB)';
 
 // ADDED IN 0.9.27-svn1
 $lng['serversettings']['mod_fcgid']['idle_timeout']['title'] = 'Idle-Timeout';

templates/Froxlor/customer/email/emails_email.tpl

@@ -3,7 +3,7 @@
 	<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
 	<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
 	<if $settings['catchall']['catchall_enabled'] == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
-	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
+	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td>
 	<td>
 		<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />

templates/Froxlor/customer/traffic/traffic.tpl

@@ -15,9 +15,9 @@ $header
 
 					<table class="formtable">
 						<tr>
-							<td>{$lng['traffic']['sumftp']} GB</td>
+							<td>{$lng['traffic']['sumftp']}</td>
-							<td>{$lng['traffic']['sumhttp']} GB</td>
+							<td>{$lng['traffic']['sumhttp']}</td>
-							<td>{$lng['traffic']['summail']} GB</td>
+							<td>{$lng['traffic']['summail']}</td>
 						</tr>
 						<tr>
 							<td><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>

templates/Froxlor/customer/traffic/traffic_details.tpl

@@ -15,9 +15,9 @@ $header
 
 					<table class="formtable">
 						<tr>
-							<td>{$lng['traffic']['sumftp']} MB</td>
+							<td>{$lng['traffic']['sumftp']}</td>
-							<td>{$lng['traffic']['sumhttp']} MB</td>
+							<td>{$lng['traffic']['sumhttp']}</td>
-							<td>{$lng['traffic']['summail']} MB</td>
+							<td>{$lng['traffic']['summail']}</td>
 						</tr>
 						<tr>
 							<td><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>

templates/Sparkle/customer/email/emails_email.tpl

@@ -3,7 +3,7 @@
 	<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
 	<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
 	<if $settings['catchall']['catchall_enabled'] == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
-	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
+	<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td>
 	<td>
 		<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />

templates/Sparkle/customer/traffic/traffic.tpl

@@ -13,9 +13,9 @@ $header
 				<fieldset>
 					<table class="fullform bradius">
 						<tr>
-							<th>{$lng['traffic']['sumftp']} GB</th>
+							<th>{$lng['traffic']['sumftp']}</th>
-							<th>{$lng['traffic']['sumhttp']} GB</th>
+							<th>{$lng['traffic']['sumhttp']}</th>
-							<th>{$lng['traffic']['summail']} GB</th>
+							<th>{$lng['traffic']['summail']}</th>
 						</tr>
 						<tr>
 							<td><div style="color:#019522;">{$traffic_complete['ftp']}</div></td>

templates/Sparkle/customer/traffic/traffic_details.tpl

@@ -14,11 +14,13 @@ $header
 					<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['traffic']['traffic']} $show</legend>
 
 					<table class="formtable">
-						<tr>
+						<thead>
-							<td>{$lng['traffic']['sumftp']} MB</td>
+							<tr>
-							<td>{$lng['traffic']['sumhttp']} MB</td>
+								<th>{$lng['traffic']['sumftp']}</th>
-							<td>{$lng['traffic']['summail']} MB</td>
+								<th>{$lng['traffic']['sumhttp']}</th>
-						</tr>
+								<th>{$lng['traffic']['summail']}</th>
+							</tr>
+						</thead>
 						<tr>
 							<td><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>
 							<td><div style="color:#0000FF;text-align:center">{$traffic_complete['http']}</div></td>