Fix sorting bug e-mail backup stats

Author: Pascal Dreissen

interface/web/mail/backup_stats.php

@@ -21,16 +21,19 @@ public function prepareDataRow($rec)
 		$app->uses('functions');
 
 		$rec = parent::prepareDataRow($rec);
-
-		$rec['active'] = "Yes";
-		if ($rec['backup_interval'] === 'none') {
-			$rec['active']        = "No";
+		//var_dump($rec);
+		$rec['active'] = $app->lng('yes_txt');
+		if ($rec['backup_interval'] === 'none' || $rec['backup_interval'] === '') {
+			$rec['backup_interval'] = strtolower($app->lng('None'));
+			$rec['active'] = $app->lng('no_txt');
 			$rec['backup_copies'] = 0;
 		}
+		$rec['interval_sort'] = $rec['type'] . $rec['backup_interval'];
 		$recBackup = $app->db->queryOneRecord('SELECT COUNT(backup_id) AS backup_count FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
 		$rec['backup_copies_exists'] = $recBackup['backup_count'];
 		unset($recBackup);
 		$recBackup = $app->db->queryOneRecord('SELECT SUM(filesize) AS backup_size FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
+		$rec['backup_size_sort'] = $recBackup['backup_size'];
 		$rec['backup_size'] = $app->functions->formatBytes($recBackup['backup_size']);
 
 		return $rec;

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

@@ -29,7 +29,7 @@
 $liste["auth"]    = "yes";
 
 // mark columns for php sorting (no real mySQL columns)
-$liste["phpsort"] = array('used_sort', 'files');
+$liste["phpsort"] = array('active', 'interval_sort', 'backup_size_sort', 'backup_copies_exists');
 
 
 /*****************************************************
@@ -52,3 +52,14 @@
 		'valuefield'  => 'server_name'
 	)
 );
+$liste["item"][] = array(   'field'     => "email",
+        'datatype'  => "VARCHAR",
+        'filters'   => array( 0 => array( 'event' => 'SHOW',
+                        'type' => 'IDNTOUTF8')
+        ),
+        'formtype'  => "TEXT",
+        'op'        => "like",
+        'prefix'    => "%",
+        'suffix'    => "%",
+        'width'     => "",
+        'value'     => "");

interface/web/mail/templates/backup_stats_list.htm

@@ -9,13 +9,24 @@ <h1><tmpl_var name="list_head_txt"></h1>
 <table class="table">
                 <thead class="dark form-group-sm">
 					<tr>
-						<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
-						<th data-column="domain"><tmpl_var name="domain_txt"></th>
-						<th data-column="backup_server"><tmpl_var name="backup_server_txt"></th>
-						<th data-column="backup_interval"><tmpl_var name="backup_interval_txt"></th>
-						<th data-column="backup_count"><tmpl_var name="backup_count_txt"></th>
-						<th data-column="backup_size"><tmpl_var name="backup_size_txt"></th>
+						<th class="col-md-1" data-column="active"><tmpl_var name="active_txt"></th>
+						<th class="col-md-3" data-column="email"><tmpl_var name="domain_txt"></th>
+						<th class="col-md-3" data-column="server_id"><tmpl_var name="backup_server_txt"></th>
+						<th class="col-md-2" data-column="interval_sort"><tmpl_var name="backup_interval_txt"></th>
+						<th class="col-md-2" data-column="backup_copies_exists"><tmpl_var name="backup_count_txt"></th>
+						<th class="col-md-2" data-column="backup_size_sort"><tmpl_var name="backup_size_txt"></th>
 					</tr>
+<tr>
+                                        <td class="active">&nbsp;</td>
+                                        <td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                                        <td class="backup_server">&nbsp;</td>
+                                        <td class="backup_interval">&nbsp;</td>
+                                        <td class="backup_count">&nbsp;</td>
+                                        <td class="text-right">
+                                                <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>
+                                        </td>
+                                </tr>
+
                 </thead>
 				<tbody>
 					<tmpl_loop name="records">