From b6100d9ed21f355b6b492d30aa3426a87be96298 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 05:41:09 -0500
Subject: [PATCH] Merge branch 'dev-multi-folder-search' of github.com:roundcube/roundcubemail into dev-multi-folder-search after rebasing to master
---
program/steps/mail/search.inc | 17 +++++++++++++++++
program/steps/mail/func.inc | 1 -
skins/larry/mail.css | 4 ++++
program/steps/mail/move_del.inc | 4 ++++
4 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index cc2c7e0..3848ec5 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -210,7 +210,6 @@
return $result;
}
-
/**
* Returns default search mods
*/
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 26c7245..9a8b4a3 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -32,7 +32,11 @@
// move messages
if ($RCMAIL->action == 'move' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
+<<<<<<< HEAD
$target = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
+=======
+ $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
+>>>>>>> 010a350715f1a36eab666fe26d3118ed025133c1
$trash = $RCMAIL->config->get('trash_mbox');
foreach (rcmail_get_uids() as $mbox => $uids) {
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 9b5aa2f..67fee75 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -147,6 +147,23 @@
$OUTPUT->command('select_folder', '');
}
+// Add 'folder' column to list
+if ($_SESSION['search'][1]->multi) {
+ $a_show_cols = $_SESSION['list_attrib']['columns'] ? $_SESSION['list_attrib']['columns'] : (array)$CONFIG['list_cols'];
+ if (!in_array('folder', $a_show_cols))
+ $a_show_cols[] = 'folder';
+
+ // make message UIDs unique by appending the folder name
+ foreach ($result_h as $i => $header) {
+ $header->uid .= '-'.$header->folder;
+ $header->flags['skip_mbox_check'] = true;
+ if ($header->parent_uid)
+ $header->parent_uid .= '-'.$header->folder;
+ }
+
+ $OUTPUT->command('select_folder', '');
+}
+
// Make sure we got the headers
if (!empty($result_h)) {
rcmail_js_message_list($result_h, false, $a_show_cols);
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index bf77201..35d79d1 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -501,6 +501,10 @@
width: 135px;
}
+.messagelist tr td.folder {
+ width: 135px;
+}
+
.messagelist tr td.hidden {
display: none;
}
--
Gitblit v1.9.1