git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@324
7612ce4b-ef26-0410-bec9-
ea0150e637f0
if (strpos($string, "<") == 1) {
$string = sqimap_find_email($string);
} else {
if (strpos($string, "<") == 1) {
$string = sqimap_find_email($string);
} else {
+ $string = trim($string);
$string = substr($string, 0, strpos($string, "<"));
$string = substr($string, 0, strpos($string, "<"));
+ $string = ereg_replace ("\"", "", $string);
******************************************************************************/
function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
sqimap_mailbox_select ($imap_stream, $mailbox);
******************************************************************************/
function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
sqimap_mailbox_select ($imap_stream, $mailbox);
- fputs ($imap_stream, "a001 EXPUNGE\n");
+ fputs ($imap_stream, "a001 EXPUNGE\r\n");
$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
** Selects a mailbox
******************************************************************************/
function sqimap_mailbox_select ($imap_stream, $mailbox) {
** Selects a mailbox
******************************************************************************/
function sqimap_mailbox_select ($imap_stream, $mailbox) {
- fputs ($imap_stream, "a001 SELECT \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
$dm = sqimap_get_delimiter($imap_stream);
$mailbox = $mailbox.$dm;
}
$dm = sqimap_get_delimiter($imap_stream);
$mailbox = $mailbox.$dm;
}
- fputs ($imap_stream, "a001 CREATE \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
sqimap_subscribe ($imap_stream, $mailbox);
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
sqimap_subscribe ($imap_stream, $mailbox);
** Subscribes to an existing folder
******************************************************************************/
function sqimap_subscribe ($imap_stream, $mailbox) {
** Subscribes to an existing folder
******************************************************************************/
function sqimap_subscribe ($imap_stream, $mailbox) {
- fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
** Unsubscribes to an existing folder
******************************************************************************/
function sqimap_unsubscribe ($imap_stream, $mailbox) {
** Unsubscribes to an existing folder
******************************************************************************/
function sqimap_unsubscribe ($imap_stream, $mailbox) {
- fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
}
** This function simply deletes the given folder
******************************************************************************/
function sqimap_mailbox_delete ($imap_stream, $mailbox) {
** This function simply deletes the given folder
******************************************************************************/
function sqimap_mailbox_delete ($imap_stream, $mailbox) {
- fputs ($imap_stream, "a001 DELETE \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
echo "mailbox: $mailbox<BR>";
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
sqimap_unsubscribe ($imap_stream, $mailbox);
echo "mailbox: $mailbox<BR>";
$read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
sqimap_unsubscribe ($imap_stream, $mailbox);
$dm = sqimap_get_delimiter ($imap_stream);
$dm = sqimap_get_delimiter ($imap_stream);
- fputs ($imap_stream, "a001 LIST \"\" INBOX\n");
+ fputs ($imap_stream, "a001 LIST \"\" INBOX\r\n");
$read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$g = 0;
$phase = "inbox";
$read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$g = 0;
$phase = "inbox";
$boxes[$g]["id"] = $g;
/** Now lets get the flags for this mailbox **/
$boxes[$g]["id"] = $g;
/** Now lets get the flags for this mailbox **/
- fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\n");
+ fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n");
$read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
$flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
$read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
$flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
if (!$read_ary[$i+1]) {
if ($phase == "inbox") {
if (!$read_ary[$i+1]) {
if ($phase == "inbox") {
- fputs ($imap_stream, "a001 LSUB \"\" *\n");
+ fputs ($imap_stream, "a001 LSUB \"\" *\r\n");
$read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$phase = "lsub";
$i--;
$read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$phase = "lsub";
$i--;
** Copies specified messages to specified folder
******************************************************************************/
function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
** Copies specified messages to specified folder
******************************************************************************/
function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
- fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n");
+ fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
}
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
}
** Sets the specified messages with specified flag
******************************************************************************/
function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
** Sets the specified messages with specified flag
******************************************************************************/
function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
- fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\n");
+ fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
}
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
}
** Returns some general header information -- FROM, DATE, and SUBJECT
******************************************************************************/
function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
** Returns some general header information -- FROM, DATE, and SUBJECT
******************************************************************************/
function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\n");
+ fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
for ($i = 0; $i < count($read); $i++) {
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
for ($i = 0; $i < count($read); $i++) {
** Returns the flags for the specified messages
******************************************************************************/
function sqimap_get_flags ($imap_stream, $start, $end) {
** Returns the flags for the specified messages
******************************************************************************/
function sqimap_get_flags ($imap_stream, $start, $end) {
- fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\n");
+ fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$i = 0;
while ($i < count($read)) {
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$i = 0;
while ($i < count($read)) {
** Wrapper function that reformats the header information.
******************************************************************************/
function sqimap_get_message_header ($imap_stream, $id) {
** Wrapper function that reformats the header information.
******************************************************************************/
function sqimap_get_message_header ($imap_stream, $id) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n");
+ fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
return sqimap_get_header($imap_stream, $read);
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
return sqimap_get_header($imap_stream, $read);
** Returns the body of a message.
******************************************************************************/
function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
** Returns the body of a message.
******************************************************************************/
function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
+ fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$i = 0;
$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
$i = 0;