X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=a9e1882bdd82a9613f5abb6bc7985b63e3b3e481;hb=2e2b30211a93ee9e8d1bff6b323fb771bb8831b0;hp=1826d9124a4a69a5fb2881d82acfcb83bac65b21;hpb=7350889b45590aee831ba1150ee94efb95b03992;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 1826d912..a9e1882b 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,287 +1,268 @@
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, 9096);
- while (strpos($read, "\n") === false) {
+ 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, 9096);
+ while (strpos($read, "\n") === false) {
$read .= fgets($imap_stream, 9096);
- }
- }
- $total_size += strlen($read);
+ }
+ }
+ $total_size += strlen($read);
} else {
- if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
(($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) {
- break;
- } else {
- $data[] = $read;
- $read = fgets ($imap_stream, 9096);
- }
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets ($imap_stream, 9096);
+ }
}
- }
-
- while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
- !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ }
+
+ while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
+ !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
$read = fgets($imap_stream, 9096);
- }
- $resultlist[] = $data;
- }
- $response = $regs[1];
- $message = trim($regs[2]);
-
- if ($handle_errors == false) { return $resultlist; }
-
- if ($response == 'NO') {
- // ignore this error from m$ exchange, it is not fatal (aka bug)
- if (strstr($message, 'command resulted in') === false) {
+ }
+ $resultlist[] = $data;
+ }
+ $response = $regs[1];
+ $message = trim($regs[2]);
+
+ if ($handle_errors == false) { return $resultlist; }
+
+ 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";
- echo _("ERROR : Could not complete request.");
- echo "
\n";
- echo _("Reason Given: ");
- echo $message . "
\n";
+ echo "
\n" .
+ _("ERROR : Could not complete request.") .
+ "
\n" .
+ _("Reason Given: ") .
+ $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 $resultlist;
- }
-
- function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
- $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
- return $res[0];
- }
-
- /******************************************************************************
- ** 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, $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) {
+ }
+ } else if ($response == 'BAD') {
+ set_up_language($squirrelmail_language);
+ echo "
\n" .
+ _("ERROR : Bad or malformed request.") .
+ "
\n" .
+ _("Server responded: ") .
+ $message . "
\n";
+ exit;
+ }
+ return $resultlist;
+}
+
+function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+
+ $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+ return $res[0];
+
+}
+
+/******************************************************************************
+** 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, $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) {
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;
- }
+ }
+ 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);
+ 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);
- /** If the connection was not successful, lets see why **/
- if ($response != "OK") {
- if (!$hide) {
+ /** If the connection was not successful, lets see why **/
+ if ($response != 'OK') {
+ if (!$hide) {
if ($response != 'NO') {
- // "BAD" and anything else gets reported here.
- set_up_language($squirrelmail_language, true);
- if ($response == 'BAD')
+ // "BAD" and anything else gets reported here.
+ set_up_language($squirrelmail_language, true);
+ if ($response == 'BAD') {
printf (_("Bad request: %s")."
\r\n", $message);
- else
+ } 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;
+ }
+ echo '
' . _("Read data:") . "
\n";
+ if (is_array($read)) {
+ foreach ($read as $line) {
+ echo htmlspecialchars($line) . "
\n";
+ }
+ }
+ 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
-
- set_up_language($squirrelmail_language, true);
-
- ?>
-
-
-
- |
-
- - - |
-