Aleksander Machniak
2014-06-02 5c1bbffd7229ff27bf41f2568d0b46cc5a93c461
CS fixes
1 files modified
11 ■■■■ changed files
program/steps/mail/list.inc 11 ●●●● patch | view | raw | blame | history
program/steps/mail/list.inc
@@ -62,15 +62,18 @@
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']);
}
// fetch message headers
if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh'])))
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'])
@@ -127,11 +130,13 @@
  if ($err_code = $RCMAIL->storage->get_error_code()) {
    $RCMAIL->display_server_error();
  }
  else if ($search_request)
    else if ($search_request) {
    $OUTPUT->show_message('searchnomatch', 'notice');
  else
    }
    else {
    $OUTPUT->show_message('nomessagesfound', 'notice');
}
}
// set trash folder state
if ($mbox_name === $RCMAIL->config->get('trash_mbox')) {