Changeset d1851ba in github

Timestamp:

Apr 6, 2010 2:40:45 AM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ace0624

Parents:

3616845

Message:

Configurable limit of address group members

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/localization/de_CH/messages.inc (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/steps/addressbook/groups.inc (modified) (1 diff)

config/main.inc.php.dist

@@ -183 +183 @@
 // Maximum number of recipients per message. Default: 0 (no limit)
 $rcmail_config['max_recipients'] = 0; 
+
+// Maximum allowednumber of members of an address group. Default: 0 (no limit)
+// If 'max_recipients' is set this value should be less or equal
+$rcmail_config['max_group_members'] = 0; 
 
 // add this user-agent to message headers when sending

program/localization/de_CH/messages.inc

@@ -110 +110 @@
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'UngÃŒltige E-Mail-Adresse: $email';
+$messages['toomanyrecipients'] = 'Zuviele EmpfÀnger angegeben. Reduzieren Sie die EmpfÀngeradressen auf $max.';
+$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe ÃŒberschreitet das Maximum von $max';
 
 ?>

program/localization/en_US/messages.inc

@@ -111 +111 @@
 $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
 $messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Incorrect e-mail address: $email';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max';
 
 ?>

program/steps/addressbook/groups.inc

@@ -32 +32 @@
     $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
     
-    if (!$plugin['abort'] && $CONTACTS->add_to_group($gid, $plugin['ids']))
+    $CONTACTS->set_group($gid);
+    $num2add = count(explode(',', $plugin['ids']));
+    
+    if (!$plugin['abort'] && ($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum))
+      $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
+    else if (!$plugin['abort'] && $CONTACTS->add_to_group($gid, $plugin['ids']))
       $OUTPUT->show_message('contactaddedtogroup');
     else if ($plugin['message'])