Skip to content

Commit 1dc92d0

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 7d571f0 + 3307986 commit 1dc92d0

11 files changed

+55
-35
lines changed

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@
577577
'formtype' => 'SELECT',
578578
'default' => '1',
579579
'datasource' => array ( 'type' => 'SQL',
580-
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name',
580+
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
581581
'keyfield'=> 'server_id',
582582
'valuefield'=> 'server_name'
583583
),
@@ -589,7 +589,7 @@
589589
'separator' => ',',
590590
'default' => '1',
591591
'datasource' => array ( 'type' => 'SQL',
592-
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND {AUTHSQL} ORDER BY server_name',
592+
'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
593593
'keyfield'=> 'server_id',
594594
'valuefield'=> 'server_name'
595595
),
@@ -900,7 +900,7 @@
900900
'formtype' => 'SELECT',
901901
'default' => '1',
902902
'datasource' => array ( 'type' => 'SQL',
903-
'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND {AUTHSQL} ORDER BY server_name',
903+
'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
904904
'keyfield'=> 'server_id',
905905
'valuefield'=> 'server_name'
906906
),
@@ -912,7 +912,7 @@
912912
'separator' => ',',
913913
'default' => '1',
914914
'datasource' => array ( 'type' => 'SQL',
915-
'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND {AUTHSQL} ORDER BY server_name',
915+
'querystring' => 'SELECT server_id,server_name FROM server WHERE web_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
916916
'keyfield'=> 'server_id',
917917
'valuefield'=> 'server_name'
918918
),
@@ -1118,7 +1118,7 @@
11181118
'formtype' => 'SELECT',
11191119
'default' => '1',
11201120
'datasource' => array ( 'type' => 'SQL',
1121-
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
1121+
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
11221122
'keyfield'=> 'server_id',
11231123
'valuefield'=> 'server_name'
11241124
),
@@ -1130,7 +1130,7 @@
11301130
'separator' => ',',
11311131
'default' => '1',
11321132
'datasource' => array ( 'type' => 'SQL',
1133-
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
1133+
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
11341134
'keyfield'=> 'server_id',
11351135
'valuefield'=> 'server_name'
11361136
),
@@ -1160,7 +1160,7 @@
11601160
'formtype' => 'SELECT',
11611161
'default' => '1',
11621162
'datasource' => array ( 'type' => 'SQL',
1163-
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND {AUTHSQL} ORDER BY server_name',
1163+
'querystring' => 'SELECT server_id,server_name FROM server WHERE dns_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
11641164
'keyfield'=> 'server_id',
11651165
'valuefield'=> 'server_name'
11661166
),
@@ -1216,7 +1216,7 @@
12161216
'formtype' => 'SELECT',
12171217
'default' => '1',
12181218
'datasource' => array ( 'type' => 'SQL',
1219-
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name',
1219+
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
12201220
'keyfield'=> 'server_id',
12211221
'valuefield'=> 'server_name'
12221222
),
@@ -1228,7 +1228,7 @@
12281228
'separator' => ',',
12291229
'default' => '1',
12301230
'datasource' => array ( 'type' => 'SQL',
1231-
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name',
1231+
'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
12321232
'keyfield'=> 'server_id',
12331233
'valuefield'=> 'server_name'
12341234
),
@@ -1267,6 +1267,20 @@
12671267
'rows' => '',
12681268
'cols' => ''
12691269
),
1270+
'limit_database_quota' => array (
1271+
'datatype' => 'INTEGER',
1272+
'formtype' => 'TEXT',
1273+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
1274+
'errmsg'=> 'limit_database_quota_error_notint'),
1275+
),
1276+
'default' => '-1',
1277+
'value' => '',
1278+
'separator' => '',
1279+
'width' => '10',
1280+
'maxlength' => '10',
1281+
'rows' => '',
1282+
'cols' => ''
1283+
),
12701284
'limit_cron' => array (
12711285
'datatype' => 'INTEGER',
12721286
'formtype' => 'TEXT',

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
// Enable auth
4343
$liste["auth"] = "yes";
4444

45+
// mark columns for php sorting (no real mySQL columns)
46+
$liste["phpsort"] = array('this_month', 'last_month', 'this_year', 'last_year');
4547

4648
/*****************************************************
4749
* Suchfelder

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
1818
</tr>
1919
<tr>
2020
<td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
21-
<td></td>
22-
<td></td>
23-
<td></td>
24-
<td></td>
21+
<td class="this_month"></td>
22+
<td class="last_month"></td>
23+
<td class="this_year"></td>
24+
<td class="last_year"></td>
2525
<td class="text-right">
2626
<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/mail_user_stats.php"><span class="icon icon-filter"></span></button>
2727
</td>

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

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

3030
// mark columns for php sorting (no real mySQL columns)
31-
$liste["phpsort"] = array('used_sort', 'files');
31+
$liste["phpsort"] = array('server_name', 'client', 'used', 'quota', 'percentage');
3232

3333

3434
/*****************************************************

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
// Enable auth
4141
$liste["auth"] = "yes";
4242

43+
// mark columns for php sorting (no real mySQL columns)
44+
$liste["phpsort"] = array('this_month', 'last_month', 'this_year', 'last_year');
4345

4446
/*****************************************************
4547
* Suchfelder
@@ -57,4 +59,4 @@
5759
'width' => "",
5860
'value' => "");
5961

60-
?>
62+
?>

‎interface/web/sites/list/user_quota_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('used_sort', 'files');
46+
$liste["phpsort"] = array('used', 'soft', 'hard', 'files');
4747

4848

4949
/*****************************************************

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
// Enable auth
4343
$liste["auth"] = "yes";
4444

45+
// mark columns for php sorting (no real mySQL columns)
46+
$liste["phpsort"] = array('this_month', 'last_month', 'this_year', 'last_year');
4547

4648
/*****************************************************
4749
* Suchfelder

‎interface/web/sites/templates/database_quota_stats_list.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
1313
<th data-column="client"><tmpl_var name="client_txt"></th>
1414
<th data-column="used"><tmpl_var name="used_txt"></th>
1515
<th data-column="quota"><tmpl_var name="quota_txt"></th>
16-
<th><tmpl_var name="percentage_txt">
16+
<th data-column="percentage"><tmpl_var name="percentage_txt">
1717
<th class="small-col text-right">{tmpl_var name='search_limit'}</th>
1818
</tr>
1919
<tr>
2020
<td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
21-
<td>&nbsp;</td>
22-
<td>&nbsp;</td>
23-
<td>&nbsp;</td>
24-
<td>&nbsp;</td>
25-
<td>&nbsp;</td>
21+
<td class="server_name">&nbsp;</td>
22+
<td class="client">&nbsp;</td>
23+
<td class="used">&nbsp;</td>
24+
<td class="quota">&nbsp;</td>
25+
<td class="percentage">&nbsp;</td>
2626
<td class="text-right">
2727
<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="sites/database_quota_stats.php"><span class="icon icon-filter"></span></button>
2828
</td>

‎interface/web/sites/templates/ftp_sites_stats_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
1717
</tr>
1818
<tr>
1919
<td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
20-
<td><tmpl_var name="in_out_txt"></td>
21-
<td><tmpl_var name="in_out_txt"></td>
22-
<td><tmpl_var name="in_out_txt"></td>
23-
<td><tmpl_var name="in_out_txt"></td>
20+
<td class="this_month"><tmpl_var name="in_out_txt"></td>
21+
<td class="last_month"><tmpl_var name="in_out_txt"></td>
22+
<td class="this_year"><tmpl_var name="in_out_txt"></td>
23+
<td class="last_year"><tmpl_var name="in_out_txt"></td>
2424
<td class="text-right">
2525
<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="sites/ftp_sites_stats.php"><span class="icon icon-filter"></span></button>
2626
</td>
@@ -57,4 +57,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
5757
</tr>
5858
</tfoot>
5959
</table>
60-
</div>
60+
</div>

‎interface/web/sites/templates/user_quota_stats_list.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
1919
<tr>
2020
<td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
2121
<td><input class="form-control" type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
22-
<td>&nbsp;</td>
23-
<td>&nbsp;</td>
24-
<td>&nbsp;</td>
25-
<td>&nbsp;</td>
22+
<td class="used">&nbsp;</td>
23+
<td class="soft">&nbsp;</td>
24+
<td class="hard">&nbsp;</td>
25+
<td class="files">&nbsp;</td>
2626
<td class="text-right">
2727
<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="sites/user_quota_stats.php"><span class="icon icon-filter"></span></button>
2828
</td>

0 commit comments

Comments
 (0)