kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compilation error and improved UTF8 support

Browse Source
This commit is contained in:
sbwalker 2023-05-02 15:03:26 -04:00
parent 64b8291487
commit e31f32e5aa
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Oqtane.Server/Pages/Sitemap.cshtml.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
@ -48,7 +49,7 @@ namespace Oqtane.Pages
// build site map // build site map
var moduleDefinitions = _moduleDefinitions.GetModuleDefinitions(_alias.SiteId).ToList(); var moduleDefinitions = _moduleDefinitions.GetModuleDefinitions(_alias.SiteId).ToList();
var pageModules = _pageModules.GetPageModules(_alias.SiteId); var pageModules = _pageModules.GetPageModules(_alias.SiteId);
foreach (var page in _pages.GetPages(_alias.SiteId)) foreach (var page in _pages.GetPages(_alias.SiteId))
{ {
if (_userPermissions.IsAuthorized(null, PermissionNames.View, page.PermissionList) && page.IsNavigation) if (_userPermissions.IsAuthorized(null, PermissionNames.View, page.PermissionList) && page.IsNavigation)
{ {
@ -85,26 +86,21 @@ namespace Oqtane.Pages
} }
// write XML // write XML
var encoding = new UTF8Encoding(false); var builder = new StringBuilder();
var xmlDeclaration = new XDeclaration("1.0", encoding.WebName, null); var stringWriter = new StringWriterWithEncoding(builder, Encoding.UTF8);
var settings = new XmlWriterSettings var settings = new XmlWriterSettings
{ {
Indent = true, Indent = true,
IndentChars = " ", IndentChars = " ",
NewLineChars = Environment.NewLine,
CloseOutput = true, CloseOutput = true,
Encoding = encoding, WriteEndDocumentOnClose = true
OmitXmlDeclaration = true,
WriteEndDocumentOnClose = true,
NewLineChars = Environment.NewLine
}; };
var builder = new StringBuilder(); using (var writer = XmlWriter.Create(stringWriter, settings))
using (var writer = XmlWriter.Create(builder, settings))
{ {
writer.WriteStartDocument();
writer.WriteRaw(Environment.NewLine);
writer.WriteStartElement("urlset", "http://www.sitemaps.org/schemas/sitemap/0.9"); writer.WriteStartElement("urlset", "http://www.sitemaps.org/schemas/sitemap/0.9");
foreach (var url in sitemap) foreach (var url in sitemap)
{ {
writer.WriteStartElement("url"); writer.WriteStartElement("url");
@ -113,11 +109,28 @@ namespace Oqtane.Pages
writer.WriteEndElement(); writer.WriteEndElement();
} }
writer.WriteEndElement(); writer.WriteEndElement();
writer.WriteEndDocument();
writer.Close(); writer.Close();
} }
return Content(xmlDeclaration + builder.ToString(), "application/xml"); return Content(builder.ToString(), "application/xml");
}
}
public class StringWriterWithEncoding : StringWriter
{
private readonly Encoding _encoding;
public StringWriterWithEncoding(StringBuilder builder, Encoding encoding) : base(builder)
{
this._encoding = encoding;
}
public override Encoding Encoding
{
get
{
return this._encoding;
}
} }
} }
} }