projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove exception from Identity interface, let null signal an error.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
LoginPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index
7e99b32
..
dcfd8a7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@
-17,10
+17,15
@@
package net.pterodactylus.sone.web;
package net.pterodactylus.sone.web;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.web.page.Page.Request.Method;
import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.template.Template;
import freenet.clients.http.ToadletContext;
import net.pterodactylus.util.template.Template;
import freenet.clients.http.ToadletContext;
@@
-31,6
+36,10
@@
import freenet.clients.http.ToadletContext;
*/
public class LoginPage extends SoneTemplatePage {
*/
public class LoginPage extends SoneTemplatePage {
+ /** The logger. */
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logging.getLogger(LoginPage.class);
+
/**
* Creates a new login page.
*
/**
* Creates a new login page.
*
@@
-40,7
+49,7
@@
public class LoginPage extends SoneTemplatePage {
* The Sone web interface
*/
public LoginPage(Template template, WebInterface webInterface) {
* The Sone web interface
*/
public LoginPage(Template template, WebInterface webInterface) {
- super("login.html", template, "Page.Login.Title", webInterface);
+ super("login.html", template, "Page.Login.Title", webInterface
, false
);
}
//
}
//
@@
-52,24
+61,38
@@
public class LoginPage extends SoneTemplatePage {
*/
@Override
protected void processTemplate(Request request, Template template) throws RedirectException {
*/
@Override
protected void processTemplate(Request request, Template template) throws RedirectException {
- Set<Sone> localSones = webInterface.core().localSones();
+ super.processTemplate(request, template);
+ /* get all own identities. */
+ List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
+ Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
template.set("sones", localSones);
if (request.getMethod() == Method.POST) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
template.set("sones", localSones);
if (request.getMethod() == Method.POST) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
- Sone selectedSone = null;
- for (Sone sone : webInterface.core().localSones()) {
- if (sone.getId().equals(soneId)) {
- selectedSone = sone;
- break;
- }
- }
+ Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
if (selectedSone != null) {
setCurrentSone(request.getToadletContext(), selectedSone);
throw new RedirectException("index.html");
}
}
if (selectedSone != null) {
setCurrentSone(request.getToadletContext(), selectedSone);
throw new RedirectException("index.html");
}
}
+ List<OwnIdentity> ownIdentitiesWithoutSone = CreateSonePage.getOwnIdentitiesWithoutSone(webInterface.getCore());
+ template.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected String getRedirectTarget(Request request) {
+ if (getCurrentSone(request.getToadletContext()) != null) {
+ return "index.html";
+ }
+ return null;
}
}
+ //
+ // SONETEMPLATEPAGE METHODS
+ //
+
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/