Skip to content

Commit 1efafdd

Browse files
author
Pascal Dreissen
committed
Merge branch 'master' into 'applemooz_master'
Master See merge request pdreissen/ispconfig3!35
2 parents bb2dcd9 + dca272b commit 1efafdd

36 files changed

+580
-376
lines changed

‎helper_scripts/utils.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/bash
2+
3+
# this is a bash script library to be called by other scripts,
4+
# but not to be run directly
5+
26
# Copyright (c) 2009, Scott Barr <gsbarr@gmail.com>
37
# All rights reserved.
48
#

‎install/tpl/master_cf_amavis10027.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-o strict_rfc821_envelopes=yes
1313
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
1414
-o smtp_send_xforward_command=yes
15-
-o milter_default_action=accept
16-
-o milter_macro_daemon_name=ORIGINATING
15+
-o milter_default_action=accept
16+
-o milter_macro_daemon_name=ORIGINATING
1717
-o disable_dns_lookups=yes
1818

‎interface/lib/classes/functions.inc.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,14 @@ public function intval($string, $force_numeric = false) {
281281
* @return string - formated bytes
282282
*/
283283
public function formatBytes($size, $precision = 2) {
284-
$base=log($size)/log(1024);
285284
$suffixes=array('', ' kB', ' MB', ' GB', ' TB');
286-
return round(pow(1024, $base-floor($base)), $precision).$suffixes[floor($base)];
285+
if($size != 0 || is_nan($size)) {
286+
$base=log($size)/log(1024);
287+
$tmpoutput = round(pow(1024, $base-floor($base)), $precision).$suffixes[floor($base)];
288+
} else {
289+
$tmpoutput = "0 " . $suffixes[1];
290+
}
291+
return $tmpoutput;
287292
}
288293

289294
/** IDN converter wrapper.

‎interface/web/mail/backup_stats.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@ public function prepareDataRow($rec)
2121
$app->uses('functions');
2222

2323
$rec = parent::prepareDataRow($rec);
24-
25-
$rec['active'] = "Yes";
26-
if ($rec['backup_interval'] === 'none') {
27-
$rec['active'] = "No";
24+
//var_dump($rec);
25+
$rec['active'] = $app->lng('yes_txt');
26+
if ($rec['backup_interval'] === 'none' || $rec['backup_interval'] === '') {
27+
$rec['backup_interval'] = strtolower($app->lng('None'));
28+
$rec['active'] = $app->lng('no_txt');
2829
$rec['backup_copies'] = 0;
2930
}
31+
$rec['interval_sort'] = $rec['type'] . $rec['backup_interval'];
3032
$recBackup = $app->db->queryOneRecord('SELECT COUNT(backup_id) AS backup_count FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
3133
$rec['backup_copies_exists'] = $recBackup['backup_count'];
3234
unset($recBackup);
3335
$recBackup = $app->db->queryOneRecord('SELECT SUM(filesize) AS backup_size FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
36+
$rec['backup_size_sort'] = $recBackup['backup_size'];
3437
$rec['backup_size'] = $app->functions->formatBytes($recBackup['backup_size']);
3538

3639
return $rec;

‎interface/web/mail/list/backup_stats.list.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
$liste["auth"] = "yes";
3030

3131
// mark columns for php sorting (no real mySQL columns)
32-
$liste["phpsort"] = array('used_sort', 'files');
32+
$liste["phpsort"] = array('active', 'interval_sort', 'backup_size_sort', 'backup_copies_exists');
3333

3434

3535
/*****************************************************
@@ -52,3 +52,14 @@
5252
'valuefield' => 'server_name'
5353
)
5454
);
55+
$liste["item"][] = array( 'field' => "email",
56+
'datatype' => "VARCHAR",
57+
'filters' => array( 0 => array( 'event' => 'SHOW',
58+
'type' => 'IDNTOUTF8')
59+
),
60+
'formtype' => "TEXT",
61+
'op' => "like",
62+
'prefix' => "%",
63+
'suffix' => "%",
64+
'width' => "",
65+
'value' => "");

‎interface/web/mail/list/mail_user_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', 'last_month', 'this_year', 'last_year');
46+
$liste["phpsort"] = array('this_month_sort', 'last_month_sort', 'this_year_sort', 'last_year_sort');
4747

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

‎interface/web/mail/list/user_quota_stats.list.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
// mark columns for php sorting (no real mySQL columns)
4444
$liste["phpsort"] = array('used_sort', 'percentage_sort');
45-
4645
/*****************************************************
4746
* Suchfelder
4847
*****************************************************/

‎interface/web/mail/mail_user_stats.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,31 @@ function prepareDataRow($rec)
3535
//** Traffic of the current month
3636
$tmp_date = date('Y-m');
3737
$tmp_rec = $app->db->queryOneRecord("SELECT traffic as t FROM mail_traffic WHERE mailuser_id = ? AND month = ?", $rec['mailuser_id'], $tmp_date);
38+
$rec['this_month_sort'] = $tmp_rec['t'];
3839
// $rec['this_month'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
3940
$rec['this_month'] = $app->functions->formatBytes($tmp_rec['t']);
4041
if ($rec['this_month'] == 'NAN') $rec['this_month'] = '0 KB';
4142

4243
//** Traffic of the current year
4344
$tmp_date = date('Y');
4445
$tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic) as t FROM mail_traffic WHERE mailuser_id = ? AND month like ?", $rec['mailuser_id'], $tmp_date . '%');
46+
$rec['this_year_sort'] = $tmp_rec['t'];
4547
// $rec['this_year'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
4648
$rec['this_year'] = $app->functions->formatBytes($tmp_rec['t']);
4749
if ($rec['this_year'] == 'NAN') $rec['this_year'] = '0 KB';
4850

4951
//** Traffic of the last month
5052
$tmp_date = date('Y-m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
5153
$tmp_rec = $app->db->queryOneRecord("SELECT traffic as t FROM mail_traffic WHERE mailuser_id = ? AND month = ?", $rec['mailuser_id'], $tmp_date);
54+
$rec['last_month_sort'] = $tmp_rec['t'];
5255
// $rec['last_month'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
5356
$rec['last_month'] = $app->functions->formatBytes($tmp_rec['t']);
5457
if ($rec['last_month'] == 'NAN') $rec['last_month'] = '0 KB';
5558

5659
//** Traffic of the last year
5760
$tmp_date = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
5861
$tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic) as t FROM mail_traffic WHERE mailuser_id = ? AND month like ?", $rec['mailuser_id'], $tmp_date . '%');
62+
$rec['last_year_sort'] = $tmp_rec['t'];
5963
// $rec['last_year'] = number_format($app->functions->intval($tmp_rec['t'])/1024/1024, 0, '.', ' ');
6064
$rec['last_year'] = $app->functions->formatBytes($tmp_rec['t']);
6165
if ($rec['last_year'] == 'NAN') $rec['last_year'] = '0 KB';

‎interface/web/mail/templates/backup_stats_list.htm‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,24 @@ <h1><tmpl_var name="list_head_txt"></h1>
99
<table class="table">
1010
<thead class="dark form-group-sm">
1111
<tr>
12-
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
13-
<th data-column="domain"><tmpl_var name="domain_txt"></th>
14-
<th data-column="backup_server"><tmpl_var name="backup_server_txt"></th>
15-
<th data-column="backup_interval"><tmpl_var name="backup_interval_txt"></th>
16-
<th data-column="backup_count"><tmpl_var name="backup_count_txt"></th>
17-
<th data-column="backup_size"><tmpl_var name="backup_size_txt"></th>
12+
<th class="col-md-1" data-column="active"><tmpl_var name="active_txt"></th>
13+
<th class="col-md-3" data-column="email"><tmpl_var name="domain_txt"></th>
14+
<th class="col-md-3" data-column="server_id"><tmpl_var name="backup_server_txt"></th>
15+
<th class="col-md-2" data-column="interval_sort"><tmpl_var name="backup_interval_txt"></th>
16+
<th class="col-md-2" data-column="backup_copies_exists"><tmpl_var name="backup_count_txt"></th>
17+
<th class="col-md-2" data-column="backup_size_sort"><tmpl_var name="backup_size_txt"></th>
1818
</tr>
19+
<tr>
20+
<td class="active">&nbsp;</td>
21+
<td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
22+
<td class="backup_server">&nbsp;</td>
23+
<td class="backup_interval">&nbsp;</td>
24+
<td class="backup_count">&nbsp;</td>
25+
<td class="text-right">
26+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="mail/backup_stats.php"><span class="icon icon-filter"></span></button>
27+
</td>
28+
</tr>
29+
1930
</thead>
2031
<tbody>
2132
<tmpl_loop name="records">

‎interface/web/mail/templates/mail_user_stats_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
99
<table class="table">
1010
<thead class="dark form-group-sm">
1111
<tr>
12-
<th data-column="email"><tmpl_var name="email_txt"></th>
13-
<th data-column="this_month"><tmpl_var name="this_month_txt"></th>
14-
<th data-column="last_month"><tmpl_var name="last_month_txt"></th>
15-
<th data-column="this_year"><tmpl_var name="this_year_txt"></th>
16-
<th data-column="last_year"><tmpl_var name="last_year_txt"></th>
12+
<th class="col-md-3" data-column="email"><tmpl_var name="email_txt"></th>
13+
<th class="col-md-1" data-column="this_month_sort"><tmpl_var name="this_month_txt"></th>
14+
<th class="col-md-1" data-column="last_month_sort"><tmpl_var name="last_month_txt"></th>
15+
<th class="col-md-1" data-column="this_year_sort"><tmpl_var name="this_year_txt"></th>
16+
<th class="col-md-1" data-column="last_year_sort"><tmpl_var name="last_year_txt"></th>
1717
<th class="small-col text-right">{tmpl_var name='search_limit'}</th>
1818
</tr>
1919
<tr>

0 commit comments

Comments
 (0)