From 1a034323fc7cefc8dd0283ae9d1a83ce3abbaf0a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 15 Jun 2011 09:21:49 -0400
Subject: [PATCH] - Add possibility to return subscription status and css class name for folder row from "folder_save" hook - Fix folder preview frame state after folder creation
---
program/steps/settings/save_folder.inc | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index a4e752c..5467113 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -71,6 +71,7 @@
$folder['name'] = $name_imap;
$folder['oldname'] = $old_imap;
+ $folder['class'] = '';
$folder['settings'] = array(
// List view mode: 0-list, 1-threads
'view_mode' => (int) get_input_value('_viewmode', RCUBE_INPUT_POST),
@@ -82,12 +83,14 @@
// create a new mailbox
if (!$error && !strlen($old)) {
+ $folder['subscribe'] = true;
+
$plugin = $RCMAIL->plugins->exec_hook('folder_create', array('record' => $folder));
$folder = $plugin['record'];
if (!$plugin['abort']) {
- $created = $IMAP->create_mailbox($folder['name'], TRUE);
+ $created = $IMAP->create_mailbox($folder['name'], $folder['subscribe']);
}
else {
$created = $plugin['result'];
@@ -105,9 +108,11 @@
$RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
}
-
- rcmail_update_folder_row($folder['name']);
+
+ rcmail_update_folder_row($folder['name'], null, $folder['subscribe'], $folder['class']);
$OUTPUT->show_message('foldercreated', 'confirmation');
+ // reset folder preview frame
+ $OUTPUT->command('subscription_select');
$OUTPUT->send('iframe');
}
else {
@@ -163,7 +168,7 @@
$OUTPUT->show_message('folderupdated', 'confirmation');
if ($rename) {
- rcmail_update_folder_row($folder['name'], $folder['oldname']);
+ rcmail_update_folder_row($folder['name'], $folder['oldname'], $folder['subscribe'], $folder['class']);
$OUTPUT->send('iframe');
}
}
--
Gitblit v1.9.1