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

SMTP frontend

Browse Source 
Signed-off-by: Bernardus Jansen <bernardus@bajansen.nl>
master
Bernardus Jansen 8 years ago
parent 72cbac1a56
commit 69121a894a
6 changed files with 104 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      libresonic-main/pom.xml
  2. 20
      libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
  3. 20
      libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
  4. 22
      libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
  5. 34
      libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
  6. 50
      libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp

6
libresonic-main/pom.xml
Unescape View File

@ -259,6 +259,12 @@
<version>1.5.5</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.5.5</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>

20
libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
Unescape View File

@ -134,43 +134,43 @@ public class AdvancedSettingsCommand {
this.toast = toast;
}
public String getSMTPServer() {
public String getSmtpServer() {
return smtpServer;
}
public void setSMTPServer(String smtpServer) {
public void setSmtpServer(String smtpServer) {
this.smtpServer = smtpServer;
}
public String getSMTPEncryption() {
public String getSmtpEncryption() {
return smtpEncryption;
}
public void setSMTPEncryption(String smtpEncryption) {
public void setSmtpEncryption(String smtpEncryption) {
this.smtpEncryption = smtpEncryption;
}
public String getSMTPPort() {
public String getSmtpPort() {
return smtpPort;
}
public void setSMTPPort(String smtpPort) {
public void setSmtpPort(String smtpPort) {
this.smtpPort = smtpPort;
}
public String getSMTPUser() {
public String getSmtpUser() {
return smtpUser;
}
public void setSMTPUser(String smtpUser) {
public void setSmtpUser(String smtpUser) {
this.smtpUser = smtpUser;
}
public String getSMTPPassword() {
public String getSmtpPassword() {
return smtpPassword;
}
public void setSMTPPassword(String smtpPassword) {
public void setSmtpPassword(String smtpPassword) {
this.smtpPassword = smtpPassword;
}
}

20
libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
Unescape View File

@ -47,10 +47,10 @@ public class AdvancedSettingsController extends SimpleFormController {
command.setLdapAutoShadowing(settingsService.isLdapAutoShadowing());
command.setBrand(settingsService.getBrand());
command.setSMTPServer(settingsService.getSMTPServer());
command.setSMTPEncryption(settingsService.getSMTPEncryption());
command.setSMTPPort(settingsService.getSMTPPort());
command.setSMTPUser(settingsService.getSMTPUser());
command.setSmtpServer(settingsService.getSmtpServer());
command.setSmtpEncryption(settingsService.getSmtpEncryption());
command.setSmtpPort(settingsService.getSmtpPort());
command.setSmtpUser(settingsService.getSmtpUser());
return command;
}
@ -79,13 +79,13 @@ public class AdvancedSettingsController extends SimpleFormController {
settingsService.setLdapManagerPassword(command.getLdapManagerPassword());
}
settingsService.setSMTPServer(command.getSMTPServer());
settingsService.setSMTPEncryption(command.getSMTPEncryption());
settingsService.setSMTPPort(command.getSMTPPort());
settingsService.setSMTPUser(command.getSMTPUser());
settingsService.setSmtpServer(command.getSmtpServer());
settingsService.setSmtpEncryption(command.getSmtpEncryption());
settingsService.setSmtpPort(command.getSmtpPort());
settingsService.setSmtpUser(command.getSmtpUser());
if (StringUtils.isNotEmpty(command.getSMTPPassword())) {
settingsService.setSMTPPassword(command.getSMTPPassword());
if (StringUtils.isNotEmpty(command.getSmtpPassword())) {
settingsService.setSmtpPassword(command.getSmtpPassword());
}
settingsService.save();

22
libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
Unescape View File

@ -138,29 +138,29 @@ public class MultiController extends MultiActionController {
}
/*
* e-mail user new password via configured SMTP server
* 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" */
/* Default to protocol smtp when SmtpEncryption is set to "None" */
String prot = "smtp";
if (settingsService.getSMTPServer() == null || settingsService.getSMTPServer().isEmpty()) {
LOG.warn("Can not send email; no SMTP server configured.");
if (settingsService.getSmtpServer() == null || settingsService.getSmtpServer().isEmpty()) {
LOG.warn("Can not send email; no Smtp server configured.");
return false;
}
Properties props = new Properties();
if (settingsService.getSMTPEncryption().equals("SSL/TLS")) {
if (settingsService.getSmtpEncryption().equals("SSL/TLS")) {
prot = "smtps";
props.put("mail." + prot + ".ssl.enable", "true");
} else if (settingsService.getSMTPEncryption().equals("STARTTLS")) {
} else if (settingsService.getSmtpEncryption().equals("STARTTLS")) {
prot = "smtp";
props.put("mail." + prot + ".starttls.enable", "true");
}
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 + ".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");
}
@ -183,7 +183,7 @@ public class MultiController extends MultiActionController {
Transport trans = session.getTransport(prot);
try {
if (props.get("mail." + prot + ".auth").equals("true")) {
trans.connect(settingsService.getSMTPServer(), settingsService.getSMTPUser(), settingsService.getSMTPPassword());
trans.connect(settingsService.getSmtpServer(), settingsService.getSmtpUser(), settingsService.getSmtpPassword());
} else {
trans.connect();
}

34
libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
Unescape View File

@ -144,11 +144,11 @@ public class SettingsService {
private static final String KEY_SONOS_SERVICE_NAME = "SonosServiceName";
private static final String KEY_SONOS_SERVICE_ID = "SonosServiceId";
private static final String KEY_SMTP_SERVER = "SMTPServer";
private static final String KEY_SMTP_ENCRYPTION = "SMTPEncryption";
private static final String KEY_SMTP_PORT = "SMTPPort";
private static final String KEY_SMTP_USER = "SMTPUser";
private static final String KEY_SMTP_PASSWORD = "SMTPPassword";
private static final String KEY_SMTP_SERVER = "SmtpServer";
private static final String KEY_SMTP_ENCRYPTION = "SmtpEncryption";
private static final String KEY_SMTP_PORT = "SmtpPort";
private static final String KEY_SMTP_USER = "SmtpUser";
private static final String KEY_SMTP_PASSWORD = "SmtpPassword";
// Default values.
private static final String DEFAULT_INDEX_STRING = "A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ)";
@ -1459,52 +1459,52 @@ public class SettingsService {
this.versionService = versionService;
}
public String getSMTPServer() {
public String getSmtpServer() {
return properties.getProperty(KEY_SMTP_SERVER, DEFAULT_SMTP_SERVER);
}
public void setSMTPServer(String smtpServer) {
public void setSmtpServer(String smtpServer) {
setString(KEY_SMTP_SERVER, smtpServer);
}
public String getSMTPPort() {
public String getSmtpPort() {
return getString(KEY_SMTP_PORT, DEFAULT_SMTP_PORT);
}
public void setSMTPPort(String smtpPort) {
public void setSmtpPort(String smtpPort) {
setString(KEY_SMTP_PORT, smtpPort);
}
public String getSMTPEncryption() {
public String getSmtpEncryption() {
return properties.getProperty(KEY_SMTP_ENCRYPTION, DEFAULT_SMTP_ENCRYPTION);
}
public void setSMTPEncryption(String encryptionMethod) {
public void setSmtpEncryption(String encryptionMethod) {
setString(KEY_SMTP_ENCRYPTION, encryptionMethod);
}
public String getSMTPUser() {
public String getSmtpUser() {
return properties.getProperty(KEY_SMTP_USER, DEFAULT_SMTP_USER);
}
public void setSMTPUser(String smtpUser) {
public void setSmtpUser(String smtpUser) {
setString(KEY_SMTP_USER, smtpUser);
}
public String getSMTPPassword() {
public String getSmtpPassword() {
String s = properties.getProperty(KEY_SMTP_PASSWORD, DEFAULT_SMTP_PASSWORD);
try {
return StringUtil.utf8HexDecode(s);
} catch (Exception x) {
LOG.warn("Failed to decode SMTP password.", x);
LOG.warn("Failed to decode Smtp password.", x);
return s;
}
}
public void setSMTPPassword(String smtpPassword) {
public void setSmtpPassword(String smtpPassword) {
try {
smtpPassword = StringUtil.utf8HexEncode(smtpPassword);
} catch (Exception x) {
LOG.warn("Failed to encode SMTP password.", x);
LOG.warn("Failed to encode Smtp password.", x);
}
properties.setProperty(KEY_SMTP_PASSWORD, smtpPassword);
}

50
libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
Unescape View File

@ -41,6 +41,56 @@
</tr>
</table>
<table style="white-space:nowrap" class="indent">
<tr>
<td><fmt:message key="advancedsettings.smtpServer"/></td>
<td>
<form:input path="smtpServer" size="50"/>
<c:import url="helpToolTip.jsp"><c:param name="topic" value="smtpServer"/></c:import>
</td>
</tr>
<tr>
<td><fmt:message key="advancedsettings.smtpPort"/></td>
<td>
<form:input path="smtpPort" size="5"/>
<c:import url="helpToolTip.jsp"><c:param name="topic" value="smtpPort"/></c:import>
</td>
</tr>
<tr>
<td><fmt:message key="advancedsettings.smtpEncryption"/></td>
<td>
<form:select path="smtpEncryption" cssStyle="width:20em">
<fmt:message key="advancedsettings.smtpEncryption.none" var="none"/>
<fmt:message key="advancedsettings.smtpEncryption.starttls" var="starttls"/>
<fmt:message key="advancedsettings.smtpEncryption.ssl" var="ssl"/>
<form:option value="None" label="None"/>
<form:option value="STARTTLS" label="STARTTLS"/>
<form:option value="SSL/TLS" label="SSL/TLS"/>
</form:select>
</td>
</tr>
<tr>
<td><fmt:message key="advancedsettings.smtpUser"/></td>
<td>
<form:input path="smtpUser" size="40"/>
<c:import url="helpToolTip.jsp"><c:param name="topic" value="smtpUser"/></c:import>
</td>
</tr>
<tr>
<td><fmt:message key="advancedsettings.smtpPassword"/></td>
<td>
<form:password path="smtpPassword" size="40"/>
<c:import url="helpToolTip.jsp"><c:param name="topic" value="smtpPassword"/></c:import>
</td>
</tr>
</table>
<table class="indent"><tr><td>
<form:checkbox path="ldapEnabled" id="ldap" cssClass="checkbox" onclick="enableLdapFields()"/>
<label for="ldap"><fmt:message key="advancedsettings.ldapenabled"/></label>

Write Preview
Loading…
Cancel
Save