From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 04 Jun 2014 11:20:33 -0400
Subject: [PATCH] Fix attachment menu structure and aria-attributes
---
program/steps/addressbook/mailto.inc | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 6813958..f5ff20b 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/addressbook/mailto.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2007-2013, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Compose a recipient list with all selected contacts |
@@ -14,37 +17,57 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id: copy.inc 471 2007-02-09 21:25:50Z thomasb $
-
*/
-$cid = get_input_value('_cid', RCUBE_INPUT_GET);
+$cids = rcmail_get_cids();
+$mailto = array();
$recipients = null;
-$mailto = array();
-if ($cid && preg_match('/^[a-z0-9\-\+\/_=]+(,[a-z0-9\-\+\/_=]+)*$/i', $cid) && $CONTACTS->ready)
-{
- $CONTACTS->set_page(1);
- $CONTACTS->set_pagesize(100);
- $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid);
+foreach ($cids as $source => $cid) {
+ $CONTACTS = $RCMAIL->get_address_book($source);
- while (is_object($recipients) && ($rec = $recipients->iterate()))
- $mailto[] = format_email_recipient($rec['email'], $rec['name']);
+ if ($CONTACTS->ready) {
+ $CONTACTS->set_page(1);
+ $CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query
+ $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email');
+ }
}
-if (!empty($mailto))
-{
- $mailto_str = join(', ', $mailto);
- $mailto_id = substr(md5($mailto_str), 0, 16);
- $_SESSION['mailto'][$mailto_id] = urlencode($mailto_str);
- $OUTPUT->redirect(array('task' => 'mail', '_action' => 'compose', '_mailto' => $mailto_id));
-}
-else
- $OUTPUT->show_message('nocontactsfound', 'warning');
+if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source'])) {
+ $source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+ $CONTACTS = $RCMAIL->get_address_book($source);
+ $group_id = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);
+ $group_data = $CONTACTS->get_group($group_id);
+
+ // group has an email address assigned: use that
+ if ($group_data['email']) {
+ $mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']);
+ }
+ else if ($CONTACTS->ready) {
+ $CONTACTS->set_group($group_id);
+ $CONTACTS->set_page(1);
+ $CONTACTS->set_pagesize(200); // limit somehow
+ $recipients = $CONTACTS->list_records();
+ }
+}
+
+if ($recipients) {
+ while (is_object($recipients) && ($rec = $recipients->iterate())) {
+ $emails = $CONTACTS->get_col_values('email', $rec, true);
+ $mailto[] = format_email_recipient($emails[0], $rec['name']);
+ }
+}
+
+if (!empty($mailto)) {
+ $mailto_str = join(', ', $mailto);
+ $mailto_id = substr(md5($mailto_str), 0, 16);
+ $_SESSION['mailto'][$mailto_id] = urlencode($mailto_str);
+ $OUTPUT->command('open_compose_step', array('_mailto' => $mailto_id));
+}
+else {
+ $OUTPUT->show_message('nocontactsfound', 'warning');
+}
// send response
$OUTPUT->send();
-
-?>
\ No newline at end of file
--
Gitblit v1.9.1