From dc2ef4cd8a86b1b5f24137694723708ad8f79bac Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 20:52:16 +0200 Subject: [PATCH] Fixed issue with missing folder owner --- src/zall/Zallery.java | 6 ++-- src/zall/bean/Folder.java | 70 ++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java index 8fec668..d9c6d7a 100755 --- a/src/zall/Zallery.java +++ b/src/zall/Zallery.java @@ -32,7 +32,7 @@ import zutil.log.LogUtil; public class Zallery extends HttpServlet{ private static Logger logger = LogUtil.getLogger(); - public static final String VERSION = "1.0.1"; + public static final String VERSION = "1.0.2"; public static String WEBSITE_NAME = "Example.com"; public static String WEBSITE_URL = "http://example.com"; @@ -54,7 +54,7 @@ public class Zallery extends HttpServlet{ Context context = new InitialContext(); // Check if Zallery has been properly configured if ("C:\\\\data".equals(context.lookup("java:comp/env/DATA_PATH"))) - throw new ServletException("Zallery has not been properly configured, set proper configuration in Zaller.xml context file."); + throw new ServletException("Zallery has not been properly configured, set proper configuration in Zallery.xml context file."); WEBSITE_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME"); WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL"); @@ -211,7 +211,7 @@ public class Zallery extends HttpServlet{ } } List list = Media.load(db, folder); - List subFolders = Folder.loadSubFolders(db, folder.getId(), user); + List subFolders = Folder.loadSubFolders(db, folder, user); //session.setAttribute("user", user); request.setAttribute("folder", folder); diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index fdb585a..6ee98ac 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -4,8 +4,10 @@ import java.io.File; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; @@ -21,25 +23,23 @@ import zall.Zallery; public class Folder extends DBBean{ private static final Logger logger = LogUtil.getLogger(); - protected transient String name; - protected User user; - protected String path; + private transient String name; + protected Long user; + protected transient User userInstance; + private String path; protected Folder parent; - protected Timestamp date; - protected boolean isPrivate; + private boolean isPrivate; - //@DBLinkTable(name="FolderTree", beanClass=Folder.class, idColumn="parent") - //protected LinkedList subFolders; public static Folder load(DBConnection db, Long id) throws SQLException{ return load(db, Folder.class, id); } - public static List loadSubFolders(DBConnection db, Long id, User user) throws SQLException{ + public static List loadSubFolders(DBConnection db, Folder folder, User requestingUser) throws SQLException{ PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE parent=? AND (isPrivate=0 OR user=? OR ?)"); - sql.setLong(1, id); - sql.setLong(2, user.getId()); - sql.setBoolean(3, user.isSuperUser()); + sql.setLong(1, folder.getId()); + sql.setLong(2, folder.user); + sql.setBoolean(3, requestingUser.isSuperUser()); return DBConnection.exec(sql, DBBeanSQLResultHandler.createList(Folder.class, db)); } @@ -60,15 +60,13 @@ public class Folder extends DBBean{ public static List load(DBConnection db, User user) throws SQLException{ if( user.getId() == null ) - return new LinkedList(); + return Collections.emptyList(); PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE user=?"); sql.setLong(1, user.getId() ); return DBConnection.exec(sql, DBBeanSQLResultHandler.createList(Folder.class, db)); } public Folder(){ - //subFolders = new LinkedList(); - date = new Timestamp( System.currentTimeMillis() ); } public String getName(){ @@ -76,20 +74,25 @@ public class Folder extends DBBean{ String[] tmp = path.split("/"); name = tmp[tmp.length-1]; } - String userName = user != null ? user.getName() : "UNKNOWN"; + String userName = getUser() != null ? getUser().getName() : "UNKNOWN"; String tmp = name.replaceAll("\\{NAME\\}", userName); return tmp; } - public String getUnModName(){ - if(name == null) - getName(); - return name; - } public User getUser(){ - return user; + if (userInstance == null) { + try { + DBConnection db = Zallery.getDB(); + userInstance = User.load(db, user); + db.close(); + } catch (Exception e) { + logger.log(Level.WARNING, null, e); + } + } + return userInstance; } public void setUser(User user){ - this.user = user; + this.user = user.getId(); + this.userInstance = null; } public boolean isPrivate(){ return isPrivate; @@ -98,12 +101,9 @@ public class Folder extends DBBean{ this.isPrivate = priv; } public String getPath(){ - String tmp = path.replaceAll("\\{NAME\\}", user.getName()); + String tmp = path.replaceAll("\\{NAME\\}", getUser().getName()); return tmp; } - public String getUnModPath(){ - return path; - } public void setName(String name){ this.name = name; if( parent.path.endsWith("/") ) @@ -125,20 +125,6 @@ public class Folder extends DBBean{ return parent; } - /*public void addSubFolder(Folder f){ - if( !subFolders.contains(f) ){ - subFolders.add( f ); - f.setParent( this ); - } - }*/ - - /*public List getSubFolders(){ - return subFolders; - }*/ - - public Timestamp getDate(){ - return date; - } /** * @param filename is the name of the file @@ -166,7 +152,7 @@ public class Folder extends DBBean{ tmp.append( File.separatorChar ); // Add UserID and this folders path - String tmp_path = path.replaceAll("\\{NAME\\}", ""+user.getId()); + String tmp_path = path.replaceAll("\\{NAME\\}", ""+user); tmp_path = tmp_path.replaceAll("/", Matcher.quoteReplacement(File.separator)); tmp.append( tmp_path ); @@ -195,6 +181,6 @@ public class Folder extends DBBean{ } public boolean isEmpty(DBConnection db) throws SQLException { - return Folder.loadSubFolders(db, this.getId(), user).isEmpty() && Media.load(db, this).isEmpty(); + return Folder.loadSubFolders(db, this, getUser()).isEmpty() && Media.load(db, this).isEmpty(); } }