zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #395: filenames are URL-encoded when used in combination with {UP} tags.

Browse source
This commit is contained in:
Dario Solera 2009-10-21 15:02:58 +00:00
parent d460d9bd47
commit 9e9ceb2ec7
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.1.410")] [assembly: AssemblyVersion("3.0.1.411")]
[assembly: AssemblyFileVersion("3.0.1.410")] [assembly: AssemblyFileVersion("3.0.1.411")]

21
Core/Formatter.cs
View file

@ -232,6 +232,7 @@ namespace ScrewTurn.Wiki {
match = ExtendedUpRegex.Match(sb.ToString()); match = ExtendedUpRegex.Match(sb.ToString());
while(match.Success) { while(match.Success) {
if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) { if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) {
EncodeFilename(sb, match.Index + match.Length);
sb.Remove(match.Index, match.Length); sb.Remove(match.Index, match.Length);
string prov = match.Groups[1].Value.StartsWith(":") ? match.Value.Substring(4, match.Value.Length - 5) : match.Value.Substring(3, match.Value.Length - 4); string prov = match.Groups[1].Value.StartsWith(":") ? match.Value.Substring(4, match.Value.Length - 5) : match.Value.Substring(3, match.Value.Length - 4);
string page = null; string page = null;
@ -869,6 +870,26 @@ namespace ScrewTurn.Wiki {
return sb.ToString(); return sb.ToString();
} }
/// <summary>
/// Encodes a filename used in combination with {UP} tags.
/// </summary>
/// <param name="buffer">The buffer.</param>
/// <param name="startIndex">The index where to start working.</param>
private static void EncodeFilename(StringBuilder buffer, int startIndex) {
// 1. Find end of the filename (first pipe or closed square bracket)
// 2. Encode the string
string allData = buffer.ToString();
int endIndex = allData.IndexOfAny(new[] { '|', ']' }, startIndex);
if(endIndex > startIndex) {
int len = endIndex - startIndex;
string value = Tools.UrlEncode(allData.Substring(startIndex, len));
buffer.Remove(startIndex, len);
buffer.Insert(startIndex, value);
}
}
/// <summary> /// <summary>
/// Builds the anchor markup for a header. /// Builds the anchor markup for a header.
/// </summary> /// </summary>