diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java index bfad2780c7..c568083d76 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java @@ -254,8 +254,14 @@ public class HomeHelper extends HelperBase { continue; } } - buf.append("\n
" );
String charset = mailPart.charset;
@@ -662,9 +662,9 @@ public class WebMail extends HttpServlet
}
/**
* prepare line for presentation between html tags
- *
+ *
* Escapes html tags
- *
+ *
* @param line null OK
* @return escaped string or "" for null input
*/
@@ -680,7 +680,7 @@ public class WebMail extends HttpServlet
//// Start state change and button processing here ////
/**
- *
+ *
* @param sessionObject
* @param request
* @return new state, or null if unknown
@@ -706,7 +706,7 @@ public class WebMail extends HttpServlet
*/
boolean offline = buttonPressed(request, OFFLINE);
if (buttonPressed(request, LOGIN) || offline) {
-
+
if( user == null || user.length() == 0 ) {
sessionObject.error += _t("Need username for authentication.") + '\n';
doContinue = false;
@@ -951,7 +951,7 @@ public class WebMail extends HttpServlet
/**
- *
+ *
* @param sessionObject
* @param request
* @return new state, or null if unknown
@@ -992,7 +992,7 @@ public class WebMail extends HttpServlet
/**
* Process all buttons, which possibly change internal state.
* Also processes ?show=x for a GET
- *
+ *
* @param sessionObject
* @param request
* @param isPOST disallow button pushes if false
@@ -1118,11 +1118,11 @@ public class WebMail extends HttpServlet
if( isPOST && buttonPressed( request, NEW ) ) {
state = State.NEW;
}
-
+
boolean reply = false;
boolean replyAll = false;
boolean forward = false;
-
+
if (buttonPressed(request, REPLY)) {
reply = true;
} else if (buttonPressed(request, REPLYALL)) {
@@ -1148,7 +1148,7 @@ public class WebMail extends HttpServlet
} else {
uidl = Base64.decodeToString(request.getParameter(B64UIDL));
}
-
+
if( uidl != null ) {
MailCache mc = getCurrentMailCache(sessionObject, request);
Mail mail = (mc != null) ? mc.getMail(uidl, MailCache.FetchMode.ALL) : null;
@@ -1259,7 +1259,7 @@ public class WebMail extends HttpServlet
sender = Mail.getAddress( mail.reply );
else if( mail.sender != null && Mail.validateAddress( mail.sender ) )
sender = Mail.getAddress( mail.sender );
-
+
PrintWriter pw = new PrintWriter( text );
pw.println();
pw.println();
@@ -1489,7 +1489,7 @@ public class WebMail extends HttpServlet
}
}
} catch (NumberFormatException nfe) {}
- }
+ }
// Save the draft or else the attachment comes back
if (deleted) {
String uidl = Base64.decodeToString(request.getParameter(NEW_UIDL));
@@ -1522,7 +1522,7 @@ public class WebMail extends HttpServlet
String uidl = Base64.decodeToString(b64UIDL);
return uidl;
}
-
+
if (buttonPressed(request, DELETE)) {
MailCache mc = getCurrentMailCache(sessionObject, request);
if (mc != null && mc.getFolderName().equals(DIR_TRASH)) {
@@ -1562,7 +1562,7 @@ public class WebMail extends HttpServlet
sessionObject.error += "Failed move to " + to + '\n';
}
return showUIDL;
- }
+ }
/**
* process download link in message view
@@ -1578,7 +1578,7 @@ public class WebMail extends HttpServlet
if (str == null) {
str = request.getParameter(RAW_ATTACHMENT);
isRaw = true;
- }
+ }
if( str != null ) {
try {
int id = Integer.parseInt( str );
@@ -1637,10 +1637,10 @@ public class WebMail extends HttpServlet
{
if( part == null )
return null;
-
+
if (part.getID() == id)
return part;
-
+
if( part.multipart || part.message ) {
for( MailPart p : part.parts ) {
MailPart subPart = getMailPartFromID(p, id);
@@ -1742,7 +1742,7 @@ public class WebMail extends HttpServlet
} else if (buttonPressed(request, CLEAR)) {
sessionObject.reallyDelete = false;
}
-
+
sessionObject.markAll = buttonPressed( request, MARKALL );
sessionObject.clear = buttonPressed( request, CLEAR );
sessionObject.invert = buttonPressed( request, INVERT );
@@ -1963,7 +1963,7 @@ public class WebMail extends HttpServlet
/**
* The entry point for all web page loads
- *
+ *
* @param httpRequest
* @param response
* @param isPOST disallow button pushes if false
@@ -2014,22 +2014,22 @@ public class WebMail extends HttpServlet
response.setHeader("Referrer-Policy", "no-referrer");
response.setHeader("Accept-Ranges", "none");
RequestWrapper request = new RequestWrapper( httpRequest );
-
+
SessionObject sessionObject = null;
-
+
String subtitle = "";
-
+
HttpSession httpSession = request.getSession( true );
-
+
sessionObject = getSessionObject( httpSession );
synchronized( sessionObject ) {
-
+
sessionObject.pageChanged = false;
sessionObject.themePath = "/themes/susimail/" + theme + '/';
sessionObject.imgPath = sessionObject.themePath + "images/";
sessionObject.isMobile = isMobile;
-
+
if (isPOST) {
// TODO not perfect, but only clear on POST so they survive a P-R-G
sessionObject.error = "";
@@ -2064,7 +2064,7 @@ public class WebMail extends HttpServlet
// This must be called to add the attachment before
// processStateChangeButtons() sends the message
state = processComposeButtons(sessionObject, request);
- }
+ }
state = processStateChangeButtons(sessionObject, request, isPOST, state);
state = processConfigButtons(sessionObject, request, isPOST, state);
if (_log.shouldDebug()) _log.debug("Prelim. state is " + state);
@@ -2102,12 +2102,12 @@ public class WebMail extends HttpServlet
// int newIdle = httpSession.getMaxInactiveInterval();
// if (_log.shouldDebug()) _log.debug("Changed idle from " + oldIdle + " to " + newIdle);
//}
-
+
if( state != State.AUTH ) {
if (isPOST)
state = processGenericButtons(sessionObject, request, state);
}
-
+
if( state == State.LIST ) {
if (isPOST) {
int page = 1;
@@ -2287,7 +2287,7 @@ public class WebMail extends HttpServlet
//// Begin output
PrintWriter out = response.getWriter();
-
+
/*
* build subtitle
*/
@@ -2439,20 +2439,20 @@ public class WebMail extends HttpServlet
else if (state == State.LOADING)
showLoading(out, sessionObject, request);
-
+
else if( state == State.LIST )
showFolder( out, sessionObject, mc, request );
-
+
else if( state == State.SHOW )
showMessage(out, sessionObject, mc, showUIDL, buttonPressed(request, DELETE));
-
+
else if( state == State.NEW )
showCompose( out, sessionObject, request );
-
+
else if( state == State.CONFIG )
showConfig(out, folder);
-
- //out.println( "