X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=5e80c89cb8cfc8413fce3e81dd776c5fc42b9e30;hb=718cfbb233ff039755bc3e1dfacc1a9f3395ccb7;hp=f047f3036d978b60a3ca2ec6f8a8e6b30fb010b0;hpb=2c898a113f1e765b06eb92b09d2a80a30e7036b7;p=squirrelmail.git diff --git a/functions/imap_general.php b/functions/imap_general.php index f047f303..5e80c89c 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -1,54 +1,52 @@ -$read
"; flush(); } + $counter++; + } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)); + + $response = $regs[1]; + $message = trim($regs[2]); + + if ($imap_general_debug) echo "--
"; if ($handle_errors == true) { if ($response == "NO") { - echo "
"; - echo _("ERROR : Could not complete request."); - echo "
"; - echo _("Reason Given: "); - echo "$message

"; - exit; + // 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 "
\n"; + echo _("Reason Given: "); + echo $message . "

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

\n"; echo _("Server responded: "); - echo "$message

"; + echo $message . "

\n"; exit; } } @@ -56,37 +54,66 @@ 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, $imap_port, $hide) { - global $color; - $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string); + 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 +124,7 @@
- +
@@ -105,8 +132,8 @@
-
- +
+
@@ -114,10 +141,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,6 +288,7 @@ ******************************************************************************/ 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); @@ -205,66 +297,37 @@ $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"; - - 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."\r\n"; - if ($cc_list) { - $message .= "Cc: ".$cc."\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 .= stripslashes($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"); - - $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message); + 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); + } ?>