X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=5e80c89cb8cfc8413fce3e81dd776c5fc42b9e30;hb=f1f3803aab9214d9d65a6e2ff9a5fbb4339be0ad;hp=02d94872d9d172c38b8c9eaa3179682c7a24fc1f;hpb=40ba4d36052da54f044e9b966ef7c60d16c21215;p=squirrelmail.git diff --git a/functions/imap_general.php b/functions/imap_general.php index 02d94872..5e80c89c 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -5,27 +5,24 @@ ** This implements all functions that do general imap functions. **/ + $imap_general_debug = false; + //$imap_general_debug = false; + /****************************************************************************** ** 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 ($imap_stream, $pre, $handle_errors, &$response, &$message) { - global $color, $squirrelmail_language; - - //$imap_general_debug = true; - $imap_general_debug = false; + global $color, $squirrelmail_language, $imap_general_debug; - $read = fgets ($imap_stream, 1024); - if ($imap_general_debug) echo "$read
"; $counter = 0; - while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) { - $data[$counter] = $read; - $read = fgets ($imap_stream, 1024); - if ($imap_general_debug) echo "$read
"; - $counter++; - } - + do { + $data[$counter] = $read = fgets ($imap_stream, 9096); + if ($imap_general_debug) { echo "$read
"; flush(); } + $counter++; + } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)); + $response = $regs[1]; $message = trim($regs[2]); @@ -33,13 +30,16 @@ if ($handle_errors == true) { if ($response == "NO") { - set_up_language($squirrelmail_language); - echo "
\n"; - echo _("ERROR : Could not complete request."); - echo "
\n"; - echo _("Reason Given: "); - echo $message . "
\n"; - 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") { set_up_language($squirrelmail_language); echo "
\n"; @@ -54,9 +54,6 @@ 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. @@ -64,7 +61,8 @@ 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); + $imap_stream = fsockopen ($imap_server_address, $imap_port, + &$error_number, &$error_string, 15); $server_info = fgets ($imap_stream, 1024); // Decrypt the password @@ -80,7 +78,8 @@ exit; } - fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n"); + 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 **/ @@ -95,9 +94,12 @@ printf (_("Unknown error: %s") . "
\n", $message); echo "
"; echo _("Read data:") . "
\n"; - foreach ($read as $line) - { - echo htmlspecialchars($line) . "
\n"; + if (is_array($read)) + { + foreach ($read as $line) + { + echo htmlspecialchars($line) . "
\n"; + } } exit; } else { @@ -161,35 +163,86 @@ fputs ($imap_stream, "a001 LOGOUT\r\n"); } +function sqimap_capability($imap_stream, $capability) { + global $sqimap_capabilities; + global $imap_general_debug; + + if (!is_array($sqimap_capabilities)) { + fputs ($imap_stream, "a001 CAPABILITY\r\n"); + $read = sqimap_read_data($imap_stream, "a001", true, $a, $b); + $c = explode(' ', $read[0]); + for ($i=2; $i < count($c); $i++) { + list($k, $v) = explode('=', $c[$i]); + $sqimap_capabilities[$k] = ($v)?$v:TRUE; + } + } + return $sqimap_capabilities[$capability]; +} /****************************************************************************** ** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test... ******************************************************************************/ - function sqimap_get_delimiter ($imap_stream = false) { - global $optional_delimiter; - if (!$optional_delimiter) $optional_delimiter = "detect"; +function sqimap_get_delimiter ($imap_stream = false) { + global $imap_general_debug; + global $sqimap_delimiter; + global $optional_delimiter; - if (strtolower($optional_delimiter) == "detect") { - fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n"); - $read = sqimap_read_data($imap_stream, ".", true, $a, $b); - $quote_position = strpos ($read[0], "\""); - $delim = substr ($read[0], $quote_position+1, 1); - return $delim; - } else { - return $optional_delimiter; - } - - /* According to something that I can't find, this is supposed to work on all systems - - fputs ($imap_stream, "a001 NAMESPACE\r\n"); - $read = sqimap_read_data($imap_stream, "a001", true, $a, $b); - eregi("\"\" \"(.)\"", $read[0], $regs); - return $regs[1]; - */ + /* 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")) { + /* According to something that I can't find, this is supposed to work on all systems + OS: This won't work in Courier IMAP. + OS: According to rfc2342 response from NAMESPACE command is: + OS: * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES) + OS: We want to lookup all personal NAMESPACES... + */ + fputs ($imap_stream, "a001 NAMESPACE\r\n"); + $read = sqimap_read_data($imap_stream, "a001", true, $a, $b); + if (eregi('\* NAMESPACE +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL)', $read[0], $data)) { + if (eregi('^\( *\((.*)\) *\)', $data[1], $data2)) + $pn = $data2[1]; + $pna = explode(')(', $pn); + while (list($k, $v) = each($pna)) + { + list($_, $n, $_, $d) = explode('"', $v); + $pn[$n] = $d; + } +/* OS: We don't need this code right now, it is for other_users and shared folders + if (eregi('^\( *\((.*)\) *\)', $data[2], $data2)) + $on = $data2[1]; + if (eregi('^\( *\((.*)\) *\)', $data[3], $data2)) + $sn = $data2[1]; + unset($data); + $ona = explode(')(', $on); + while (list($k, $v) = each($ona)) + { + list($_, $n, $_, $d) = explode('"', $v); + $on[$n] = $d; + } + $sna = explode(')(', $sn); + while (list($k, $v) = each($sna)) + { + list($_, $n, $_, $d) = explode('"', $v); + $sn[$n] = $d; + } +*/ + } + $sqimap_delimiter = $pn[0]; + } else { + fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n"); + $read = sqimap_read_data($imap_stream, ".", true, $a, $b); + $quote_position = strpos ($read[0], "\""); + $sqimap_delimiter = substr ($read[0], $quote_position+1, 1); + } + } + return $sqimap_delimiter; +} /******************************************************************************