Don’t register shutdown hooks for all Services.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / WebInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 2177aab..f975f00 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -48,10 +48,8 @@ import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateFactory;
 import net.pterodactylus.util.template.TemplateProvider;
-import freenet.clients.http.LinkEnabledCallback;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.ToadletContainer;
-import freenet.clients.http.ToadletContext;
 import freenet.l10n.BaseL10n;
 
 /**
@@ -78,7 +76,7 @@ public class WebInterface extends AbstractService {
         *            The Sone plugin
         */
        public WebInterface(SonePlugin sonePlugin) {
-               super("Sone Web Interface");
+               super("Sone Web Interface", false);
                this.sonePlugin = sonePlugin;
        }
 
@@ -154,68 +152,35 @@ public class WebInterface extends AbstractService {
                templateFactory.addFilter("l10n", new L10nFilter(l10n()));
                templateFactory.addFilter("substring", new SubstringFilter());
                templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
-
-               String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+               templateFactory.addTemplateObject("formPassword", sonePlugin.pluginRespirator().getToadletContainer().getFormPassword());
 
                Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html"));
-               loginTemplate.set("formPassword", formPassword);
-
                Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html"));
-               indexTemplate.set("formPassword", formPassword);
-
                Template addSoneTemplate = templateFactory.createTemplate(createReader("/templates/addSone.html"));
-               addSoneTemplate.set("formPassword", formPassword);
-
+               Template loadSoneTemplate = templateFactory.createTemplate(createReader("/templates/loadSone.html"));
                Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
-               knownSonesTemplate.set("formPassword", formPassword);
-
                Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html"));
-               createSoneTemplate.set("formPassword", formPassword);
-
                Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
-               createPostTemplate.set("formPassword", formPassword);
-
                Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
-               createReplyTemplate.set("formPassword", formPassword);
-
                Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
-               editProfileTemplate.set("formPassword", formPassword);
-
                Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
-               backupProfileTemplate.set("formPassword", formPassword);
-
                Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
-               viewSoneTemplate.set("formPassword", formPassword);
-
                Template blockSoneTemplate = templateFactory.createTemplate(createReader("/templates/blockSone.html"));
-               blockSoneTemplate.set("formPassword", formPassword);
-
                Template unblockSoneTemplate = templateFactory.createTemplate(createReader("/templates/unblockSone.html"));
-               unblockSoneTemplate.set("formPassword", formPassword);
-
                Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
-               viewPostTemplate.set("formPassword", formPassword);
-
                Template deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html"));
-               deletePostTemplate.set("formPassword", formPassword);
-
+               Template deleteReplyTemplate = templateFactory.createTemplate(createReader("/templates/deleteReply.html"));
                Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/followSone.html"));
-               followSoneTemplate.set("formPassword", formPassword);
-
                Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html"));
-               unfollowSoneTemplate.set("formPassword", formPassword);
-
                Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
-               deleteSoneTemplate.set("formPassword", formPassword);
-
                Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
-
                Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
 
                PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
                pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
-               pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this), "AddSone"));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new LoadSonePage(loadSoneTemplate, this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, this)));
@@ -226,6 +191,7 @@ public class WebInterface extends AbstractService {
                pageToadlets.add(pageToadletFactory.createPageToadlet(new UnblockSonePage(unblockSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyPage(deleteReplyTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSonePage(unfollowSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone"));
@@ -276,24 +242,6 @@ public class WebInterface extends AbstractService {
        }
 
        /**
-        * {@link LinkEnabledCallback} implementation that always returns
-        * {@code true} when {@link LinkEnabledCallback#isEnabled(ToadletContext)}
-        * is called.
-        *
-        * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-        */
-       public class AlwaysEnabledCallback implements LinkEnabledCallback {
-
-               /**
-                * {@inheritDoc}
-                */
-               @Override
-               public boolean isEnabled(ToadletContext toadletContext) {
-                       return true;
-               }
-       }
-
-       /**
         * Template provider implementation that uses
         * {@link WebInterface#createReader(String)} to load templates for
         * inclusion.