diff --git a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java index f047d17f4..a32ca428e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/BlogManager.java +++ b/apps/syndie/java/src/net/i2p/syndie/BlogManager.java @@ -479,6 +479,8 @@ public class BlogManager { */ private static final String DEFAULT_SINGLE_USER_ARCHIVES[] = new String[] { "http://syndiemedia.i2p/archive/archive.txt" + , "http://gloinsblog.i2p/archive/archive.txt" + , "http://glog.i2p/archive/archive.txt" }; public User getDefaultUser() { diff --git a/apps/syndie/java/src/net/i2p/syndie/Updater.java b/apps/syndie/java/src/net/i2p/syndie/Updater.java index 0f1b060ec..58ac8f48a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/Updater.java +++ b/apps/syndie/java/src/net/i2p/syndie/Updater.java @@ -69,7 +69,7 @@ public class Updater { // wait try { - Thread.currentThread().sleep(1*60*1000); + Thread.currentThread().sleep(5*60*1000); } catch (InterruptedException ie) {} while (true) { diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java index 8daeeb46f..a7f6cd111 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java @@ -518,7 +518,10 @@ public class HTMLRenderer extends EventReceiverImpl { _bodyBuffer.append(getSpan("attachmentSummary")).append(" ("); _bodyBuffer.append(getSpan("attachmentSummarySize")).append(attachments[id].getDataLength()/1024).append("KB, "); _bodyBuffer.append(getSpan("attachmentSummaryName")).append(" \"").append(sanitizeString(attachments[id].getName())).append("\", "); - _bodyBuffer.append(getSpan("attachmentSummaryDesc")).append(" \"").append(sanitizeString(attachments[id].getDescription())).append("\", "); + String descr = attachments[id].getDescription(); + if ( (descr != null) && (descr.trim().length() > 0) ) { + _bodyBuffer.append(getSpan("attachmentSummaryDesc")).append(" \"").append(sanitizeString(descr.trim())).append("\", "); + } _bodyBuffer.append(getSpan("attachmentSummaryType")).append(sanitizeString(attachments[id].getMimeType())).append(")"); } } diff --git a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java index 60ed9bf4c..91a942285 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/BaseServlet.java @@ -510,6 +510,7 @@ public abstract class BaseServlet extends HttpServlet { } //out.write("\n"); out.write("\n"); + out.write("About "); if (BlogManager.instance().authorizeRemote(user)) { out.write("Syndicate\n"); out.write("Import RSS/Atom\n"); diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java index 7506820c1..c254b176d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java @@ -163,6 +163,9 @@ public class PostBean { return raw.toString(); } + /** until we have a good filtering/preferences system, lets try to keep the content small */ + private static final int MAX_SIZE = 256*1024; + private void cacheAttachments() throws IOException { File postCacheDir = new File(BlogManager.instance().getTempDir(), _user.getBlog().toBase64()); if (!postCacheDir.exists()) @@ -177,10 +180,14 @@ public class PostBean { o.write(buf, 0, read); o.close(); in.close(); - _localFiles.add(f); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Caching attachment " + i + " temporarily in " - + f.getAbsolutePath() + " w/ " + f.length() + "bytes"); + if (f.length() > MAX_SIZE) { + _log.error("Refusing to post the attachment, because it is too big: " + f.length()); + } else { + _localFiles.add(f); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Caching attachment " + i + " temporarily in " + + f.getAbsolutePath() + " w/ " + f.length() + "bytes"); + } } _fileStreams.clear(); } diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java index 3d4d13c61..42acbfc36 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java @@ -91,8 +91,11 @@ public class PostServlet extends BaseServlet { if ( (replyTo != null) && (replyTo.trim().length() > 0) ) { byte r[] = Base64.decode(replyTo); if (r != null) { - if (entryHeaders == null) entryHeaders = HTMLRenderer.HEADER_IN_REPLY_TO + ": entry://" + new String(r, "UTF-8"); - else entryHeaders = entryHeaders + '\n' + HTMLRenderer.HEADER_IN_REPLY_TO + ": entry://" + new String(r, "UTF-8"); + replyTo = new String(r, "UTF-8"); + if (!replyTo.startsWith("entry://") && !replyTo.startsWith("blog://")) + replyTo = "entry://" + replyTo; + if (entryHeaders == null) entryHeaders = HTMLRenderer.HEADER_IN_REPLY_TO + ": " + replyTo; + else entryHeaders = entryHeaders + '\n' + HTMLRenderer.HEADER_IN_REPLY_TO + ": " + replyTo; } else { replyTo = null; }