X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=f4acc08c642574d3d080d5462df50262224a10d8;hb=6332704d9e75c774f164dda49a29f87a3454f789;hp=2e216e4d8063fbdda0706783c3d4c2639a601173;hpb=61d9e88594284a19469c122a527b31b493a5dc0a;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 2e216e4d..f4acc08c 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -7,82 +7,115 @@
** $Id$
**/
+ if (defined ('imap_general_php'))
+ return;
+ define ('imap_general_php', true);
+
+ global $imap_general_debug;
$imap_general_debug = false;
+ /******************************************************************************
+ ** Sets an unique session id in order to avoid simultanous sessions crash.
+ ******************************************************************************/
+
+ function sqimap_session_id() {
+ return( substr( session_id(), -4 ) );
+ }
+
+
/******************************************************************************
** Reads the output from the IMAP stream. If handle_errors is set to true,
** this will also handle all errors that are received. If it is not set,
** the errors will be sent back through $response and $message
******************************************************************************/
- function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
- global $color, $squirrelmail_language, $imap_general_debug;
- $read = fgets($imap_stream, 9096);
+ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
+ &$response, &$message) {
+ global $color, $squirrelmail_language, $imap_general_debug;
- if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
- $size = $regs[1];
- } else {
- $size = 0;
- }
+ $read = "";
+ $resultlist = array();
- $data = array();
- $total_size = 0;
-
- $continue = true;
- while ($continue) {
- // Continue if needed for this single line
+ $more_msgs = true;
+ while ($more_msgs) {
+ $data = array();
+ $total_size = 0;
while (strpos($read, "\n") === false) {
$read .= fgets($imap_stream, 9096);
}
- // For debugging purposes
- if ($imap_general_debug) {
- echo "$read
\n";
- flush();
- }
-
- // If we know the size, no need to look at the end parameters
- if ($size > 0) {
- if ($total_size == $size) {
- $data[] = $read;
- $read = fgets($imap_stream, 9096);
- while (!ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
- $read = fgets($imap_stream, 9096);
- }
- $continue = false;
- } else if ($total_size > $size) {
- $difference = $total_size - $size;
- $total_size = $total_size - strlen($read);
- $read = substr ($read, 0, strlen($read)-$difference);
- $data[] = $read;
- $junk = fgets($imap_stream, 9096);
- $continue = false;
- } else {
- $data[] = $read;
- $read = fgets($imap_stream, 9096);
+ if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+ $size = $regs[1];
+ } else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) {
+ // Sizeless response, probably single-line
+ // For debugging purposes
+ if ($imap_general_debug) {
+ echo "$read
\n";
+ flush();
}
- $total_size += strlen($read);
+ $size = 0;
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
} else {
- if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
- $continue = false;
+ $size = 0;
+ }
+ while (1) {
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ // For debugging purposes
+ if ($imap_general_debug) {
+ echo "$read
\n";
+ flush();
+ }
+ // If we know the size, no need to look at the end parameters
+ if ($size > 0) {
+ if ($total_size == $size) {
+ // We've reached the end of this 'message', switch to the next one.
+ $data[] = $read;
+ break;
+ } else if ($total_size > $size) {
+ $difference = $total_size - $size;
+ $total_size = $total_size - strlen($read);
+ $data[] = substr ($read, 0, strlen($read)-$difference);
+ $read = substr ($read, strlen($read)-$difference, strlen($read));
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ }
+ $total_size += strlen($read);
} else {
- $data[] = $read;
- $read = fgets ($imap_stream, 9096);
+ if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets ($imap_stream, 9096);
+ }
}
}
- }
+ while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
+ !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ $read = fgets($imap_stream, 9096);
+ }
+ $resultlist[] = $data;
+ }
$response = $regs[1];
$message = trim($regs[2]);
if ($imap_general_debug) echo '--
';
if ($handle_errors == false)
- return $data;
+ return $resultlist;
if ($response == 'NO') {
// ignore this error from m$ exchange, it is not fatal (aka bug)
- if (!ereg('command resulted in',$message)) {
+ if (strstr($message, 'command resulted in') === false) {
set_up_language($squirrelmail_language);
echo "
\n";
echo _("ERROR : Could not complete request.");
@@ -100,8 +133,12 @@
echo $message . "
\n";
exit;
}
-
- return $data;
+ return $resultlist;
+ }
+
+ function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+ $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+ return $res[0];
}
/******************************************************************************
@@ -128,9 +165,9 @@
exit;
}
- fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) .
- '" "' . quotemeta($password) . "\"\r\n");
- $read = sqimap_read_data ($imap_stream, 'a001', false, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . ' LOGIN "' . quoteIMAP($username) .
+ '" "' . quoteIMAP($password) . "\"\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), false, $response, $message);
/** If the connection was not successful, lets see why **/
if ($response != "OK") {
@@ -210,16 +247,16 @@
** Simply logs out the imap session
******************************************************************************/
function sqimap_logout ($imap_stream) {
- fputs ($imap_stream, "a001 LOGOUT\r\n");
+ fputs ($imap_stream, sqimap_session_id() . " LOGOUT\r\n");
}
-function sqimap_capability($imap_stream, $capability) {
+ function sqimap_capability($imap_stream, $capability) {
global $sqimap_capabilities;
global $imap_general_debug;
if (!is_array($sqimap_capabilities)) {
- fputs ($imap_stream, "a001 CAPABILITY\r\n");
- $read = sqimap_read_data($imap_stream, 'a001', true, $a, $b);
+ fputs ($imap_stream, sqimap_session_id() . " CAPABILITY\r\n");
+ $read = sqimap_read_data($imap_stream, sqimap_session_id(), true, $a, $b);
$c = explode(' ', $read[0]);
for ($i=2; $i < count($c); $i++) {
@@ -230,24 +267,25 @@ function sqimap_capability($imap_stream, $capability) {
$sqimap_capabilities[$cap_list[0]] = TRUE;
}
}
+ if (! isset($sqimap_capabilities[$capability]))
+ return false;
return $sqimap_capabilities[$capability];
}
/******************************************************************************
** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test...
******************************************************************************/
-function sqimap_get_delimiter ($imap_stream = false) {
- global $imap_general_debug;
- global $sqimap_delimiter;
- global $optional_delimiter;
+ function sqimap_get_delimiter ($imap_stream = false) {
+ global $imap_general_debug;
+ global $sqimap_delimiter;
+ global $optional_delimiter;
- /* Use configured delimiter if set */
- if((!empty($optional_delimiter)) && $optional_delimiter != "detect") {
- return $optional_delimiter;
- }
+ /* Use configured delimiter if set */
+ if((!empty($optional_delimiter)) && $optional_delimiter != "detect")
+ return $optional_delimiter;
- /* Do some caching here */
- if (!$sqimap_delimiter) {
+ /* Do some caching here */
+ if (!$sqimap_delimiter) {
if (sqimap_capability($imap_stream, "NAMESPACE")) {
/* According to something that I can't find, this is supposed to work on all systems
OS: This won't work in Courier IMAP.
@@ -255,10 +293,10 @@ function sqimap_get_delimiter ($imap_stream = false) {
OS: * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES)
OS: We want to lookup all personal NAMESPACES...
*/
- fputs ($imap_stream, "a001 NAMESPACE\r\n");
- $read = sqimap_read_data($imap_stream, 'a001', true, $a, $b);
- if (eregi('\* NAMESPACE +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL)', $read[0], $data)) {
- if (eregi('^\( *\((.*)\) *\)', $data[1], $data2))
+ fputs ($imap_stream, sqimap_session_id() . " NAMESPACE\r\n");
+ $read = sqimap_read_data($imap_stream, sqimap_session_id(), true, $a, $b);
+ if (eregi('\\* NAMESPACE +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL)', $read[0], $data)) {
+ if (eregi('^\\( *\\((.*)\\) *\\)', $data[1], $data2))
$pn = $data2[1];
$pna = explode(')(', $pn);
while (list($k, $v) = each($pna))
@@ -280,15 +318,15 @@ function sqimap_get_delimiter ($imap_stream = false) {
}
}
return $sqimap_delimiter;
-}
+ }
/******************************************************************************
** Gets the number of messages in the current mailbox.
******************************************************************************/
function sqimap_get_num_messages ($imap_stream, $mailbox) {
- fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\r\n");
- $read_ary = sqimap_read_data ($imap_stream, 'a001', true, $result, $message);
+ fputs ($imap_stream, sqimap_session_id() . " EXAMINE \"$mailbox\"\r\n");
+ $read_ary = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $result, $message);
for ($i = 0; $i < count($read_ary); $i++) {
if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) {
return $regs[1];
@@ -347,10 +385,10 @@ function sqimap_get_delimiter ($imap_stream = false) {
/******************************************************************************
** Returns the number of unseen messages in this folder
******************************************************************************/
- function sqimap_unseen_messages ($imap_stream, &$num_unseen, $mailbox) {
- //fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
- fputs ($imap_stream, "a001 STATUS \"$mailbox\" (UNSEEN)\r\n");
- $read_ary = sqimap_read_data ($imap_stream, 'a001', true, $result, $message);
+ function sqimap_unseen_messages ($imap_stream, $mailbox) {
+ //fputs ($imap_stream, sqimap_session_id() . " SEARCH UNSEEN NOT DELETED\r\n");
+ fputs ($imap_stream, sqimap_session_id() . " STATUS \"$mailbox\" (UNSEEN)\r\n");
+ $read_ary = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $result, $message);
ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs);
return $regs[1];
}
@@ -360,7 +398,7 @@ function sqimap_get_delimiter ($imap_stream = false) {
** Saves a message to a given folder -- used for saving sent messages
******************************************************************************/
function sqimap_append ($imap_stream, $sent_folder, $length) {
- fputs ($imap_stream, "a001 APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
+ fputs ($imap_stream, sqimap_session_id() . " APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
$tmp = fgets ($imap_stream, 1024);
}