Changeset 3468 in subversion

Timestamp:

Apr 2, 2010 9:53:39 AM (3 years ago)

Author:

alec

Message:

• Added optional (max_recipients) support to restrict total number of recipients per message (#1484542)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/pl_PL/messages.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (5 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added optional (max_recipients) support to restrict total number of recipients per message (#1484542)
 - Re-organize editor buttons, add blockquote and search buttons
 - Make possible to write inside or after a quoted html message (#1485476)

trunk/roundcubemail/config/main.inc.php.dist

@@ -180 +180 @@
 // How many seconds must pass between emails sent by a user
 $rcmail_config['sendmail_delay'] = 0;
+
+// Maximum number of recipients per message. Default: 0 (no limit)
+$rcmail_config['max_recipients'] = 0; 
 
 // add this user-agent to message headers when sending

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -112 +112 @@
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
 
 ?>

trunk/roundcubemail/program/localization/pl_PL/messages.inc

@@ -155 +155 @@
 $messages['notuploadedwarning'] = 'Nie wszystkie załÄ
 czniki zostały pobrane. Poczekaj lub anuluj pobieranie.';
+$messages['toomanyrecipients'] = 'Zbyt wielu odbiorców. Zmniejsz ich liczbę do $max.';
 
 ?>

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -150 +150 @@
 }
 
-// parse email address input
-function rcmail_email_input_format($mailto)
-{
-  global $EMAIL_FORMAT_ERROR;
+// parse email address input (and count addresses)
+function rcmail_email_input_format($mailto, $count=false)
+{
+  global $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
 
   $regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<\S+@\S+>)/U');
@@ -198 +198 @@
   }
 
+  if ($count) {
+    $RECIPIENT_COUNT += count($result);
+  }
+
   return implode(', ', $result);
 }
@@ -213 +217 @@
 
 $EMAIL_FORMAT_ERROR = NULL;
-
-$mailto = rcmail_email_input_format(get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset));
-$mailcc = rcmail_email_input_format(get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset));
-$mailbcc = rcmail_email_input_format(get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset));
+$RECIPIENT_COUNT = 0;
+
+$mailto = rcmail_email_input_format(get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset), true);
+$mailcc = rcmail_email_input_format(get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset), true);
+$mailbcc = rcmail_email_input_format(get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset), true);
 
 if ($EMAIL_FORMAT_ERROR) {
@@ -298 +303 @@
   $headers['Bcc'] = $mailbcc;
   
-if (!empty($identity_arr['bcc']))
+if (!empty($identity_arr['bcc'])) {
   $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
+  $RECIPIENT_COUNT ++;
+}
+
+if (($max_recipients = (int) $RCMAIL->config->get('max_recipients')) > 0) {
+  if ($RECIPIENT_COUNT > $max_recipients) {
+    $OUTPUT->show_message('toomanyrecipients', 'error', array('max' => $max_recipients));
+    $OUTPUT->send('iframe');
+  }
+}
 
 // add subject
@@ -360 +374 @@
 
 
-$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
-$isHtml = ($isHtmlVal == "1");
+$isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
 
 // fetch message body