*
* @return string a 4 chars unique string
*/
-function sqimap_session_id() {
- global $data_dir, $username;
+global $sqimap_session_id;
+$sqimap_session_id = 1;
+function sqimap_session_id() {
- $IMAPSessionID = substr(session_id(), -4);
- if( $IMAPSessionID == '' ) {
- $IMAPSessionID = 'A001';
- }
+ global $data_dir, $username, $sqimap_session_id;
- return( $IMAPSessionID );
+ return( sprintf("A%03d", $sqimap_session_id++) );
}
/******************************************************************************
******************************************************************************/
function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message) {
- fputs ($imap_stream, sqimap_session_id() . ' ' . $query . "\r\n");
- $read = sqimap_read_data_list ($imap_stream, sqimap_session_id(), $handle_errors, $response, $message);
+ $sid = sqimap_session_id();
+ fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
+ $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message, $query );
return $read;
}
function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message) {
- fputs ($imap_stream, sqimap_session_id() . ' ' . $query . "\r\n");
- $read = sqimap_read_data ($imap_stream, sqimap_session_id(), $handle_errors, $response, $message);
+ $sid = sqimap_session_id();
+ fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
+ $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query);
return $read;
}
-/******************************************************************************
-** 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
-******************************************************************************/
+/*
+ * 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_list ($imap_stream, $pre, $handle_errors,
- &$response, &$message) {
+ &$response, &$message, $query = '') {
global $color, $squirrelmail_language;
-
+
$read = '';
+ $bufsize = 9096;
$resultlist = array();
-
+
$more_msgs = true;
while ($more_msgs) {
$data = array();
$total_size = 0;
+
while (strpos($read, "\n") === false) {
- $read .= fgets($imap_stream, 9096);
+ if(!($read .= fgets($imap_stream, $bufsize))) {
+ break;
+ }
}
-
- if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+
+ // if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+ if (preg_match('/^\* [0-9]+ FETCH.*\{([0-9]+)\}/', $read, $regs)) {
$size = $regs[1];
} else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) {
// Sizeless response, probably single-line
$size = -1;
$data[] = $read;
- $read = fgets($imap_stream, 9096);
+ $read = fgets($imap_stream, $bufsize);
} else {
$size = -1;
}
while (1) {
while (strpos($read, "\n") === false) {
- $read .= fgets($imap_stream, 9096);
+ if(!($read .= fgets($imap_stream, $bufsize))) {
+ break;
+ }
}
// If we know the size, no need to look at the end parameters
if ($size > 0) {
break;
} else {
$data[] = $read;
- $read = fgets($imap_stream, 9096);
+ $read = fgets($imap_stream, $bufsize);
while (strpos($read, "\n") === false) {
- $read .= fgets($imap_stream, 9096);
+ $read .= fgets($imap_stream, $bufsize);
}
}
$total_size += strlen($read);
} else {
- if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ if (preg_match("/^$pre (OK|BAD|NO)(.*)/", $read, $regs) ||
+ // if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
(($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) {
break;
+ } else if ( preg_match("/^\* OK \[PARSE.*/", $read, $regs ) ) {
+ /*
+ This block has been added in order to avoid the problem
+ caused by the * OK [PARSE] Missing parameter answer
+ Please, replace it with a better parsing if you know how.
+ */
+ $read = fgets ($imap_stream, $bufsize);
+ $data[] = $read;
+ $read = fgets ($imap_stream, $bufsize);
} else {
$data[] = $read;
- $read = fgets ($imap_stream, 9096);
+ $read = fgets ($imap_stream, $bufsize);
}
}
}
-
- while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
- !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
- $read = fgets($imap_stream, 9096);
+
+ // while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
+ // !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ while (($more_msgs = !preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read, $regs)) &&
+ !preg_match('/^\* [0-9]+ FETCH.*/', $read, $regs)) {
+ $read = fgets($imap_stream, $bufsize);
}
$resultlist[] = $data;
}
+
$response = $regs[1];
$message = trim($regs[2]);
-
- if ($handle_errors == false) { return $resultlist; }
-
- if ($response == 'NO') {
+
+ if ($handle_errors == false) {
+ return( $resultlist );
+ } else if ($response == 'NO') {
// ignore this error from m$ exchange, it is not fatal (aka bug)
if (strstr($message, 'command resulted in') === false) {
set_up_language($squirrelmail_language);
echo "<br><b><font color=$color[2]>\n" .
_("ERROR : Could not complete request.") .
"</b><br>\n" .
+ _("Query:") .
+ $query . '<br>' .
_("Reason Given: ") .
$message . "</font><br>\n";
exit;
echo "<br><b><font color=$color[2]>\n" .
_("ERROR : Bad or malformed request.") .
"</b><br>\n" .
+ _("Query:") .
+ $query . '<br>' .
_("Server responded: ") .
$message . "</font><br>\n";
exit;
+ } else {
+ return( $resultlist );
}
- return $resultlist;
}
-function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') {
- $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+ $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message, $query);
return $res[0];
-
+
}
/******************************************************************************
* correct locale from the user's preferences.
* Therefore, apply the same hack as on the login
* screen.
- */
+ */
/* $squirrelmail_language is set by a cookie when
* the user selects language and logs out
- */
+ */
set_up_language($squirrelmail_language, true);
*/
function sqimap_get_num_messages ($imap_stream, $mailbox) {
- $read_ary = sqimap_run_command ($imap_stream, " EXAMINE \"$mailbox\"", true, $result, $message);
+ $read_ary = sqimap_run_command ($imap_stream, "EXAMINE \"$mailbox\"", true, $result, $message);
for ($i = 0; $i < count($read_ary); $i++) {
if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) {
return $regs[1];
* Luke Ehresman <lkehresman@yahoo.com>
* "Luke Ehresman" <lkehresman@yahoo.com>
* lkehresman@yahoo.com (Luke Ehresman)
- * become: Luke Ehresman
+ * becomes: Luke Ehresman
* <lkehresman@yahoo.com>
* becomes: lkehresman@yahoo.com
*/
function sqimap_find_displayable_name ($string) {
$string = trim($string);
-
+
if ( ereg('^(.+)<.*>', $string, $regs) ) {
- $string = ereg_replace ('"', '', $regs[1] );
+ $orig_string = $string;
+ $string = str_replace ('"', '', $regs[1] );
+ if (trim($string) == '') {
+ $string = sqimap_find_email($orig_string);
+ }
+ if( $string == '' || $string == ' ' ){
+ $string = ' ';
+ }
}
elseif ( ereg('\((.*)\)', $string, $regs) ) {
if( ( $regs[1] == '' ) || ( $regs[1] == ' ' ) ){
}
}
else {
- $string = sqimap_find_email($string);
+ $string = str_replace ('"', '', sqimap_find_email($string));
}
return trim($string);
*/
function sqimap_unseen_messages ($imap_stream, $mailbox) {
//fputs ($imap_stream, sqimap_session_id() . " SEARCH UNSEEN NOT DELETED\r\n");
- $read_ary = sqimap_run_command ($imap_stream, " STATUS \"$mailbox\" (UNSEEN)", true, $result, $message);
+ $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (UNSEEN)", true, $result, $message);
ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs);
return $regs[1];
}
projects / squirrelmail.git / blobdiff