X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_general.php;h=64e11117221bb269ec961f5bd110212e40e25892;hp=e07bbc99590aaf7770f0b22abdcf04d40ca9c6e5;hb=85fc999eef303af18fcd6417afe042ab0c6e025c;hpb=dae7a3c2759ac891830dd90d26dc8e1da3e4432d diff --git a/functions/imap_general.php b/functions/imap_general.php index e07bbc99..64e11117 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -1,7 +1,7 @@ 0) { @@ -83,41 +108,71 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors, 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) || - (($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) { + if (preg_match("/^$pre (OK|BAD|NO)(.*)/", $read, $regs) || + // if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) || + (($size == -1) && preg_match('/^\* [0-9]+ FETCH.*/', $read, $regs))) { break; + } else if ( preg_match('/^\* OK \[PARSE.*/', $read, $regs ) ) { + while ( preg_match('/^\* OK \[PARSE.*/', $read, $regs ) ) { + $read = fgets($imap_stream, $bufsize); + } + /* + 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. + This block has been updated by + Seth E. Randall . Once we see + one OK [PARSE line, we just go through and keep + tossing them out until we get something different. + */ + $data[] = $read; + $read = fgets ($imap_stream, $bufsize); + } else if (preg_match('/^\* BYE \[ALERT\](.*)/', $read, $regs)) { + /* + It seems that the IMAP server has coughed a lung up + and hung up the connection. Print any info we have + and abort. + */ + echo _("Please contact your system administrator and report the following error:") . "
\n"; + echo "$regs[1]"; + exit(0); } 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 "
\n" . _("ERROR : Could not complete request.") . "
\n" . + _("Query:") . + $query . '
' . _("Reason Given: ") . $message . "
\n"; exit; @@ -127,18 +182,21 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors, echo "
\n" . _("ERROR : Bad or malformed request.") . "
\n" . + _("Query:") . + $query . '
' . _("Server responded: ") . $message . "
\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]; - + } /****************************************************************************** @@ -148,17 +206,17 @@ function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$mes function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) { global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad; - + $imap_stream = fsockopen ( $imap_server_address, $imap_port, $error_number, $error_string, 15); if ( !$imap_stream ) { return FALSE; } $server_info = fgets ($imap_stream, 1024); - + // Decrypt the password $password = OneTimePadDecrypt($password, $onetimepad); - + /** Do some error correction **/ if (!$imap_stream) { if (!$hide) { @@ -169,9 +227,8 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ exit; } - 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); + $query = 'LOGIN "' . quoteIMAP($username) . '" "' . quoteIMAP($password) . '"'; + $read = sqimap_run_command ($imap_stream, $query, false, $response, $message); /** If the connection was not successful, lets see why **/ if ($response != 'OK') { @@ -192,17 +249,19 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ } exit; } else { - // If the user does not log in with the correct - // username and password it is not possible to get the - // 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 - + /* If the user does not log in with the correct + * username and password it is not possible to get the + * 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); - + displayHtmlHeader( _("Unknown user or password incorrect.") ); echo "\n"; error_username_password_incorrect(); @@ -213,7 +272,7 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ exit; } } - + return $imap_stream; } @@ -221,16 +280,16 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ * Simply logs out the imap session */ function sqimap_logout ($imap_stream) { - fputs ($imap_stream, sqimap_session_id() . " LOGOUT\r\n"); + /* Logout is not valid until the server returns 'BYE' */ + sqimap_run_command($imap_stream, 'LOGOUT', false, $response, $message); } function sqimap_capability($imap_stream, $capability) { global $sqimap_capabilities; - + if (!is_array($sqimap_capabilities)) { - fputs ($imap_stream, sqimap_session_id() . " CAPABILITY\r\n"); - $read = sqimap_read_data($imap_stream, sqimap_session_id(), true, $a, $b); - + $read = sqimap_run_command($imap_stream, 'CAPABILITY', true, $a, $b); + $c = explode(' ', $read[0]); for ($i=2; $i < count($c); $i++) { $cap_list = explode('=', $c[$i]); @@ -254,12 +313,12 @@ function sqimap_get_delimiter ($imap_stream = false) { global $sqimap_delimiter; global $optional_delimiter; - + /* Use configured delimiter if set */ if((!empty($optional_delimiter)) && $optional_delimiter != 'detect') { return $optional_delimiter; } - + /* Do some caching here */ if (!$sqimap_delimiter) { if (sqimap_capability($imap_stream, 'NAMESPACE')) { @@ -269,8 +328,7 @@ 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, sqimap_session_id() . " NAMESPACE\r\n"); - $read = sqimap_read_data($imap_stream, sqimap_session_id(), true, $a, $b); + $read = sqimap_run_command($imap_stream, 'NAMESPACE', true, $a, $b); if (eregi('\\* NAMESPACE +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL)', $read[0], $data)) { if (eregi('^\\( *\\((.*)\\) *\\)', $data[1], $data2)) { $pn = $data2[1]; @@ -302,15 +360,14 @@ function sqimap_get_delimiter ($imap_stream = false) { */ function sqimap_get_num_messages ($imap_stream, $mailbox) { - fputs ($imap_stream, sqimap_session_id() . " EXAMINE \"$mailbox\"\r\n"); - $read_ary = sqimap_read_data ($imap_stream, sqimap_session_id(), 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]; - } + if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) { + return $regs[1]; + } } return sprintf( "BUG! Couldn't get number of messages in %s!", $mailbox ); - + } @@ -325,7 +382,7 @@ function sqimap_find_email ($string) { ** What about ** lehresma@css.tayloru.edu (Luke Ehresman) **/ - + if (ereg("<([^>]+)>", $string, $regs)) { $string = $regs[1]; } @@ -334,43 +391,58 @@ function sqimap_find_email ($string) { /* -* Takes the From: field, and creates a displayable name. -* Luke Ehresman -* becomes: Luke Ehresman -* -* becomes: lkehresman@yahoo.com -*/ + * Takes the From: field, and creates a displayable name. + * Luke Ehresman + * "Luke Ehresman" + * lkehresman@yahoo.com (Luke Ehresman) + * becomes: Luke Ehresman + * + * becomes: lkehresman@yahoo.com + */ function sqimap_find_displayable_name ($string) { - $string = ' '.trim($string); - $orig_string = $string; - if (($angle1 = strpos($string, '<')) && strpos($string, '>')) { - if ($angle1 == 1) { - $string = sqimap_find_email($string); - } else { - $string = trim($string); - $string = substr($string, 0, $angle1-1); - $string = ereg_replace ('"', '', $string); - } - + $string = trim($string); + + if ( ereg('^(.+)<.*>', $string, $regs) ) { + $orig_string = $string; + $string = str_replace ('"', '', $regs[1] ); if (trim($string) == '') { - $string = sqimap_find_email($orig_string); + $string = sqimap_find_email($orig_string); + } + if( $string == '' || $string == ' ' ){ + $string = ' '; } - } else if ( ($paren1 = strpos($string, '(')) - && ($paren2 = strpos($string, ')'))) { - $string = substr($string, $paren1 + 1, $paren2 - $paren1 - 1); } - return $string; -} + elseif ( ereg('\((.*)\)', $string, $regs) ) { + if( ( $regs[1] == '' ) || ( $regs[1] == ' ' ) ){ + if ( ereg('^(.+) \(', $string, $regs) ) { + $string = ereg_replace( ' \(\)$', '', $string ); + } else { + $string = ' '; + } + } else { + $string = $regs[1]; + } + } + else { + $string = str_replace ('"', '', sqimap_find_email($string)); + } + return trim($string); +} /* * Returns the number of unseen messages in this folder */ 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); + $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (UNSEEN)", true, $result, $message); + $i = 0; + while (isset($read_ary[$i])) { + if (ereg("UNSEEN ([0-9]+)", $read_ary[$i], $regs)) { + break; + } + $i++; + } return $regs[1]; } @@ -387,5 +459,5 @@ function sqimap_append_done ($imap_stream) { fputs ($imap_stream, "\r\n"); $tmp = fgets ($imap_stream, 1024); } - + ?>