From 3303ace2f7c17bb466a1c8608cca4aa90406af37 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 7 Aug 2017 20:59:36 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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);