StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2024-03-25 18:35:49 +01:00
parent 0cb8b2a399 92e94eaa51
commit 70d32a9048
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.example</groupId> <groupId>org.example</groupId>
<artifactId>Widerhall</artifactId> <artifactId>Widerhall</artifactId>
<version>1.0.1</version> <version>1.0.2</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

1
src/main/java/de/srsoftware/widerhall/data/User.java
View File

@@ -9,6 +9,7 @@ import java.time.LocalDate;
import java.util.*; import java.util.*;
import static de.srsoftware.widerhall.Constants.*; import static de.srsoftware.widerhall.Constants.*;
import static de.srsoftware.widerhall.Util.t;
/** /**
* @author Stephan Richter * @author Stephan Richter

2
src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
View File

@@ -11,6 +11,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import static de.srsoftware.widerhall.Util.t;
public class SmtpClient { public class SmtpClient {
private static final Logger LOG = LoggerFactory.getLogger(SmtpClient.class); private static final Logger LOG = LoggerFactory.getLogger(SmtpClient.class);
private static final String HOST = "mail.smtp.host"; private static final String HOST = "mail.smtp.host";

2
src/main/java/de/srsoftware/widerhall/web/Web.java
View File

@@ -463,7 +463,7 @@ public class Web extends TemplateServlet {
if (email == null || email.isBlank() || if (email == null || email.isBlank() ||
name == null || name.isBlank() || name == null || name.isBlank() ||
pass == null || pass.isBlank() || pass == null || pass.isBlank() ||
pass_repeat == null || pass_repeat.isBlank()) return loadTemplate(REGISTER,Map.of(ERROR,t"Fill all fields, please!"),NAME,name,EMAIL,email),resp); pass_repeat == null || pass_repeat.isBlank()) return loadTemplate(REGISTER,Map.of(ERROR,t("Fill all fields, please!"),NAME,name,EMAIL,email),resp);
if (!pass.equals(pass_repeat)) return loadTemplate(REGISTER,Map.of(ERROR,t("Passwords do not match!"),NAME,name,EMAIL,email),resp); if (!pass.equals(pass_repeat)) return loadTemplate(REGISTER,Map.of(ERROR,t("Passwords do not match!"),NAME,name,EMAIL,email),resp);
if (Util.simplePassword(pass)) return loadTemplate(REGISTER,Map.of(ERROR,t("Password to short or to simple!"),NAME,name,EMAIL,email),resp); if (Util.simplePassword(pass)) return loadTemplate(REGISTER,Map.of(ERROR,t("Password to short or to simple!"),NAME,name,EMAIL,email),resp);

5
static/templates/footer.st
View File

@@ -1,4 +1,5 @@
<div class="footer"> <div class="footer">
Widerhall Mail-Verteiler. Version 1.0.1. Hol dir den Quellcode auf <a target="_blank" href="https://git.srsoftware.de/StephanRichter/Widerhall/src/branch/lang_de">git.srsoftware.de</a> Widerhall Mail-Verteiler.
Version 1.0.2.
Hol dir den Quellcode auf <a target="_blank" href="https://git.srsoftware.de/StephanRichter/Widerhall/src/branch/lang_de">git.srsoftware.de</a>
</div> </div>