summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-01-16 11:41:09 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-01-16 11:41:09 +0100
commitb6100d9ed21f355b6b492d30aa3426a87be96298 (patch)
tree1c55eb66a5483530b44c875d89ec49dfd367561f /program
parentd53b60406c8070f363d42b32a21670ae68f56cc1 (diff)
parent010a350715f1a36eab666fe26d3118ed025133c1 (diff)
Merge branch 'dev-multi-folder-search' of github.com:roundcube/roundcubemail into dev-multi-folder-search
after rebasing to master
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc1
-rw-r--r--program/steps/mail/move_del.inc4
-rw-r--r--program/steps/mail/search.inc17
3 files changed, 21 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index cc2c7e0b5..3848ec540 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -210,7 +210,6 @@ function rcmail_get_uids()
return $result;
}
-
/**
* Returns default search mods
*/
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 26c724597..9a8b4a3ac 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -32,7 +32,11 @@ $trash = $RCMAIL->config->get('trash_mbox');
// 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 9b5aa2fc1..67fee755d 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -147,6 +147,23 @@ if ($_SESSION['search'][1]->multi) {
$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);