Skip to content

Commit c33ec08

Browse files
author
Florian Schaal
committed
fixed #4062 - Several column don't sort at all (stable 3.1)
1 parent 621c436 commit c33ec08

10 files changed

+32
-26
lines changed

‎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>

‎interface/web/sites/templates/web_sites_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_domain" value="{tmpl_var name='search_domain'}" /></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="sites/web_sites_stats.php"><span class="icon icon-filter"></span></button>
2727
</td>

0 commit comments

Comments
 (0)