ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

NEW - # 116: Added Private Folder s

Browse source 
http://bugs.koc.se/view.php?id=116
This commit is contained in:
Ziver Koc 2012-06-13 20:05:58 +00:00
parent d3b4793113
commit 36cee77790
9 changed files with 84 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
WebContent/css/zallery.css
View file

@ -96,4 +96,15 @@ padding-top: 0px;
.modmedia_edit{
display: none;
}
.not-singular .entry-content .private{
display: block;
position: absolute;
top: -6px;
right: 10px;
width: 74px;
height: 22px;
background: url("../img/private.png") no-repeat top left;
z-index: 200
}

21
WebContent/gallery.jsp
View file

@ -15,9 +15,15 @@
<button type="button" onClick="window.location='gallery?folder=<%=folder.getParent().getId()%>'"><img src="img/arrow_undo.png" style="width: 10px; padding-right: 5px;">...Back</button>
<%} %>
</TD><TD>
<%if( user.canEdit( folder ) && folder.getParent() != null ){ %>
<%if( user.canEdit( folder ) && folder.getParent() != null ){ %>
<form action="gallery?folder=<%=folder.getParent().getId() %>" method="post" align="right">
<input type="hidden" name="id" value="<%=folder.getId() %>">
<%if( !folder.isPrivate() ){ %>
<button type="submit" name="action" value="mkprivate" ><img src="img/user-silhouette.png" style="width: 10px; padding-right: 5px;">Private</button>
<%}else{ %>
<button type="submit" name="action" value="mkprivate" ><img src="img/user-share.png" style="width: 10px; padding-right: 5px;">Public</button>
<%} %>
<button type="submit" name="action" value="rmdir" onClick="return confirm ('Are you sure you want to delete this folder?')"><img src="img/delete.png" style="width: 10px; padding-right: 5px;">Delete</button>
</form>
<%} %>
@ -27,9 +33,16 @@
for( Folder subfolder : ((List<Folder>)request.getAttribute("subfolders")) ){ %>
<DIV class="entry-content">
<DIV class="entry-content">
<%if( subfolder.getDate().after(new Timestamp(System.currentTimeMillis()-10*24*60*60*1000) )){ %><SPAN class="new"></SPAN><%} %>
<A href="gallery?folder=<%=subfolder.getId()%>"><SPAN class="slide-title" style="opacity: 0; "><%=subfolder.getName()%></SPAN>
<IMG class="thumbnail" src="img/folder.png" width="125" height="125" alt="<%=subfolder.getName()%>"><SPAN class="cover-up"></SPAN></A>
<%if( subfolder.isPrivate() ){ %>
<SPAN class="private"></SPAN>
<%} else if( subfolder.getDate().after(new Timestamp(System.currentTimeMillis()-10*24*60*60*1000) )){ %>
<SPAN class="new"></SPAN>
<%} %>
<A href="gallery?folder=<%=subfolder.getId()%>">
<SPAN class="slide-title" style="opacity: 0; "><%=subfolder.getName()%></SPAN>
<IMG class="thumbnail" src="img/folder.png" width="125" height="125" alt="<%=subfolder.getName()%>">
<SPAN class="cover-up"></SPAN
></A>
</DIV>
</DIV><!-- .post -->
<% } %>

BIN
WebContent/img/private.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
WebContent/img/private.xcf Normal file
View file

Binary file not shown.

BIN
WebContent/img/user-share.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 881 B

BIN
WebContent/img/user-silhouette.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 511 B

4
src/zall/Zallery.java
View file

@ -260,7 +260,7 @@ public class Zallery extends HttpServlet{
if(request.getParameter("folder") != null && !request.getParameter("folder").equalsIgnoreCase("null"))
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")) );
else{
folder = Folder.loadRoot(db);
folder = Folder.loadRoot(db, user);
// Setup new root folder
if( folder == null ){
folder = Folder.genRoot();
@ -268,7 +268,7 @@ public class Zallery extends HttpServlet{
}
}
List<Media> list = Media.load(db, folder);
List<Folder> subFolders = Folder.loadSubFolders(db, folder.getId());
List<Folder> subFolders = Folder.loadSubFolders(db, folder.getId(), user);
//session.setAttribute("user", user);
request.setAttribute("folder", folder);

48
src/zall/ZalleryAjax.java
View file

@ -93,13 +93,18 @@ public class ZalleryAjax extends HttpServlet{
if( action.equalsIgnoreCase("verfemail") ){
User verfuser = User.load(db, Long.parseLong(request.getParameter("id")));
if( verfuser.verifyEmail(request.getParameter("hash")) ){
sendEmailNewUserToAdmin(verfuser, db);
if( verfuser.isEnabled() )
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified");
else {
sendEmailNewUserToAdmin(verfuser, db);
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting account activation by an admin.");
}
verfuser.save(db);
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting account activation by an admin.");
}
else if(out != null) out.println("{ \"error\":\"Email verification failed!\" }");
else msgs.add(MessageType.ERROR, "Email verification failed!");
else if(out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }");
else msgs.add(MessageType.ERROR, "Invalid email verification hash!");
return;
}
@ -301,6 +306,33 @@ public class ZalleryAjax extends HttpServlet{
else if(out != null) out.println("{ \"error\": \"No such item!\"}");
else msgs.add(MessageType.ERROR, "The item does not exist!");
}
// Toggle folder private
else if( action.equalsIgnoreCase("mkprivate") ){
if( request.getParameter("id") == null){
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}");
else msgs.add(MessageType.ERROR, "Missing parameters!");
return;
}
long id = Long.parseLong(request.getParameter("id"));
Folder folder = Folder.load(db, id);
if( folder != null ){
if( user.canEdit(folder) ){
folder.setPrivate( !folder.isPrivate() );
folder.save(db);
if(out != null) out.println("{}");
else{
if(folder.isPrivate()) msgs.add(MessageType.INFO, "Folder is now private (not visible to other users).");
else msgs.add(MessageType.INFO, "Folder is now public (can be viewed by other users).");
}
}
else if(out != null) out.println("{ \"error\": \"You are not authorize to edit this folder!\"}");
else msgs.add(MessageType.ERROR, "You are not authorize to edit this folder!");
}
else if(out != null) out.println("{ \"error\": \"No such folder!\"}");
else msgs.add(MessageType.ERROR, "The folder does not exist!");
}
else if( action.equalsIgnoreCase("rmdir") ){
if( request.getParameter("id") == null){
@ -336,7 +368,7 @@ public class ZalleryAjax extends HttpServlet{
// parent folder
if( folder == null ){
String[] dirs = path.split("/");
Folder parent = Folder.loadRoot(db);
Folder parent = Folder.loadRoot(db, user);
if( user.isSuperUser() && path.charAt(0) == '/' )
path = "";
else{
@ -345,7 +377,7 @@ public class ZalleryAjax extends HttpServlet{
// Get root folder
parent = Folder.load(db, path, user); // Get user root folder
if( parent == null ){ // Create root folder
parent = Folder.loadRoot(db); // get root folder
parent = Folder.loadRoot(db, user); // get root folder
folder = new Folder();
folder.setUser( user );
folder.setParent( parent );
@ -409,7 +441,7 @@ public class ZalleryAjax extends HttpServlet{
smtpEmail.setSubject("Registration at "+Zallery.getWebsiteName());
smtpEmail.setContentType(ContentType.HTML);
smtpEmail.setMessage("You receive this message because you have requested an account" +
"<br>at <a href='"+Zallery.getWebsiteURL()+"'>"+Zallery.getWebsiteName()+"</a>. Please click the link to verify your email address: " +
"<br>at "+Zallery.getWebsiteName()+". Please click the link to verify your email address: " +
"<p><a href='"+Zallery.getWebsiteURL()+"?action=verfemail&id="+user.getId()+"&hash="+user.getEmailVerificationHash()+"'>"+Zallery.getWebsiteURL()+"?action=verfemail&id="+user.getId()+"&hash="+user.getEmailVerificationHash()+"</a>" +
"<p> You will have to wait for an admin to activate your account after you have verified your email.");
smtpEmail.send();

19
src/zall/bean/Folder.java
View file

@ -26,6 +26,7 @@ public class Folder extends DBBean{
protected String path;
protected Folder parent;
protected Timestamp date;
protected boolean isPrivate;
//@DBLinkTable(name="FolderTree", beanClass=Folder.class, idColumn="parent")
//protected LinkedList<Folder> subFolders;
@ -34,15 +35,17 @@ public class Folder extends DBBean{
public static Folder load(DBConnection db, Long id) throws SQLException{
return load(db, Folder.class, id);
}
public static List<Folder> loadSubFolders(DBConnection db, Long id) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE parent=?");
public static List<Folder> loadSubFolders(DBConnection db, Long id, User user) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE parent=? AND (isPrivate=0 OR user=?)");
sql.setLong(1, id);
sql.setLong(2, user.getId());
return DBConnection.exec(sql, DBBeanSQLResultHandler.createList(Folder.class, db));
}
public static Folder loadRoot(DBConnection db) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE path=?");
public static Folder loadRoot(DBConnection db, User user) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE path=? AND (isPrivate=0 OR user=?)");
sql.setString(1, "/");
sql.setLong(2, user.getId());
return DBConnection.exec(sql, DBBeanSQLResultHandler.create(Folder.class, db));
}
@ -85,6 +88,12 @@ public class Folder extends DBBean{
public void setUser(User user){
this.user = user;
}
public boolean isPrivate(){
return isPrivate;
}
public void setPrivate(boolean priv){
this.isPrivate = priv;
}
public String getPath(){
String tmp = path.replaceAll("\\{NAME\\}", user.getName());
return tmp;
@ -180,6 +189,6 @@ public class Folder extends DBBean{
}
public boolean isEmpty(DBConnection db) throws SQLException {
return Folder.loadSubFolders(db, this.getId()).isEmpty() && Media.load(db, this).isEmpty();
return Folder.loadSubFolders(db, this.getId(), user).isEmpty() && Media.load(db, this).isEmpty();
}
}