Release v.10.2.6622.0

Sitefinity · Dec 12, 2017 · f178201 · f178201
1 parent cc60c6d
commit f178201
Show file tree

Hide file tree

Showing 119 changed files with 921 additions and 483 deletions.
diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs
diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Controllers/BlogPostController.cs b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Controllers/BlogPostController.cs
@@ -13,6 +13,8 @@
 using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers;
 using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
 using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Routing;
+using Telerik.Sitefinity.Frontend.Mvc.Models;
+using Telerik.Sitefinity.Model;
 using Telerik.Sitefinity.Modules.Blogs;
 using Telerik.Sitefinity.Modules.Pages.Configuration;
 using Telerik.Sitefinity.Mvc;
@@ -28,7 +30,7 @@ namespace Telerik.Sitefinity.Frontend.Blogs.Mvc.Controllers
     /// </summary>
     [Localization(typeof(BlogPostResources))]
     [ControllerToolboxItem(Name = "BlogPost_MVC", Title = "Blog posts", SectionName = ToolboxesConfig.ContentToolboxSectionName, ModuleName = "Blogs", CssClass = BlogPostController.WidgetIconCssClass)]
-    public class BlogPostController : Controller, IContentLocatableView, IRouteMapper, IPersonalizable
+    public class BlogPostController : ContentBaseController, IContentLocatableView, IRouteMapper, IPersonalizable
     {
         #region Properties
 
@@ -115,6 +117,27 @@ public bool OpenInSamePage
         /// </value>
         public Guid DetailsPageId { get; set; }
 
+        /// <summary>
+        /// Gets the metadata container.
+        /// </summary>
+        /// <value>
+        /// The metadata container.
+        /// </value>
+        [TypeConverter(typeof(ExpandableObjectConverter))]
+        public override MetadataModel MetadataFields
+        {
+            get
+            {
+                if (this.metadata == null)
+                {
+                    this.metadata = base.MetadataFields;
+                    this.metadata.OpenGraphType = OpenGraphTypes.Article;
+                }
+
+                return this.metadata;
+            }
+        }
+
         #endregion
 
         #region Actions
@@ -195,6 +218,8 @@ public ActionResult ListByTaxon(ITaxon taxonFilter, int? page)
         /// </returns>
         public ActionResult Details(BlogPost item)
         {
+            this.InitializeMetadataDetailsViewBag(item);
+
             var fullTemplateName = this.detailTemplateNamePrefix + this.DetailTemplateName;
 
             if (item != null)
@@ -278,10 +303,12 @@ protected virtual bool TryResolveParentFilterMode(string[] urlParams, RequestCon
 
                 return true;
             }
+
             if (urlParams.Length > 1)
             {
                 this.TryResolveParentFilterMode(urlParams.Take(urlParams.Length - 1).ToArray(), requestContext, manager);
             }
+
             return false;
         }
 
@@ -360,6 +387,7 @@ private void SetRedirectUrlQueryString(ITaxon taxon)
         internal const string WidgetIconCssClass = "sfBlogsViewIcn sfMvcIcn";
 
         private IBlogPostModel model;
+        private MetadataModel metadata;
 
         private string listTemplateName = "BlogPostList";
         private string listTemplateNamePrefix = "List.";

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Helpers/DetailLocationHyperLinkHelper.cs b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Helpers/DetailLocationHyperLinkHelper.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Telerik.Sitefinity.Blogs.Model;
 using Telerik.Sitefinity.Frontend.Blogs.Mvc.Models.Blog;
 using Telerik.Sitefinity.Frontend.Mvc.Helpers;
@@ -33,15 +30,12 @@ public static string GetDetailPageUrl(ItemViewModel item, Guid detailsPageId, Bl
             else if (blogDetailLocationMode == BlogDetailLocationMode.PerItem)
             {
                 var blog = item.DataItem as Blog;
-
                 if (blog != null)
                 {
                     var blogPageId = blog.DefaultPageId;
-
-                    if (blogPageId.HasValue)
+                    if (blogPageId.HasValue && blogPageId.Value != Guid.Empty)
                         url = HyperLinkHelpers.GetDetailPageUrl(item.DataItem, blogPageId.Value);
                 }
-
             }
             else if (blogDetailLocationMode == BlogDetailLocationMode.SamePage)
             {

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/DesignerView.Simple.cshtml
@@ -44,15 +44,15 @@
             <div class="radio">
                 <label class="full-width">
                     <input type="radio" ng-click="changeFilteredSelectionMode('MinPostsCount')" ng-checked="isFilteredSelectionModeChecked('MinPostsCount')"/>
-                    @Html.Raw(String.Format(Html.Resource("BlogsWithMoreThanPosts"),
+                    @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("BlogsWithMoreThanPosts")).ToString(),
                     "<input type='text' style='width: 40px' ng-model='properties.MinPostsCount.PropertyValue' ng-disabled='!isFilteredSelectionModeChecked(\"MinPostsCount\")' />"))
                 </label>
             </div>
 
             <div class="radio">
                 <label class="full-width">
                     <input type="radio" ng-click="changeFilteredSelectionMode('MaxPostsAge')" ng-checked="isFilteredSelectionModeChecked('MaxPostsAge')" />
-                    @Html.Raw(String.Format(Html.Resource("OnlyBlogsThatHavePostsNotOlderYhanMonths"),
+                    @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("OnlyBlogsThatHavePostsNotOlderYhanMonths")).ToString(),
                     "<input type='text' style='width: 40px' ng-model='properties.MaxPostsAge.PropertyValue' ng-disabled='!isFilteredSelectionModeChecked(\"MaxPostsAge\")' />"))
                 </label>
             </div>
@@ -71,7 +71,7 @@
                     <strong>@Html.Resource("UsePaging")</strong><br />
 
                     <span>
-                        @Html.Raw(String.Format(Html.Resource("DivideToItemPerPage"),
+                        @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(),
                         "<input type='text' style='width: 40px' ng-disabled='properties.DisplayMode.PropertyValue!=\"Paging\"' ng-model='properties.ItemsPerPage.PropertyValue'/>"))
                     </span>
                 </label>
@@ -83,7 +83,7 @@
                     <strong>@Html.Resource("UseLimit")</strong><br />
 
                     <span>
-                        @Html.Raw(String.Format(Html.Resource("ShowLimitedItems"),
+                        @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(),
                         "<input type='text' style='width: 40px' ng-disabled='properties.DisplayMode.PropertyValue!=\"Limit\"' ng-model='properties.LimitCount.PropertyValue'/>"))
                     </span>
                 </label>

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/Detail.DetailPage.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/Blog/Detail.DetailPage.cshtml
@@ -19,5 +19,5 @@
         }
     }
 
-    <div @Html.InlineEditingFieldAttributes("Description", "LongText")>@Html.Raw(Model.Item.Fields.Description)</div>
+    <div @Html.InlineEditingFieldAttributes("Description", "LongText")>@Html.HtmlSanitize((string)Model.Item.Fields.Description)</div>
 </div>
diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/DesignerView.Simple.cshtml
@@ -99,7 +99,7 @@
                     <strong>@Html.Resource("UsePaging")</strong><br />
 
                     <span>
-                        @Html.Raw(String.Format(Html.Resource("DivideToItemPerPage"),
+                        @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("DivideToItemPerPage")).ToString(),
                         "<input type='text' style='width: 40px' ng-disabled='properties.DisplayMode.PropertyValue!=\"Paging\"' ng-model='properties.ItemsPerPage.PropertyValue'/>"))
                     </span>
                 </label>
@@ -111,7 +111,7 @@
                     <strong>@Html.Resource("UseLimit")</strong><br />
 
                     <span>
-                        @Html.Raw(String.Format(Html.Resource("ShowLimitedItems"),
+                        @Html.Raw(String.Format(Html.HtmlSanitize((string)Html.Resource("ShowLimitedItems")).ToString(),
                         "<input type='text' style='width: 40px' ng-disabled='properties.DisplayMode.PropertyValue!=\"Limit\"' ng-model='properties.LimitCount.PropertyValue'/>"))
                     </span>
                 </label>

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/Detail.DetailPage.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/Detail.DetailPage.cshtml
@@ -16,9 +16,9 @@
         @Html.CommentsCount(string.Empty, @Model.Item.DataItem)
     </div>
 
-    <div @Html.InlineEditingFieldAttributes("Summary", "LongText")>@Html.Raw(Model.Item.Fields.Summary)</div>
+    <div @Html.InlineEditingFieldAttributes("Summary", "LongText")>@Html.HtmlSanitize((string)Model.Item.Fields.Summary)</div>
 
-    <div @Html.InlineEditingFieldAttributes("Content", "LongText")>@Html.Raw(Model.Item.Fields.Content)</div>
+    <div @Html.InlineEditingFieldAttributes("Content", "LongText")>@Html.HtmlSanitize((string)Model.Item.Fields.Content)</div>
 
     @{        
         if (Model.EnableSocialSharing)

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/List.BlogPostList.cshtml b/Telerik.Sitefinity.Frontend.Blogs/Mvc/Views/BlogPost/List.BlogPostList.cshtml
@@ -26,7 +26,7 @@
                     @Html.CommentsCount((string)navigateUrl, item.DataItem)
                 </div>
 
-                <div @Html.InlineEditingFieldAttributes("Summary", "ShortText")>@Html.Raw(item.Fields.Summary)</div>
+                <div @Html.InlineEditingFieldAttributes("Summary", "ShortText")>@Html.HtmlSanitize((string)item.Fields.Summary)</div>
 
                 <a href="@navigateUrl">@Html.Resource("FullStory")</a>
             </li>

diff --git a/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj b/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj
@@ -42,6 +42,9 @@
   </PropertyGroup>
   <PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
@@ -63,7 +66,7 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.Text.Signed.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Text.Signed.4.5.14\lib\net45\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -147,6 +150,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\snk\PublicKey.snk">
+      <Link>PublicKey.snk</Link>
+    </None>
     <None Include="app.config" />
     <EmbeddedResource Include="Mvc\Views\BlogPost\List.BlogPostList.cshtml" />
     <EmbeddedResource Include="Mvc\Views\BlogPost\DesignerView.Simple.cshtml" />
@@ -168,31 +174,31 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Telerik.Sitefinity.ContentModules">
-      <HintPath>..\packages\Telerik.Sitefinity.Content.10.1.6520.0\lib\net45\Telerik.Sitefinity.ContentModules.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Content.10.2.6622\lib\net45\Telerik.Sitefinity.ContentModules.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Model">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.10.1.6520.0\lib\net45\Telerik.Sitefinity.Model.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.10.2.6622\lib\net45\Telerik.Sitefinity.Model.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Personalization">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.10.1.6520.0\lib\net45\Telerik.Sitefinity.Personalization.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.10.2.6622\lib\net45\Telerik.Sitefinity.Personalization.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.10.1.6520.0\lib\net45\Telerik.Sitefinity.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.10.2.6622\lib\net45\Telerik.Sitefinity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Utilities">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.10.1.6520.0\lib\net45\Telerik.Sitefinity.Utilities.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.10.2.6622\lib\net45\Telerik.Sitefinity.Utilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Frontend">
-      <HintPath>..\packages\Telerik.Sitefinity.Feather.Core.10.1.6520.0\lib\net45\Telerik.Sitefinity.Frontend.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Feather.Core.10.2.6622\lib\net45\Telerik.Sitefinity.Frontend.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Mvc">
-      <HintPath>..\packages\Telerik.Sitefinity.Mvc.10.1.6520.0\lib\net45\Telerik.Sitefinity.Mvc.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Mvc.10.2.6622\lib\net45\Telerik.Sitefinity.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/Telerik.Sitefinity.Frontend.Blogs/packages.config b/Telerik.Sitefinity.Frontend.Blogs/packages.config
@@ -6,11 +6,11 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
-  <package id="ServiceStack.Text.Signed" version="4.5.8" targetFramework="net45" />
+  <package id="ServiceStack.Text.Signed" version="4.5.14" targetFramework="net45" />
   <package id="Sitefinity.RazorEngine" version="3.0.8.0" targetFramework="net45" />
   <package id="Telerik.DataAccess.Core" version="2016.2.822.1" targetFramework="net45" />
-  <package id="Telerik.Sitefinity.Content" version="10.1.6520.0" targetFramework="net45" />
-  <package id="Telerik.Sitefinity.Core" version="10.1.6520.0" targetFramework="net45" />
-  <package id="Telerik.Sitefinity.Feather.Core" version="10.1.6520.0" targetFramework="net45" />
-  <package id="Telerik.Sitefinity.Mvc" version="10.1.6520.0" targetFramework="net45" />
+  <package id="Telerik.Sitefinity.Content" version="10.2.6622" targetFramework="net45" />
+  <package id="Telerik.Sitefinity.Core" version="10.2.6622" targetFramework="net45" />
+  <package id="Telerik.Sitefinity.Feather.Core" version="10.2.6622" targetFramework="net45" />
+  <package id="Telerik.Sitefinity.Mvc" version="10.2.6622" targetFramework="net45" />
 </packages>
diff --git a/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/Card.Simple.cshtml b/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/Card.Simple.cshtml
@@ -1,5 +1,7 @@
 @model Telerik.Sitefinity.Frontend.Card.Mvc.Models.Card.CardViewModel
 
+@using Telerik.Sitefinity.Frontend.Mvc.Helpers;
+
 <div class="@Model.CssClass">
 
         @if (!string.IsNullOrEmpty(Model.SelectedSizeUrl))
@@ -9,15 +11,15 @@
 
         @if (!string.IsNullOrEmpty(Model.Heading))
         {
-            <h3>@Html.Raw(Model.Heading)</h3>
+            <h3>@Html.HtmlSanitize(Model.Heading)</h3>
         }
         @if (!string.IsNullOrEmpty(Model.Description))
         {
-            <div>@Html.Raw(Model.Description)</div>
+            <div>@Html.HtmlSanitize(Model.Description)</div>
         }
         @if (!string.IsNullOrEmpty(Model.ActionName))
         {
-            <a href="@Model.ActionUrl">
+            <a href="@Html.UrlSanitize(Model.ActionUrl)">
                 <span>@Model.ActionName</span>
             </a>
         }

diff --git a/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/Card.cshtml b/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/Card.cshtml
@@ -1,21 +1,23 @@
 @model Telerik.Sitefinity.Frontend.Card.Mvc.Models.Card.CardViewModel
 
+@using Telerik.Sitefinity.Frontend.Mvc.Helpers;
+
 <div class="@Model.CssClass">
     @if (!string.IsNullOrEmpty(Model.SelectedSizeUrl))
     {
         <img src="@Model.SelectedSizeUrl"  title="@Model.ImageTitle" alt="@Model.ImageAlternativeText"/>
     }
     @if (!string.IsNullOrEmpty(Model.Heading))
     {   
-        <h3>@Html.Raw(Model.Heading)</h3>
+        <h3>@Html.HtmlSanitize(Model.Heading)</h3>
     }
     @if (!string.IsNullOrEmpty(Model.Description))
     {
-        <div>@Html.Raw(Model.Description)</div>
+        <div>@Html.HtmlSanitize(Model.Description)</div>
     }
     @if (!string.IsNullOrEmpty(Model.ActionName))
     {
-        <a href="@Model.ActionUrl">
+        <a href="@Html.UrlSanitize(Model.ActionUrl)">
             <span>@Model.ActionName</span>
         </a>
     }

diff --git a/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Card/Mvc/Views/Card/DesignerView.Simple.cshtml
@@ -21,7 +21,8 @@
             sf-model="properties.ImageId.PropertyValue"
             sf-image="selectedImage"
             sf-provider="properties.ImageProviderName.PropertyValue"
-            id="image-field"></sf-image-field>
+            id="image-field"
+            sf-media-settings="@SettingsHelpers.GetMediaSettings("Image")"></sf-image-field>
     </div>
 
     <hr class="side-to-side">