X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=1cdd83a0d445716eaf86a63bc1febb8fe0325893;hb=90bc0b93cb30d88fa4199370b902ca8671895f7d;hp=784a75d2dab64656c14d0b1f38c3e80edc0eda3e;hpb=1d2ce1c34e00aac31c2dacfc5473b8f389395f82;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 784a75d2..1cdd83a0 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,36 +3,72 @@
** imap.php
**
** This implements all functions that do general imap functions.
+ **
+ ** $Id$
**/
+ $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;
+ global $color, $squirrelmail_language, $imap_general_debug;
- //$imap_general_debug = true;
- $imap_general_debug = false;
+ $read = fgets($imap_stream, 9096);
- $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++;
+ if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+ $size = $regs[1];
+ } else {
+ $size = 0;
}
+ $data = Array();
+
+ $continue = true;
+ while ($continue) {
+ // Continue if needed for this single line
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ if ($imap_general_debug) {
+ echo "$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);
+ }
+ }
+
$response = $regs[1];
$message = trim($regs[2]);
if ($imap_general_debug) echo "--
";
- if ($handle_errors == true) {
- if ($response == "NO") {
+ 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.");
@@ -40,23 +76,20 @@
echo _("Reason Given: ");
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;
}
+ } 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.
@@ -64,7 +97,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 +114,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,12 +130,15 @@
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 if ($response == "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.
@@ -161,29 +199,89 @@
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++) {
+ $cap_list = explode('=', $c[$i]);
+ if (isset($cap_list[1]))
+ $sqimap_capabilities[$cap_list[0]] = $cap_list[1];
+ else
+ $sqimap_capabilities[$cap_list[0]] = TRUE;
+ }
+ }
+ return $sqimap_capabilities[$capability];
+}
/******************************************************************************
** Returns the delimeter between mailboxes: INBOX/Test, or INBOX.Test...
******************************************************************************/
- function sqimap_get_delimiter ($imap_stream = false) {
- 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);
+function sqimap_get_delimiter ($imap_stream = false) {
+ global $imap_general_debug;
+ global $sqimap_delimiter;
+ global $optional_delimiter;
- return $delim;
-
- /* 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;
+}
/******************************************************************************