diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-16 15:14:41 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-16 15:14:41 +0000 |
| commit | 272c49b8ca54267634f94d7fdde7c2c2040df165 (patch) | |
| tree | 6e51092afa198a7fbc01b061cca99ad59f112d9d /roundcubemail/program/steps/mail/get.inc | |
| parent | cbd7d7b73b9571a4030961155f1fe0cbb0f1a3d3 (diff) | |
Merged devel-framework branch (r5746:5779) back into trunk
git-svn-id: https://svn.roundcube.net/trunk@5781 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/get.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index d114e7c61..7da8f13fa 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/program/steps/mail/get.inc @@ -36,7 +36,7 @@ if (!empty($_GET['_preload'])) { ob_end_clean(); // Now we need IMAP connection -if (!$RCMAIL->imap_connect()) { +if (!$RCMAIL->storage_connect()) { // Get action is often executed simultanously. // Some servers have MAXPERIP or other limits. // To workaround this we'll wait for some time @@ -117,7 +117,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { if (!rcmail_mem_check($part->size * 10)) { $out = '<body>' . rcube_label('messagetoobig'). ' ' . html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id - .'&_mbox='. urlencode($RCMAIL->imap->get_mailbox_name()), rcube_label('download')) . '</body></html>'; + .'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')) . '</body></html>'; } else { // get part body if not available @@ -157,7 +157,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { $stdout = fopen('php://output', 'w'); stream_filter_register('rcube_content', 'rcube_content_filter') or die('Failed to register content filter'); stream_filter_append($stdout, 'rcube_content'); - $RCMAIL->imap->get_message_part($MESSAGE->uid, $part->mime_id, $part, false, $stdout); + $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, false, $stdout); } } else { @@ -165,7 +165,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { if ($part->body) echo $part->body; else if ($part->size) - $RCMAIL->imap->get_message_part($MESSAGE->uid, $part->mime_id, $part, true); + $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, true); } } |