Skip to content

Commit 66190e1

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
Master See merge request !156
2 parents 9bde82f + b3f0183 commit 66190e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+416
-3
lines changed

‎interface/web/mail/backup_stats.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class list_action extends listform_actions {
1818
public function prepareDataRow($rec)
1919
{
2020
global $app;
21+
$app->uses('functions');
2122

2223
$rec = parent::prepareDataRow($rec);
2324

@@ -28,6 +29,9 @@ public function prepareDataRow($rec)
2829
}
2930
$recBackup = $app->db->queryOneRecord('SELECT COUNT(backup_id) AS backup_count FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
3031
$rec['backup_copies_exists'] = $recBackup['backup_count'];
32+
unset($recBackup);
33+
$recBackup = $app->db->queryOneRecord('SELECT SUM(filesize) AS backup_size FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
34+
$rec['backup_size'] = $app->functions->formatBytes($recBackup['backup_size']);
3135

3236
return $rec;
3337
}

‎interface/web/mail/lib/lang/ar_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/bg_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/br_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/cz_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/de_backup_stats_list.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22
$wb["list_head_txt"] = 'Backup Statistiken';
3-
$wb["database_name_txt"] = '';
43
$wb['active_txt'] = 'Aktiv';
54
$wb['domain_txt'] = 'Email';
65
$wb['backup_count_txt'] = 'Anz. Backups';
76
$wb['backup_server_txt'] = 'Server';
87
$wb['backup_interval_txt'] = 'Intervall / Anz.';
8+
$wb['backup_size_txt'] = 'Backupgrösse';
99
?>

‎interface/web/mail/lib/lang/el_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/en_backup_stats_list.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22
$wb["list_head_txt"] = 'Backup Stats';
3-
$wb["database_name_txt"] = '';
43
$wb['active_txt'] = 'Active';
54
$wb['domain_txt'] = 'Email';
65
$wb['backup_count_txt'] = 'Backup count';
76
$wb['backup_server_txt'] = 'Server';
87
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
99
?>

‎interface/web/mail/lib/lang/es_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

‎interface/web/mail/lib/lang/fi_backup_stats_list.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
$wb["list_head_txt"] = 'Backup Stats';
3+
$wb['active_txt'] = 'Active';
4+
$wb['domain_txt'] = 'Email';
5+
$wb['backup_count_txt'] = 'Backup count';
6+
$wb['backup_server_txt'] = 'Server';
7+
$wb['backup_interval_txt'] = 'Interval / cnt.';
8+
$wb['backup_size_txt'] = 'Backupsize';
9+
?>

0 commit comments

Comments
 (0)