Feature/5101 ck editor option to resize images on upload

.github/ISSUE_TEMPLATE/bug-report.md

@@ -41,6 +41,7 @@ Provide any additional context that may be helpful in understanding and/or resol
 Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
 -->
 * [ ] 10.00.00 alpha build
+* [ ] 09.11.00 release candidate
 * [ ] 09.10.02 release candidate
 * [ ] 09.10.01 latest supported release
 

Build/Symbols/DotNetNuke_Symbols.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" version="09.10.02" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.11.00" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>

Build/Tasks/CreateUpgrade.cs

@@ -24,7 +24,7 @@ public sealed class CreateUpgrade : FrostingTask<Context>
         /// <inheritdoc/>
         public override void Run(Context context)
         {
-            this.RenameResourcesFor98xUpgrades(context);
+            this.RenameResourcesForUpgrade(context);
             context.CreateDirectory(context.ArtifactsFolder);
             var excludes = new string[context.PackagingPatterns.InstallExclude.Length + context.PackagingPatterns.UpgradeExclude.Length];
             context.PackagingPatterns.InstallExclude.CopyTo(excludes, 0);
@@ -38,20 +38,22 @@ public override void Run(Context context)
         }
 
         [Obsolete(
-            "Workaround to support upgrades from 9.8.0 which may or may not still have Telerik installed."
-            + "This method is to be removed in v10.0.0 and we should also implement a solution to remove these .resources files"
-            + "from the available extensions to make sure people don't install them by mistake.")]
-        private void RenameResourcesFor98xUpgrades(Context context)
+                    "Workaround to support upgrades from 9.8.0 which may or may not still have Telerik installed."
+                    + "It also prevents the new Resource Manager module being installed for 9.11+ upgrades."
+                    + "This method is to be removed in v10.0.0 and we should also implement a solution to remove these .resources files"
+                    + "from the available extensions to make sure people don't install them by mistake.")]
+        private void RenameResourcesForUpgrade(Context context)
         {
-            var telerikPackages = new[]
+            var packages = new[]
                                   {
                                       $"{context.WebsiteFolder}Install/Module/DNNCE_DigitalAssetsManagement*.zip",
                                       $"{context.WebsiteFolder}Install/Module/Telerik*.zip",
                                       $"{context.WebsiteFolder}Install/Library/DNNCE_Web.Deprecated*.zip",
                                       $"{context.WebsiteFolder}Install/Library/DNNCE_Website.Deprecated*.zip",
+                                      $"{context.WebsiteFolder}Install/Module/DNNCE_ResourceManager*.zip",
                                   };
 
-            var filesToRename = context.GetFilesByPatterns(telerikPackages);
+            var filesToRename = context.GetFilesByPatterns(packages);
             foreach (var fileToRename in filesToRename)
             {
                 File.Move(

DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Console" type="Module" version="09.10.02">
+        <package name="DotNetNuke.Console" type="Module" version="09.11.00">
             <friendlyName>Console</friendlyName>
             <description>Display children pages as icon links for navigation.</description>
             <iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>

DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.10.02">
+    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.11.00">
       <friendlyName>DotNetNuke Telerik Web Components</friendlyName>
       <description>Provides Telerik Components for DotNetNuke.</description>
       <dependencies/>

DNN Platform/Connectors/Azure/AzureConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.10.02">
+        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.11.00">
             <friendlyName>Dnn Azure Connector</friendlyName>
             <description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
             <iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>

DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.10.02">
+        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.11.00">
             <friendlyName>Google Analytics Connector</friendlyName>
             <description>Configure your sites Google Analytics settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>

DNN Platform/Connectors/GoogleTagManager/GoogleTagManagerConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.10.02">
+        <package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.11.00">
             <friendlyName>Google Tag Manager Connector</friendlyName>
             <description>Configure your sites Google Tag Manager settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png</iconFile>

DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNJWT" type="Provider" version="09.10.02">
+    <package name="DNNJWT" type="Provider" version="09.11.00">
       <friendlyName>DNN JWT Auth Handler</friendlyName>
       <description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
       <dependencies/>

DNN Platform/DotNetNuke.Abstractions/Portals/IPortalSettings.cs

@@ -475,6 +475,11 @@ public interface IPortalSettings
         /// </summary>
         int SplashTabId { get; set; }
 
+        /// <summary>
+        /// Gets a value indicating what the SSL setup is for this portal.
+        /// </summary>
+        Security.SiteSslSetup SSLSetup { get; }
+
         /// <summary>
         /// Gets a value indicating whether SSL is enabled for the portal.
         /// </summary>

DNN Platform/DotNetNuke.Abstractions/Security/SiteSslSetup.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Abstractions.Security
+{
+    /// <summary>
+    /// The SiteSslSetup is used in the portal settings to indicate what the global SSL setup is for the site.
+    /// </summary>
+    public enum SiteSslSetup
+    {
+        /// <summary>
+        /// No SSL
+        /// </summary>
+        Off = 0,
+
+        /// <summary>
+        /// Complete SSL
+        /// </summary>
+        On = 1,
+
+        /// <summary>
+        /// Ability to tweak SSL settings
+        /// </summary>
+        Advanced = 2,
+    }
+}

DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.10.02">
+    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.11.00">
       <friendlyName>DNN Deprecated Web Controls Library</friendlyName>
       <description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
       <dependencies/>

DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs

@@ -419,91 +419,6 @@ public Task<HttpResponseMessage> UploadFromLocal(int portalId)
             return task;
         }
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        [AllowAnonymous]
-        public HttpResponseMessage UploadFromUrl(UploadByUrlDto dto)
-        {
-            FileUploadDto result;
-            WebResponse response = null;
-            Stream responseStream = null;
-            var mediaTypeFormatter = new JsonMediaTypeFormatter();
-            mediaTypeFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/plain"));
-
-            if (this.VerifySafeUrl(dto.Url) == false)
-            {
-                return this.Request.CreateResponse(HttpStatusCode.BadRequest);
-            }
-
-            try
-            {
-                var request = (HttpWebRequest)WebRequest.Create(dto.Url);
-                request.Credentials = CredentialCache.DefaultCredentials;
-                response = request.GetResponse();
-                responseStream = response.GetResponseStream();
-                if (responseStream == null)
-                {
-                    throw new Exception("No server response");
-                }
-
-                var fileName = this.GetFileName(response);
-                if (string.IsNullOrEmpty(fileName))
-                {
-                    fileName = HttpUtility.UrlDecode(new Uri(dto.Url).Segments.Last());
-                }
-
-                var portalId = dto.PortalId;
-                if (portalId > -1)
-                {
-                    if (!this.IsPortalIdValid(portalId))
-                    {
-                        throw new HttpResponseException(HttpStatusCode.Unauthorized);
-                    }
-                }
-                else
-                {
-                    portalId = this.PortalSettings.PortalId;
-                }
-
-                result = UploadFile(responseStream, portalId, this.UserInfo, dto.Folder.ValueOrEmpty(), dto.Filter.ValueOrEmpty(),
-                    fileName, dto.Overwrite, dto.IsHostMenu, dto.Unzip, dto.ValidationCode);
-
-                /* Response Content Type cannot be application/json
-                    * because IE9 with iframe-transport manages the response
-                    * as a file download
-                    */
-                return this.Request.CreateResponse(
-                    HttpStatusCode.OK,
-                    result,
-                    mediaTypeFormatter,
-                    "text/plain");
-            }
-            catch (Exception ex)
-            {
-                result = new FileUploadDto
-                {
-                    Message = ex.Message,
-                };
-                return this.Request.CreateResponse(
-                    HttpStatusCode.OK,
-                    result,
-                    mediaTypeFormatter,
-                    "text/plain");
-            }
-            finally
-            {
-                if (response != null)
-                {
-                    response.Close();
-                }
-
-                if (responseStream != null)
-                {
-                    responseStream.Close();
-                }
-            }
-        }
-
         private static string GetLocalizedString(string key)
         {
             const string resourceFile = "/App_GlobalResources/FileUpload.resx";

DNN Platform/DotNetNuke.Web/UI/RibbonBarManager.cs

@@ -87,12 +87,18 @@ public static TabInfo InitTabInfoObject(TabInfo relativeToTab, TabRelativeLocati
             {
                 newTab.PortalID = parentTab.PortalID;
                 newTab.ParentId = parentTab.TabID;
-                newTab.Level = parentTab.Level + 1;
-                if (PortalSettings.Current.SSLEnabled)
-                {
-                    newTab.IsSecure = parentTab.IsSecure;
-
-                    // Inherit from parent
+                newTab.Level = parentTab.Level + 1;
+                switch (PortalSettings.Current.SSLSetup)
+                {
+                    case Abstractions.Security.SiteSslSetup.Off:
+                        newTab.IsSecure = false;
+                        break;
+                    case Abstractions.Security.SiteSslSetup.Advanced:
+                        newTab.IsSecure = parentTab.IsSecure;
+                        break;
+                    default:
+                        newTab.IsSecure = true;
+                        break;
                 }
             }
             else

DNN Platform/DotNetNuke.Web/UI/WebControls/DnnRibbonBarTool.cs

@@ -310,7 +310,7 @@ protected virtual void ProcessTool()
                             // Prevent PageSettings in a popup if SSL is enabled and enforced, which causes redirection/javascript broswer security issues.
                             if (this.ToolInfo.ToolName == "PageSettings" || this.ToolInfo.ToolName == "CopyPage" || this.ToolInfo.ToolName == "NewPage")
                             {
-                                if (!(PortalSettings.SSLEnabled && PortalSettings.SSLEnforced))
+                                if (!(PortalSettings.SSLSetup != Abstractions.Security.SiteSslSetup.Off && PortalSettings.SSLEnforced))
                                 {
                                     this.DnnLink.Attributes.Add("onclick", "return " + UrlUtils.PopUpUrl(this.DnnLink.NavigateUrl, this, PortalSettings, true, false));
                                 }

DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.ClientAPI" type="Library" version="09.10.02" >
+        <package name="DotNetNuke.ClientAPI" type="Library" version="09.11.00" >
             <friendlyName>DotNetNuke ClientAPI</friendlyName>
             <description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
             <dependencies/>

DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.10.02">
+    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.11.00">
       <friendlyName>DNN Deprecated Website Codebehind files</friendlyName>
       <description>DNN Deprecated Website Codebehind files for backward compability.</description>
       <dependencies/>

DNN Platform/HttpModules/UrlRewrite/BasicUrlRewriter.cs

@@ -291,34 +291,44 @@ internal override void RewriteUrl(object sender, EventArgs e)
                 {
                     // request is for a standard page
                     strURL = string.Empty;
-
-                    // if SSL is enabled
-                    if (portalSettings.SSLEnabled)
-                    {
-                        // if page is secure and connection is not secure orelse ssloffload is enabled and server value exists
-                        if ((portalSettings.ActiveTab.IsSecure && !request.IsSecureConnection) &&
-                            (UrlUtils.IsSslOffloadEnabled(request) == false))
-                        {
-                            // switch to secure connection
-                            strURL = requestedPath.Replace("http://", "https://");
-                            strURL = this.FormatDomain(strURL, portalSettings.STDURL, portalSettings.SSLURL);
-                        }
-                    }
-
-                    // if SSL is enforced
-                    if (portalSettings.SSLEnforced)
-                    {
-                        // if page is not secure and connection is secure
-                        if (!portalSettings.ActiveTab.IsSecure && request.IsSecureConnection)
-                        {
-                            // check if connection has already been forced to secure orelse ssloffload is disabled
-                            if (request.QueryString["ssl"] == null)
-                            {
-                                strURL = requestedPath.Replace("https://", "http://");
-                                strURL = this.FormatDomain(strURL, portalSettings.SSLURL, portalSettings.STDURL);
-                            }
-                        }
-                    }
+
+                    switch (portalSettings.SSLSetup)
+                    {
+                        case Abstractions.Security.SiteSslSetup.On:
+                            if (!request.IsSecureConnection)
+                            {
+                                // switch to secure connection
+                                strURL = requestedPath.Replace("http://", "https://");
+                            }
+
+                            break;
+                        case Abstractions.Security.SiteSslSetup.Advanced:
+                            // if site is secure or else page is secure and connection is not secure orelse ssloffload is enabled and server value exists
+                            if (portalSettings.ActiveTab.IsSecure &&
+                                !request.IsSecureConnection &&
+                                (UrlUtils.IsSslOffloadEnabled(request) == false))
+                            {
+                                // switch to secure connection
+                                strURL = requestedPath.Replace("http://", "https://");
+                                strURL = this.FormatDomain(strURL, portalSettings.STDURL, portalSettings.SSLURL);
+                            }
+
+                            if (portalSettings.SSLEnforced)
+                            {
+                                // if page is not secure and connection is secure
+                                if (!portalSettings.ActiveTab.IsSecure && request.IsSecureConnection)
+                                {
+                                    // check if connection has already been forced to secure orelse ssloffload is disabled
+                                    if (request.QueryString["ssl"] == null)
+                                    {
+                                        strURL = requestedPath.Replace("https://", "http://");
+                                        strURL = this.FormatDomain(strURL, portalSettings.SSLURL, portalSettings.STDURL);
+                                    }
+                                }
+                            }
+
+                            break;
+                    }
 
                     // if a protocol switch is necessary
                     if (!string.IsNullOrEmpty(strURL))

DNN Platform/JavaScript Libraries/Knockout/03.03.00.txt

@@ -0,0 +1 @@
+Resources\Libraries\Knockout\03_03_00\

DNN Platform/JavaScript Libraries/Knockout/Knockout.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Knockout" type="JavaScript_Library" version="03.03.00">
+    <package name="Knockout" type="JavaScript_Library" version="03.05.01">
       <friendlyName>Knockout JavaScript Library</friendlyName>
       <description>Knockout is an MVVM library that is used for client side databinding.</description>
       <iconFile>Icons\Sigma\Extensions_32x32_Standard.png</iconFile>
@@ -19,7 +19,7 @@
             <libraryName>Knockout</libraryName>
             <fileName>knockout.js</fileName>
             <objectName>ko</objectName>
-            <CDNPath>//cdnjs.cloudflare.com/ajax/libs/knockout/3.3.0/knockout-min.js</CDNPath>
+            <CDNPath>//cdnjs.cloudflare.com/ajax/libs/knockout/3.5.1/knockout-latest.min.js</CDNPath>
           </javaScriptLibrary>
         </component>
         <component type="JavaScriptFile">
@@ -31,6 +31,7 @@
           </jsfiles>
         </component>
         <component type="Cleanup" version="02.02.01" fileName="02.02.01.txt" />
+        <component type="Cleanup" version="03.03.00" fileName="03.03.00.txt" />
       </components>
     </package>
   </packages>