aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'juick-www/src/main')
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Settings.java9
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/settings_main.html6
2 files changed, 1 insertions, 14 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Settings.java b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
index d2b65661..6fa3fd2e 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
@@ -181,15 +181,6 @@ public class Settings {
result = "<p>Error</p>";
}
break;
- case "email":
- String newHash = userService.updateSecretEmail(visitor);
- if (StringUtils.isNotEmpty(newHash)) {
- result = String.format("<p>New secret email: <strong>%s@mail.juick.com</strong></p>" +
- "<p><a href=\"/settings\">Back</a>.</p>", newHash);
- } else {
- throw new HttpBadRequestException();
- }
- break;
case "email-add":
if (!emailService.verifyAddressByCode(visitor.getUid(), request.getParameter("account"))) {
String authCode = UserUtils.generateHash(8);
diff --git a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
index 7a95f2a9..e5342229 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/settings_main.html
@@ -101,11 +101,7 @@
{% endif %}
<p>&nbsp;</p>
<p>You can post to Juick via e-mail. Send your <span style="text-decoration: underline">plain text</span>
- messages to special secret e-mail. You can attach one photo or video file.</p>
- <p>Secret email: {% if ehash is not empty %} <strong>{{ ehash }}</strong> {% else %}-{% endif %}</p>
- <form action="/settings" method="post">
- <p><input type="hidden" name="page" value="email"/><input type="submit" value=" Generate new "/></p>
- </form>
+ messages to <span><a href="mailto:juick@juick.com">juick@juick.com</a></span>. You can attach one photo or video file.</p>
</fieldset>
<fieldset>
<legend style="background: url(//static.juick.com/settings/facebook.png) no-repeat; padding-left: 58px; line-height: 48px;">