Merge pull request #3524 from mikesmeltzer/RemoveDnnCopyright

Remove DNN Copyright Injection
dnnsoftware · Jan 27, 2020 · b0abde7 · b0abde7
2 parents 6332824 + 9bb32f2
commit b0abde7
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 85 deletions.
diff --git a/DNN Platform/Website/Default.aspx.cs b/DNN Platform/Website/Default.aspx.cs
@@ -247,20 +247,6 @@ private void InitializePage()
                     break;
             }
 
-            //page comment
-            if (Host.DisplayCopyright)
-            {
-                Comment += string.Concat(Environment.NewLine,
-                                         "<!--*********************************************-->",
-                                         Environment.NewLine,
-                                         "<!-- DNN Platform - https://dnncommunity.org      -->",
-                                         Environment.NewLine,
-                                         "<!-- Copyright (c) 2002-2019, by .NET Foundation -->",
-                                         Environment.NewLine,
-                                         "<!--*********************************************-->",
-                                         Environment.NewLine);
-            }
-
             //Only insert the header control if a comment is needed
             if(!String.IsNullOrWhiteSpace(Comment))
                 Page.Header.Controls.AddAt(0, new LiteralControl(Comment));
@@ -379,10 +365,6 @@ private void InitializePage()
             {
                 KeyWords = PortalSettings.KeyWords;
             }
-            if (Host.DisplayCopyright)
-            {
-                KeyWords += ",DotNetNuke,DNN";
-            }
 
             //META copyright
             if (!string.IsNullOrEmpty(PortalSettings.FooterText))
@@ -395,14 +377,9 @@ private void InitializePage()
             }
 
             //META generator
-            if (Host.DisplayCopyright)
-            {
-                Generator = "DotNetNuke ";
-            }
-            else
-            {
-                Generator = "";
-            }
+
+            Generator = "";
+
 
             //META Robots - hide it inside popups and if PageHeadText of current tab already contains a robots meta tag
             if (!UrlUtils.InPopUp() &&

diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/src/components/otherSettings/index.jsx b/Dnn.AdminExperience/ClientSide/Security.Web/src/components/otherSettings/index.jsx
@@ -171,25 +171,6 @@ class OtherSettingsPanelBody extends Component {
         if (state.otherSettings) {
             return (
                 <div className={styles.otherSettings}>
-                    <InputGroup>
-                        <div className="otherSettings-row_switch">
-                            <Label
-                                labelType="inline"
-                                tooltipMessage={resx.get("plDisplayCopyright.Help")}
-                                label={resx.get("plDisplayCopyright")}
-                                extra={
-                                    <Tooltip
-                                        messages={[resx.get("GlobalSetting")]}
-                                        type="global"
-                                        style={{ float: "left", position: "static" }} />
-                                } />
-                            <Switch
-                                onText={resx.get("SwitchOn")}
-                                offText={resx.get("SwitchOff")}
-                                value={state.otherSettings.DisplayCopyright}
-                                onChange={this.onSettingChange.bind(this, "DisplayCopyright")} />
-                        </div>
-                    </InputGroup>
                     <InputGroup>
                         <div className="otherSettings-row_switch">
                             <Label
@@ -209,7 +190,7 @@ class OtherSettingsPanelBody extends Component {
                                 onChange={this.onSettingChange.bind(this, "ShowCriticalErrors")} />
                         </div>
                     </InputGroup>
-                    <InputGroup>
+                    <InputGroup> 
                         <div className="otherSettings-row_switch">
                             <Label
                                 labelType="inline"

diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/privacySettings/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/privacySettings/index.jsx
@@ -204,26 +204,6 @@ class PrivacySettingsPanelBody extends Component {
             onChange={this.onSettingChange.bind(this, "CheckUpgrade")}
           />
         </InputGroup>
-        <InputGroup>
-          <Label
-            labelType="inline"
-            tooltipMessage={resx.get("plDisplayCopyright.Help")}
-            label={resx.get("plDisplayCopyright")}
-            extra={
-              <Tooltip
-                messages={[resx.get("GlobalSetting")]}
-                type="global"
-                style={{ float: "left", position: "static" }}
-              />
-            }
-          />
-          <Switch
-            onText={resx.get("SwitchOn")}
-            offText={resx.get("SwitchOff")}
-            value={state.privacySettings.DisplayCopyright}
-            onChange={this.onSettingChange.bind(this, "DisplayCopyright")}
-          />
-        </InputGroup>
       </div>
     ) : (
       <div key="column-one-left" className="left-column" />

diff --git a/...inExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdatePrivacySettings.cs b/...inExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdatePrivacySettings.cs
@@ -24,8 +24,6 @@ public class UpdatePrivacySettingsRequest
 
         public bool DnnImprovementProgram { get; set; }
 
-        public bool DisplayCopyright { get; set; }
-
         public bool DataConsentActive { get; set; }
 
         public int DataConsentConsentRedirect { get; set; }

diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateOtherSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/UpdateOtherSettingsRequest.cs
@@ -19,7 +19,6 @@ namespace Dnn.PersonaBar.Security.Services.Dto
 {
     public class UpdateOtherSettingsRequest
     {
-        public bool DisplayCopyright { get; set; }
 
         public bool ShowCriticalErrors { get; set; }
 

diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SecurityController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SecurityController.cs
@@ -749,7 +749,6 @@ public HttpResponseMessage GetOtherSettings()
                     {
                         Settings = new
                         {
-                            Host.DisplayCopyright,
                             Host.ShowCriticalErrors,
                             Host.DebugMode,
                             Host.RememberCheckbox,
@@ -784,7 +783,6 @@ public HttpResponseMessage UpdateOtherSettings(UpdateOtherSettingsRequest reques
         {
             try
             {
-                HostController.Instance.Update("Copyright", request.DisplayCopyright ? "Y" : "N", false);
                 HostController.Instance.Update("ShowCriticalErrors", request.ShowCriticalErrors ? "Y" : "N", false);
                 HostController.Instance.Update("DebugMode", request.DebugMode ? "True" : "False", false);
                 HostController.Instance.Update("RememberCheckbox", request.RememberCheckbox ? "Y" : "N", false);

diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
@@ -1571,7 +1571,6 @@ public HttpResponseMessage GetPrivacySettings(int? portalId)
                         portalSettings.CookieMoreLink,
                         CheckUpgrade = HostController.Instance.GetBoolean("CheckUpgrade", true),
                         DnnImprovementProgram = HostController.Instance.GetBoolean("DnnImprovementProgram", true),
-                        DisplayCopyright = HostController.Instance.GetBoolean("Copyright", true),
                         portalSettings.DataConsentActive,
                         DataConsentResetTerms = false,
                         DataConsentConsentRedirect = TabSanitizer(portalSettings.DataConsentConsentRedirect, pid)?.TabID,
@@ -1612,7 +1611,6 @@ public HttpResponseMessage UpdatePrivacySettings(UpdatePrivacySettingsRequest re
                 PortalController.UpdatePortalSetting(pid, "CookieMoreLink", request.CookieMoreLink, false, request.CultureCode);
                 HostController.Instance.Update("CheckUpgrade", request.CheckUpgrade ? "Y" : "N", false);
                 HostController.Instance.Update("DnnImprovementProgram", request.DnnImprovementProgram ? "Y" : "N", false);
-                HostController.Instance.Update("Copyright", request.DisplayCopyright ? "Y" : "N", false);
                 PortalController.UpdatePortalSetting(pid, "DataConsentActive", request.DataConsentActive.ToString(), false);
                 PortalController.UpdatePortalSetting(pid, "DataConsentConsentRedirect", ValidateTabId(request.DataConsentConsentRedirect, pid).ToString(), false);
                 PortalController.UpdatePortalSetting(pid, "DataConsentUserDeleteAction", request.DataConsentUserDeleteAction.ToString(), false);

diff --git a/.../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx b/.../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/App_LocalResources/Security.resx
@@ -1120,12 +1120,6 @@
   <data name="CheckHiddenSystemFilesSuccess.Text" xml:space="preserve">
     <value>There are no files marked as system file or hidden in the website folder.</value>
   </data>
-  <data name="plDisplayCopyright.Help" xml:space="preserve">
-    <value>Check this box to add the DNN copyright credits to the page source.</value>
-  </data>
-  <data name="plDisplayCopyright.Text" xml:space="preserve">
-    <value>Show Copyright Credits</value>
-  </data>
   <data name="CheckTelerikVulnerabilityFailure.Text" xml:space="preserve">
     <value>The Telerik component vulnerability has not been patched, please go to http://www.dnnsoftware.com/community-blog/cid/155449/critical-security-update--september2017 for detailed information and to download the patch.</value>
   </data>

diff --git a/...sonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/...sonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
@@ -1362,12 +1362,6 @@
   <data name="PrivacyCookieConsentSettings.Text" xml:space="preserve">
     <value>Cookie Consent Settings</value>
   </data>
-  <data name="plDisplayCopyright.Help" xml:space="preserve">
-    <value>Include DNN Platform Copyright statement in page HTML source. Users will not see this rendered in their browser.</value>
-  </data>
-  <data name="plDisplayCopyright.Text" xml:space="preserve">
-    <value>Display Copyright</value>
-  </data>
   <data name="DataConsentActive.Help" xml:space="preserve">
     <value>When switched on, registered users will be forced to consent to the terms and conditions of this site</value>
   </data>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ namespace Dnn.PersonaBar.Security.Services.Dto @@
     {
         public class UpdateOtherSettingsRequest
         {
-            public bool DisplayCopyright { get; set; }
             public bool ShowCriticalErrors { get; set; }
@@ Expand Down @@