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

Fixed transclusion issue.

Browse source
This commit is contained in:
Dario Solera 2010-04-09 15:59:10 +00:00
parent acfc1ad983
commit ddcdf77f53
1 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Core/Formatter.cs
View file

@ -2369,27 +2369,6 @@ namespace ScrewTurn.Wiki {
Match match; Match match;
// Format {CLOUD} tag (it has to be in Phase3 because on page rebind the cache is not cleared)
// --> When rebidning a page, the cache is now cleared
/*match = CloudRegex.Match(sb.ToString());
string cloudMarkup = BuildCloud(DetectNamespaceInfo(current));
while(match.Success) {
sb.Remove(match.Index, match.Length);
sb.Insert(match.Index, cloudMarkup);
match = CloudRegex.Match(sb.ToString(), match.Index + cloudMarkup.Length);
}*/
// Format {NAMESPACE} tag
// --> Now processed with {INCOMING/OUTGOING}
/*string ns = Tools.DetectCurrentNamespace();
if(string.IsNullOrEmpty(ns)) ns = "<root>";
match = NamespaceRegex.Match(sb.ToString());
while(match.Success) {
sb.Remove(match.Index, match.Length);
sb.Insert(match.Index, ns);
match = NamespaceRegex.Match(sb.ToString(), match.Index + 11);
}*/
// Format other Phase3 special tags // Format other Phase3 special tags
match = Phase3SpecialTagRegex.Match(sb.ToString()); match = Phase3SpecialTagRegex.Match(sb.ToString());
while(match.Success) { while(match.Success) {
@ -2477,7 +2456,7 @@ namespace ScrewTurn.Wiki {
match = SignRegex.Match(sb.ToString()); match = SignRegex.Match(sb.ToString());
} }
// Transclusion (intra-Wiki) // Transclusion
match = TransclusionRegex.Match(sb.ToString()); match = TransclusionRegex.Match(sb.ToString());
while(match.Success) { while(match.Success) {
sb.Remove(match.Index, match.Length); sb.Remove(match.Index, match.Length);
@ -2492,12 +2471,13 @@ namespace ScrewTurn.Wiki {
} }
} }
PageInfo info = Pages.FindPage(pageName); PageInfo info = Pages.FindPage(pageName);
if(info != null && (current != null && info.FullName != current.FullName)) { // Avoid circular transclusion!
string currentUsername = SessionFacade.GetCurrentUsername(); string currentUsername = SessionFacade.GetCurrentUsername();
string[] currentGroups = SessionFacade.GetCurrentGroupNames(); string[] currentGroups = SessionFacade.GetCurrentGroupNames();
bool canView = AuthChecker.CheckActionForPage(info, Actions.ForPages.ReadPage, currentUsername, currentGroups); bool canView = AuthChecker.CheckActionForPage(info, Actions.ForPages.ReadPage, currentUsername, currentGroups);
if(canView) { if(canView) {
if(info != null && (current != null && info.FullName != current.FullName)) { // Avoid circular transclusion!
dummy = new StringBuilder(); dummy = new StringBuilder();
dummy.Append(@"<div class=""transcludedpage"">"); dummy.Append(@"<div class=""transcludedpage"">");
dummy.Append(FormattingPipeline.FormatWithPhase3( dummy.Append(FormattingPipeline.FormatWithPhase3(
@ -2508,15 +2488,16 @@ namespace ScrewTurn.Wiki {
sb.Insert(match.Index, dummy.ToString()); sb.Insert(match.Index, dummy.ToString());
} }
else { else {
string formatterErrorString = @"<b style=""color: #FF0000;"">FORMATTER ERROR (Transcluded inexistent page or this same page)</b>"; string formatterErrorString = @"<b style=""color: #FF0000;"">PERMISSION ERROR (You are not allowed to see transcluded page)</b>";
sb.Insert(match.Index, formatterErrorString); sb.Insert(match.Index, formatterErrorString);
} }
} }
else { else {
string formatterErrorString = @"<b style=""color: #FF0000;"">PERMISSION ERROR (You are not allowed to see transcluded page)</b>"; string formatterErrorString = @"<b style=""color: #FF0000;"">FORMATTER ERROR (Transcluded inexistent page or this same page)</b>";
sb.Insert(match.Index, formatterErrorString); sb.Insert(match.Index, formatterErrorString);
} }
match = TransclusionRegex.Match(sb.ToString()); match = TransclusionRegex.Match(sb.ToString());
} }