Remove radeox

Radeox is a rendering engine for an unspecified markup. Its [website](http://radeox.org/) is dead, the website of its [authors](http://www.codehaus.org/) is dead too, its [last commit](https://github.com/codehaus/radeox) was 13 years ago. It's only used for the welcome and login messages, as well as comments from users. If we want to have some markup parsing, we should use something maintained with autoescaping guarantees, instead of a piece of zombie code prone to $DEITY knows what injections. Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
2019-10-06 16:02:46 -06:00
parent e5404648a4
commit 85e0e08d9a
37 changed files with 4 additions and 118 deletions
@@ -225,12 +225,6 @@
            <scope>runtime</scope>
        </dependency>

-        <dependency>
-            <groupId>radeox</groupId>
-            <artifactId>radeox</artifactId>
-            <version>1.0-b2</version>
-        </dependency>
-
        <dependency>
            <groupId>org.directwebremoting</groupId>
            <artifactId>dwr</artifactId>
@@ -1,75 +0,0 @@
-/*
- This file is part of Airsonic.
-
- Airsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Airsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Airsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2016 (C) Airsonic Authors
- Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
- */
-package org.airsonic.player.taglib;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.radeox.api.engine.RenderEngine;
-import org.radeox.api.engine.context.RenderContext;
-import org.radeox.engine.BaseRenderEngine;
-import org.radeox.engine.context.BaseRenderContext;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import java.io.IOException;
-
-/**
- * Renders a Wiki text with markup to HTML, using the Radeox render engine.
- *
- * @author Sindre Mehus
- */
-public class WikiTag extends BodyTagSupport {
-
-    private static final RenderContext RENDER_CONTEXT = new BaseRenderContext();
-    private static final RenderEngine RENDER_ENGINE = new BaseRenderEngine();
-
-    private String text;
-
-    public int doStartTag() {
-        return EVAL_BODY_BUFFERED;
-    }
-
-    public int doEndTag() throws JspException {
-        String result;
-        synchronized (RENDER_ENGINE) {
-            result = RENDER_ENGINE.render(StringEscapeUtils.unescapeXml(text), RENDER_CONTEXT);
-        }
-        try {
-            pageContext.getOut().print(result);
-        } catch (IOException x) {
-            throw new JspTagException(x);
-        }
-        return EVAL_PAGE;
-    }
-
-    public void release() {
-        text = null;
-        super.release();
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-}
@@ -543,7 +543,6 @@ main.tags=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0439 \u0442\u0
 main.playcount=\u0421\u043B\u0443\u0448\u0430\u043D\u043E {0} \u043F\u044A\u0442\u0438.
 main.lastplayed=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u043E \u043D\u0430 {0}.
 main.comment=\u041A\u043E\u043C\u0435\u043D\u0442\u0438\u0440\u0430\u0439
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=\u0421\u043F\u043E\u0434\u0435\u043B\u0438
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Editar tags
 main.playcount=Reprodu\u00EFt {0} cops.
 main.lastplayed=\u00DAltima reproducci\u00F3 {0}.
 main.comment=Comentari
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Compartir
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Upravit \u0161t\u00EDtky
 main.playcount=P\u0159ehr\u00E1no {0} kr\u00E1t.
 main.lastplayed=Naposledy p\u0159ehr\u00E1no {0}.
 main.comment=Koment\u00E1\u0159
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Sd\u00EDlet
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u00C6ndre tags
 main.playcount=Spillet {0} gange.
 main.lastplayed=Sidst spillet {0}.
 main.comment=Kommentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Del
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Tags editieren
 main.playcount={0} mal gespielt.
 main.lastplayed=Zuletzt am {0} gespielt.
 main.comment=Kommentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Teilen
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u03A0\u03C1\u03BF\u03C3\u03B1\u03C1\u03BC\u03BF\u03B3\u03AE \u03B5\u0
 main.playcount=\u03A0\u03B1\u03B9\u03B3\u03BC\u03AD\u03BD\u03BF {0} \u03C6\u03BF\u03C1\u03AD\u03C2.
 main.lastplayed=\u03A4\u03B5\u03BB\u03B5\u03C5\u03C4\u03B1\u03AF\u03B1 \u03C0\u03B1\u03B9\u03B3\u03BC\u03AD\u03BD\u03BF {0}.
 main.comment=\u03A3\u03C7\u03CC\u03BB\u03B9\u03BF
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -544,7 +544,6 @@ main.tags=Edit tags
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Comment
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Edit tags
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Comment
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Editar etiquetas
 main.playcount=Reproducido {0} veces.
 main.lastplayed=\u00DAltima reproducci\u00F3n {0}.
 main.comment=Comentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Compartir
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Muuda teeke
 main.playcount=Esitatud {0} korda.
 main.lastplayed=Viimati esitati {0}.
 main.comment=Kommentaar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Jaga
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Avainsanat
 main.playcount=Toistettu {0} kertaa.
 main.lastplayed=Viimeksi toistettu {0}.
 main.comment=Kommentoi
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -544,7 +544,6 @@ main.tags=Editer les tags
 main.playcount=Ecout\u00e9 {0} fois
 main.lastplayed=et pour la derni\u00e8re fois le {0}.
 main.comment=Commentaire
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Gras</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Retour \u00e0 la ligne</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italique</td><td style="padding-left:3em;padding-right:1em">(ligne vide)</td><td>Nouveau paragraphe</td></tr><tr><td style="padding-right:1em">* text</td><td>Element d'une liste</td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Lien</td></tr><tr><td style="padding-right:1em">1. text</td><td>Liste \u00e9num\u00e9r\u00e9e</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Lien textuel</td></tr></table>
 main.sharealbum=Partager
 main.more=Plus d'options...
 main.more.selection=Morceaux s\u00e9lectionn\u00e9s
@@ -543,7 +543,6 @@ main.tags=Breyta Tag
 main.playcount=Spila\u00F0 {0} Sinnum.
 main.lastplayed=S\u00ED\u00F0ast Spila\u00F0 {0}.
 main.comment=Athugasemndir
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Modifica tag
 main.playcount=Riprodotto {0} volte.
 main.lastplayed=Riprodotto l''ultima volta il {0}.
 main.comment=Commenta
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u30BF\u30B0\u7DE8\u96C6
 main.playcount={0} \u56DE\u518D\u751F\u6E08\u307F
 main.lastplayed=\u6700\u7D42\u518D\u751F\u65E5 {0}
 main.comment=\u30B3\u30E1\u30F3\u30C8
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=\u5171\u6709
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\uD0DC\uADF8 \uC218\uC815
 main.playcount={0}\uBC88 \uC7AC\uC0DD\uB428.
 main.lastplayed={0}\uC5D0 \uB9C8\uC9C0\uB9C9 \uC7AC\uC0DD\uB428.
 main.comment=\uCF54\uBA58\uD2B8
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Edit tags
 main.playcount=\u0421\u0432\u0438\u0440\u0435\u043B {0} \u043F\u0430\u0442\u0438.
 main.lastplayed=\u041F\u043E\u0441\u043B\u0435\u0434\u0435\u043D \u043F\u0430\u0442 \u0441\u0432\u0438\u0440\u0435\u043B \u043D\u0430 {0}.
 main.comment=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Tags bewerken
 main.playcount={0} keer afgespeeld.
 main.lastplayed=Laatst afgespeeld op {0}.
 main.comment=Opmerking
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__tekst__</td><td>Vetgedrukte tekst</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Regeleinde</td></tr><tr><td style="padding-right:1em">~~tekst~~</td><td>Cursieve tekst</td><td style="padding-left:3em;padding-right:1em">(witregel)</td><td>Nieuwe alinea</td></tr><tr><td style="padding-right:1em">* tekst </td><td>Lijstitem </td><td style="padding-left:3em;padding-right:1em">http://voorbeeld.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. tekst </td><td>Opsommingslijstitem<td style="padding-left:3em;padding-right:1em">{link:Voorbeeld|http://voorbeeld.com}</td><td>Link met naam</td></tr></table>
 main.sharealbum=Delen
 main.more=Meer acties\u2026
 main.more.selection=Geselecteerde nummers\u2026
@@ -543,7 +543,6 @@ main.tags=Endra tags
 main.playcount=Spelt {0} gonger.
 main.lastplayed=Sist spelt {0}.
 main.comment=Kommentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Endre tags
 main.playcount=Spilt {0} ganger.
 main.lastplayed=Sist spilt {0}.
 main.comment=Kommentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Edytuj tagi
 main.playcount=Odtwarzane {0} razy.
 main.lastplayed=Ostatnio odtwarzane {0}.
 main.comment=Komentarze
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Udost\u0119pnij
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Editar etiquetas
 main.playcount=Ouvida {0} vezes.
 main.lastplayed=Ouvida a \u00FAltima vez em {0}.
 main.comment=Comentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Edit tags
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Comment
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Edit tags
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Comment
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u0433
 main.playcount=\u041F\u0440\u043E\u0441\u043B\u0443\u0448\u0430\u043D\u043E {0} \u0440\u0430\u0437.
 main.lastplayed=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u0440\u0430\u0437 \u043F\u0440\u043E\u0441\u043B\u0443\u0448\u0430\u043D\u043E {0}.
 main.comment=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Uredi zna\u010Dke
 main.playcount=Predvajano {0} krat.
 main.lastplayed=Nazadnje predvajano {0}.
 main.comment=Komentar
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Skupna uporaba
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u00C4ndra Taggar
 main.playcount=Spelad {0} g\u00E5nger.
 main.lastplayed=Senast spelad {0}.
 main.comment=Kommentera
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=Редагувати теґи
 main.playcount=Played {0} times.
 main.lastplayed=Last played {0}.
 main.comment=Коментар
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=Share
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u7F16\u8F91\u6807\u7B7E
 main.playcount=\u64AD\u653E {0} \u6B21.
 main.lastplayed=\u4E0A\u6B21\u64AD\u653E: {0}.
 main.comment=\u8BC4\u8BBA
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=\u5171\u4EAB
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -543,7 +543,6 @@ main.tags=\u7DE8\u8F2F\u6A19\u7C64
 main.playcount=\u64AD\u653E {0} \u6B21\u3002
 main.lastplayed=\u4E0A\u6B21\u64AD\u653E\u5728 {0}\u3002
 main.comment=\u8A55\u8AD6
-main.wiki=<table class="detail"><tr><td style="padding-right:1em">__text__</td><td>Bold text</td><td style="padding-left:3em;padding-right:1em">\\\\</td><td>Line break</td></tr><tr><td style="padding-right:1em">~~text~~</td><td>Italic text</td><td style="padding-left:3em;padding-right:1em">(empty line)</td><td>New paragraph</td></tr><tr><td style="padding-right:1em">* text </td><td>List item </td><td style="padding-left:3em;padding-right:1em">http://foo.com/</td><td>Link</td></tr><tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr></table>
 main.sharealbum=\u5206\u4EAB
 main.more=More actions\u2026
 main.more.selection=Selected songs\u2026
@@ -279,7 +279,7 @@
    </c:if>
 </div>

-<div id="comment" class="albumComment"><sub:wiki text="${model.dir.comment}"/></div>
+<div id="comment" class="albumComment">${model.dir.comment}</div>

 <div id="commentForm" style="display:none">
    <form method="post" action="setMusicFileInfo.view">
@@ -289,7 +289,6 @@
        <textarea name="comment" rows="6" cols="70">${model.dir.comment}</textarea>
        <input type="submit" value="<fmt:message key="common.save"/>">
    </form>
-    <fmt:message key="main.wiki"/>
 </div>

 <script type='text/javascript'>
@@ -207,7 +207,7 @@
 <%@ include file="viewSelector.jsp" %>
 <div style="clear:both"></div>

-<div id="comment" class="albumComment"><sub:wiki text="${model.dir.comment}"/></div>
+<div id="comment" class="albumComment">${model.dir.comment}</div>

 <div id="commentForm" style="display:none">
    <form method="post" action="setMusicFileInfo.view">
@@ -217,7 +217,6 @@
        <textarea name="comment" rows="6" cols="70">${model.dir.comment}</textarea>
        <input type="submit" value="<fmt:message key="common.save"/>">
    </form>
-    <fmt:message key="main.wiki"/>
 </div>

 <script type='text/javascript'>
@@ -151,7 +151,6 @@
            <td>
                <form:textarea path="loginMessage" rows="5" cols="70"/>
                <c:import url="helpToolTip.jsp"><c:param name="topic" value="loginmessage"/></c:import>
-                <fmt:message key="main.wiki"/>
            </td>
        </tr>

@@ -65,7 +65,7 @@

 <c:if test="${not empty model.welcomeMessage}">
    <div style="width:15em;float:right;padding:0 1em 0 1em;border-left:1px solid #<spring:theme code="detailColor"/>">
-        <sub:wiki text="${model.welcomeMessage}"/>
+        ${model.welcomeMessage}
    </div>
 </c:if>

@@ -19,7 +19,7 @@

            <img src="<spring:theme code="logoImage"/>" alt="">

-            <div class="loginmessagetop"><sub:wiki text="${model.loginMessage}"/></div>
+            <div class="loginmessagetop">${model.loginMessage}</div>

            <input required type="text" autofocus id="j_username" name="j_username" tabindex="1" placeholder="<fmt:message key="login.username"/>">