From 0d4b34b23915a8c09017a64acd54e21d6cb84f31 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 17:09:00 +0200 Subject: [PATCH 1/7] revert tomcat deployment and module --- build.xml | 9 +++++++-- src/zall/Zallery.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 457be59..164a2a2 100755 --- a/build.xml +++ b/build.xml @@ -11,13 +11,13 @@ - + @@ -70,14 +70,19 @@ - + + + + diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java index 9205dac..8fec668 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.0"; + public static final String VERSION = "1.0.1"; public static String WEBSITE_NAME = "Example.com"; public static String WEBSITE_URL = "http://example.com"; From 76206ffa0887fa1c4f4ee84def9a93da490e1039 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 17:26:42 +0200 Subject: [PATCH 2/7] rolback of rollback --- build.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml index 164a2a2..d033c56 100755 --- a/build.xml +++ b/build.xml @@ -17,7 +17,6 @@ - @@ -70,19 +69,18 @@ - + - - - + + + From dc2ef4cd8a86b1b5f24137694723708ad8f79bac Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 20:52:16 +0200 Subject: [PATCH 3/7] 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(); } } From e974bd65d97aa0cc441196a142379fa69127e48e Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 20:56:53 +0200 Subject: [PATCH 4/7] bugfix --- src/zall/bean/Folder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index 6ee98ac..a22197c 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -24,7 +24,7 @@ public class Folder extends DBBean{ private static final Logger logger = LogUtil.getLogger(); private transient String name; - protected Long user; + protected long user = -1; protected transient User userInstance; private String path; protected Folder parent; @@ -139,7 +139,7 @@ public class Folder extends DBBean{ return null; } - if( user == null || filename == null ) + if( user >= 0 || filename == null ) return null; StringBuilder tmp = new StringBuilder(); From 3303ace2f7c17bb466a1c8608cca4aa90406af37 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 20:59:36 +0200 Subject: [PATCH 5/7] bugfix --- src/zall/bean/Folder.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index a22197c..a7921ea 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -28,6 +28,7 @@ public class Folder extends DBBean{ protected transient User userInstance; private String path; protected Folder parent; + protected Timestamp date; private boolean isPrivate; @@ -67,6 +68,7 @@ public class Folder extends DBBean{ } public Folder(){ + date = new Timestamp( System.currentTimeMillis() ); } public String getName(){ @@ -125,6 +127,10 @@ public class Folder extends DBBean{ return parent; } + public Timestamp getDate(){ + return date; + } + /** * @param filename is the name of the file From 4602818bac01ec8512770c95e4b2f43cbab23551 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 21:03:29 +0200 Subject: [PATCH 6/7] bugfix --- src/zall/bean/Folder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zall/bean/Folder.java b/src/zall/bean/Folder.java index a7921ea..6f4cc36 100755 --- a/src/zall/bean/Folder.java +++ b/src/zall/bean/Folder.java @@ -145,7 +145,7 @@ public class Folder extends DBBean{ return null; } - if( user >= 0 || filename == null ) + if( user < 0 || filename == null ) return null; StringBuilder tmp = new StringBuilder(); From be4362c88494b1942d6511fb7aa5b30b76505fed Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 21:13:50 +0200 Subject: [PATCH 7/7] Added extra logging --- src/zall/UploadServlet.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/zall/UploadServlet.java b/src/zall/UploadServlet.java index e814c4c..e3e1731 100644 --- a/src/zall/UploadServlet.java +++ b/src/zall/UploadServlet.java @@ -30,9 +30,8 @@ public class UploadServlet extends AjaxFileUpload{ private static final Logger logger = LogUtil.getLogger(); private static final long serialVersionUID = 1L; - public static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList(new String[]{ - "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v" - }))); + private static final Set VIDEO_EXT = Collections.unmodifiableSet(new HashSet(Arrays.asList( + "avi","mp4","mpeg","mpeg","divx","xvid","wmv","mov","flv","m4v"))); @Override public String getProgressHTML() { @@ -76,6 +75,7 @@ public class UploadServlet extends AjaxFileUpload{ vid.setUser( user ); vid.setFile( item ); vid.save(db); + logger.info("Video upload successful: "+vid.getFolder().getPath()); } else{ Image img = new Image(); @@ -83,7 +83,8 @@ public class UploadServlet extends AjaxFileUpload{ img.setFolder( folder ); img.setUser( user ); img.setFile( item ); - img.save(db); + img.save(db); + logger.info("Image upload successful: "+img.getFolder().getPath()); } } catch (Exception e) { logger.log(Level.WARNING, "Error: Creating new Media(\""+item.getName()+"\")", e);