Author: batosai
Date: 2008-08-09 18:26:08 +0000 (Sat, 09 Aug 2008)
New Revision: 21690
Modified:
trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
Log:
Code tidy.
Modified: trunk/apps/WoT/src/plugins/WoT/WoTplugin.java
===================================================================
--- trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-09 17:22:22 UTC
(rev 21689)
+++ trunk/apps/WoT/src/plugins/WoT/WoTplugin.java 2008-08-09 18:26:08 UTC
(rev 21690)
@@ -105,87 +105,6 @@
return makeHomePage();
}
}
-
- @Override
- public String handleHTTPPost(HTTPRequest request) throws
PluginHTTPException {
-
- String pass = request.getPartAsString("formPassword", 32);
- if ((pass.length() == 0) ||
!pass.equals(pr.getNode().clientCore.formPassword)) {
- return "Buh! Invalid form password";
- }
-
- String page = request.getPath().substring(SELF_URI.length());
- if(page.equals("/createIdentity")) {
- return
makeCreateIdentityPage(request.getPartAsString("nickName",1024));
- }
- else if(page.equals("/createIdentity2")) {
- try {
- OwnIdentity identity = new OwnIdentity( new
FreenetURI(request.getPartAsString("insertURI",1024)),
-
new
FreenetURI(request.getPartAsString("requestURI",1024)),
-
new Date(0),
-
new Date(),
-
!request.getPartAsString("publishTrustList",1024).equals(""));
- // TODO Set the nickName as an attribute
-
- //TODO Make the new identity trust the seed
identity
- db.store(identity);
- db.commit();
- }
- catch(MalformedURLException e) {
- // TODO Make a good looking error messages
system
- return e.getLocalizedMessage();
- }
- return makeOwnIdentitiesPage();
- }
- else if(page.equals("/addIdentity")) {
- try {
- FreenetURI identity = new
FreenetURI(request.getPartAsString("identityURI", 1024));
-
- FetchContext fetchContext =
client.getFetchContext();
- fetchContext.maxSplitfileBlockRetries = -1; //
retry forever
- fetchContext.maxNonSplitfileRetries = -1; //
retry forever
- client.fetch(identity, -1, this, this,
fetchContext);
-
- return makeKnownIdentitiesPage();
- }
- catch(MalformedURLException e) {
- return e.getLocalizedMessage();
- }
- catch (FetchException e) {
- return e.toString();
- }
- }
- else if (page.equals("/insertIdentity")) {
-
- FreenetURI uri;
- try {
- uri = new
FreenetURI(request.getPartAsString("identity", 1024));
- } catch (MalformedURLException e) {
- return e.getLocalizedMessage();
- }
-
- ObjectSet<OwnIdentity> ownIdentities =
db.queryByExample(new OwnIdentity(null, uri, null, null, true));
- if (ownIdentities.size() == 0) return "Identity not
found";
-
- OwnIdentity identity = ownIdentities.next();
-
- try {
- inserter.insert(identity);
- } catch (Exception e) {
- return e.getLocalizedMessage();
- }
-
- return makeOwnIdentitiesPage();
- }
- else {
- return makeHomePage();
- }
- }
-
- @Override
- public String handleHTTPPut(HTTPRequest request) throws
PluginHTTPException {
- return null;
- }
private String makeHomePage() {
@@ -329,6 +248,96 @@
return pageNode.generate();
}
+ @Override
+ public String handleHTTPPost(HTTPRequest request) throws
PluginHTTPException {
+
+ String pass = request.getPartAsString("formPassword", 32);
+ if ((pass.length() == 0) ||
!pass.equals(pr.getNode().clientCore.formPassword)) {
+ return "Buh! Invalid form password";
+ }
+
+ String page = request.getPath().substring(SELF_URI.length());
+
+ if(page.equals("/createIdentity")) {
+ return
makeCreateIdentityPage(request.getPartAsString("nickName",1024));
+ }
+ else if(page.equals("/createIdentity2")) {
+ return createIdentity(request);
+ }
+ else if(page.equals("/addIdentity")) {
+ return addIdentity(request);
+ }
+ else if (page.equals("/insertIdentity")) {
+
+ FreenetURI uri;
+ try {
+ uri = new
FreenetURI(request.getPartAsString("identity", 1024));
+ } catch (MalformedURLException e) {
+ return e.getLocalizedMessage();
+ }
+
+ ObjectSet<OwnIdentity> ownIdentities =
db.queryByExample(new OwnIdentity(null, uri, null, null, true));
+ if (ownIdentities.size() == 0) return "Identity not
found";
+
+ OwnIdentity identity = ownIdentities.next();
+
+ try {
+ inserter.insert(identity);
+ } catch (Exception e) {
+ return e.getLocalizedMessage();
+ }
+
+ return makeOwnIdentitiesPage();
+ }
+ else {
+ return makeHomePage();
+ }
+ }
+
+ private String addIdentity(HTTPRequest request) {
+ try {
+ FreenetURI identity = new
FreenetURI(request.getPartAsString("identityURI", 1024));
+
+ FetchContext fetchContext = client.getFetchContext();
+ fetchContext.maxSplitfileBlockRetries = -1; // retry
forever
+ fetchContext.maxNonSplitfileRetries = -1; // retry
forever
+ client.fetch(identity, -1, this, this, fetchContext);
+ }
+ catch(MalformedURLException e) {
+ return e.getLocalizedMessage();
+ }
+ catch (FetchException e) {
+ return e.toString();
+ }
+
+ return makeKnownIdentitiesPage();
+ }
+
+ private String createIdentity(HTTPRequest request) {
+ try {
+ OwnIdentity identity = new OwnIdentity( new
FreenetURI(request.getPartAsString("insertURI",1024)),
+
new
FreenetURI(request.getPartAsString("requestURI",1024)),
+
new Date(0),
+
new Date(),
+
!request.getPartAsString("publishTrustList",1024).equals(""));
+ // TODO Set the nickName as an attribute
+
+ //TODO Make the new identity trust the seed identity
+ db.store(identity);
+ db.commit();
+ }
+ catch(MalformedURLException e) {
+ // TODO Make a good looking error messages system
+ return e.getLocalizedMessage();
+ }
+ return makeOwnIdentitiesPage();
+ }
+
+ @Override
+ public String handleHTTPPut(HTTPRequest request) throws
PluginHTTPException {
+ return null;
+ }
+
private HTMLNode getPageNode() {
return pm.getPageNode("Web of Trust", null);
}
