X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_general.php;h=008d0053231e4da30235e64312ac398d132ab99a;hp=28fe6cffe8a536209d5cba0030660c8b67be193e;hb=bef6629cffe522e21ec116f71b86cb69ecdc5e0d;hpb=3411d4ec9a699200e2a77256df2bd8da1f346a82 diff --git a/functions/imap_general.php b/functions/imap_general.php index 28fe6cff..008d0053 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -11,182 +11,169 @@ * $Id$ */ -require_once('../functions/page_header.php'); -require_once('../functions/display_messages.php'); +require_once(SM_PATH . 'functions/page_header.php'); global $sqimap_session_id; $sqimap_session_id = 1; /* Sets an unique session id in order to avoid simultanous sessions crash. */ -function sqimap_session_id() { +function sqimap_session_id($unique_id = false) { global $data_dir, $username, $sqimap_session_id; - return( sprintf("A%03d", $sqimap_session_id++) ); + if (!$unique_id) { + return( sprintf("A%03d", $sqimap_session_id++) ); + } else { + return( sprintf("A%03d", $sqimap_session_id++) . ' UID' ); + } } /* * Both send a command and accept the result from the command. * This is to allow proper session number handling. */ -function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message) { - $sid = sqimap_session_id(); +function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message, $unique_id = false) { + $sid = sqimap_session_id($unique_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) { - $sid = sqimap_session_id(); +function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message, $unique_id = false) { + $sid = sqimap_session_id($unique_id); fputs ($imap_stream, $sid . ' ' . $query . "\r\n"); $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query); return $read; } +/* + * custom fgets function. gets a line from IMAP + * no matter how big it may be + */ + +function sqimap_fgets($imap_stream) { + $read = ''; + $buffer = 4096; + $results = ''; + while (strpos($read, "\n") === false) { + if (!($read = fgets($imap_stream, $buffer))) { + break; + } + $results .= $read; + } + return $results; +} + /* * 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, $query = '') { global $color, $squirrelmail_language; - $read = ''; - $bufsize = 9096; + $pre_a = explode(' ',trim($pre)); + $pre = $pre_a[0]; $resultlist = array(); - - $more_msgs = true; - while ($more_msgs) { - $data = array(); - $total_size = 0; - - while (strpos($read, "\n") === false) { - if(!($read .= fgets($imap_stream, $bufsize))) { - break; - } - } - - /* 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)) { */ - } else if (preg_match('/^\* [0-9]+ FETCH/', $read, $regs)) { - /* Sizeless response, probably single-line */ - $size = -1; - $data[] = $read; - $read = fgets($imap_stream, $bufsize); - } else { - $size = -1; - } - while (1) { - while (strpos($read, "\n") === false) { - if(!($read .= fgets($imap_stream, $bufsize))) { - break; + $data = array(); + $read = sqimap_fgets($imap_stream); + while (1) { + switch (true) { + case preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read, $regs): + case preg_match('/^\* (BYE \[ALERT\])(.*)$/', $read, $regs): + $response = $regs[1]; + $message = trim($regs[2]); + break 2; + case preg_match("/^\* (OK \[PARSE\])(.*)$/", $read): + $read = sqimap_fgets($imap_stream); + break 1; + case preg_match('/^\* ([0-9]+) FETCH.*/', $read, $regs): + $fetch_data = array(); + $fetch_data[] = $read; + $read = sqimap_fgets($imap_stream); + while (!preg_match('/^\* [0-9]+ FETCH.*/', $read) && + !preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read)) { + $fetch_data[] = $read; + $last = $read; + $read = sqimap_fgets($imap_stream); } - } - /* 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, $bufsize); - while (strpos($read, "\n") === false) { - $read .= fgets($imap_stream, $bufsize); - } + if (isset($last) && preg_match('/^\)/', $last)) { + array_pop($fetch_data); } - $total_size += strlen($read); - } else { - /* if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) || */ - if (preg_match("/^$pre (OK|BAD|NO)(.*)/", $read, $regs) || - /* (($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) { */ - (($size == -1) && preg_match('/^\* [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. - * 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. - */ - while ( preg_match('/^\* OK \[PARSE.*/', $read, $regs ) ) { - $read = fgets($imap_stream, $bufsize); - } - $data[] = $read; - $read = fgets ($imap_stream, $bufsize); - } else if (preg_match('/^\* BYE \[ALERT\](.*)/', $read, $regs)) { - /* - * It seems that the IMAP server has coughed up a lung - * 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; - } else { - $data[] = $read; - $read = fgets ($imap_stream, $bufsize); - } - } - } - - /* - * 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[] = $fetch_data; + break 1; + default: + $data[] = $read; + $read = sqimap_fgets($imap_stream); + break 1; } + } + if (!empty($data)) { $resultlist[] = $data; } - - $response = $regs[1]; - $message = trim($regs[2]); - + elseif (empty($resultlist)) { + $resultlist[] = array(); + } if ($handle_errors == false) { return( $resultlist ); - } else if ($response == 'NO') { - /* ignore this error from M$ exchange, it is not fatal (aka bug) */ + } + elseif ($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"; + require_once(SM_PATH . 'functions/display_messages.php'); + $string = "\n" . + _("ERROR : Could not complete request.") . + "
\n" . + _("Query:") . + $query . '
' . + _("Reason Given: ") . + $message . "
\n"; + error_box($string,$color); exit; } - } else if ($response == 'BAD') { + } + elseif ($response == 'BAD') { set_up_language($squirrelmail_language); - echo "
\n" . - _("ERROR : Bad or malformed request.") . - "
\n" . - _("Query:") . - $query . '
' . - _("Server responded: ") . - $message . "
\n"; + require_once(SM_PATH . 'functions/display_messages.php'); + $string = "\n" . + _("ERROR : Bad or malformed request.") . + "
\n" . + _("Query:") . + $query . '
' . + _("Server responded: ") . + $message . "
\n"; + error_box($string,$color); exit; - } else { + } + else { return $resultlist; } } function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') { $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message, $query); - return $res[0]; + + /* sqimap_read_data should be called for one response + but since it just calls sqimap_read_data_list which + handles multiple responses we need to check for that + and merge the $res array IF they are seperated and + IF it was a FETCH response. */ + + if (isset($res[1]) && is_array($res[1]) && isset($res[1][0]) + && preg_match('/^\* \d+ FETCH/', $res[1][0])) { + $result = array(); + foreach($res as $index=>$value) { + $result = array_merge($result, $res["$index"]); + } + } + if (isset($result)) { + return $result; + } + else { + return $res[0]; + } + } /* @@ -194,7 +181,9 @@ function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$mes * will be displayed. This function returns the imap connection handle. */ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) { - global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad; + global $color, $squirrelmail_language, $onetimepad; + + $imap_server_address = sqimap_get_user_server($imap_server_address, $username); $imap_stream = fsockopen ( $imap_server_address, $imap_port, $error_number, $error_string, 15); if ( !$imap_stream ) { @@ -209,8 +198,11 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ if (!$imap_stream) { if (!$hide) { set_up_language($squirrelmail_language, true); - printf (_("Error connecting to IMAP server: %s.")."
\r\n", $imap_server_address); - echo "$error_number : $error_string
\r\n"; + require_once(SM_PATH . 'functions/display_messages.php'); + $string = sprintf (_("Error connecting to IMAP server: %s.") . + "
\r\n", $imap_server_address) . + "$error_number : $error_string
\r\n"; + error_box($string,$color); } exit; } @@ -224,17 +216,19 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ if ($response != 'NO') { /* "BAD" and anything else gets reported here. */ set_up_language($squirrelmail_language, true); + require_once(SM_PATH . 'functions/display_messages.php'); if ($response == 'BAD') { - printf (_("Bad request: %s")."
\r\n", $message); + $string = sprintf (_("Bad request: %s")."
\r\n", $message); } else { - printf (_("Unknown error: %s") . "
\n", $message); + $string = sprintf (_("Unknown error: %s") . "
\n", $message); } - echo '
' . _("Read data:") . "
\n"; + $string .= '
' . _("Read data:") . "
\n"; if (is_array($read)) { foreach ($read as $line) { - echo htmlspecialchars($line) . "
\n"; + $string .= htmlspecialchars($line) . "
\n"; } } + error_box($string,$color); exit; } else { /* @@ -247,13 +241,11 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ * $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(); - session_destroy(); + include_once(SM_PATH . 'functions/display_messages.php' ); + sqsession_destroy(); + logout_error( _("Unknown user or password incorrect.") ); exit; } } else { @@ -269,9 +261,8 @@ function sqimap_logout ($imap_stream) { sqimap_run_command($imap_stream, 'LOGOUT', false, $response, $message); } -function sqimap_capability($imap_stream, $capability) { +function sqimap_capability($imap_stream, $capability='') { global $sqimap_capabilities; - if (!is_array($sqimap_capabilities)) { $read = sqimap_run_command($imap_stream, 'CAPABILITY', true, $a, $b); @@ -285,11 +276,14 @@ function sqimap_capability($imap_stream, $capability) { } } } - if (isset($sqimap_capabilities[$capability])) { - return $sqimap_capabilities[$capability]; - } else { - return false; + if ($capability) { + if (isset($sqimap_capabilities[$capability])) { + return $sqimap_capabilities[$capability]; + } else { + return false; + } } + return $sqimap_capabilities; } /* Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test */ @@ -340,13 +334,13 @@ function sqimap_get_delimiter ($imap_stream = false) { /* Gets the number of messages in the current mailbox. */ 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\"", false, $result, $message); for ($i = 0; $i < count($read_ary); $i++) { if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) { return $regs[1]; } } - return "BUG! Couldn't get number of messages in $mailbox!"; + return false; //"BUG! Couldn't get number of messages in $mailbox!"; } @@ -412,8 +406,9 @@ function sqimap_find_displayable_name ($string) { * Returns the number of unseen messages in this folder */ function sqimap_unseen_messages ($imap_stream, $mailbox) { - $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (UNSEEN)", true, $result, $message); + $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (UNSEEN)", false, $result, $message); $i = 0; + $regs = array(false, false); while (isset($read_ary[$i])) { if (ereg("UNSEEN ([0-9]+)", $read_ary[$i], $regs)) { break; @@ -423,6 +418,26 @@ function sqimap_unseen_messages ($imap_stream, $mailbox) { return $regs[1]; } +/* + * Returns the number of unseen/total messages in this folder + */ +function sqimap_status_messages ($imap_stream, $mailbox) { + $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (MESSAGES UNSEEN)", false, $result, $message); + $i = 0; + $messages = $unseen = false; + $regs = array(false,false); + while (isset($read_ary[$i])) { + if (preg_match('/UNSEEN\s+([0-9]+)/i', $read_ary[$i], $regs)) { + $unseen = $regs[1]; + } + if (preg_match('/MESSAGES\s+([0-9]+)/i', $read_ary[$i], $regs)) { + $messages = $regs[1]; + } + $i++; + } + return array('MESSAGES' => $messages, 'UNSEEN'=>$unseen); +} + /* * Saves a message to a given folder -- used for saving sent messages @@ -433,8 +448,38 @@ function sqimap_append ($imap_stream, $sent_folder, $length) { } function sqimap_append_done ($imap_stream) { + global $squirrelmail_language, $color; fputs ($imap_stream, "\r\n"); $tmp = fgets ($imap_stream, 1024); + if (preg_match("/(.*)(BAD|NO)(.*)$/", $tmp, $regs)) { + set_up_language($squirrelmail_language); + require_once(SM_PATH . 'functions/display_messages.php'); + $string = "\n" . + _("ERROR : Bad or malformed request.") . + "
\n" . + _("Server responded: ") . + $tmp . "
\n"; + error_box($string,$color); + exit; + } } +function sqimap_get_user_server ($imap_server, $username) { + if (substr($imap_server, 0, 4) != "map:") { + return $imap_server; + } + $function = substr($imap_server, 4); + return $function($username); +} + +/* This is an example that gets imapservers from yellowpages (NIS). + * you can simple put map:map_yp_alias in your $imap_server_address + * in config.php use your own function instead map_yp_alias to map your + * LDAP whatever way to find the users imapserver. */ + +function map_yp_alias($username) { + $yp = `ypmatch $username aliases`; + return chop(substr($yp, strlen($username)+1)); +} + ?>