Ticket #1158: 1158.diff

File 1158.diff, 2.2 KB (added by wockenfuss, 5 years ago)
Line 
1diff -rN ../old/apps/susimail/src/src/i2p/susi/util/Config.java ./apps/susimail/src/src/i2p/susi/util/Config.java
226,27d25
3< import i2p.susi.debug.Debug;
4<
529a28
6> import java.io.FileOutputStream;
782c81
8<                       Debug.debug( Debug.DEBUG, "Could not open WEB-INF/classes/susimail.properties (possibly in jar), reason: " + e.getMessage() );
9---
10>                       I2PAppContext.getGlobalContext().logManager().getLog(Config.class).error( "Could not open WEB-INF/classes/susimail.properties (possibly in jar)", e );
1186a86,88
12>                       if( !cfg.exists() ) {
13>                               properties.store( new FileOutputStream(cfg), "copy of susimail.properties" );
14>                       }
1590c92
16<                       Debug.debug( Debug.DEBUG, "Could not open susimail.config, reason: " + e.getMessage() );
17---
18>                       I2PAppContext.getGlobalContext().logManager().getLog(Config.class).debug( "Could not open susimail.config, reason: " + e.getMessage() );
19diff -rN ../old/apps/susimail/src/src/i2p/susi/webmail/WebMail.java ./apps/susimail/src/src/i2p/susi/webmail/WebMail.java
2026d25
21< import i2p.susi.debug.Debug;
22338d336
23<                       Debug.setLevel( RELEASE ? Debug.ERROR : Debug.DEBUG );
24362c360
25<               return "<input type=\"submit\" name=\"" + name + "\" value=\"" + label + "\" disabled>";
26---
27>               return "<input type=\"submit\" class=\"" + name + "\" name=\"" + name + "\" value=\"" + label + "\" disabled>";
28646a645,648
29>                       else if( buttonPressed( request, RELOAD ) ) {
30>                               Config.reloadConfiguration();
31>                               sessionObject.info = _("Configuration reloaded");
32>                       }
33900a903
34>                       sessionObject.info = _("Configuration reloaded");
351659c1662
36<                       "<tr><td></td><td align=\"left\">" + button( LOGIN, _("Login") ) + " <input class=\"cancel\" type=\"reset\" value=\"" + _("Reset") + "\"></td></tr>\n" +
37---
38>                       "<tr><td></td><td align=\"left\">" + button( LOGIN, _("Login") ) + " <input class=\"cancel\" type=\"reset\" value=\"" + _("Reset") + "\">" + button( RELOAD, _("Reload Config") ) + "</td></tr>\n" +
391708,1711d1710
40<                       Debug.debug( Debug.DEBUG, "check" + i + ": checkId=" + checkId + ", idChecked=" + idChecked + ", pageChanged=" + sessionObject.pageChanged +
41<                                       ", markAll=" + sessionObject.markAll +
42<                                       ", invert=" + sessionObject.invert +
43<                                       ", clear=" + sessionObject.clear );