MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small changes/fixes

Browse Source 
Signed-off-by: Bernardus Jansen <bernardus@bajansen.nl>
This commit is contained in:
Bernardus Jansen
2016-05-19 21:51:14 +02:00
parent 35a748fc85
commit 72cbac1a56
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
+3 -3
View File
@@ -42,7 +42,7 @@ public class AdvancedSettingsCommand {
private String smtpServer;
private String smtpEncryption;
private int smtpPort;
private String smtpPort;
private String smtpUser;
private String smtpPassword;
@@ -150,11 +150,11 @@ public class AdvancedSettingsCommand {
this.smtpEncryption = smtpEncryption;
}
public int getSMTPPort() {
public String getSMTPPort() {
return smtpPort;
}
public void setSMTPPort(int smtpPort) {
public void setSMTPPort(String smtpPort) {
this.smtpPort = smtpPort;
}
libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
+9 -4
View File
@@ -137,7 +137,11 @@ public class MultiController extends MultiActionController {
return new ModelAndView("recover", "model", map);
}
/*
* e-mail user new password via configured SMTP server
*/
private boolean emailPassword(String password, String username, String email) {
/* Default to protocol smtp when SMTPEncryption is set to "None" */
String prot = "smtp";
if (settingsService.getSMTPServer() == null || settingsService.getSMTPServer().isEmpty()) {
@@ -155,6 +159,7 @@ public class MultiController extends MultiActionController {
}
props.put("mail." + prot + ".host", settingsService.getSMTPServer());
props.put("mail." + prot + ".port", settingsService.getSMTPPort());
/* use authentication when SMTPUser is configured */
if (settingsService.getSMTPUser() != null && !settingsService.getSMTPUser().isEmpty()) {
props.put("mail." + prot + ".auth", "true");
}
@@ -174,13 +179,13 @@ public class MultiController extends MultiActionController {
"Your Libresonic server\n" +
"libresonic.org");
message.setSentDate(new Date());
Transport trans = session.getTransport(prot);
try {
if (settingsService.getSMTPUser() != null && !settingsService.getSMTPUser().isEmpty()) {
trans.connect();
} else {
if (props.get("mail." + prot + ".auth").equals("true")) {
trans.connect(settingsService.getSMTPServer(), settingsService.getSMTPUser(), settingsService.getSMTPPassword());
} else {
trans.connect();
}
trans.sendMessage(message, message.getAllRecipients());
} finally {