admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BLCC#60989 ook in de bon de mention-bb-code strippen

Browse Source 
svn path=/Website/trunk/; revision=55488
This commit is contained in:
Koen Reefman
2022-04-04 14:40:54 +00:00
parent e38c3e6572
commit 31872f7bea
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/Shared/Shared.inc
View File

@@ -447,8 +447,6 @@ var shared = {
var matched = waarde.match(new RegExp(strre, "gi")); var matched = waarde.match(new RegExp(strre, "gi"));
if (matched != null) if (matched != null)
{ {
var prs_key = -1;
var prs_name = "";
for (var i = 0; i < matched.length; i++) for (var i = 0; i < matched.length; i++)
{ {
var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag
@@ -1228,7 +1226,7 @@ safe = {
} }
} }
// Checking for [mention] prs_key | prs_name [/mention] as used in notestamp // Checking for [mention] prs_key | prs_name [/mention] as used in notes
strre = "\\[(mention)\\](\\d+)\\|(.+)\\[\\/(?:\\1)\\]"; strre = "\\[(mention)\\](\\d+)\\|(.+)\\[\\/(?:\\1)\\]";
var matched = waarde.match(new RegExp(strre, "gi")); var matched = waarde.match(new RegExp(strre, "gi"));
if (matched != null) if (matched != null)

41
APPL/Shared/default.xsl
View File

@@ -123,21 +123,20 @@
// Checking for [link] url (|optionaltext) [/link] // Checking for [link] url (|optionaltext) [/link]
// or [url] url (|optionaltext) [/url] // or [url] url (|optionaltext) [/url]
var strre = "\\[(link|url)\\](.*?)\\[\\/(?:\\1)\\]"; var strre = "\\[(link|url)\\](.*?)\\[\\/(?:\\1)\\]";
var strLinkre = "^((ftp|http|https):\\/\\/|(mailto|tel):)"; var allowedLinkRegex = new RegExp("^((ftp|http|https):\\/\\/|(mailto|tel):)", "i"); // S("allowedLinkRegex")
var re = new RegExp(strre, "gi"); var matched = waarde.match(new RegExp(strre, "gi"));
var allowedLinkRegex = new RegExp(strLinkre, "gi");
var matched = waarde.match(re);
if (matched != null) if (matched != null)
{ {
var url = ""; var url = "";
var label = ""; var label = "";
for (var i = 0; i < matched.length; i++) for (var i = 0; i < matched.length; i++)
{ {
if (matched[i].match(re)) // om RegExp.$2 te bepalen var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag
if (groups)
{ {
// RegExp.$1 = "link" of "url" (wordt verder niet gebruikt) // groups[1] = "link" of "url" (wordt verder niet gebruikt)
// RegExp.$2 = url (|optionaltext) // groups[2] = url (|optionaltext)
var result = RegExp.$2.split("|"); var result = groups[2].split("|");
if (result.length > 0) if (result.length > 0)
{ {
var safe_url = safe.htmlattr(result[0]); var safe_url = safe.htmlattr(result[0]);
@@ -158,6 +157,24 @@
} }
} }
// Checking for [mention] prs_key | prs_name [/mention] as used in notes
// Deze strippen we ipv parsen, je bent het immers zelf
strre = "\\[(mention)\\](\\d+)\\|(.+)\\[\\/(?:\\1)\\]";
var matched = waarde.match(new RegExp(strre, "gi"));
if (matched != null)
{
for (var i = 0; i < matched.length; i++)
{
var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag
if (groups)
{ // groups[1] = "mention" (wordt verder niet gebruikt)
// groups[2] = prs_key
// groups[3] = prs_name
safehtml = safehtml.replace(safe.html(matched[i]), "@" + safe.html(groups[3]));
}
}
}
for (var i = 0; i < safepairs.length; i++) for (var i = 0; i < safepairs.length; i++)
{ {
var code = safepairs[i]; var code = safepairs[i];
@@ -1660,7 +1677,7 @@ END:VCALENDAR
</td> </td>
<td colspan="3" style="padding-top:10px;"> <td colspan="3" style="padding-top:10px;">
<xsl:call-template name="linebreaks"> <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/> <xsl:with-param name="string" select="fclt:fclthtml(notes/note[key=$mx_key]/omschrijving)"/>
</xsl:call-template> </xsl:call-template>
</td> </td>
</tr> </tr>
@@ -2055,7 +2072,7 @@ END:VCALENDAR
</td> </td>
<td colspan="5" style="padding-top:15px;padding-bottom:10px;"> <td colspan="5" style="padding-top:15px;padding-bottom:10px;">
<xsl:call-template name="linebreaks"> <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$ox_key]/omschrijving"/> <xsl:with-param name="string" select="fclt:fclthtml(notes/note[key=$ox_key]/omschrijving)"/>
</xsl:call-template> </xsl:call-template>
</td> </td>
</tr> </tr>
@@ -3175,7 +3192,7 @@ END:VCALENDAR
</td> </td>
<td colspan="3" style="padding-top:10px;" class="value"> <td colspan="3" style="padding-top:10px;" class="value">
<xsl:call-template name="linebreaks"> <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/> <xsl:with-param name="string" select="fclt:fclthtml(notes/note[key=$mx_key]/omschrijving)"/>
</xsl:call-template> </xsl:call-template>
</td> </td>
</tr> </tr>
@@ -3607,7 +3624,7 @@ END:VCALENDAR
</td> </td>
<td colspan="3" style="padding-top:10px;" class="value"> <td colspan="3" style="padding-top:10px;" class="value">
<xsl:call-template name="linebreaks"> <xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/> <xsl:with-param name="string" select="fclt:fclthtml(notes/note[key=$mx_key]/omschrijving)"/>
</xsl:call-template> </xsl:call-template>
</td> </td>
</tr> </tr>