From: Michael M Slusarz Date: Tue, 29 Sep 2009 19:36:56 +0000 (-0600) Subject: Recent Searches was mislabeled as Saved Searches X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0b0306b7fcc26d001ed67b687c26de4cd587a9e8;p=horde.git Recent Searches was mislabeled as Saved Searches --- diff --git a/imp/js/search.js b/imp/js/search.js index dbfc7c98d..7c0abf50f 100644 --- a/imp/js/search.js +++ b/imp/js/search.js @@ -42,7 +42,7 @@ var ImpSearch = { stripeAllElements(); }, - updateSavedSearches: function(searches) + updateRecentSearches: function(searches) { var fragment = document.createDocumentFragment(), node = new Element('OPTION'); diff --git a/imp/search.php b/imp/search.php index 765b1ef48..5bf7c6476 100644 --- a/imp/search.php +++ b/imp/search.php @@ -115,18 +115,18 @@ $js_load = array( 'ImpSearch.updateFolderList(' . Horde_Serialize::serialize($folders, Horde_Serialize::JSON, $charset) . ')' ); -/* Process list of saved searches. */ -$saved_searches = $imp_search->listQueries(IMP_Search::LIST_SEARCH | IMP_Search::NO_BASIC_SEARCH, false); -if (!empty($saved_searches)) { - $ss = array(); - foreach ($saved_searches as $key => $val) { - $ss[$key] = array( +/* Process list of recent searches. */ +$recent_searches = $imp_search->listQueries(IMP_Search::LIST_SEARCH | IMP_Search::NO_BASIC_SEARCH, false); +if (!empty($recent_searches)) { + $rs = array(); + foreach ($recent_searches as $key => $val) { + $rs[$key] = array( 'c' => $imp_search->getCriteria($key), 'l' => Horde_String::truncate($val), 'v' => $key ); } - $js_load[] = 'ImpSearch.updateSavedSearches(' . Horde_Serialize::serialize($ss, Horde_Serialize::JSON, $charset) . ')'; + $js_load[] = 'ImpSearch.updateRecentSearches(' . Horde_Serialize::serialize($rs, Horde_Serialize::JSON, $charset) . ')'; } /* Preselect mailboxes. */