ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Some smal fixes and updated Zutil

Browse source
This commit is contained in:
Ziver Koc 2017-08-01 23:21:49 +02:00
parent 99c9b136d7
commit 75f09064f7
4 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebContent/register.jsp
View file

@ -16,7 +16,7 @@
},
name: {
required: true,
firstLastName: true
//firstLastName: true
}
},
messages: {

10
Zallery.iml
View file

@ -44,5 +44,15 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="Zutil" />
<orderEntry type="module-library">
<library>
<CLASSES />
<JAVADOC />
<NATIVE>
<root url="file://$MODULE_DIR$/../IntelliJ/Hal/plugins/zwave/lib" />
</NATIVE>
<SOURCES />
</library>
</orderEntry>
</component>
</module>

2
src/zall/Zallery.java
View file

@ -125,7 +125,7 @@ public class Zallery extends HttpServlet{
user.logout( response );
if( !user.isEmailVerified() )
msgs.add(MessageType.ERROR, "Your email has not been verified!");
msgs.add(MessageType.WARNING, "Your email has not been verified!");
else if( !user.isEnabled() )
msgs.add(MessageType.ERROR, "Your account is disabled! Please contact the website administrator.");
else

26
src/zall/action/user/VerifyEmailAction.java
View file

@ -27,19 +27,23 @@ public class VerifyEmailAction extends ZalleryAction{
PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException {
User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id")));
if( verifiedUser.verifyEmail(request.getParameter("hash")) ){
if( verifiedUser.isEnabled() )
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified");
else {
ZalleryEmail.sendNewUserRegistrationToAdmin(verifiedUser, db);
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting account activation by an admin.");
if (verifiedUser != null) {
if (verifiedUser.verifyEmail(request.getParameter("hash"))) {
if (verifiedUser.isEnabled())
if (out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified");
else {
ZalleryEmail.sendNewUserRegistrationToAdmin(verifiedUser, db);
if (out != null) out.println("{ }");
else
msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin.");
}
verifiedUser.save(db);
}
verifiedUser.save(db);
else if (out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }");
else msgs.add(MessageType.ERROR, "Invalid email verification hash!");
}
else if(out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }");
else msgs.add(MessageType.ERROR, "Invalid email verification hash!");
else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
}