- /* Construct the Search QuERY */
-
-# account for multiple search terms
-
- $multi_search = array ();
- $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
- $multi_search = split (' ', $search_what);
- if (count($multi_search)==1) {
- $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
- }
- else {
- $search_string = '';
- $count = count($multi_search);
- for ($x=0;$x<$count;$x++) {
- $search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
- }
- }
- $search_string = trim($search_string);
-
-# now use $search_string in the imap search
+ /* 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 = '';
+ foreach ($multi_search as $multi_search_part) {
+ $search_string .= $search_where . ' "' . $multi_search_part . '" ';
+ }
+/*
+ if (count($multi_search)==1) {
+ $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
+ }
+ else {
+ $search_string = '';
+ $count = count($multi_search);
+ for ($x=0;$x<$count;$x++) {
+ trim($multi_search[$x]);
+ $search_string = $search_string . ' ' . $search_where . ' "' . $multi_search[$x] . '"';
+ }
+ }
+*/
+ $search_string = trim($search_string);