projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Load known post replies in configuration loader, too.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
LogoutPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
index
f173bbb
..
bc4c56d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LogoutPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LogoutPage.java
@@
-1,5
+1,5
@@
/*
/*
- *
FreenetSone - LogoutPage.java - Copyright © 2010
David Roden
+ *
Sone - LogoutPage.java - Copyright © 2010–2013
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
*
* 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
@@
-17,7
+17,9
@@
package net.pterodactylus.sone.web;
package net.pterodactylus.sone.web;
+import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
import freenet.clients.http.ToadletContext;
/**
import freenet.clients.http.ToadletContext;
/**
@@
-34,7
+36,7
@@
public class LogoutPage extends SoneTemplatePage {
* The Sone web interface
*/
public LogoutPage(Template template, WebInterface webInterface) {
* The Sone web interface
*/
public LogoutPage(Template template, WebInterface webInterface) {
- super("logout.html", template, "Page.Logout.Title", webInterface);
+ super("logout.html", template, "Page.Logout.Title", webInterface
, true
);
}
//
}
//
@@
-45,9
+47,9
@@
public class LogoutPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(
Request request, Template template
) throws RedirectException {
+ protected void processTemplate(
FreenetRequest request, TemplateContext templateContext
) throws RedirectException {
setCurrentSone(request.getToadletContext(), null);
setCurrentSone(request.getToadletContext(), null);
- super.processTemplate(request, template);
+ super.processTemplate(request, template
Context
);
throw new RedirectException("index.html");
}
throw new RedirectException("index.html");
}
@@
-55,16
+57,11
@@
public class LogoutPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected boolean requiresLogin() {
- return true;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public boolean isEnabled(ToadletContext toadletContext) {
public boolean isEnabled(ToadletContext toadletContext) {
- return getCurrentSone(toadletContext) != null;
+ if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
+ return false;
+ }
+ return (getCurrentSone(toadletContext, false) != null) && (webInterface.getCore().getLocalSones().size() != 1);
}
}
}
}