Merge pull request #1 from Brianetta/de-svn

Aleksander Machniak

2012-05-09 66510e20d36cb8da4f3012ef063de7bfce9b51aa

 program/include/rcmail.php

@@ -325,7 +325,7 @@
    $this->output->set_charset(RCMAIL_CHARSET);

    // add some basic labels to client
    $this->output->add_label('loading', 'servererror');
    $this->output->add_label('loading', 'servererror', 'requesttimedout');

    return $this->output;
  }
@@ -520,7 +520,7 @@
      $_SESSION['storage_port'] = $port;
      $_SESSION['storage_ssl']  = $ssl;
      $_SESSION['password']     = $this->encrypt($pass);
      $_SESSION['login_time']   = mktime();
      $_SESSION['login_time']   = time();

      if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_')
        $_SESSION['timezone'] = floatval($_REQUEST['_timezone']);
@@ -1577,13 +1577,13 @@
                if ($maxlength && $maxlength > 1) {
                    $foldername = abbreviate_string($foldername, $maxlength);
                }
            }

                 $select->add(str_repeat(' ', $nestLevel*4) . $foldername, $folder['id']);
            $select->add(str_repeat(' ', $nestLevel*4) . $foldername, $folder['id']);

                if (!empty($folder['folders'])) {
                    $out .= $this->render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
                        $select, $realnames, $nestLevel+1, $opts);
                }
            if (!empty($folder['folders'])) {
                $out .= $this->render_folder_tree_select($folder['folders'], $mbox_name, $maxlength,
                    $select, $realnames, $nestLevel+1, $opts);
            }
        }