Merge pull request #24 from Janfred/broadcast_improvements

Broadcast improvements:
- allow to send to mailboxes only
- allow to send to only some domains
- allow domain admins to send to their domains - new config option $CONF['sendmail_all_admins']

broadcast-message.php

@@ -27,7 +27,11 @@
 
 require_once('common.php');
 
-authentication_require_role('global-admin');
+if (Config::bool('sendmail_all_admins')) {
+   authentication_require_role('admin');
+} else {
+   authentication_require_role('global-admin');
+}
 
 if ($CONF['sendmail'] != 'YES') {
    header("Location: main.php");
@@ -37,6 +41,7 @@ if ($CONF['sendmail'] != 'YES') {
 $error = 0;
 
 $smtp_from_email = smtp_get_admin_email();
+$allowed_domains = list_domains_for_admin(authentication_get_username());
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
@@ -49,23 +54,35 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
    }
    else
    {
+      $wanted_domains = array_intersect($allowed_domains, $_POST['domains']);
+
       $table_mailbox = table_by_key('mailbox');
-	  $table_alias = table_by_key('alias');
-      
-	  $q = "select username from $table_mailbox union select goto from $table_alias " .
-		   "where goto not in (select username from $table_mailbox)";
-
-      $result = db_query ($q);
-      if ($result['rows'] > 0)
-      {
+      $table_alias = table_by_key('alias');
+
+      $recipients = [];
+
+      $q = "SELECT username from $table_mailbox WHERE ".db_in_clause("domain", $wanted_domains);
+      if (intval(safepost('mailboxes_only')) == 0) {
+         $q .= " UNION SELECT goto FROM $table_alias WHERE ".db_in_clause("domain", $wanted_domains)."AND goto NOT IN ($q)";
+      }
+      $result = db_query($q);
+      if($result['rows'] > 0) {
+         while($row = db_array($result['result'])) {
+            $recipients[] = $row[0];
+         }
+      }
+
+      $recipients = array_unique($recipients);
+
+      if(count($recipients)>0) {
          mb_internal_encoding("UTF-8");
          $b_name = mb_encode_mimeheader( $_POST['name'], 'UTF-8', 'Q');
          $b_subject = mb_encode_mimeheader( $_POST['subject'], 'UTF-8', 'Q');
          $b_message = base64_encode($_POST['message']);
 
          $i = 0;
-         while ($row = db_array ($result['result'])) {
-            $fTo = $row[0];
+         foreach ($recipients as $rcpt) {
+            $fTo = $rcpt;
             $fHeaders  = 'To: ' . $fTo . "\n";
             $fHeaders .= 'From: ' . $b_name . ' <' . $smtp_from_email . ">\n";
             $fHeaders .= 'Subject: ' . $b_subject . "\n";
@@ -94,6 +111,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
 if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1)
 {
+	$smarty->assign ('allowed_domains', $allowed_domains);
 	$smarty->assign ('smtp_from_email', $smtp_from_email);
 	$smarty->assign ('error', $error);
 	$smarty->assign ('smarty_template', 'broadcast-message');

config.inc.php

@@ -396,6 +396,9 @@ $CONF['backup'] = 'NO';
 // Send Mail
 // If you don't want sendmail tab set this to 'NO';
 $CONF['sendmail'] = 'YES';
+// Set this to YES if you want to allow non-super-admins to
+// send mails to their users
+$CONF['sendmail_all_admins'] = 'NO';
 
 // Logging
 // If you don't want logging set this to 'NO';

languages/bg.lang

@@ -323,6 +323,8 @@ $PALANG['pBroadcast_name'] = 'Име';
 $PALANG['pBroadcast_success'] = 'Вашето съобщение беше изпратено.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Съобщение до всички';
 $PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие и Съобщение са задължителни!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/ca.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/cn.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/cs.lang

@@ -334,7 +334,8 @@ $PALANG['pBroadcast_name'] = 'Vaše jméno';
 $PALANG['pBroadcast_success'] = 'Zpráva pro všechny schránky byla odeslána.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Poslat email všem';
 $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné !';
-
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
 $PALANG['pStatus_custom'] = 'Doručeno do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/da.lang

@@ -333,6 +333,8 @@ $PALANG['pBroadcast_name'] = 'Dit navn';
 $PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Rundsend meddelse';
 $PALANG['pBroadcast_error_empty']       = 'Felterne "Dit navn", "Emne" og "Meddelelse" skal alle udfyldes.';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres ';
 $PALANG['pStatus_custom'] = 'Leveres til ';

languages/de.lang

@@ -331,6 +331,8 @@ $PALANG['pBroadcast_name'] = 'Ihr Name';
 $PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Rundmail';
 $PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht dürfen nicht leer sein!';
+$PALANG['broadcast_mailboxes_only'] = "Nur an Postfächer senden";
+$PALANG['broadcast_to_domains'] = "Senden an Domains:";
 
 $PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR ';
 $PALANG['pStatus_custom'] = 'Zustellung an ';

languages/en.lang

@@ -331,6 +331,8 @@ $PALANG['pBroadcast_name'] = 'Your name';
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message';
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes';
+$PALANG['broadcast_to_domains'] = 'Send to domains:';
 
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE ';
 $PALANG['pStatus_custom'] = 'Delivers to ';

languages/es.lang

@@ -324,6 +324,8 @@ $PALANG['pBroadcast_name'] = 'Tu nombre';
 $PALANG['pBroadcast_success'] = 'Se ha enviado el mensaje.'; 
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pueden estar vacíos!'; 
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'posiblemente NO SE ENTREGÓ'; 
 $PALANG['pStatus_custom'] = 'Enviado a '; 
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/et.lang

@@ -326,6 +326,8 @@ $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/eu.lang

@@ -321,6 +321,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/fi.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Nimesi';
 $PALANG['pBroadcast_success'] = 'Tiedostusviestisi on lähetetty.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Tiedotusviesti';
 $PALANG['pBroadcast_error_empty'] = 'Nimi, Aihe tai Viesti kenttien ei pidä olla tyhjiä!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'ehkä ei voida toimittaa ';
 $PALANG['pStatus_custom'] = 'Toimittaa osoiteeseen ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/fo.lang

@@ -327,6 +327,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/fr.lang

@@ -324,7 +324,9 @@ $PALANG['pBroadcast_title'] = 'Envoyer un message général';
 $PALANG['pBroadcast_name'] = 'Votre nom';
 $PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
 $PALANG['pAdminMenu_broadcast_message'] = 'message général';
-$PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides !';
+$PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'Non délivrable ';
 $PALANG['pStatus_custom'] = 'Délivré à ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/hr.lang

@@ -320,6 +320,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/hu.lang

@@ -332,6 +332,8 @@ $PALANG['pBroadcast_name'] = 'Neved';
 $PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast üzenet'; # XXX partly translated
 $PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetnek üresek !';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető ';
 $PALANG['pStatus_custom'] = 'Ide kézbesítődik ';

languages/is.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/it.lang

@@ -323,6 +323,8 @@ $PALANG['pBroadcast_name'] = 'Il tuo nome';
 $PALANG['pBroadcast_success'] = 'Il tuo messaggio è stato inoltrato a tutto il gruppo.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Invio di gruppo';
 $PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non possono restare vuoti!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE ';
 $PALANG['pStatus_custom'] = 'In consegna a ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/ja.lang

@@ -330,6 +330,8 @@ $PALANG['pBroadcast_name'] = '名前';
 $PALANG['pBroadcast_success'] = 'ブロードキャストメッセージは送信されました。';
 $PALANG['pAdminMenu_broadcast_message'] = 'ブロードキャスト';
 $PALANG['pBroadcast_error_empty'] = '名前、件名、メッセージは入力が必要です。';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'おそらく配送不可能 ';
 $PALANG['pStatus_custom'] = '配送先 ';

languages/lt.lang

@@ -328,6 +328,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/mk.lang

@@ -323,6 +323,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/nb.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Ditt navn';
 $PALANG['pBroadcast_success'] = 'Masseutsendelsesmeldingen ble sendt.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Send masseutsendelse';
 $PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke være tomme!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES ';
 $PALANG['pStatus_custom'] = 'Leverer til ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/nl.lang

@@ -323,6 +323,8 @@ $PALANG['pBroadcast_name'] = 'Uw naam';
 $PALANG['pBroadcast_success'] = 'Uw algemene bericht is verzonden.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Algemeen bericht';
 $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
 $PALANG['pStatus_custom'] = 'Bezorgen op ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/nn.lang

@@ -321,6 +321,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/pl.lang

@@ -328,6 +328,8 @@ $PALANG['pBroadcast_name'] = 'Nazwa';
 $PALANG['pBroadcast_success'] = 'Wiadomość do wszystkich została wysłana.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Wiadomość do wszystkich';
 $PALANG['pBroadcast_error_empty'] = 'Pola Nazwa, Temat i Wiadomość nie powinny być puste !';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA ';
 $PALANG['pStatus_custom'] = 'Dostarczyć do ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/pt-br.lang

@@ -332,6 +332,8 @@ $PALANG['pBroadcast_name'] = 'Seu nome';
 $PALANG['pBroadcast_success'] = 'Mensagem em massa enviada.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Mensagem em massa';
 $PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Assunto e Mensagem devem ser preenchidos!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL ';
 $PALANG['pStatus_custom'] = 'Envia para ';

languages/ro.lang

@@ -330,6 +330,8 @@ $PALANG['pBroadcast_name'] = 'Numele';
 $PALANG['pBroadcast_success'] = 'A fost trimis mesajul la toti utilizatorii.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Mesaj general';
 $PALANG['pBroadcast_error_empty'] = 'Campurile Nume, Subiect si Mesaj nu pot fi goale!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'probabil UNDELIVERABLE ';
 $PALANG['pStatus_custom'] = 'Livreaza la ';

languages/ru.lang

@@ -332,6 +332,8 @@ $PALANG['pBroadcast_name'] = 'Ваше имя';
 $PALANG['pBroadcast_success'] = 'Ваше широковещательное сообщение было отправлено.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Широковещательное сообщение';
 $PALANG['pBroadcast_error_empty'] = 'Поля Имя, Тема и Сообщение не должны быть пустыми!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'возможно НЕ ДОСТАВЛЕНО ';
 $PALANG['pStatus_custom'] = 'Доставляется для ';

languages/sk.lang

@@ -323,6 +323,8 @@ $PALANG['pBroadcast_name'] = 'Vaše meno';
 $PALANG['pBroadcast_success'] = 'Hromadná správa bola odoslaná.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Hromadná správa';
 $PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu byť prázdne!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ ';
 $PALANG['pStatus_custom'] = 'Doručuje sa na ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP ';

languages/sl.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/sv.lang

@@ -331,6 +331,8 @@ $PALANG['pBroadcast_name'] = 'Ditt namn';
 $PALANG['pBroadcast_success'] = 'Ditt grupputskick har sänts.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Grupputskick';
 $PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande ska inte vara tomma!';
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 
 $PALANG['pStatus_undeliverable'] = 'kan eventuellt ej levereras ';
 $PALANG['pStatus_custom'] = 'Levereras till ';

languages/tr.lang

@@ -322,6 +322,8 @@ $PALANG['pBroadcast_name'] = 'Your name'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
 $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
 $PALANG['pStatus_custom'] = 'Delivers to '; # XXX
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

languages/tw.lang

@@ -324,6 +324,8 @@ $PALANG['pBroadcast_name'] = '你的名字';
 $PALANG['pBroadcast_success'] = '你給所有用戶的郵件已發出。';
 $PALANG['pAdminMenu_broadcast_message'] = '發送給所有用戶';
 $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX
+$PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX
+$PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX
 $PALANG['pStatus_undeliverable'] = '可能無法送遞 ';
 $PALANG['pStatus_custom'] = '送遞至 ';
 $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX

templates/broadcast-message.tpl

@@ -21,6 +21,18 @@
 		<td class="label"><label>{$PALANG.message}:</label></td>
 		<td><textarea class="flat" cols="40" rows="6" name="message"></textarea></td>
 	</tr>
+	<tr>
+		<td class="label"><label>{$PALANG.broadcast_mailboxes_only}</label></td>
+		<td><input type="checkbox" value="1" name="mailboxes_only"/></td>
+	</tr>
+	<tr>
+		<td class="label"><label>{$PALANG.broadcast_to_domains}</label></td>
+		<td>
+			<select multiple="multiple" name="domains[]">
+				{html_options output=$allowed_domains values=$allowed_domains selected=$allowed_domains}
+			</select>
+		</td>
+	</tr>
 	<tr>
 		<td>&nbsp;</td>
 		<td>

templates/menu.tpl

@@ -62,7 +62,7 @@
 	<li><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a>
 		<ul>
 			<li><a target="_top" href="{#url_sendmail#}">{$PALANG.pMenu_sendmail}</a></li>
-{if $authentication_has_role.global_admin}
+{if $authentication_has_role.global_admin || $CONF.sendmail_all_admins === 'YES'}
 			<li><a target="_top" href="{#url_broadcast_message#}">{$PALANG.pAdminMenu_broadcast_message}</a></li>
 {/if}
 		</ul>