Store the request in all template contexts.

diff --git a/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java b/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java
new file mode 100644 (file)
index 0000000..d8b44ee
--- /dev/null
+++ b/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java
@@ -0,0 +1,47 @@
+/*
+ * Sone - HttpRequestAccessor.java - Copyright © 2011 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.wotns.template;
+
+import net.pterodactylus.util.template.Accessor;
+import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
+import freenet.support.api.HTTPRequest;
+
+/**
+ * {@link Accessor} implementation that can parse headers from
+ * {@link HTTPRequest}s.
+ *
+ * @see HTTPRequest#getHeader(String)
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class HttpRequestAccessor extends ReflectionAccessor {
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public Object get(TemplateContext templateContext, Object object, String member) {
+               Object parentValue = super.get(templateContext, object, member);
+               if (parentValue != null) {
+                       return parentValue;
+               }
+               HTTPRequest httpRequest = (HTTPRequest) object;
+               return httpRequest.getHeader(member);
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
index ba2537e..85ad8b1 100644 (file)
--- a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
+++ b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
@@ -89,6 +89,7 @@ public class BasicPage extends FreenetTemplatePage {
        @Override
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
        @Override
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);

+               templateContext.set("request", request.getHttpRequest());

                templateContext.set("ownIdentities", identityManager.getAllOwnIdentities());
                templateContext.set("formPassword", webInterface.getWoTNSPlugin().getToadletContainer().getFormPassword());
        }
                templateContext.set("ownIdentities", identityManager.getAllOwnIdentities());
                templateContext.set("formPassword", webInterface.getWoTNSPlugin().getToadletContainer().getFormPassword());
        }

diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java b/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
index 18daf46..4d63640 100644 (file)
--- a/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
@@ -35,11 +35,13 @@ import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.wotns.freenet.wot.Identity;
 import net.pterodactylus.wotns.main.IdentityComparator;
 import net.pterodactylus.wotns.main.WoTNSPlugin;
 import net.pterodactylus.wotns.freenet.wot.Identity;
 import net.pterodactylus.wotns.main.IdentityComparator;
 import net.pterodactylus.wotns.main.WoTNSPlugin;

+import net.pterodactylus.wotns.template.HttpRequestAccessor;

 import net.pterodactylus.wotns.template.IdentityAccessor;
 import net.pterodactylus.wotns.web.FreenetRequest;
 import net.pterodactylus.wotns.web.PageToadlet;
 import net.pterodactylus.wotns.web.PageToadletFactory;
 import freenet.clients.http.ToadletContainer;
 import net.pterodactylus.wotns.template.IdentityAccessor;
 import net.pterodactylus.wotns.web.FreenetRequest;
 import net.pterodactylus.wotns.web.PageToadlet;
 import net.pterodactylus.wotns.web.PageToadletFactory;
 import freenet.clients.http.ToadletContainer;

+import freenet.support.api.HTTPRequest;

 
 /**
  * TODO
 
 /**
  * TODO


@@ -60,6 +62,7 @@ public class WebInterface {
 
                templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
                templateContextFactory.addAccessor(Identity.class, new IdentityAccessor());
 
                templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
                templateContextFactory.addAccessor(Identity.class, new IdentityAccessor());

+               templateContextFactory.addAccessor(HTTPRequest.class, new HttpRequestAccessor());

                templateContextFactory.addFilter("html", new HtmlFilter());
                CollectionSortFilter sortFilter = new CollectionSortFilter();
                sortFilter.addComparator(Identity.class, IdentityComparator.NAME);
                templateContextFactory.addFilter("html", new HtmlFilter());
                CollectionSortFilter sortFilter = new CollectionSortFilter();
                sortFilter.addComparator(Identity.class, IdentityComparator.NAME);