Skip to content

Commit acad34e

Browse files
author
Pascal Dreissen
committed
Merge branch 'master' into 'applemooz_master'
Master See merge request pdreissen/ispconfig3!39
2 parents 63172e6 + 161d091 commit acad34e

File tree

11 files changed

+82
-6
lines changed

11 files changed

+82
-6
lines changed

‎install/tpl/debian6_dovecot2.conf.master‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,20 @@ protocol lmtp {
6666
postmaster_address = webmaster@localhost
6767
mail_plugins = quota sieve
6868
}
69+
mail_plugins = $mail_plugins quota
70+
imap_capability=+SEPCIAL-USE XLIST
71+
namespace inbox {
72+
inbox = yes
73+
mailbox Drafts {
74+
special_use = \Drafts
75+
}
76+
mailbox Junk {
77+
special_use = \Junk
78+
}
79+
mailbox Sent {
80+
special_use = \Sent
81+
}
82+
mailbox Trash {
83+
special_use = \Trash
84+
}
85+
}

‎install/tpl/debian_dovecot2.conf.master‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,19 @@ protocol lmtp {
6565
mail_plugins = quota sieve
6666
}
6767
mail_plugins = $mail_plugins quota
68+
imap_capability=+SEPCIAL-USE XLIST
69+
namespace inbox {
70+
inbox = yes
71+
mailbox Drafts {
72+
special_use = \Drafts
73+
}
74+
mailbox Junk {
75+
special_use = \Junk
76+
}
77+
mailbox Sent {
78+
special_use = \Sent
79+
}
80+
mailbox Trash {
81+
special_use = \Trash
82+
}
83+
}

‎install/tpl/fedora_dovecot2.conf.master‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,19 @@ protocol lmtp {
6262
mail_plugins = quota sieve
6363
}
6464
mail_plugins = $mail_plugins quota
65+
imap_capability=+SEPCIAL-USE XLIST
66+
namespace inbox {
67+
inbox = yes
68+
mailbox Drafts {
69+
special_use = \Drafts
70+
}
71+
mailbox Junk {
72+
special_use = \Junk
73+
}
74+
mailbox Sent {
75+
special_use = \Sent
76+
}
77+
mailbox Trash {
78+
special_use = \Trash
79+
}
80+
}

‎install/tpl/opensuse_dovecot2.conf.master‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,19 @@ protocol lmtp {
6161
mail_plugins = quota sieve
6262
}
6363
mail_plugins = $mail_plugins quota
64+
imap_capability=+SEPCIAL-USE XLIST
65+
namespace inbox {
66+
inbox = yes
67+
mailbox Drafts {
68+
special_use = \Drafts
69+
}
70+
mailbox Junk {
71+
special_use = \Junk
72+
}
73+
mailbox Sent {
74+
special_use = \Sent
75+
}
76+
mailbox Trash {
77+
special_use = \Trash
78+
}
79+
}

‎install/tpl/system.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ tab_change_discard=n
5353
tab_change_warning=n
5454
use_loadindicator=y
5555
use_combobox=y
56+
use_ipsuggestions=y
57+
ipsuggestions_max=50
5658
maintenance_mode=n
5759
admin_dashlets_left=
5860
admin_dashlets_right=

‎interface/web/sites/lib/lang/en_web_sites_stats_list.lng‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ $wb["last_month_txt"] = 'Last month';
66
$wb["this_year_txt"] = 'This year';
77
$wb["last_year_txt"] = 'Last year';
88
$wb["sum_txt"] = 'Sum';
9-
?>
9+
$wb["percentage_txt"] = 'In use %';
10+
$wb["quota_txt"] = 'Quota';
11+
?>

‎interface/web/sites/lib/lang/nl_web_sites_stats_list.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ $wb['last_month_txt'] = 'Vorige maand';
66
$wb['this_year_txt'] = 'Dit jaar';
77
$wb['last_year_txt'] = 'Vorig jaar';
88
$wb['sum_txt'] = 'Som';
9-
$wb['quota_txt'] = 'Quota';
109
$wb['percentage_txt'] = 'In gebruik %';
10+
$wb['quota_txt'] = 'Quota';
1111
?>

‎interface/web/sites/list/web_sites_stats.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
$liste["auth"] = "yes";
4444

4545
// mark columns for php sorting (no real mySQL columns)
46-
$liste["phpsort"] = array('this_month_sort', 'last_month_sort', 'this_year_sort', 'last_year_sort');
46+
$liste["phpsort"] = array('this_month_sort', 'last_month_sort', 'this_year_sort', 'last_year_sort', 'percentage', 'quota_sort');
4747

4848
/*****************************************************
4949
* Suchfelder

‎interface/web/sites/web_sites_stats.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,13 @@ function prepareDataRow($rec)
6767
$rec['last_year'] = $app->functions->formatBytes($tmp_rec['t']);
6868
$rec['last_year_sort'] = $tmp_rec['t'];
6969
$this->sum_last_year += $tmp_rec['t'];
70+
$rec['percentage'] = $rec['traffic_quota'] == '-1' ? -1 : round((($rec['this_month_sort']/($rec['traffic_quota']*1024*1024))*100));
71+
$rec['progressbar'] = $rec['percentage'] > 100 ? 100 : $rec['percentage'];
72+
$rec['quota_sort'] = $rec['traffic_quota'];
73+
$rec['quota'] = $rec['traffic_quota'] == '-1' ? 'unlimited' : $app->functions->formatBytes($rec['traffic_quota']*1024*1024);
74+
//echo 'quota: ' . $rec['traffic_quota']*1024*1024 . ' - traffic: ' . $rec['this_month_sort'] . ' - percentage: ' . $rec['percentage'] . ' - progressbar: ' . $rec['progressbar'] . '<br/>';
7075

76+
//var_dump($rec);
7177
//* The variable "id" contains always the index variable
7278
$rec['id'] = $rec[$this->idx_key];
7379

@@ -97,3 +103,4 @@ function onShowEnd()
97103

98104

99105
?>
106+

‎interface/web/themes/default/assets/stylesheets/ispconfig.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,4 +811,4 @@ span.pbvaluemargin {
811811

812812
.ip_suggestion_server {
813813
font-weight: bold;
814-
}
814+
}

0 commit comments

Comments
 (0)