diff options
Diffstat (limited to 'modules-available/dozmod')
5 files changed, 17 insertions, 2 deletions
diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json index fe558ed5..92977639 100644 --- a/modules-available/dozmod/lang/de/template-tags.json +++ b/modules-available/dozmod/lang/de/template-tags.json @@ -1,6 +1,7 @@ { "lang_actionTarget": "Aktionsziel", "lang_asteriskRequired": "Felder mit (*) sind erforderlich", + "lang_blockCount": "Anzahl Bl\u00f6cke", "lang_canLogin": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden", "lang_createTime": "Erstellt", "lang_currentFilter": "Aktueller Filter", @@ -21,8 +22,10 @@ "lang_emailNotifications": "EMail-Benachrichtigungen aktiviert", "lang_error": "Fehler", "lang_event": "Ereignis", + "lang_fileSize": "Dateigr\u00f6\u00dfe", "lang_followingPlaceholdersUnused": "Folgende Platzhalter m\u00fcssen im Template verwendet werden", "lang_hasNewer": "Neuere Version existiert", + "lang_hash": "Hash", "lang_heading": "Zu l\u00f6schende VM-Versionen", "lang_host": "Host", "lang_image": "VM", @@ -56,6 +59,7 @@ "lang_senderAddress": "Absenderadresse", "lang_senderName": "Absender Anzeigename", "lang_size": "Gr\u00f6\u00dfe", + "lang_spaceWastedDuplication": "Potentiell durch mehrfach vorkommende Bl\u00f6cke belegter Speicherplatz", "lang_ssl": "SSL-Modus", "lang_sslExplicit": "Explizites SSL (\"STARTTLS\")", "lang_sslImplicit": "Implizites SSL", diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json index 6a0434a3..396cb839 100644 --- a/modules-available/dozmod/lang/en/template-tags.json +++ b/modules-available/dozmod/lang/en/template-tags.json @@ -1,6 +1,7 @@ { "lang_actionTarget": "Action target", "lang_asteriskRequired": "Fields marked with (*) are required", + "lang_blockCount": "Block count", "lang_canLogin": "Members of this organization can login", "lang_createTime": "Created", "lang_currentFilter": "Current filter", @@ -21,8 +22,10 @@ "lang_emailNotifications": "E-Mail notifications enabled", "lang_error": "Error", "lang_event": "Event", + "lang_fileSize": "File size", "lang_followingPlaceholdersUnused": "The following placeholders are not being used", "lang_hasNewer": "Newer version exists", + "lang_hash": "Hash", "lang_heading": "Images marked for deletion", "lang_host": "Host", "lang_image": "VM", @@ -56,6 +59,7 @@ "lang_senderAddress": "Sender address", "lang_senderName": "Sender's display name", "lang_size": "Size", + "lang_spaceWastedDuplication": "Potentially wasted space by duplicate blocks", "lang_ssl": "SSL mode", "lang_sslExplicit": "Explicit SSL (\"STARTTLS\")", "lang_sslImplicit": "Implicit SSL", diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php index dfb49e0b..6c0c8a6b 100644 --- a/modules-available/dozmod/page.inc.php +++ b/modules-available/dozmod/page.inc.php @@ -126,11 +126,14 @@ class Page_DozMod extends Page $res = Database::simpleQuery("SELECT blocksha1, blocksize, Count(*) AS blockcount FROM sat.imageblock" . " GROUP BY blocksha1, blocksize HAVING blockcount > 1 ORDER BY blockcount DESC, blocksha1 ASC"); $data = array('hashes' => array()); + $spaceWasted = 0; while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $row['hash_hex'] = bin2hex($row['blocksha1']); $row['blocksize_s'] = Util::readableFileSize($row['blocksize']); $data['hashes'][] = $row; + $spaceWasted += $row['blocksize'] * ($row['blockcount'] - 1); } + $data['spacewasted'] = Util::readableFileSize($spaceWasted); Render::addTemplate('blockstats', $data); } diff --git a/modules-available/dozmod/templates/blockstats-details.html b/modules-available/dozmod/templates/blockstats-details.html index 68e03fbc..e9466d94 100644 --- a/modules-available/dozmod/templates/blockstats-details.html +++ b/modules-available/dozmod/templates/blockstats-details.html @@ -1,6 +1,6 @@ <table class="table table-bordered table-striped"> <tr> - <th>{{lang_imageName}}</th> + <th>{{lang_image}}</th> <th>{{lang_createTime}}</th> <th>{{lang_fileSize}}</th> <th>{{lang_blockCount}}</th> diff --git a/modules-available/dozmod/templates/blockstats.html b/modules-available/dozmod/templates/blockstats.html index 82a66146..cba3b476 100644 --- a/modules-available/dozmod/templates/blockstats.html +++ b/modules-available/dozmod/templates/blockstats.html @@ -1,8 +1,12 @@ +<div class="alert alert-info"> + {{lang_spaceWastedDuplication}}: {{spacewasted}} +</div> + <table class="table table-condensed table-striped" style="width: auto"> <tr> <th>{{lang_hash}}</th> <th>{{lang_size}}</th> - <th>{{lang_count}}</th> + <th>{{lang_blockCount}}</th> </tr> {{#hashes}} <tr> |