diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml
old mode 100644
new mode 100755
index ba26cc0e..d0b9b0e1
--- a/airsonic-main/pom.xml
+++ b/airsonic-main/pom.xml
@@ -323,12 +323,6 @@
1.1.0
-
- net.tanesha.recaptcha4j
- recaptcha4j
- 0.0.8
-
-
de.u-mass
lastfm-java
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
index a05ad05a..63b2a6d8 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
@@ -1,8 +1,5 @@
package org.airsonic.player.controller;
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
-import net.tanesha.recaptcha.ReCaptchaResponse;
import org.airsonic.player.domain.User;
import org.airsonic.player.service.SecurityService;
import org.airsonic.player.service.SettingsService;
@@ -49,21 +46,13 @@ public class RecoverController {
Map map = new HashMap();
String usernameOrEmail = StringUtils.trimToNull(request.getParameter("usernameOrEmail"));
- ReCaptcha captcha = ReCaptchaFactory.newSecureReCaptcha("6LcZ3OMSAAAAANkKMdFdaNopWu9iS03V-nLOuoiH",
- "6LcZ3OMSAAAAAPaFg89mEzs-Ft0fIu7wxfKtkwmQ", false);
- boolean showCaptcha = true;
if (usernameOrEmail != null) {
map.put("usernameOrEmail", usernameOrEmail);
User user = getUserByUsernameOrEmail(usernameOrEmail);
- String challenge = request.getParameter("recaptcha_challenge_field");
- String uresponse = request.getParameter("recaptcha_response_field");
- ReCaptchaResponse captchaResponse = captcha.checkAnswer(request.getRemoteAddr(), challenge, uresponse);
- if (!captchaResponse.isValid()) {
- map.put("error", "recover.error.invalidcaptcha");
- } else if (user == null) {
+ if (user == null) {
map.put("error", "recover.error.usernotfound");
} else if (user.getEmail() == null) {
map.put("error", "recover.error.noemail");
@@ -74,17 +63,12 @@ public class RecoverController {
user.setLdapAuthenticated(false);
user.setPassword(password);
securityService.updateUser(user);
- showCaptcha = false;
} else {
map.put("error", "recover.error.sendfailed");
}
}
}
- if (showCaptcha) {
- map.put("captcha", captcha.createRecaptchaHtml(null, null));
- }
-
return new ModelAndView("recover", "model", map);
}
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
index dbcdc7e7..3ee0b042 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
@@ -21,12 +21,6 @@
">
-
-
-
-
-
-
diff --git a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8-sources.jar b/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8-sources.jar
deleted file mode 100644
index ce7c4bc1..00000000
Binary files a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8-sources.jar and /dev/null differ
diff --git a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar b/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar
deleted file mode 100644
index 03460d70..00000000
Binary files a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar and /dev/null differ
diff --git a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom b/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom
deleted file mode 100644
index 4090c285..00000000
--- a/repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom
+++ /dev/null
@@ -1,6 +0,0 @@
-
- 4.0.0
- net.tanesha.recaptcha4j
- recaptcha4j
- 0.0.8
-
\ No newline at end of file