fixed most compilation errors

This commit is contained in:
Ziver Koc 2018-07-24 16:23:53 +02:00
parent cd24ee74e3
commit de503bd441
23 changed files with 208 additions and 475 deletions

View file

@ -3,6 +3,8 @@ package zall.page;
import zall.ZalleryServlet;
import zall.bean.Folder;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
@ -20,9 +22,13 @@ import java.util.logging.Logger;
public class GalleryServlet extends ZalleryServlet {
private static Logger logger = LogUtil.getLogger();
public static final String JSP_FILE = "gallery.jsp";
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
User user = AuthenticationManager.getUserSession(request.getSession());
Folder folder;
if (request.getParameter("folder") != null && !request.getParameter("folder").equalsIgnoreCase("null"))
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")));
else {
@ -33,6 +39,7 @@ public class GalleryServlet extends ZalleryServlet {
folder.save(db);
}
}
List<Media> list = Media.load(db, folder);
List<Folder> subFolders = Folder.loadSubFolders(db, folder, user);
@ -41,21 +48,19 @@ public class GalleryServlet extends ZalleryServlet {
request.setAttribute("subfolders", subFolders);
request.setAttribute("media", list);
include("header.jsp", request, response);
include("gallery.jsp", request, response);
include("footer.jsp", request, response);
include(JSP_FILE, request, response);
}
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
User user = AuthenticationManager.getUserSession(request.getSession());
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
long id = Long.parseLong(request.getParameter("id"));
if (request.getParameter("id") == null) {
msgs.add(UserMessage.MessageType.ERROR, "Missing parameters!");
msgs.add(UserMessage.MessageType.ERROR, "id" + lang.getString("error.not.found.parameter"));
return;
}
long id = Long.parseLong(request.getParameter("id"));
Folder folder = Folder.load(db, id);
switch (request.getParameter("action")) {
@ -66,18 +71,20 @@ public class GalleryServlet extends ZalleryServlet {
case "private":
if (folder != null) {
if (user.canEdit(folder)) {
if (AuthenticationManager.canEdit(user, folder)) {
folder.setPrivate(!folder.isPrivate());
folder.save(db);
if (folder.isPrivate())
msgs.add(UserMessage.MessageType.INFO, "Folder is now private (not visible to other users).");
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.modify.folder.is.private"));
else
msgs.add(UserMessage.MessageType.INFO, "Folder is now public (can be viewed by other users).");
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.modify.folder.is.public"));
} else
msgs.add(UserMessage.MessageType.ERROR, "You are not authorize to edit this folder!");
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.allowed.edit.folder"));
} else
msgs.add(UserMessage.MessageType.ERROR, "The folder does not exist!");
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.folder"));
break;
}
doGet(request, response, db);
}
}