From 7190fa92a8911792d397e8ce8dd339de71649053 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Sun, 8 Nov 2020 21:32:32 -0500 Subject: [PATCH] Removed Telerik dependencies --- AssemblyInfo.vb | 2 +- Components/Configuration.vb | 22 ------------ DotNetNuke.Modules.Feedback.vbproj | 10 ------ Feedback.ascx | 1 - Settings.ascx | 12 ------- Settings.ascx.designer.vb | 54 ------------------------------ Settings.ascx.vb | 2 -- _buildfiles/version.txt | 2 +- packages.config | 1 - 9 files changed, 2 insertions(+), 104 deletions(-) diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 3e22037..48c3b2d 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: - + diff --git a/Components/Configuration.vb b/Components/Configuration.vb index 3457715..6c24d2c 100644 --- a/Components/Configuration.vb +++ b/Components/Configuration.vb @@ -104,8 +104,6 @@ Namespace DotNetNuke.Modules.Feedback Private _captchaVisibility As CaptchaVisibilities Private _captchaAudio As Boolean Private _captchaCase As Boolean - Private _captchaLineNoise As Telerik.Web.UI.CaptchaLineNoiseLevel - Private _captchaBackgroundNoise As Telerik.Web.UI.CaptchaBackgroundNoiseLevel Private _repeatSubmissionFilter As RepeatSubmissionFilters Private _repeatSubmissionInteval As Integer Private _duplicateSubmission As Boolean @@ -787,8 +785,6 @@ Namespace DotNetNuke.Modules.Feedback _captchaVisibility = GetCaptchaVisibility() 'Handles legacy UseCaptcha setting _captchaAudio = GetSetting("Feedback_CaptchaAudio", False) _captchaCase = GetSetting("Feedback_CaptchaCase", True) - _captchaLineNoise = GetCaptchaLineNoise() - _captchaBackgroundNoise = GetCaptchaBackgroundNoise() 'Issue #22 NoCaptcha support _useNoCaptcha = GetSetting("Feedback_UseNoCaptcha", False) @@ -913,22 +909,6 @@ Namespace DotNetNuke.Modules.Feedback End If End Function - Private Function GetCaptchaLineNoise() As Telerik.Web.UI.CaptchaLineNoiseLevel - If _settings("Feedback_CaptchaLineNoise") IsNot Nothing Then - Return CType(_settings("Feedback_CaptchaLineNoise"), Telerik.Web.UI.CaptchaLineNoiseLevel) - Else - Return Telerik.Web.UI.CaptchaLineNoiseLevel.Low - End If - End Function - - Private Function GetCaptchaBackgroundNoise() As Telerik.Web.UI.CaptchaBackgroundNoiseLevel - If _settings("Feedback_CaptchaBackgroundNoise") IsNot Nothing Then - Return CType(_settings("Feedback_CaptchaBackgroundNoise"), Telerik.Web.UI.CaptchaBackgroundNoiseLevel) - Else - Return Telerik.Web.UI.CaptchaBackgroundNoiseLevel.Low - End If - End Function - Public Sub SaveSettings() SaveSettings(_moduleId) End Sub @@ -955,8 +935,6 @@ Namespace DotNetNuke.Modules.Feedback .UpdateModuleSetting(_moduleId, "Feedback_CaptchaVisibility", _captchaVisibility.ToString) .UpdateModuleSetting(_moduleId, "Feedback_CaptchaAudio", _captchaAudio.ToString) .UpdateModuleSetting(_moduleId, "Feedback_CaptchaCase", _captchaCase.ToString) - .UpdateModuleSetting(_moduleId, "Feedback_CaptchaLineNoise", CInt(_captchaLineNoise).ToString) - .UpdateModuleSetting(_moduleId, "Feedback_CaptchaBackgroundNoise", CInt(_captchaBackgroundNoise).ToString) .UpdateModuleSetting(_moduleId, "Feedback_DuplicateSubmission", _duplicateSubmission.ToString) .UpdateModuleSetting(_moduleId, "Feedback_RepeatSubmissionFilter", _repeatSubmissionFilter.ToString) .UpdateModuleSetting(_moduleId, "Feedback_RepeatSubmissionInteval", _repeatSubmissionInteval.ToString) diff --git a/DotNetNuke.Modules.Feedback.vbproj b/DotNetNuke.Modules.Feedback.vbproj index acbbb81..5d304e4 100644 --- a/DotNetNuke.Modules.Feedback.vbproj +++ b/DotNetNuke.Modules.Feedback.vbproj @@ -112,11 +112,6 @@ False False - - packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\DotNetNuke.Web.Deprecated.dll - False - False - packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll False @@ -156,11 +151,6 @@ System.XML - - packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\Telerik.Web.UI.dll - False - False - diff --git a/Feedback.ascx b/Feedback.ascx index 952cc73..7a9b133 100644 --- a/Feedback.ascx +++ b/Feedback.ascx @@ -1,7 +1,6 @@ <%@ Control Language="vb" AutoEventWireup="false" Explicit="True" Codebehind="Feedback.ascx.vb" Inherits="DotNetNuke.Modules.Feedback.Feedback" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls"%> -<%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web.Deprecated" Namespace="DotNetNuke.Web.UI.WebControls" %> <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
diff --git a/Settings.ascx b/Settings.ascx index 3113df6..b39720e 100644 --- a/Settings.ascx +++ b/Settings.ascx @@ -166,18 +166,6 @@
-
- - -
-
- - -
-
- - -
diff --git a/Settings.ascx.designer.vb b/Settings.ascx.designer.vb index 8fbee9f..39041ac 100644 --- a/Settings.ascx.designer.vb +++ b/Settings.ascx.designer.vb @@ -662,60 +662,6 @@ Namespace DotNetNuke.Modules.Feedback ''' Protected WithEvents rblCaptchaVisibility As Global.System.Web.UI.WebControls.RadioButtonList - ''' - '''plCaptchaCase control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents plCaptchaCase As Global.System.Web.UI.UserControl - - ''' - '''chkCaptchaCase control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents chkCaptchaCase As Global.System.Web.UI.WebControls.CheckBox - - ''' - '''plCaptchaLineNoise control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents plCaptchaLineNoise As Global.System.Web.UI.UserControl - - ''' - '''ddlCaptchaLineNoise control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents ddlCaptchaLineNoise As Global.System.Web.UI.WebControls.DropDownList - - ''' - '''plCaptchaBackgroundNoise control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents plCaptchaBackgroundNoise As Global.System.Web.UI.UserControl - - ''' - '''ddlCaptchaBackgroundNoise control. - ''' - ''' - '''Auto-generated field. - '''To modify move field declaration from designer file to code-behind file. - ''' - Protected WithEvents ddlCaptchaBackgroundNoise As Global.System.Web.UI.WebControls.DropDownList - ''' '''plNoCaptcha control. ''' diff --git a/Settings.ascx.vb b/Settings.ascx.vb index efc6d95..3c707e2 100644 --- a/Settings.ascx.vb +++ b/Settings.ascx.vb @@ -195,8 +195,6 @@ Namespace DotNetNuke.Modules.Feedback rblScope.SelectedValue = CInt(MyConfiguration.Scope).ToString chkAsync.Checked = MyConfiguration.SendAsync rblCaptchaVisibility.SelectedValue = CInt(MyConfiguration.CaptchaVisibility).ToString - BindToEnum(GetType(Telerik.Web.UI.CaptchaLineNoiseLevel), ddlCaptchaLineNoise) - BindToEnum(GetType(Telerik.Web.UI.CaptchaBackgroundNoiseLevel), ddlCaptchaBackgroundNoise) ' Issue 22, NoCaptcha support chkNoCaptcha.Checked = MyConfiguration.UseNoCaptcha diff --git a/_buildfiles/version.txt b/_buildfiles/version.txt index 1526f1e..c186a67 100644 --- a/_buildfiles/version.txt +++ b/_buildfiles/version.txt @@ -1 +1 @@ -6.7.0.17 \ No newline at end of file +6.7.0.22 \ No newline at end of file diff --git a/packages.config b/packages.config index a777f4d..97633e4 100644 --- a/packages.config +++ b/packages.config @@ -2,7 +2,6 @@ -