Fix page title and folder selection in search mode

Thomas Bruederli

2014-04-07 6dc1a6645168e5e777a3db97b92d360a9e6b0c86

Fix page title and folder selection in search mode

 program/js/app.js

@@ -712,7 +712,7 @@
          var oldmbox = this.env.search_scope == 'all' ? '*' : this.env.mailbox;
          this.env.search_mods[props] = this.env.search_mods[oldmbox];  // copy search mods from active search
          this.env.mailbox = props;
          this.env.search_scope = 'base';
          this.env.search_scope = 'sub';
          this.qsearch(this.gui_objects.qsearchbox.value);
          this.select_folder(this.env.mailbox, '', true);
          break;

 program/localization/en_US/labels.inc

@@ -319,6 +319,7 @@
$labels['spouse'] = 'Spouse';
$labels['allfields'] = 'All fields';
$labels['search'] = 'Search';
$labels['searchfor'] = 'Search for "$q"';
$labels['advsearch'] = 'Advanced Search';
$labels['advanced'] = 'Advanced';
$labels['other'] = 'Other';

 program/steps/mail/func.inc

@@ -420,7 +420,7 @@

    $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);

    if ($multifolder) {
    if ($multifolder && $_SESSION['search_scope'] == 'all') {
        $OUTPUT->command('select_folder', '');
    }


 program/steps/mail/search.inc

@@ -170,4 +170,5 @@
$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
$OUTPUT->set_pagetitle($RCMAIL->gettext(array('name' => 'searchfor', 'vars' => array('q' => $str))));
$OUTPUT->send();