echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SusiMail: P-R-G to config page (ticket #1373)

Browse Source
This commit is contained in:
zzz
2017-12-14 16:39:23 +00:00
parent 0722fd8b19
commit 52f736a06e
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@ -141,6 +141,7 @@ public class WebMail extends HttpServlet
private static final String SAVE = "save"; private static final String SAVE = "save";
private static final String SAVE_AS = "saveas"; private static final String SAVE_AS = "saveas";
private static final String REFRESH = "refresh"; private static final String REFRESH = "refresh";
// also a GET param
private static final String CONFIGURE = "configure"; private static final String CONFIGURE = "configure";
private static final String NEW = "new"; private static final String NEW = "new";
private static final String REPLY = "reply"; private static final String REPLY = "reply";
@ -578,7 +579,7 @@ public class WebMail extends HttpServlet
private static boolean buttonPressed( RequestWrapper request, String key ) private static boolean buttonPressed( RequestWrapper request, String key )
{ {
String value = request.getParameter( key ); String value = request.getParameter( key );
return value != null && value.length() > 0; return value != null && (value.length() > 0 || key.equals(CONFIGURE));
} }
/** /**
* recursively render all mail body parts * recursively render all mail body parts
@ -1544,22 +1545,22 @@ public class WebMail extends HttpServlet
/* /*
* process config buttons, both entering and exiting * process config buttons, both entering and exiting
* @param isPOST disallow button pushes if false
* @return true if we should go to config page
*/ */
private static void processConfigButtons(SessionObject sessionObject, RequestWrapper request) { private static boolean processConfigButtons(SessionObject sessionObject, RequestWrapper request, boolean isPOST) {
if (buttonPressed(request, CONFIGURE)) { if (buttonPressed(request, CONFIGURE)) {
sessionObject.state = STATE_CONFIG; sessionObject.state = STATE_CONFIG;
return; return true;
} }
// If no config text, we can't be on the config page, // If no config text, we can't be on the config page,
// and we don't want to process the CANCEL button which // and we don't want to process the CANCEL button which
// is also on the compose page. // is also on the compose page.
if (request.getParameter(CONFIG_TEXT) == null) if (!isPOST || request.getParameter(CONFIG_TEXT) == null)
return; return false;
if (buttonPressed(request, SAVE)) { if (buttonPressed(request, SAVE)) {
try { try {
String raw = request.getParameter(CONFIG_TEXT); String raw = request.getParameter(CONFIG_TEXT);
if (raw == null)
return;
Properties props = new Properties(); Properties props = new Properties();
DataHelper.loadProps(props, new ByteArrayInputStream(DataHelper.getUTF8(raw))); DataHelper.loadProps(props, new ByteArrayInputStream(DataHelper.getUTF8(raw)));
// for safety, disallow changing host via UI // for safety, disallow changing host via UI
@ -1611,6 +1612,7 @@ public class WebMail extends HttpServlet
} else if (buttonPressed(request, CANCEL)) { } else if (buttonPressed(request, CANCEL)) {
sessionObject.state = (sessionObject.folder != null) ? STATE_LIST : STATE_AUTH; sessionObject.state = (sessionObject.folder != null) ? STATE_LIST : STATE_AUTH;
} }
return false;
} }
/** /**
@ -1733,8 +1735,14 @@ public class WebMail extends HttpServlet
int oldState = sessionObject.state; int oldState = sessionObject.state;
processStateChangeButtons( sessionObject, request, isPOST ); processStateChangeButtons( sessionObject, request, isPOST );
if (isPOST) if (processConfigButtons(sessionObject, request, isPOST)) {
processConfigButtons( sessionObject, request ); if (isPOST) {
// P-R-G
String q = '?' + CONFIGURE;
sendRedirect(httpRequest, response, q);
return;
}
}
int newState = sessionObject.state; int newState = sessionObject.state;
if (oldState != newState) if (oldState != newState)
Debug.debug(Debug.DEBUG, "STATE CHANGE from " + oldState + " to " + newState); Debug.debug(Debug.DEBUG, "STATE CHANGE from " + oldState + " to " + newState);