X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=496e2dd84bc13e314bdebf1cd9341afb330b354f;hb=2df6ca53f811434d052179c620da81a8a5246d2f;hp=c97bf43ddec03795610d3dba28727ec589569d03;hpb=d17b1a714665bb8817373d5941ca53935944ca8c;p=squirrelmail.git diff --git a/functions/imap_general.php b/functions/imap_general.php index c97bf43d..496e2dd8 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -1,92 +1,155 @@ -$read
\n"; + flush(); + } + + if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) { + if ($size) { + $dt = $data; + $dt[0] = $dt[count($dt)-1] = ""; + $d = implode ("", $dt); + if (strlen($d) >= $size) { + $continue = false; + } else { + $data[] = $read; + $read = fgets ($imap_stream, 9096); + } + } else { + $continue = false; + } + } else { + $data[] = $read; + $read = fgets ($imap_stream, 9096); + } } - if ($handle_errors == true) { - if ($response == "NO") { - echo "
"; + $response = $regs[1]; + $message = trim($regs[2]); + + if ($imap_general_debug) echo "--
"; + + if ($handle_errors == false) + return $data; + + if ($response == "NO") { + // ignore this error from m$ exchange, it is not fatal (aka bug) + if (!ereg("command resulted in",$message)) { + set_up_language($squirrelmail_language); + echo "
\n"; echo _("ERROR : Could not complete request."); - echo "
"; + echo "

\n"; echo _("Reason Given: "); - echo "$message

"; - exit; - } else if ($response == "BAD") { - echo "
"; - echo _("ERROR : Bad or malformed request."); - echo "
"; - echo _("Server responded: "); - echo "$message

"; + echo $message . "

\n"; exit; } + } else if ($response == "BAD") { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Bad or malformed request."); + echo "
\n"; + echo _("Server responded: "); + echo $message . "

\n"; + exit; } return $data; } - - - /****************************************************************************** ** Logs the user into the imap server. If $hide is set, no error messages ** will be displayed. This function returns the imap connection handle. ******************************************************************************/ - function sqimap_login ($username, $password, $imap_server_address, $hide) { - global $color; - $imap_stream = fsockopen ($imap_server_address, 143, &$error_number, &$error_string); + 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); $server_info = fgets ($imap_stream, 1024); + // Decrypt the password + $password = OneTimePadDecrypt($password, $onetimepad); + /** Do some error correction **/ if (!$imap_stream) { if (!$hide) { - echo "Error connecting to IMAP server: $imap_server_address.
\r\n"; + 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"; } exit; } - fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n"); - $read = fgets ($imap_stream, 1024); + fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) . + "\" \"" . quotemeta($password) . "\"\r\n"); + $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message); /** If the connection was not successful, lets see why **/ - if (substr($read, 0, 7) != "a001 OK") { + if ($response != "OK") { if (!$hide) { - if (substr($read, 0, 8) == "a001 BAD") { - echo "Bad request: $read
\r\n"; + if ($response != "NO") { + // "BAD" and anything else gets reported here. + set_up_language($squirrelmail_language, true); + if ($response == "BAD") + printf (_("Bad request: %s")."
\r\n", $message); + else + printf (_("Unknown error: %s") . "
\n", $message); + echo "
"; + echo _("Read data:") . "
\n"; + if (is_array($read)) + { + foreach ($read as $line) + { + echo htmlspecialchars($line) . "
\n"; + } + } exit; - } else if (substr($read, 0, 7) == "a001 NO") { + } 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 + + set_up_language($squirrelmail_language, true); + ?> @@ -97,7 +160,7 @@
- +
@@ -105,8 +168,8 @@
-
- +
+
@@ -114,10 +177,8 @@ - "; + ** ** lehresma@css.tayloru.edu + ** + ** What about + ** lehresma@css.tayloru.edu (Luke Ehresman) **/ - if (strpos($string, "<") && strpos($string, ">")) { - $string = substr($string, strpos($string, "<")+1); - $string = substr($string, 0, strpos($string, ">")); + if (ereg("<([^>]+)>", $string, $regs)) { + $string = $regs[1]; } return trim($string); } @@ -197,79 +327,46 @@ ******************************************************************************/ function sqimap_find_displayable_name ($string) { $string = " ".trim($string); + $orig_string = $string; if (strpos($string, "<") && strpos($string, ">")) { if (strpos($string, "<") == 1) { $string = sqimap_find_email($string); } else { + $string = trim($string); $string = substr($string, 0, strpos($string, "<")); + $string = ereg_replace ("\"", "", $string); } + + if (trim($string) == "") { + $string = sqimap_find_email($orig_string); + } } return $string; } - /****************************************************************************** ** Returns the number of unseen messages in this folder ******************************************************************************/ - function sqimap_unseen_messages ($imap_stream, &$num_unseen) { - fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n"); + 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); - $unseen = false; - - if (strlen($read_ary[0]) > 10) { - $unseen = true; - $ary = explode (" ", $read_ary[0]); - $num_unseen = count($ary) - 2; - } else { - $unseen = false; - $num_unseen = 0; - } - - return $unseen; + ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs); + return $regs[1]; } /****************************************************************************** ** Saves a message to a given folder -- used for saving sent messages ******************************************************************************/ - function sqimap_append ($imap_stream, $mailbox, $body, $to, $cc, $bcc, $subject, $data_dir, $username, $domain, $version) { - global $sent_folder, $data_dir; - - $from = getPref($data_dir, $username, "full_name"); - $from_addr = getPref($data_dir, $username, "email_address"); - if ($from_addr == "") - $from_addr = "$username@$domain"; - $to_list = getLineOfAddrs($to); - $cc_list = getLineOfAddrs($cc); - $bcc_list = getLineOfAddrs($bcc); - - if ($from == "") - $from = "<$from_addr>"; - else - $from = $from . " <$from_addr>"; - - $message = "Date: ".date("D, j M Y H:i:s ", mktime()) . timezone() . "\r\n"; - $message .= "Subject: $subject\r\n"; - $message .= "From: $from\r\n"; - $message .= "To: $to_list\r\n"; - if ($cc_list) { - $message .= "Cc: $cc_list\r\n"; // Who the CCs are - } - $message .= "Content-Type: text/plain; charset=ISO-8859-1\r\n"; - $message .= "Content-Transfer-Encoding: 8bit\r\n"; - $message .= "\r\n"; - $message .= "$body\r\n"; - $message .= "\r\n"; - - $size = count_chars($message); - fputs ($imap_stream, "a001 APPEND $sent_folder (\\Seen) \{$size}\r\n"); - fputs ($imap_stream, "$message"); - echo "a001 APPEND $sent_folder (\\Seen) \{$size}
"; - - $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message); - for ($i = 0; $i < count($read_ary); $i++) { - echo $read_ary[$i] . "
"; - } + function sqimap_append ($imap_stream, $sent_folder, $length) { + fputs ($imap_stream, "a001 APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n"); + $tmp = fgets ($imap_stream, 1024); } + + function sqimap_append_done ($imap_stream) { + fputs ($imap_stream, "\r\n"); + $tmp = fgets ($imap_stream, 1024); + } ?>