aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-11-30 13:13:05 +0300
committerGravatar Vitaly Takmazov2018-11-30 13:13:05 +0300
commit4034b885d3e934eb45c87b5377579fbbeb909544 (patch)
treee198f3c12baf6debc7e85cf185b0e5650ebbad75 /src/main
parentefb5920e3043ff11adbf15ab5f2a397817ff1fde (diff)
XMPP signup error page
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/server/www/controllers/SignUp.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/juick/server/www/controllers/SignUp.java b/src/main/java/com/juick/server/www/controllers/SignUp.java
index e4ea6958..e33b16cd 100644
--- a/src/main/java/com/juick/server/www/controllers/SignUp.java
+++ b/src/main/java/com/juick/server/www/controllers/SignUp.java
@@ -96,7 +96,8 @@ public class SignUp {
@RequestParam String hash,
@RequestParam String action,
@RequestParam(required = false) String username,
- @RequestParam(required = false) String password) {
+ @RequestParam(required = false) String password,
+ ModelMap modelMap) {
com.juick.User visitor = UserUtils.getCurrentUser();
int uid = 0;
@@ -152,6 +153,10 @@ public class SignUp {
emailService.addEmail(uid, email);
emailService.deleteAuthCode(hash);
} else {
+ if (type.equals("xmpp")) {
+ modelMap.addAttribute("result", "XMPP support is disabled for new users");
+ return "views/settings_result";
+ }
throw new HttpBadRequestException();
}
}