From 6ac9395fbd8fed837d4f40501e4e6cd089243b96 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date: Sat, 02 Aug 2014 10:46:29 -0400
Subject: [PATCH] Use Net_LDAP3
---
program/include/rcmail.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index b105eb8..ceb369a 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -427,6 +427,9 @@
$this->output->set_env('user_id', $this->user->get_hash());
}
+ // set compose mode for all tasks (message compose step can be triggered from everywhere)
+ $this->output->set_env('compose_extwin', $this->config->get('compose_extwin',false));
+
// add some basic labels to client
$this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout',
'refreshing', 'windowopenerror');
@@ -1684,7 +1687,8 @@
$quota = $this->plugins->exec_hook('quota', $quota);
$quota_result = (array) $quota;
- $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+ $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+ $quota_result['folder'] = $folder !== null && $folder !== '' ? $folder : 'INBOX';
if ($quota['total'] > 0) {
if (!isset($quota['percent'])) {
@@ -1746,10 +1750,6 @@
unset($quota_result['abort']);
if (empty($quota_result['table'])) {
unset($quota_result['all']);
- }
-
- if ($folder !== null && $folder !== '') {
- $quota_result['folder'] = $folder;
}
return $quota_result;
--
Gitblit v1.9.1