thomascube
2009-07-09 742d61aaf32875645f50456d263fe649db5eef0a
program/include/rcmail.php
@@ -301,10 +301,6 @@
    if (!($this->output instanceof rcube_template))
      $this->output = new rcube_template($this->task, $framed);
    foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) {
      $this->output->set_env($js_config_var, $this->config->get($js_config_var));
    }
    // set keep-alive/check-recent interval
    if ($keep_alive = $this->config->get('keep_alive')) {
      // be sure that it's less than session lifetime
@@ -321,10 +317,10 @@
    $this->output->set_env('task', $this->task);
    $this->output->set_env('action', $this->action);
    $this->output->set_env('comm_path', $this->comm_path);
    $this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET));
    $this->output->set_charset(RCMAIL_CHARSET);
    // add some basic label to client
    $this->output->add_label('loading');
    $this->output->add_label('loading', 'servererror');
    
    return $this->output;
  }
@@ -370,6 +366,7 @@
      'imap' => $this->config->get('imap_auth_type', 'check'),
      'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
      'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'),
      'debug_mode' => (bool) $this->config->get('imap_debug', 0),
    );
    $this->imap->set_options($options);