From d01f9fc7f5a369284fbfd92c6e804d84147e42a1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 04 Aug 2014 13:03:27 -0400
Subject: [PATCH] Add option (disabled_actions) to disable UI elements/actions (#1489638)
---
program/steps/mail/func.inc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 5efafda..c6c0b95 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -110,14 +110,14 @@
// set configuration
$RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
- 'skip_deleted', 'display_next', 'message_extwin', 'compose_extwin', 'forward_attachment'));
+ 'skip_deleted', 'display_next', 'message_extwin', 'forward_attachment'));
if (!$OUTPUT->ajax_call) {
$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
'copy', 'move', 'quota', 'replyall', 'replylist', 'stillsearching',
'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded',
- 'priority', 'withattachment');
+ 'priority', 'withattachment', 'fileuploaderror');
}
$pagetitle = $RCMAIL->localize_foldername($mbox_name, true);
@@ -2075,6 +2075,7 @@
));
$content = html::tag('input', array('type' => 'hidden', 'name' => '_unlock', 'value' => ''))
+ . html::tag('input', array('type' => 'hidden', 'name' => '_framed', 'value' => '1'))
. html::div(null, $fileinput->show())
. html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));
@@ -2112,11 +2113,10 @@
foreach ($abook->list_groups($search, $search_mode) as $group) {
$abook->reset();
$abook->set_group($group['ID']);
- $group_prop = $abook->get_group($group['ID']);
// group (distribution list) with email address(es)
- if ($group_prop['email']) {
- foreach ((array)$group_prop['email'] as $email) {
+ if ($group['email']) {
+ foreach ((array)$group['email'] as $email) {
$row_id = 'G'.$group['ID'];
$jsresult[$row_id] = format_email_recipient($email, $group['name']);
$OUTPUT->command('add_contact_row', $row_id, array(
@@ -2124,7 +2124,7 @@
}
}
// make virtual groups clickable to list their members
- else if ($group_prop['virtual']) {
+ else if ($group['virtual']) {
$row_id = 'G'.$group['ID'];
$OUTPUT->command('add_contact_row', $row_id, array(
'contactgroup' => html::a(array(
--
Gitblit v1.9.1