diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
index a48230c69ff57ab8c29425e203c97f3ef9e1ad91..0d749b1493772728135caa5e4b193dc23f3aff60 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
@@ -88,22 +88,13 @@ public class HTMLPreviewRenderer extends HTMLRenderer {
for (int i = 0; i < _links.size(); i++) {
Link l = (Link)_links.get(i);
String schema = l.schema;
- _postBodyBuffer.append("<p>Schema: ").append(schema).append("</p>");
_postBodyBuffer.append("<a ");
- if(schema.equals("attachment")) {
- /* No need for externallink double checker */
- int ID = Integer.parseInt(l.location);
- _postBodyBuffer.append("href=\"").append(getAttachmentURL(ID));
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- } else {
- _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
- if (l.schema != null)
- _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
- if (l.location != null)
+ _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+ if (l.schema != null)
+ _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+ if (l.location != null)
_postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- }
-
+ _postBodyBuffer.append("\">").append(sanitizeString(l.location));
_postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
}
_postBodyBuffer.append("<br />\n");
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 15ce181a64256f84d9b4b913a8183b05a86701f0..dba3f28332cb857cec04dad30a1430d7b7fdfa07 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
@@ -437,16 +437,10 @@ public class HTMLRenderer extends EventReceiverImpl {
if (!continueBody()) { return; }
if ( (schema == null) || (location == null) ) return;
_bodyBuffer.append("<a ");
- if ( schema.equals("attachment") ) {
- int attachmentID = Integer.parseInt(location);
- _bodyBuffer.append("href=\"").
- append(getAttachmentURL(attachmentID));
- } else {
- _bodyBuffer.append(getClass("externalLink")).append(" href=\"externallink.jsp?schema=");
- _bodyBuffer.append(sanitizeURL(schema)).append("&location=");
- _bodyBuffer.append(sanitizeURL(location)).append("&description=");
- _bodyBuffer.append(sanitizeURL(text));
- }
+ _bodyBuffer.append(getClass("externalLink")).append(" href=\"externallink.jsp?schema=");
+ _bodyBuffer.append(sanitizeURL(schema)).append("&location=");
+ _bodyBuffer.append(sanitizeURL(location)).append("&description=");
+ _bodyBuffer.append(sanitizeURL(text));
_bodyBuffer.append("\">").
append(sanitizeString(text)).
append("</a>");
@@ -651,19 +645,12 @@ public class HTMLRenderer extends EventReceiverImpl {
Link l = (Link)_links.get(i);
String schema = l.schema;
_postBodyBuffer.append("<a ");
- if(schema.equals("attachment")) {
- /* No need for externallink double checker */
- int ID = Integer.parseInt(l.location);
- _postBodyBuffer.append(" href=\"").append(getAttachmentURL(ID));
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- } else {
- _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
- if (l.schema != null)
- _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
- if (l.location != null)
- _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- }
+ _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+ if (l.schema != null)
+ _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+ if (l.location != null)
+ _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
+ _postBodyBuffer.append("\">").append(sanitizeString(l.location));
_postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
}
_postBodyBuffer.append("<br />\n");
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java
index 4bf4af3b3975eb4e645fe2cc169e41db21425b0e..b38f9b0ee774962ff58972712098b65187511a4a 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java
@@ -314,4 +314,4 @@ public class RSSRenderer extends HTMLRenderer {
String sanitized = sanitizeXML(t);
System.out.println("[" + str + "] --> [" + sanitized + "]");
}
-}
\ No newline at end of file
+}
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
index 86b328ffa85ab13822f85eca2412adfea224c700..94a158547004d8a5519df09015736d2c2ffeb512 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
@@ -406,21 +406,13 @@ public class ThreadedHTMLRenderer extends HTMLRenderer {
for (int i = 0; i < _links.size(); i++) {
Link l = (Link)_links.get(i);
String schema = l.schema;
- _postBodyBuffer.append("<a ");
- if(schema.equals("attachment")) {
- /* No need for externallink double checker */
- int ID = Integer.parseInt(l.location);
- _postBodyBuffer.append(" href=\"").append(getAttachmentURL(ID));
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- } else {
- _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
- if (l.schema != null)
- _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
- if (l.location != null)
- _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
- _postBodyBuffer.append("\">").append(sanitizeString(l.location));
- }
-
+ _postBodyBuffer.append("<a ");
+ _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+ if (l.schema != null)
+ _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+ if (l.location != null)
+ _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
+ _postBodyBuffer.append("\">").append(sanitizeString(l.location));
_postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
}
_postBodyBuffer.append("<br />\n");
diff --git a/apps/syndie/jsp/smlref.jsp b/apps/syndie/jsp/smlref.jsp
index e2f6b577f659ee528d8a9d36860170f4abbe8761..87e6474473eb475ac0bc6761d8ba9d4994c988a6 100644
--- a/apps/syndie/jsp/smlref.jsp
+++ b/apps/syndie/jsp/smlref.jsp
@@ -17,7 +17,7 @@ request.setCharacterEncoding("UTF-8");
<li>[cut]more inside[/cut] = <a href="#">more inside...</a></li>
<li>[quote][/quote] = Quoted text</li>
<li>[img attachment="1"]alt[/img] = use attachment 1 as an image with 'alt' as the alt text</li>
- <li>[link schema="attachment" location="0"]text[/link] = offer a link to one of the attachments in your post (redundant, but useful in context sometimes)
+ <li>[attachment id="0"]text[/attachment] = offer the attachment as a link in your post
<li>[link schema="eep" location="http://forum.i2p"]text[/link] = offer a link to an external resource (accessible with the given schema)</li>
<li>[blog name="name" bloghash="base64hash"]description[/blog] = link to all posts in the blog</li>
<li>[blog name="name" bloghash="base64hash" blogentry="1234"]description[/blog] = link to the specified post in the blog</li>