From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
program/steps/addressbook/mailto.inc | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 7116e55..4258b7c 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -1,11 +1,11 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| program/steps/addressbook/mailto.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2007, The Roundcube Dev Team |
+ | 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. |
@@ -19,28 +19,25 @@
+-----------------------------------------------------------------------+
*/
-$cids = rcmail_get_cids();
-$mailto = array();
-$recipients = null;
+$cids = rcmail_get_cids();
+$mailto = array();
+$sources = array();
-foreach ($cids as $source => $cid)
-{
+foreach ($cids as $source => $cid) {
$CONTACTS = $RCMAIL->get_address_book($source);
- if ($CONTACTS->ready)
- {
+ 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');
+ $sources[] = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email');
}
}
-if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source']))
-{
- $source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+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_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
@@ -51,22 +48,23 @@
$CONTACTS->set_group($group_id);
$CONTACTS->set_page(1);
$CONTACTS->set_pagesize(200); // limit somehow
- $recipients = $CONTACTS->list_records();
+ $sources[] = $CONTACTS->list_records();
}
}
-if ($recipients)
-{
- while (is_object($recipients) && ($rec = $recipients->iterate())) {
+foreach ($sources as $source) {
+ while (is_object($source) && ($rec = $source->iterate())) {
$emails = $CONTACTS->get_col_values('email', $rec, true);
- $mailto[] = format_email_recipient($emails[0], $rec['name']);
+
+ if (!empty($emails)) {
+ $mailto[] = format_email_recipient($emails[0], $rec['name']);
+ }
}
}
-if (!empty($mailto))
-{
+if (!empty($mailto)) {
$mailto_str = join(', ', $mailto);
- $mailto_id = substr(md5($mailto_str), 0, 16);
+ $mailto_id = substr(md5($mailto_str), 0, 16);
$_SESSION['mailto'][$mailto_id] = urlencode($mailto_str);
$OUTPUT->command('open_compose_step', array('_mailto' => $mailto_id));
}
--
Gitblit v1.9.1