*
* IMAP search routines
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
+ * @subpackage imap
* @deprecated This search interface has been largely replaced by asearch
*/
$color, $search_position = '', $search_all, $count_all) {
global $message_highlight_list, $squirrelmail_language, $languages,
- $index_order, $pos, $allow_charset_search, $uid_support,
+ $index_order, $pos, $allow_charset_search,
$imap_server_type;
$pos = $search_position;
$multi_search = explode(' ', $search_what);
$search_string = '';
- /* it seems macosx does not support the prefered search
+ /* it seems macosx does not support the prefered search
syntax so we fall back to the older style. This IMAP
server has a problem with multiple search terms. Instead
of returning the messages that match all the terms it
if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
$languages[$squirrelmail_language]['CHARSET']) {
$ss = "SEARCH CHARSET "
- . strtoupper($languages[$squirrelmail_language]['CHARSET'])
+ . strtoupper($languages[$squirrelmail_language]['CHARSET'])
. " ALL $search_string";
} else {
$ss = "SEARCH ALL $search_string";
}
/* read data back from IMAP */
- $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, $uid_support);
+ $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, TRUE);
/* try US-ASCII charset if search fails */
- if (isset($languages[$squirrelmail_language]['CHARSET'])
+ if (isset($languages[$squirrelmail_language]['CHARSET'])
&& strtolower($result) == 'no') {
$ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
- $readin = sqimap_run_command ($imapConnection, $ss, true,
+ $readin = sqimap_run_command ($imapConnection, $ss, true,
$result, $message);
}
-?>
+?>
\ No newline at end of file