Merge branch 'dev-multi-folder-search' of github.com:roundcube/roundcubemail into dev-multi-folder-search

after rebasing to master

program/steps/mail/func.inc

@@ -210,7 +210,6 @@ function rcmail_get_uids()
     return $result;
 }
 
-
 /**
  * Returns default search mods
  */

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) {

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);

skins/larry/mail.css

@@ -501,6 +501,10 @@ table.messagelist.fixedcopy {
 	width: 135px;
 }
 
+.messagelist tr td.folder {
+	width: 135px;
+}
+
 .messagelist tr td.hidden {
 	display: none;
 }