diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 46970b70..6b40db90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,8 @@
+
+
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 32bfad65..23b73acf 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
- version = 1110;
+ version = 1112;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 0b26d62a..fe697b0c 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -109,19 +109,6 @@ public abstract class RepositoryServer {
targets_.add(Constants.MailAddress); //себе.
targets_.addAll(message_in.targets);
//------------------------------
- Vector targetsNames = new Vector<>();
- for (String target: targets_){
- String [] data = target.split("@");
- if (data.length>0) {
- String tname = data[0];
- targetsNames.add(tname);
- }
- }
- String text_ =
- "Адресаты: "+String.join(", ",targetsNames)+"\n"+
- message_in.text
- ;
- //------------------------------
Session session = Session.getDefaultInstance(props,
new Authenticator() {
@Override
@@ -143,7 +130,7 @@ public abstract class RepositoryServer {
message.setSubject(message_in.subject);
Multipart multipart = new MimeMultipart();
MimeBodyPart textBodyPart = new MimeBodyPart();
- textBodyPart.setText(text_);
+ textBodyPart.setText(message_in.text);
multipart.addBodyPart(textBodyPart);
for (String aName : innerFiles.keySet()) {
MimeBodyPart attachmentBodyPart = new MimeBodyPart();
diff --git a/src/Visual_DVM_2021/Passes/All/Email.java b/src/Visual_DVM_2021/Passes/All/Email.java
index 1f395a2f..52aac974 100644
--- a/src/Visual_DVM_2021/Passes/All/Email.java
+++ b/src/Visual_DVM_2021/Passes/All/Email.java
@@ -2,7 +2,10 @@ package Visual_DVM_2021.Passes.All;
import Repository.EmailMessage;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
+import Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+
+import java.util.Vector;
//http://java-online.ru/javax-mail.xhtml
//https://javarush.ru/groups/posts/1226-kak-otpravitjh-pisjhmo-iz-java-prilozhenija-s-primerom
public class Email extends ComponentsRepositoryPass {
@@ -18,11 +21,29 @@ public class Email extends ComponentsRepositoryPass {
}
@Override
protected void ServerAction() throws Exception {
+ Vector targetsNames = new Vector<>();
+ for (String target: target.targets){
+ if (server.db.subscribers.containsKey(target)) {
+ Subscriber subscriber = server.db.subscribers.get(target);
+ if (subscriber.mailOn != 0) {
+ String[] data = target.split("@");
+ if (data.length > 0) {
+ String tname = data[0];
+ targetsNames.add(tname);
+ }
+ }
+ }
+ }
+ String text_ =
+ "Адресаты: "+String.join(", ",targetsNames)+"\n"+
+ target.text
+ ;
+
//нужно разделить сообщение на несколько одинаковых, по числу адресатов.
for (String recipient : target.targets) {
EmailMessage part = new EmailMessage();
part.subject = target.subject;
- part.text = target.text;
+ part.text = text_;
part.targets.add(recipient);
part.files.putAll(target.files);
Command(new ServerExchangeUnit_2021(ServerCode.Email, "", part));