projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use sqimap_session_id instead of axxxx for imap connections.
[squirrelmail.git]
/
functions
/
imap_search.php
diff --git
a/functions/imap_search.php
b/functions/imap_search.php
index 7efff2d8c2ed56622f16a1b0a97cfaf2aba44755..6180c46732e0988c09246638d85115cb3757af6c 100644
(file)
--- a/
functions/imap_search.php
+++ b/
functions/imap_search.php
@@
-20,20
+20,20
@@
function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
$urlMailbox = urlencode($mailbox);
# Construct the Search QuERY
$urlMailbox = urlencode($mailbox);
# Construct the Search QuERY
-
+ $ss = sqimap_session_id();
if (isset($languages[$squirrelmail_language]["CHARSET"]) && $languages[$squirrelmail_language]["CHARSET"]) {
if (isset($languages[$squirrelmail_language]["CHARSET"]) && $languages[$squirrelmail_language]["CHARSET"]) {
- $ss = "
a001
SEARCH CHARSET ".$languages[$squirrelmail_language]["CHARSET"]." ALL $search_where \"$search_what\"\r\n";
+ $ss = " SEARCH CHARSET ".$languages[$squirrelmail_language]["CHARSET"]." ALL $search_where \"$search_what\"\r\n";
} else {
} else {
- $ss = "
a001
SEARCH ALL $search_where \"$search_what\"\r\n";
+ $ss = " SEARCH ALL $search_where \"$search_what\"\r\n";
}
fputs($imapConnection,$ss);
# Read Data Back From IMAP
}
fputs($imapConnection,$ss);
# Read Data Back From IMAP
- $readin = sqimap_read_data ($imapConnection,
"a001"
, false, $result, $message);
+ $readin = sqimap_read_data ($imapConnection,
sqimap_session_id()
, false, $result, $message);
if (isset($languages[$squirrelmail_language]["CHARSET"]) && strtolower($result) == "no") {
if (isset($languages[$squirrelmail_language]["CHARSET"]) && strtolower($result) == "no") {
- $ss =
"a001
SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
+ $ss =
sqimap_session_id() . "
SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
fputs ($imapConnection, $ss);
fputs ($imapConnection, $ss);
- $readin = sqimap_read_data ($imapConnection,
"a001"
, true, $result, $message);
+ $readin = sqimap_read_data ($imapConnection,
sqimap_session_id()
, true, $result, $message);
}
unset($messagelist); $msgs=""; $c = 0;
}
unset($messagelist); $msgs=""; $c = 0;