/**
* imap_search.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* IMAP search routines
*
* $Id$
+ * @package squirrelmail
+ * @deprecated This search interface has been largely replaced by asearch
*/
-require_once('../functions/imap.php');
-require_once('../functions/date.php');
-require_once('../functions/array.php');
-require_once('../functions/mailbox_display.php');
-require_once('../functions/mime.php');
+/**
+ * Load up a bunch of SM functions */
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/mailbox_display.php');
+require_once(SM_PATH . 'functions/mime.php');
function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
$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, $uid_support,
+ $imap_server_type;
$pos = $search_position;
$search_what = ereg_replace('[ ]{2,}', ' ', $search_what);
$multi_search = explode(' ', $search_what);
$search_string = '';
- foreach ($multi_search as $multi_search_part) {
- $search_string .= $search_where . ' {' . strlen($multi_search_part)
- . "}\r\n" . $multi_search_part . ' ';
+
+ /* 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
+ returns the messages that match each term. Could be fixed
+ on the client side, but should be fixed on the server
+ as per the RFC */
+
+ if ($imap_server_type == 'macosx') {
+ foreach ($multi_search as $multi_search_part) {
+ if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+ $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+ }
+ $search_string .= $search_where . ' ' .$multi_search_part . ' ';
+ }
+ }
+ else {
+ foreach ($multi_search as $multi_search_part) {
+ if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+ $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+ }
+ $search_string .= $search_where . ' {' . strlen($multi_search_part)
+ . "}\r\n" . $multi_search_part . ' ';
+ }
}
$search_string = trim($search_string);
if (strstr($errors,'* SEARCH')) {
return array();
}
- echo "<!-- $errors -->";
+ echo '<!-- '.htmlspecialchars($errors) .' -->';
}