From 112c9133bb8dc3b4e8f1d47241fa57c86dd5065c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 05 Oct 2008 03:18:15 -0400
Subject: [PATCH] - removed deprecated rcube_add_label() and all uses - code for 'show' action added in r1937 moved to show.inc
---
program/steps/mail/show.inc | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 941c3cc..d8478d5 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -71,11 +71,16 @@
// give message uid to the client
$OUTPUT->set_env('uid', $MESSAGE->uid);
+ // set environement
$OUTPUT->set_env('safemode', $MESSAGE->is_safe);
$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
$OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
$OUTPUT->set_env('mailbox', $mbox_name);
-
+ if ($CONFIG['trash_mbox'])
+ $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
+ if (!$OUTPUT->ajax_call)
+ $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+
// check for unset disposition notification
if ($MESSAGE->headers->mdn_to &&
!$MESSAGE->headers->mdn_sent &&
@@ -92,7 +97,7 @@
}
else if (empty($CONFIG['mdn_requests']))
{
- rcube_add_label('mdnrequest');
+ $OUTPUT->add_label('mdnrequest');
$OUTPUT->set_env('mdn_request', true);
}
}
--
Gitblit v1.9.1