diff options
author | Aleksander Machniak <alec@alec.pl> | 2019-12-15 13:01:37 +0300 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2019-12-15 13:01:37 +0300 |
commit | 5f30dc68a3b67eedb57a5f0115b4bad783cb3347 (patch) | |
tree | cbb4d0b3830b9e07122ab2f944067e0c41a44596 /program | |
parent | eadbe91c92890ca92aafedfe37e43140fe030a9b (diff) |
Fix so number of contacts in a group is not limited to 200 when redirecting to mail composer from Contacts (#6972)
Use max_group_members with fallback to 999 if unset.
Diffstat (limited to 'program')
-rw-r--r-- | program/steps/addressbook/groups.inc | 2 | ||||
-rw-r--r-- | program/steps/addressbook/mailto.inc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc index 33b8627b9..b61e426d5 100644 --- a/program/steps/addressbook/groups.inc +++ b/program/steps/addressbook/groups.inc @@ -37,7 +37,7 @@ if ($RCMAIL->action == 'group-addmembers') { $num2add = count($plugin['ids']); if (!$plugin['abort']) { - if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum)) { + if (($maxnum = $RCMAIL->config->get('max_group_members')) && ($CONTACTS->count()->count + $num2add > $maxnum)) { $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum)); $OUTPUT->send(); } diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc index 81fa14d5d..2d6480b8f 100644 --- a/program/steps/addressbook/mailto.inc +++ b/program/steps/addressbook/mailto.inc @@ -43,9 +43,11 @@ if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source'])) { $mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']); } else if ($CONTACTS->ready) { + $maxnum = (int) $RCMAIL->config->get('max_group_members'); + $CONTACTS->set_group($group_id); $CONTACTS->set_page(1); - $CONTACTS->set_pagesize(200); // limit somehow + $CONTACTS->set_pagesize($maxnum ?: 999); $sources[] = $CONTACTS->list_records(); } } |