fixed most compilation errors
This commit is contained in:
parent
cd24ee74e3
commit
de503bd441
23 changed files with 208 additions and 475 deletions
|
|
@ -74,201 +74,6 @@ public class Zallery extends HttpServlet{
|
|||
|
||||
}
|
||||
|
||||
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException{
|
||||
DBConnection db = null;
|
||||
try{
|
||||
doGet(request, response, db = getDB());
|
||||
} finally{
|
||||
if(db != null) db.close();
|
||||
}
|
||||
}
|
||||
|
||||
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException{
|
||||
try{
|
||||
response.setContentType("text/html");
|
||||
HttpSession session = request.getSession();
|
||||
String page = new File(request.getRequestURI()).getName();
|
||||
request.setAttribute("page", page);
|
||||
User user = (User) session.getAttribute("user");
|
||||
String action = request.getParameter("action");
|
||||
if( action == null ) action = "";
|
||||
UserMessage msgs = UserMessage.getUserMessage(session);
|
||||
|
||||
|
||||
// Verify email address
|
||||
if( action.equalsIgnoreCase("verfemail") ){
|
||||
User verfUser = User.load(db, Long.parseLong(request.getParameter("id")));
|
||||
if (verfUser != null) {
|
||||
if( verfUser.verifyEmail(request.getParameter("hash")) ){
|
||||
ZalleryEmail.sendNewUserRegistrationToAdmin(verfUser, db);
|
||||
verfUser.save(db);
|
||||
msgs.add(MessageType.INFO, "Your email has been successfully verified.");
|
||||
msgs.add(MessageType.WARNING, "The account is waiting account activation by an admin.");
|
||||
}
|
||||
else
|
||||
msgs.add(MessageType.ERROR, "Email verification failed!");
|
||||
}
|
||||
else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
|
||||
}
|
||||
// auth with cookie
|
||||
if( user == null ){
|
||||
user = User.loadByCookie(request, db, getCookieValue(request.getCookies(), "sessionHash") );
|
||||
if(user != null){
|
||||
logger.info("Used cookies to auth User: \""+user.getName()+"\".");
|
||||
session.setAttribute("user", user);
|
||||
}
|
||||
}
|
||||
|
||||
if( user == null && ( !page.startsWith("register") && !page.startsWith("login") )){
|
||||
//response.sendRedirect("login?redirect=\""+getUrl(request)+"\"");
|
||||
response.sendRedirect("login");
|
||||
return;
|
||||
}
|
||||
// validate user or Logout
|
||||
if( user != null && ( !user.valid(request) || page.startsWith("logout") )){
|
||||
logger.info("Logging Out User: \""+user.getName()+"\".");
|
||||
session.invalidate();
|
||||
session = request.getSession( true );
|
||||
msgs.setSession( session );
|
||||
user.logout( response );
|
||||
|
||||
if( !user.isEmailVerified() )
|
||||
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
|
||||
msgs.add(MessageType.WARNING, "Your have been logged out.");
|
||||
user = null;
|
||||
response.sendRedirect("login");
|
||||
return;
|
||||
}
|
||||
|
||||
//**********************************************************
|
||||
String include_jsp = null;
|
||||
if( user != null ){
|
||||
logger.finest("Valid user: \""+user.getName()+"\"");
|
||||
// Import JSP pages
|
||||
if(page.startsWith("media")){
|
||||
try{
|
||||
if( request.getParameter("id") == null && request.getParameter("type") == null){
|
||||
msgs.add(MessageType.ERROR, "Missing parameters!");
|
||||
return;
|
||||
}
|
||||
int id = Integer.parseInt( request.getParameter("id") );
|
||||
Media media = Media.load(db, request.getParameter("type"), id);
|
||||
|
||||
request.setAttribute("media", media);
|
||||
include_jsp = "media.jsp";
|
||||
}catch(NumberFormatException e){ logger.log(Level.FINE, "", e); }
|
||||
}
|
||||
else if(page.startsWith("login")){
|
||||
include_jsp = "login.jsp";
|
||||
}
|
||||
else if(page.startsWith("profile")){
|
||||
if( request.getParameter("id") != null ){
|
||||
User profile_user = User.load(db, Long.parseLong( request.getParameter("id") ));
|
||||
if( AuthenticationManager.canEdit( user, profile_user )){
|
||||
request.setAttribute("profile_user", profile_user);
|
||||
include_jsp = "profile.jsp";
|
||||
}else{
|
||||
msgs.add(MessageType.ERROR, "You do not have permission to edit this user.");
|
||||
}
|
||||
}else{
|
||||
request.setAttribute("profile_user", user);
|
||||
include_jsp = "profile.jsp";
|
||||
}
|
||||
}
|
||||
else if(page.startsWith("users")){
|
||||
List<User> users = User.load(db);
|
||||
request.setAttribute("users", users);
|
||||
include_jsp = "users.jsp";
|
||||
}
|
||||
else if(page.startsWith("upload")){
|
||||
List<Folder> dirList = Folder.load(db, user);
|
||||
request.setAttribute("folders", dirList);
|
||||
include_jsp = "upload.jsp";
|
||||
}
|
||||
else if( page.startsWith("slideshow") ){
|
||||
Image image = Image.load(db, Integer.parseInt( request.getParameter("id") ));
|
||||
request.setAttribute("image", image );
|
||||
List<Image> list = Image.loadFolder(db, image.getFolder());
|
||||
|
||||
request.setAttribute("image", image);
|
||||
request.setAttribute("images", list);
|
||||
|
||||
include_jsp = "slideshow.jsp";
|
||||
}
|
||||
else { // if(page.startsWith("gallery"))
|
||||
Folder folder = null;
|
||||
if(request.getParameter("folder") != null && !request.getParameter("folder").equalsIgnoreCase("null"))
|
||||
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")) );
|
||||
else{
|
||||
folder = Folder.loadRoot(db, user);
|
||||
// Setup new root folder
|
||||
if( folder == null ){
|
||||
folder = Folder.genRoot();
|
||||
folder.save(db);
|
||||
}
|
||||
}
|
||||
List<Media> list = Media.load(db, folder);
|
||||
List<Folder> subFolders = Folder.loadSubFolders(db, folder, user);
|
||||
|
||||
//session.setAttribute("user", user);
|
||||
request.setAttribute("folder", folder);
|
||||
request.setAttribute("subfolders", subFolders);
|
||||
request.setAttribute("media", list);
|
||||
|
||||
include_jsp = "gallery.jsp";
|
||||
}
|
||||
}
|
||||
else if(page.startsWith("register")){
|
||||
include_jsp = "register.jsp";
|
||||
}
|
||||
else if(page.startsWith("login")){
|
||||
include_jsp = "login.jsp";
|
||||
}
|
||||
else{
|
||||
//response.sendRedirect("login?redirect=\""+getUrl(request)+"\"");
|
||||
response.sendRedirect("login");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
include("header.jsp", request, response);
|
||||
if( include_jsp != null )
|
||||
include(include_jsp, request, response);
|
||||
include("footer.jsp", request, response);
|
||||
} catch (Exception e) {
|
||||
logger.severe(e.getMessage());
|
||||
System.out.flush();
|
||||
throw new ServletException(e);
|
||||
} finally{
|
||||
if(db != null) db.close();
|
||||
}
|
||||
}
|
||||
|
||||
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException{
|
||||
try {
|
||||
include("ajax", request, response);
|
||||
|
||||
// RequestDispatcher include header read only workaround
|
||||
HttpSession session = request.getSession();
|
||||
User user = (User) session.getAttribute("user");
|
||||
if( user != null ){
|
||||
Cookie c = new Cookie("sessionHash", user.getSessionHash() );
|
||||
c.setMaxAge(5*24*60*60); // 5 days
|
||||
response.addCookie( c );
|
||||
}
|
||||
|
||||
// Do the output
|
||||
doGet(request, response);
|
||||
|
||||
} catch (Exception e) {
|
||||
logger.severe(e.getMessage());
|
||||
throw new ServletException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static DBConnection getDB() throws ServletException{
|
||||
try {
|
||||
return new DBConnection("jdbc/mysql");
|
||||
|
|
@ -277,11 +82,6 @@ public class Zallery extends HttpServlet{
|
|||
}
|
||||
}
|
||||
|
||||
protected void include(String url, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
|
||||
RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/"+url);
|
||||
if (dispatcher != null)
|
||||
dispatcher.include(request, response);
|
||||
}
|
||||
|
||||
public static String getCookieValue(Cookie[] cookies, String name) {
|
||||
if( cookies == null )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue