CS fixes

1 files changed, 50 insertions, 45 deletions

diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 929dda299..496c95146 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -20,7 +20,7 @@
 */
 
 if (!$OUTPUT->ajax_call) {
-  return;
+    return;
 }
 
 $save_arr      = array();
@@ -28,28 +28,28 @@ $dont_override = (array) $RCMAIL->config->get('dont_override');
 
 // is there a sort type for this request?
 if ($sort = rcube_utils::get_input_value('_sort', rcube_utils::INPUT_GET)) {
-  // yes, so set the sort vars
-  list($sort_col, $sort_order) = explode('_', $sort);
-
-  // set session vars for sort (so next page and task switch know how to sort)
-  if (!in_array('message_sort_col', $dont_override)) {
-    $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
-  }
-  if (!in_array('message_sort_order', $dont_override)) {
-    $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
-  }
+    // yes, so set the sort vars
+    list($sort_col, $sort_order) = explode('_', $sort);
+
+    // set session vars for sort (so next page and task switch know how to sort)
+    if (!in_array('message_sort_col', $dont_override)) {
+        $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
+    }
+    if (!in_array('message_sort_order', $dont_override)) {
+        $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
+    }
 }
 
 // is there a set of columns for this request?
 if ($cols = rcube_utils::get_input_value('_cols', rcube_utils::INPUT_GET)) {
-  $_SESSION['list_attrib']['columns'] = explode(',', $cols);
-  if (!in_array('list_cols', $dont_override)) {
-    $save_arr['list_cols'] = explode(',', $cols);
-  }
+    $_SESSION['list_attrib']['columns'] = explode(',', $cols);
+    if (!in_array('list_cols', $dont_override)) {
+        $save_arr['list_cols'] = explode(',', $cols);
+    }
 }
 
 if (!empty($save_arr)) {
-  $RCMAIL->user->save_prefs($save_arr);
+    $RCMAIL->user->save_prefs($save_arr);
 }
 
 $mbox_name = $RCMAIL->storage->get_folder();
@@ -60,27 +60,30 @@ $RCMAIL->storage->folder_sync($mbox_name);
 
 // initialize searching result if search_filter is used
 if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
-  $search_request = md5($mbox_name.$_SESSION['search_scope'].$_SESSION['search_filter']);
-  $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());
-  $_SESSION['search'] = $RCMAIL->storage->get_search_set();
-  $_SESSION['search_request'] = $search_request;
-  $OUTPUT->set_env('search_request', $search_request);
-  $OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
+    $search_request = md5($mbox_name.$_SESSION['search_scope'].$_SESSION['search_filter']);
+    $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());
+
+    $_SESSION['search']         = $RCMAIL->storage->get_search_set();
+    $_SESSION['search_request'] = $search_request;
+
+    $OUTPUT->set_env('search_request', $search_request);
+    $OUTPUT->set_env('search_filter', $_SESSION['search_filter']);
 }
 
 // fetch message headers
-if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh'])))
-  $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order());
+if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh']))) {
+    $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order());
+}
 
 // update search set (possible change of threading mode)
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
     && $_SESSION['search_request'] == $_REQUEST['_search']
 ) {
-  $_SESSION['search'] = $RCMAIL->storage->get_search_set();
+    $_SESSION['search'] = $RCMAIL->storage->get_search_set();
 }
 // remove old search data
 else if (empty($_REQUEST['_search']) && isset($_SESSION['search'])) {
-  $RCMAIL->session->remove('search');
+    $RCMAIL->session->remove('search');
 }
 
 // empty result? we'll skip UNSEEN counting in rcmail_send_unread_count()
@@ -104,33 +107,35 @@ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_nam
 
 // remove old message rows if commanded by the client
 if (!empty($_REQUEST['_clear'])) {
-  $OUTPUT->command('clear_message_list');
+    $OUTPUT->command('clear_message_list');
 }
 
 // add message rows
 rcmail_js_message_list($a_headers, false, $cols);
 
 if (isset($a_headers) && count($a_headers)) {
-  if ($search_request) {
-    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
-  }
-
-  // remember last HIGHESTMODSEQ value (if supported)
-  // we need it for flag updates in check-recent
-  $data = $RCMAIL->storage->folder_data($mbox_name);
-  if (!empty($data['HIGHESTMODSEQ'])) {
-    $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
-  }
+    if ($search_request) {
+        $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+    }
+
+    // remember last HIGHESTMODSEQ value (if supported)
+    // we need it for flag updates in check-recent
+    $data = $RCMAIL->storage->folder_data($mbox_name);
+    if (!empty($data['HIGHESTMODSEQ'])) {
+        $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
+    }
 }
 else {
-  // handle IMAP errors (e.g. #1486905)
-  if ($err_code = $RCMAIL->storage->get_error_code()) {
-    $RCMAIL->display_server_error();
-  }
-  else if ($search_request)
-    $OUTPUT->show_message('searchnomatch', 'notice');
-  else
-    $OUTPUT->show_message('nomessagesfound', 'notice');
+    // handle IMAP errors (e.g. #1486905)
+    if ($err_code = $RCMAIL->storage->get_error_code()) {
+        $RCMAIL->display_server_error();
+    }
+    else if ($search_request) {
+        $OUTPUT->show_message('searchnomatch', 'notice');
+    }
+    else {
+        $OUTPUT->show_message('nomessagesfound', 'notice');
+    }
 }
 
 // set trash folder state