From 56a19f1e5e8a462a1374ae4cb4ecacf48c479da6 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Thu, 4 Oct 2001 14:47:44 +0000 Subject: [PATCH] Use sqimap_session_id instead of axxxx for imap connections. (src part) git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1544 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/folders_rename_do.php | 8 +- src/read_body.php | 179 +++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 95 deletions(-) diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index 4c0dcfff..8807f645 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -33,10 +33,10 @@ else $newone = "$new_name"; - $cmd = "a024 RENAME \"" . quoteIMAP($orig) . "\" \"" . + $cmd = sqimap_session_id() . " RENAME \"" . quoteIMAP($orig) . "\" \"" . quoteIMAP($newone) . "\"\r\n"; fputs ($imapConnection, $cmd); - $data = sqimap_read_data($imapConnection, "a024", true, $a, $b); + $data = sqimap_read_data($imapConnection, sqimap_session_id(), true, $a, $b); // Renaming a folder doesn't renames the folder but leaves you unsubscribed // at least on Cyrus IMAP servers. @@ -47,9 +47,9 @@ sqimap_unsubscribe($imapConnection, $orig); sqimap_subscribe($imapConnection, $newone); - fputs ($imapConnection, "a001 LIST \"\" \"" . quoteIMAP($newone) . + fputs ($imapConnection, sqimap_session_id() . " LIST \"\" \"" . quoteIMAP($newone) . "*\"\r\n"); - $data = sqimap_read_data($imapConnection, "a001", true, $a, $b); + $data = sqimap_read_data($imapConnection, sqimap_session_id(), true, $a, $b); for ($i=0; $i < count($data); $i++) { $name = find_mailbox_name($data[$i]); diff --git a/src/read_body.php b/src/read_body.php index 50c18b1a..dfcf7e24 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -23,21 +23,21 @@ displayPageHeader($color, $mailbox); if (isset($view_hdr)) { - fputs ($imapConnection, "a003 FETCH $passed_id BODY[HEADER]\r\n"); - $read = sqimap_read_data ($imapConnection, "a003", true, $a, $b); + fputs ($imapConnection, sqimap_session_id() . " FETCH $passed_id BODY[HEADER]\r\n"); + $read = sqimap_read_data ($imapConnection, sqimap_session_id(), true, $a, $b); - echo '
'; - echo '' . "\n"; - echo "
" . _("Viewing full header") . ' - '; + echo '
' . + '' . "\n" . + "
" . _("Viewing full header") . ' - '; if (isset($where) && isset($what)) { // Got here from a search echo "'; } else { echo ""; } - echo ''._("View message") . "
\n"; - echo "\n"; - echo '
'; + echo ''._("View message") . "
\n" . + "\n" . + '
'; $cnum = 0; for ($i=1; $i < count($read); $i++) { @@ -304,14 +304,13 @@ $subject = decodeHeader(htmlspecialchars($message->header->subject)); do_hook('read_body_top'); - echo '
'; - - echo '' . "\n"; - echo '
'; - echo ' '; - echo ' '; - echo ' ' . + '
'; - echo ' '; + echo '
' . + '' . "\n" . + ' '; - echo ' ' . + ' '; - echo '
' . + ' ' . + ' ' . + ' '; - echo ' '; - echo '
' . + ' '; if ($where && $what) { echo " "; } else { @@ -324,11 +323,11 @@ } else { echo " "; } - echo _("Delete"); - echo '  '; - echo ' '; - echo ' '; - echo ' ' . "\n"; + echo _("Delete") . + '  ' . + ' ' . + ' ' . + ' ' . "\n"; if ($where && $what) { } else { if ($currentArrayIndex == -1) { @@ -346,33 +345,33 @@ echo _("Next"); } } - echo ' ' . "\n"; - echo ' '; - echo ' '; - echo " "; - echo _("Forward"); - echo ' | '; - echo " "; - echo _("Reply"); - echo ' | '; - echo " "; - echo _("Reply All"); - echo '  '; - echo ' '; - echo '
'; - echo '
'; - echo ' ' . "\n"; - echo ' ' . "\n"; + echo ' ' . "\n" . + ' ' . + ' ' . + '
' . + ' ' . + " " . + _("Forward") . + ' | ' . + " " . + _("Reply") . + ' | ' . + " " . + _("Reply All") . + '  ' . + ' ' . + '
' . + '
' . + ' ' . "\n" . + ' ' . "\n" . /** subject **/ - echo " \n"; - echo ' \n" . + ' ' . "\n"; - echo ' ' ."\n"; + echo '' . "\n" . + ' ' ."\n" . /** from **/ - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . /** date **/ - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . /** to **/ - echo " \n"; - echo " ' . "\n"; - echo ' ' . "\n"; + " \n" . + " ' . "\n" . + ' ' . "\n"; /** cc **/ if (isset($cc_string)) { - echo " \n"; - echo " ' . "\n"; - echo ' ' . "\n"; + echo " \n" . + " ' . "\n" . + ' ' . "\n"; } do_hook("read_body_header"); - echo '
\n"; - echo _("Subject:"); - echo " \n"; - echo " $subject \n"; - echo " ' . "\n"; + " \n" . + _("Subject:") . + " \n" . + " $subject \n" . + " ' . "\n"; if ($where && $what) { // Got here from a search echo "" . _("View full header") . "\n"; @@ -380,61 +379,59 @@ echo "" . _("View full header") . "\n"; } do_hook("read_body_header_right"); - echo '
' . "\n"; - echo _("From:"); - echo ' ' . "\n"; - echo " $from_name \n"; - echo '
' . "\n" . + _("From:") . + ' ' . "\n" . + " $from_name \n" . + '
' . "\n"; - echo _("Date:"); - echo " \n"; - echo " $dateString \n"; - echo '
' . "\n" . + _("Date:") . + " \n" . + " $dateString \n" . + '
\n"; - echo _("To:"); - echo ' ' . "\n"; - echo " $to_string \n"; - echo '
\n" . + _("To:") . + ' ' . "\n" . + " $to_string \n" . + '
\n"; - echo ' Cc:' . "\n"; - echo " \n"; - echo " $cc_string \n"; - echo '
\n" . + ' Cc:' . "\n" . + " \n" . + " $cc_string \n" . + '
'; - echo '
'; - echo "\n"; - - echo "
\n"; - echo '
'; + echo '
' . + '
' . + "\n" . + "
\n" . + '
'; $body = formatBody($imapConnection, $message, $color, $wrap_at); - echo $body; - - echo '
'; - echo '' . "\n"; - echo " "; - echo '
 
' . "\n"; + echo $body . + '
' . + '' . "\n" . + " " . + '
 
' . "\n"; do_hook('read_body_bottom'); do_hook('html_bottom'); sqimap_logout($imapConnection); -?> +?> \ No newline at end of file -- 2.25.1