projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow links to images, Sones, and posts.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ImageBrowserPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index
6da7cda
..
3afaae6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@
-17,8
+17,12
@@
package net.pterodactylus.sone.web;
package net.pterodactylus.sone.web;
+import java.net.URI;
+
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
@@
-49,7
+53,7
@@
public class ImageBrowserPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+ protected void processTemplate(
Freenet
Request request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
String albumId = request.getHttpRequest().getParam("album", null);
if (albumId != null) {
super.processTemplate(request, templateContext);
String albumId = request.getHttpRequest().getParam("album", null);
if (albumId != null) {
@@
-63,6
+67,23
@@
public class ImageBrowserPage extends SoneTemplatePage {
Image image = webInterface.getCore().getImage(imageId, false);
templateContext.set("imageRequested", true);
templateContext.set("image", image);
Image image = webInterface.getCore().getImage(imageId, false);
templateContext.set("imageRequested", true);
templateContext.set("image", image);
+ return;
+ }
+ Sone sone = getCurrentSone(request.getToadletContext(), false);
+ String soneId = request.getHttpRequest().getParam("sone", null);
+ if (soneId != null) {
+ sone = webInterface.getCore().getSone(soneId, false);
}
}
+ templateContext.set("soneRequested", true);
+ templateContext.set("sone", sone);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isLinkExcepted(URI link) {
+ return true;
}
}
+
}
}