From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 26 Mar 2005 16:09:54 +0000 (+0000)
Subject: Drop unused file imap_search.php.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b0b33df9e58751052d432b2d2df362649f14f999;p=squirrelmail.git

Drop unused file imap_search.php.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9139 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/imap.php b/functions/imap.php
index 69085582..2cb641c4 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -18,6 +18,5 @@
 require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/imap_messages.php');
 require_once(SM_PATH . 'functions/imap_general.php');
-require_once(SM_PATH . 'functions/imap_search.php');
 
-?>
\ No newline at end of file
+?>
diff --git a/functions/imap_search.php b/functions/imap_search.php
deleted file mode 100644
index 7794caa6..00000000
--- a/functions/imap_search.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * imap_search.php
- *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * IMAP search routines
- *
- * @version $Id$
- * @package squirrelmail
- * @subpackage imap
- * @deprecated This search interface has been largely replaced by asearch
- */
-
-/**
- * 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 $squirrelmail_language, $languages, $pos, $allow_charset_search,
-           $imap_server_type;
-
-    $pos = $search_position;
-
-    /* construct the search query, taking multiple search terms into account */
-    $multi_search = array();
-    $search_what  = trim($search_what);
-    $search_what  = ereg_replace('[ ]{2,}', ' ', $search_what);
-    $multi_search = explode(' ', $search_what);
-    $search_string = '';
-
-    /* it seems macosx and hmailserver do 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' || $imap_server_type == 'hmailserver') {
-        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);
-
-    /* now use $search_string in the imap search */
-    if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
-        $languages[$squirrelmail_language]['CHARSET']) {
-        $ss = "SEARCH 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, TRUE);
-
-    /* try US-ASCII charset if search fails */
-    if (isset($languages[$squirrelmail_language]['CHARSET'])
-        && strtolower($result) == 'no') {
-        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
-        $readin = sqimap_run_command ($imapConnection, $ss, true,
-                                      $result, $message);
-    }
-
-    unset($messagelist);
-
-    /* Keep going till we find the SEARCH response */
-    foreach ($readin as $readin_part) {
-        /* Check to see if a SEARCH response was received */
-        if (substr($readin_part, 0, 9) == '* SEARCH ') {
-            $messagelist = preg_split("/ /", substr($readin_part, 9));
-        } else if (isset($errors)) {
-            $errors = $errors.$readin_part;
-        } else {
-            $errors = $readin_part;
-        }
-    }
-
-    /* If nothing is found * SEARCH should be the first error else echo errors */
-    if (isset($errors)) {
-        if (strstr($errors,'* SEARCH')) {
-            return array();
-        }
-        echo '<!-- '.htmlspecialchars($errors) .' -->';
-    }
-
-
-    global $sent_folder;
-
-    $cnt = count($messagelist);
-    for ($q = 0; $q < $cnt; $q++) {
-        $id[$q] = trim($messagelist[$q]);
-    }
-
-    $msgs = fillMessageArray($imapConnection,$id,$cnt);
-
-    return $msgs;
-}
-
-?>
\ No newline at end of file