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

Initial impl of Authenticator and jsp files

Browse source
This commit is contained in:
Ziver Koc 2017-10-19 15:46:38 +02:00
parent 41b7baa382
commit 58d4ab2f75
153 changed files with 7557 additions and 11415 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/zall/action/RegisterAction.java
View file

@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;

3
src/zall/action/media/ModifyMediaAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -35,7 +36,7 @@ public class ModifyMediaAction extends ZalleryAction{
Media media = Media.load(db, request.getParameter("type"), id);
if( media != null ){
if( user.canEdit(media) ){
if( AuthenticationManager.canEdit(user, media) ){
media.setTitle( request.getParameter("title") );
media.setDescription( request.getParameter("description") );
media.save(db);

3
src/zall/action/media/RemoveFolderAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.Folder;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -38,7 +39,7 @@ public class RemoveFolderAction extends ZalleryAction{
if( !folder.isEmpty(db) ){
if(out != null) out.println("{ \"error\": \"Folder is not empty!\"}");
else msgs.add(MessageType.ERROR, "Folder is not empty!");
} else if( user.canEdit(folder) ){
} else if( AuthenticationManager.canEdit(user, folder) ){
folder.delete( db );
if(out != null) out.println("{}");
else msgs.add(MessageType.INFO, "Folder removed successfully.");

3
src/zall/action/media/RemoveMediaAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -35,7 +36,7 @@ public class RemoveMediaAction extends ZalleryAction{
Media media = Media.load(db, request.getParameter("type"), id);
if( media != null ){
if( user.canEdit(media) ){
if( AuthenticationManager.canEdit(user, media) ){
media.delete( db );
if(out != null) out.println("{}");

3
src/zall/action/media/TogglePrivateAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.Folder;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -35,7 +36,7 @@ public class TogglePrivateAction extends ZalleryAction{
Folder folder = Folder.load(db, id);
if( folder != null ){
if( user.canEdit(folder) ){
if( AuthenticationManager.canEdit(user, folder) ){
folder.setPrivate( !folder.isPrivate() );
folder.save(db);
if(out != null) out.println("{}");

3
src/zall/action/user/ModifyUserStatusAction.java
View file

@ -10,6 +10,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
@ -31,7 +32,7 @@ public class ModifyUserStatusAction extends ZalleryAction{
else // set target user to the logged in user
target_user = user;
if( user.canEdit(target_user) ){
if( AuthenticationManager.canEdit(user, target_user) ){
if( request.getParameter("email") != null )
target_user.setEmail( request.getParameter("email") );
if( request.getParameter("password") != null ){

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

@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;